Don't check the workspace project

The workspace project may not exists in Eclipse as a project. Thus, don't try to look it up but compare only the properties.
salesforce · Jul 29, 2023 · ea87570 · ea87570
1 parent eec3687
commit ea87570
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/...orce.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/BazelPackageInfo.java b/...orce.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/BazelPackageInfo.java
@@ -138,14 +138,12 @@ static Map<BazelPackage, Map<String, Target>> queryForTargets(BazelWorkspace baz
     }
 
     IProject findProject() throws CoreException {
-        var workspaceProject = getBazelPackage().getBazelWorkspace().getBazelProject().getProject();
         var workspaceRoot = getBazelPackage().getBazelWorkspace().getLocation();
         // we don't care about the actual project name - we look for the property
         var projects = getEclipseWorkspaceRoot().getProjects();
         for (IProject project : projects) {
             if (project.isAccessible() // is open
                     && project.hasNature(BAZEL_NATURE_ID) // is a Bazel project
-                    && !workspaceProject.equals(project) // is not the workspace project
                     && hasWorkspaceRootPropertySetToLocation(project, workspaceRoot) // belongs to the workspace root
                     && hasOwnerPropertySetForLabel(project, getBazelPackage().getLabel()) // represents the target
             ) {

diff --git a/...force.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/BazelTargetInfo.java b/...force.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/BazelTargetInfo.java
@@ -46,14 +46,12 @@ public BazelTargetInfo(String targetName, BazelTarget bazelTarget) {
     }
 
     IProject findProject() throws CoreException {
-        var workspaceProject = getBazelTarget().getBazelWorkspace().getBazelProject().getProject();
         var workspaceRoot = getBazelTarget().getBazelWorkspace().getLocation();
         // we don't care about the actual project name - we look for the property
         var projects = getEclipseWorkspaceRoot().getProjects();
         for (IProject project : projects) {
             if (project.isAccessible() // is open
                     && project.hasNature(BAZEL_NATURE_ID) // is a Bazel project
-                    && !workspaceProject.equals(project) // is not the workspace project
                     && hasWorkspaceRootPropertySetToLocation(project, workspaceRoot) // belongs to the workspace root
                     && hasOwnerPropertySetForLabel(project, getBazelTarget().getLabel()) // represents the target
             ) {