Improve error diagnostics for Skylark aspects.

--
MOS_MIGRATED_REVID=105851371

1 files changed, 14 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectValue.java
index 5a4052fb8c..884d5dbc72 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectValue.java
@@ -56,6 +56,8 @@ public final class AspectValue extends ActionLookupValue {
 
     public abstract AspectParameters getParameters();
 
+    public abstract String getDescription();
+
     public BuildConfiguration getConfiguration() {
       return configuration;
     }
@@ -88,6 +90,11 @@ public final class AspectValue extends ActionLookupValue {
     }
 
     @Override
+    public String getDescription() {
+      return String.format("%s of %s", aspect.getAspectFactory().getName(), getLabel());
+    }
+
+    @Override
     SkyFunctionName getType() {
       return SkyFunctions.NATIVE_ASPECT;
     }
@@ -152,6 +159,13 @@ public final class AspectValue extends ActionLookupValue {
     }
 
     @Override
+    public String getDescription() {
+      // Skylark aspects are referred to on command line with <file>%<value name>
+      return String.format(
+          "%s%%%s of %s", extensionFile.toString(), skylarkFunctionName, getLabel());
+    }
+
+    @Override
     SkyFunctionName getType() {
       return SkyFunctions.SKYLARK_ASPECT;
     }