Skip to content

Commit 794f5f5

Browse files
committed
Fix treatment of absolute labels
1 parent 23c2a28 commit 794f5f5

File tree

2 files changed

+8
-2
lines changed
  • bundles
    • com.salesforce.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/discovery/projects
    • com.salesforce.bazel.sdk/src/com/salesforce/bazel/sdk/model

2 files changed

+8
-2
lines changed

bundles/com.salesforce.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/discovery/projects/JavaProjectInfo.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,12 @@ private Entry toJavaSourceFileOrLabelEntry(String srcFileOrLabel) throws CoreExc
393393

394394
// treat as label if it looks like one
395395
if (shouldTreatAsLabel(srcFileOrLabel)) {
396+
// handle absolute labels first
397+
var mayBeAbsoluteLaybel = Label.createIfValid(srcFileOrLabel);
398+
if (mayBeAbsoluteLaybel != null) {
399+
return new LabelEntry(new BazelLabel(mayBeAbsoluteLaybel.toString()));
400+
}
401+
// treat as relative label
396402
return new LabelEntry(bazelPackage.getBazelTarget(srcFileOrLabel).getLabel());
397403
}
398404

bundles/com.salesforce.bazel.sdk/src/com/salesforce/bazel/sdk/model/BazelLabel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,9 +476,8 @@ public Label toPrimitive() {
476476
getExternalRepositoryName(),
477477
new WorkspacePath(getPackagePath()),
478478
TargetName.create(getTargetName()));
479-
} else {
480-
return Label.create(new WorkspacePath(getPackagePath()), TargetName.create(getTargetName()));
481479
}
480+
return Label.create(new WorkspacePath(getPackagePath()), TargetName.create(getTargetName()));
482481
}
483482

484483
return Label.create(fullLabel);
@@ -488,4 +487,5 @@ public Label toPrimitive() {
488487
public String toString() {
489488
return fullLabel;
490489
}
490+
491491
}

0 commit comments

Comments
 (0)