Display parsing errors for WORKSPACE files

Previously, for some types of errors, you'd just see "WORKSPACE file
could not be parsed" if there was a syntax error (instead of what the
syntax error was).

Change-Id: Ia278cf23b79f8daba02917cdfb4cc515a87080b1

--
Change-Id: Ia278cf23b79f8daba02917cdfb4cc515a87080b1
Reviewed-on: https://github.com/bazelbuild/bazel/pull/774
MOS_MIGRATED_REVID=112190322

2 files changed, 12 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
index 15c2e82332..23c92dcd5d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -133,7 +133,7 @@ public class WorkspaceFactory {
     buildFileAST = BuildFileAST.parseBuildFile(source, localReporter, false);
     if (buildFileAST.containsErrors()) {
       environmentBuilder = null;
-      throw new IOException("WORKSPACE file could not be parsed");
+      throw new IOException("Failed to parse " + source.getPath());
     }
     environmentBuilder = Environment.builder(mutability)
         .setGlobals(Environment.BUILD)
@@ -305,4 +305,11 @@ public class WorkspaceFactory {
   public static ClassObject newNativeModule(RuleClassProvider ruleClassProvider) {
     return newNativeModule(createWorkspaceFunctions(ruleClassProvider));
   }
+
+  /**
+   * @return a list of events that have occurred while parsing the WORKSPACE file.
+   */
+  public ImmutableList<Event> getEvents() {
+    return localReporter.getEvents();
+  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
index 08514baad9..65060a29e1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.lib.skyframe;
 
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.cmdline.Label;
+import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.packages.Package.LegacyBuilder;
 import com.google.devtools.build.lib.packages.PackageFactory;
 import com.google.devtools.build.lib.packages.RuleClassProvider;
@@ -94,6 +95,9 @@ public class WorkspaceFileFunction implements SkyFunction {
       } catch (PackageFunctionException e) {
         throw new WorkspaceFileFunctionException(e, Transience.PERSISTENT);
       } catch (IOException e) {
+        for (Event event : parser.getEvents()) {
+          env.getListener().handle(event);
+        }
         throw new WorkspaceFileFunctionException(e, Transience.TRANSIENT);
       }
     }