Fix issue: Tree View will show duplicated project list for multiple root scenario (#127)

* Fix issue: Tree View will show duplicated project list for multiple root scenario

Signed-off-by: Jinbo Wang <[email protected]>

* address review comments

Signed-off-by: Jinbo Wang <[email protected]>

Author: testforstephen

jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/ProjectCommand.java

@@ -14,6 +14,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
@@ -26,16 +27,17 @@
 import com.microsoft.jdtls.ext.core.model.PackageNode;
 
 public final class ProjectCommand {
-    public static final String DEFAULT_PROJECT_NAME = "jdt.ls-java-project";
 
     public static List<PackageNode> execute(List<Object> arguments, IProgressMonitor monitor) {
         String workspaceUri = (String) arguments.get(0);
+        IPath workspacePath = ResourceUtils.canonicalFilePathFromURI(workspaceUri);
+        String invisibleProjectName = getWorkspaceInvisibleProjectName(workspacePath);
 
         IProject[] projects = getWorkspaceRoot().getProjects();
         ArrayList<PackageNode> children = new ArrayList<>();
-        List<IPath> paths = Arrays.asList(ResourceUtils.filePathFromURI(workspaceUri));
+        List<IPath> paths = Arrays.asList(workspacePath);
         for (IProject project : projects) {
-            if (project.exists() && !DEFAULT_PROJECT_NAME.equals(project.getName()) ) {
+            if (project.exists() && (ResourceUtils.isContainedIn(project.getLocation(), paths) || Objects.equals(project.getName(), invisibleProjectName))) {
                 PackageNode projectNode = new PackageNode(project.getName(), project.getFullPath().toPortableString(), NodeKind.PROJECT);
                 projectNode.setUri(project.getLocationURI().toString());
                 children.add(projectNode);
@@ -48,4 +50,10 @@ public static List<PackageNode> execute(List<Object> arguments, IProgressMonitor
     private static IWorkspaceRoot getWorkspaceRoot() {
         return ResourcesPlugin.getWorkspace().getRoot();
     }
+
+    // TODO Use ProjectUtils.getWorkspaceInvisibleProjectName directly when the language server is released.
+    private static String getWorkspaceInvisibleProjectName(IPath workspacePath) {
+        String fileName = workspacePath.toFile().getName();
+        return fileName + "_" + Integer.toHexString(workspacePath.toPortableString().hashCode());
+    }
 }