Fix treatment of absolute labels

salesforce · Dec 11, 2024 · 794f5f5 · 794f5f5
1 parent 23c2a28
commit 794f5f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/....core/src/com/salesforce/bazel/eclipse/core/model/discovery/projects/JavaProjectInfo.java b/....core/src/com/salesforce/bazel/eclipse/core/model/discovery/projects/JavaProjectInfo.java
@@ -393,6 +393,12 @@ private Entry toJavaSourceFileOrLabelEntry(String srcFileOrLabel) throws CoreExc
 
         // treat as label if it looks like one
         if (shouldTreatAsLabel(srcFileOrLabel)) {
+            // handle absolute labels first
+            var mayBeAbsoluteLaybel = Label.createIfValid(srcFileOrLabel);
+            if (mayBeAbsoluteLaybel != null) {
+                return new LabelEntry(new BazelLabel(mayBeAbsoluteLaybel.toString()));
+            }
+            // treat as relative label
             return new LabelEntry(bazelPackage.getBazelTarget(srcFileOrLabel).getLabel());
         }
 

diff --git a/bundles/com.salesforce.bazel.sdk/src/com/salesforce/bazel/sdk/model/BazelLabel.java b/bundles/com.salesforce.bazel.sdk/src/com/salesforce/bazel/sdk/model/BazelLabel.java
@@ -476,9 +476,8 @@ public Label toPrimitive() {
                     getExternalRepositoryName(),
                     new WorkspacePath(getPackagePath()),
                     TargetName.create(getTargetName()));
-            } else {
-                return Label.create(new WorkspacePath(getPackagePath()), TargetName.create(getTargetName()));
             }
+            return Label.create(new WorkspacePath(getPackagePath()), TargetName.create(getTargetName()));
         }
 
         return Label.create(fullLabel);
@@ -488,4 +487,5 @@ public Label toPrimitive() {
     public String toString() {
         return fullLabel;
     }
+
 }