fix: Get correct Java project in multi-module case (#1865)

* fix: Get correct Java project in multi-module case

Signed-off-by: sheche <[email protected]>

Author: jdneo

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/commands/ProjectCommand.java

@@ -271,13 +271,13 @@ public static IJavaProject getJavaProjectFromUri(String uri) throws CoreExceptio
 
 		// For multi-module scenario
 		Arrays.sort(containers, (Comparator<IContainer>) (IContainer a, IContainer b) -> {
-			return a.getFullPath().toPortableString().length() - b.getFullPath().toPortableString().length();
+			return a.getFullPath().segmentCount() - b.getFullPath().segmentCount();
 		});
 
 		IJavaElement targetElement = null;
 		for (IContainer container : containers) {
 			targetElement = JavaCore.create(container.getProject());
-			if (targetElement != null) {
+			if (targetElement != null && targetElement.exists()) {
 				break;
 			}
 		}

org.eclipse.jdt.ls.tests/projects/maven/multimodule3/module3/pom.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse</groupId>
+    <artifactId>multimodule3</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse</groupId>
+  <artifactId>this_is_a_very_long_module_name</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>this_is_a_very_long_module_name</name>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

org.eclipse.jdt.ls.tests/projects/maven/multimodule3/module3/src/main/java/org/eclipse/App.java

@@ -0,0 +1,9 @@
+package org.eclipse;
+
+public class App {
+    public static final String GREETING = "Hello World!";
+
+    public static void main(String[] args) {
+        System.out.println(GREETING);
+    }
+}

org.eclipse.jdt.ls.tests/projects/maven/multimodule3/module3/src/test/java/org/eclipse/AppTest.java

@@ -0,0 +1,12 @@
+package org.eclipse;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class AppTest {
+    @Test
+    public void testApp() {
+        assertTrue(true);
+    }
+}

org.eclipse.jdt.ls.tests/projects/maven/multimodule3/pom.xml

@@ -11,6 +11,7 @@
   <modules>
     <module>module1</module>
     <module>module2</module>
+    <module>module3</module>
   </modules>
 
   <build>

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/commands/ProjectCommandTest.java

@@ -130,6 +130,19 @@ public void testGetMavenProjectFromUri() throws Exception {
         assertNotNull("Can get project from project uri", javaProject);
     }
 
+    @Test
+    public void testGetMultiModuleMavenProjectFromUri() throws Exception {
+        importProjects("maven/multimodule3");
+        IProject project = WorkspaceHelper.getProject("this_is_a_very_long_module_name");
+        String javaSource = project.getFile("src/main/org/eclipse/App.java").getLocationURI().toString();
+        IJavaProject javaProject = ProjectCommand.getJavaProjectFromUri(javaSource);
+        assertEquals("this_is_a_very_long_module_name", javaProject.getElementName());
+
+        String projectUri = project.getLocationURI().toString();
+        javaProject = ProjectCommand.getJavaProjectFromUri(projectUri);
+        assertEquals("this_is_a_very_long_module_name", javaProject.getElementName());
+    }
+
     @Test
     public void testGetInvisibleProjectFromUri() throws Exception {
         IProject project = copyAndImportFolder("singlefile/simple", "src/App.java");