Expect double-@-prefixed labels in Bazel output

PiperOrigin-RevId: 581018613 (cherry picked from commit a844598)
bazelbuild · Nov 14, 2023 · 73cde7e · 73cde7e
1 parent 2397056
commit 73cde7e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/shared/java/com/google/idea/blaze/common/Label.java b/shared/java/com/google/idea/blaze/common/Label.java
@@ -60,6 +60,10 @@ public Label(String label) {
       Preconditions.checkArgument(doubleSlash > 0, label);
       int colon = label.indexOf(":");
       Preconditions.checkArgument(colon > doubleSlash, label);
+      if (!label.startsWith("@@")) {
+        // Normalize `label` to either start with double-at or start with double-slash.
+        label = '@' + label;
+      }
     } else {
       Preconditions.checkArgument(label.startsWith("//"), label);
       Preconditions.checkArgument(label.contains(":"), label);
@@ -78,10 +82,10 @@ public Path getName() {
   }
 
   public String getWorkspaceName() {
-    if (!label.startsWith("@")) {
-      return "";
+    if (label.startsWith("@@")) {
+      return label.substring(2, label.indexOf("//"));
     } else {
-      return label.substring(1, label.indexOf("//"));
+      return "";
     }
   }
 

diff --git a/shared/javatests/com/google/idea/blaze/common/LabelTest.java b/shared/javatests/com/google/idea/blaze/common/LabelTest.java
@@ -100,8 +100,18 @@ public void testGetWorkspace_nonEmpty() {
     assertThat(new Label("@myworkspace//package:rule").getWorkspaceName()).isEqualTo("myworkspace");
   }
 
+  @Test
+  public void testGetWorkspace_doubleAt() {
+    assertThat(new Label("@@myws//package:rule").getWorkspaceName()).isEqualTo("myws");
+  }
+
   @Test
   public void testNew_badWorkspace() {
     assertThrows(IllegalArgumentException.class, () -> new Label("@work:space//package/path"));
   }
+
+  @Test
+  public void doubleAtNormalization() {
+    assertThat(new Label("@abc//:def")).isEqualTo(new Label("@@abc//:def"));
+  }
 }