commit 36a265772e6e901d4c689634141850814179479c
author Yue Gan <yueg@google.com> Wed May 25 11:48:10 2016 +0000
committer Yue Gan <yueg@google.com> Wed May 25 11:53:48 2016 +0000
tree 32b5241ecb5e63caf584c6796713cbee4a0bcd3a
parent 52594355dbeb9496e2775f3c438c1c887ac03f0e

Better error message when combine //visibility:(public|private) with other forms.

--
MOS_MIGRATED_REVID=123201777

src/main/java/com/google/devtools/build/lib/packages/RuleClass.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index 78ec863..edabbda 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -40,6 +40,7 @@
 import com.google.devtools.build.lib.syntax.Argument;
 import com.google.devtools.build.lib.syntax.BaseFunction;
 import com.google.devtools.build.lib.syntax.Environment;
+import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.FuncallExpression;
 import com.google.devtools.build.lib.syntax.GlobList;
 import com.google.devtools.build.lib.syntax.Runtime;
@@ -1673,7 +1674,11 @@
             rule.getLabel() + ": //visibility:legacy_public only allowed in package declaration",
             eventHandler);
       }
-      rule.setVisibility(PackageFactory.getVisibility(rule.getLabel(), attrList));
+      try {
+        rule.setVisibility(PackageFactory.getVisibility(rule.getLabel(), attrList));
+      } catch (EvalException e) {
+         rule.reportError(rule.getLabel() + " " + e.getMessage(), eventHandler);
+      }
     }
     rule.setAttributeValue(attr, nativeAttrVal, explicit);
     checkAllowedValues(rule, attr, eventHandler);