vscode does not show type hierarchy on maven multi module (#2404)

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com> Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>
eclipse-jdtls · Jan 16, 2023 · 2d43711 · 2d43711
1 parent 920e342
commit 2d43711
Show file tree

Hide file tree

Showing 12 changed files with 146 additions and 1 deletion.
diff --git a/...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/commands/TypeHierarchyCommand.java b/...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/commands/TypeHierarchyCommand.java
@@ -27,6 +27,7 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;
+import org.eclipse.jdt.internal.core.JavaModelManager;
 import org.eclipse.jdt.ls.core.internal.JDTUtils;
 import org.eclipse.jdt.ls.core.internal.JDTUtils.LocationType;
 import org.eclipse.jdt.ls.core.internal.JSONUtility;
@@ -176,7 +177,13 @@ private void resolve(TypeHierarchyItem item, IType type, TypeHierarchyDirection
 		if (monitor.isCanceled() || resolve <= 0) {
 			return;
 		}
-		ITypeHierarchy typeHierarchy = (direction == TypeHierarchyDirection.Parents) ? type.newSupertypeHierarchy(DefaultWorkingCopyOwner.PRIMARY, monitor) : type.newTypeHierarchy(type.getJavaProject(), DefaultWorkingCopyOwner.PRIMARY, monitor);
+		ITypeHierarchy typeHierarchy;
+		if (direction == TypeHierarchyDirection.Parents) {
+			typeHierarchy = type.newSupertypeHierarchy(DefaultWorkingCopyOwner.PRIMARY, monitor);
+		} else {
+			ICompilationUnit[] workingCopies = JavaModelManager.getJavaModelManager().getWorkingCopies(DefaultWorkingCopyOwner.PRIMARY, true);
+			typeHierarchy = type.newTypeHierarchy(workingCopies, monitor);
+		}
 		if (direction == TypeHierarchyDirection.Children || direction == TypeHierarchyDirection.Both) {
 			List<TypeHierarchyItem> childrenItems = new ArrayList<>();
 			IType[] children = typeHierarchy.getSubtypes(type);

diff --git a/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project1/.classpath b/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project1/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project1/.project b/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project1/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>project1</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1673806771008</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/....jdt.ls.tests/projects/eclipse/gh2871/project1/.settings/org.eclipse.core.resources.prefs b/....jdt.ls.tests/projects/eclipse/gh2871/project1/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...clipse.jdt.ls.tests/projects/eclipse/gh2871/project1/.settings/org.eclipse.jdt.core.prefs b/...clipse.jdt.ls.tests/projects/eclipse/gh2871/project1/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,14 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17
diff --git a/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project1/src/org/sample/First.java b/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project1/src/org/sample/First.java
@@ -0,0 +1,3 @@
+package org.sample;
+public abstract class First 
+{}
diff --git a/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project2/.classpath b/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project2/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/project1"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project2/.project b/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project2/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>project2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1673806771011</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/....jdt.ls.tests/projects/eclipse/gh2871/project2/.settings/org.eclipse.core.resources.prefs b/....jdt.ls.tests/projects/eclipse/gh2871/project2/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...clipse.jdt.ls.tests/projects/eclipse/gh2871/project2/.settings/org.eclipse.jdt.core.prefs b/...clipse.jdt.ls.tests/projects/eclipse/gh2871/project2/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,14 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17
diff --git a/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project2/src/org/sample/Second.java b/org.eclipse.jdt.ls.tests/projects/eclipse/gh2871/project2/src/org/sample/Second.java
@@ -0,0 +1,4 @@
+package org.sample;
+
+public class Second extends First{
+}
diff --git a/....jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/commands/TypeHierarchyCommandTest.java b/....jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/commands/TypeHierarchyCommandTest.java
@@ -114,4 +114,26 @@ public void testSubTypeHierarchy() throws Exception {
 			}
 		}
 	}
+
+	// https://github.com/redhat-developer/vscode-java/issues/2871
+	@Test
+	public void testMultipleProjects() throws Exception {
+		importProjects("eclipse/gh2871");
+		IProject project = WorkspaceHelper.getProject("project1");
+		IProgressMonitor monitor = new NullProgressMonitor();
+		TypeHierarchyParams params = new TypeHierarchyParams();
+		String uriString = project.getFile("src/org/sample/First.java").getLocationURI().toString();
+		TextDocumentIdentifier identifier = new TextDocumentIdentifier(uriString);
+		Position position = new Position(1, 22);
+		params.setTextDocument(identifier);
+		params.setResolve(1);
+		params.setDirection(TypeHierarchyDirection.Both);
+		params.setPosition(position);
+		TypeHierarchyItem item = fCommand.typeHierarchy(params, monitor);
+		assertNotNull(item);
+		assertEquals(item.getName(), "First");
+		assertNotNull(item.getChildren());
+		assertEquals(item.getChildren().size(), 1);
+		assertEquals(item.getChildren().get(0).getName(), "Second");
+	}
 }