Ignore workspaces defined in install base. (#30)

Fixes #25.

Author: guw

bundles/com.salesforce.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/BazelWorkspace.java

@@ -481,6 +481,16 @@ public BazelWorkspace getExternalWorkspace(IPath externalRoot) throws IllegalArg
         return new BazelWorkspace(externalRoot, this);
     }
 
+    /**
+     * {@return absolute file system location to the Bazel install base}
+     *
+     * @throws CoreException
+     *             if the workspace does not exist
+     */
+    public IPath getInstallBaseLocation() throws CoreException {
+        return getInfo().getInstallBase();
+    }
+
     @Override
     public BazelLabel getLabel() {
         // FIXME: the workspace should have a label but which one? @, @//, @name?

bundles/com.salesforce.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/BazelWorkspaceInfo.java

@@ -66,6 +66,7 @@ private enum BazelInfoKey {
         BAZEL_TESTLOGS("bazel-testlogs"),
         COMMAND_LOG("command_log"),
         OUTPUT_BASE("output_base"),
+        INSTALL_BASE("install_base"),
         OUTPUT_PATH("output_path"),
         STARLARK_SEMANTICS("starlark-semantics");
 
@@ -106,6 +107,7 @@ public String key() {
     private IPath bazelGenfiles;
     private IPath bazelTestlogs;
     private IPath commandLog;
+    private IPath installBase;
     private IPath outputBase;
     private IPath outputPath;
     private String starlarkSemantics;
@@ -268,6 +270,10 @@ public Stream<ExternalWorkspace> getExternalRepositoryMappings() throws CoreExce
         return externalWorkspaceByRepoName.values().stream();
     }
 
+    public IPath getInstallBase() {
+        return installBase;
+    }
+
     public String getName() {
         return name;
     }
@@ -434,6 +440,7 @@ public void load(BazelModelCommandExecutionService executionService) throws Core
             bazelGenfiles = getExpectedOutputAsPath(infoResult, BazelInfoKey.BAZEL_GENFILES);
             bazelTestlogs = getExpectedOutputAsPath(infoResult, BazelInfoKey.BAZEL_TESTLOGS);
             commandLog = getExpectedOutputAsPath(infoResult, BazelInfoKey.COMMAND_LOG);
+            installBase = getExpectedOutputAsPath(infoResult, BazelInfoKey.INSTALL_BASE);
             outputBase = getExpectedOutputAsPath(infoResult, BazelInfoKey.OUTPUT_BASE);
             outputPath = getExpectedOutputAsPath(infoResult, BazelInfoKey.OUTPUT_PATH);
             starlarkSemantics = getExpectedOutput(infoResult, BazelInfoKey.STARLARK_SEMANTICS);
@@ -503,6 +510,22 @@ public void load(BazelModelCommandExecutionService executionService) throws Core
         }
     }
 
+    private synchronized Map<String, ExternalWorkspace> loadExternalRepoMappings() throws CoreException {
+        if (externalWorkspaceByRepoName != null) {
+            return externalWorkspaceByRepoName;
+        }
+
+        var workspaceRoot = getWorkspaceFile().getParent();
+
+        var repoMappingCommand =
+                new BazelModDumpRepoMappingCommand(workspaceRoot, "", "Reading bzlmod repository mappings");
+        List<ExternalWorkspace> externalWorkspaces =
+                bazelWorkspace.getCommandExecutor().runQueryWithoutLock(repoMappingCommand);
+
+        return externalWorkspaceByRepoName =
+                externalWorkspaces.stream().collect(toMap(ExternalWorkspace::repoName, Function.identity())); // index by the "repo name" attribute
+    }
+
     private synchronized Map<String, BazelRuleAttributes> loadExternalRepositoryRules() throws CoreException {
         if (externalRepositoryRuleByName != null) {
             return externalRepositoryRuleByName;
@@ -529,20 +552,4 @@ private synchronized Map<String, BazelRuleAttributes> loadExternalRepositoryRule
                 .map(BazelRuleAttributes::new)
                 .collect(toMap(BazelRuleAttributes::getName, Function.identity())); // index by the "name" attribute
     }
-
-    private synchronized Map<String, ExternalWorkspace> loadExternalRepoMappings() throws CoreException {
-        if (externalWorkspaceByRepoName != null) {
-            return externalWorkspaceByRepoName;
-        }
-
-        var workspaceRoot = getWorkspaceFile().getParent();
-
-        var repoMappingCommand =
-                new BazelModDumpRepoMappingCommand(workspaceRoot, "", "Reading bzlmod repository mappings");
-        List<ExternalWorkspace> externalWorkspaces =
-                bazelWorkspace.getCommandExecutor().runQueryWithoutLock(repoMappingCommand);
-
-        return externalWorkspaceByRepoName =
-                externalWorkspaces.stream().collect(toMap(ExternalWorkspace::repoName, Function.identity())); // index by the "repo name" attribute
-    }
 }

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

@@ -475,6 +475,11 @@ private BazelWorkspace findExternalWorkspace(Label label) throws CoreException {
                         var path = forPosix(pathAttribute);
                         if (!path.isAbsolute()) {
                             path = bazelWorkspace.getLocation().append(path);
+                        } else if (bazelWorkspace.getInstallBaseLocation().isPrefixOf(path)) {
+                            // if this is coming from the install base we must ignore it
+                            // fixes https://github.com/eclipseguru/bazel-eclipse/issues/25
+                            return null;
+                            // TODO: should we check for other paths here as well, like output_base? Are those plausible here?
                         }
 
                         // check if path exists but here we expect it to be a proper Bazel workspace (not in output_base/external)