Fix label relativization

salesforce · Dec 6, 2024 · a3858bb · a3858bb
1 parent a0fd0f1
commit a3858bb
Showing 1 changed file with 3 additions and 9 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
@@ -303,16 +303,10 @@ public JavaSourceInfo getTestSourceInfo() {
      * @return the passed in value or a relative path to a file in this package
      */
     private String relativizeLabelToPackageIfPossible(String srcFileOrLabel) {
-        var myPackagePath = bazelPackage.getLabel().toString();
-
-        var relativePath = srcFileOrLabel;
-        var rootSlashIndex = srcFileOrLabel.indexOf(BazelLabel.BAZEL_ROOT_SLASHES);
-        if (rootSlashIndex > -1) {
-            relativePath = srcFileOrLabel.substring(rootSlashIndex + BazelLabel.BAZEL_ROOT_SLASHES.length());
-        }
-        if (relativePath.startsWith(myPackagePath + BazelLabel.BAZEL_COLON)) {
+        var myPackageLabel = bazelPackage.getLabel().toString();
+        if (srcFileOrLabel.startsWith(myPackageLabel + BazelLabel.BAZEL_COLON)) {
             // drop the package name to identify a reference within package
-            return relativePath.substring(myPackagePath.length() + 1);
+            return srcFileOrLabel.substring(myPackageLabel.length() + 1);
         }
 
         // return original passed in value