Skip to content

Add additional logic to CallHierarchyCore.getCompilationUnitNode() #3016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjohnstn merged 2 commits into from
Jun 2, 2026
Merged

Add additional logic to CallHierarchyCore.getCompilationUnitNode() #3016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfeb68a
Add additional logic to CallHierarchyCore.getCompilationUnitNode()
jjohnstn Jun 1, 2026
a027d46
Add regression test
arcivanov Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ation/core extension/org/eclipse/jdt/internal/corext/callhierarchy/CallHierarchyCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;

import org.eclipse.jdt.core.IClassFile;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
Expand Down Expand Up @@ -308,7 +309,7 @@ static CompilationUnit getCompilationUnitNode(IMember member, boolean resolveBin
ITypeRoot typeRoot= member.getTypeRoot();
try {
if (typeRoot != null && typeRoot.exists() && typeRoot.getBuffer() != null
&& JavaCore.isJavaLikeFileName(typeRoot.getElementName())) {
&& (typeRoot instanceof IClassFile || JavaCore.isJavaLikeFileName(typeRoot.getElementName()))) {
ASTParser parser= ASTParser.newParser(IASTSharedValues.SHARED_AST_LEVEL);
parser.setSource(typeRoot);
parser.setResolveBindings(resolveBindings);
Expand Down
68 changes: 66 additions & 2 deletions org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/CallHierarchyParticipantTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import org.junit.Before;
import org.junit.Test;

import org.eclipse.jdt.testplugin.JavaProjectHelper;

import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;

Expand All @@ -48,8 +50,6 @@

import org.eclipse.jdt.ui.tests.callhierarchy.TestCallHierarchyParticipant;

import org.eclipse.jdt.testplugin.JavaProjectHelper;

/**
* Tests for call hierarchy integration with contributed search participants.
*
Expand Down Expand Up @@ -398,4 +398,68 @@ public void targetMethod() {}
assertTrue("Should find firstCaller", foundFirst);
assertTrue("Should find secondCaller", foundSecond);
}

/**
* Regression test for https://github.com/eclipse-jdt/eclipse.jdt.ui/issues/3015
*
* Verifies that outgoing call hierarchy works for methods in class files
* from a JAR/class folder with attached source. The {@code isJavaLikeFileName}
* guard must not reject {@code IClassFile} members whose element name ends
* in {@code .class}.
*/
@Test
public void outgoingCallsWorkForClassFileWithAttachedSource() throws Exception {
JavaProjectHelper.addRTJar9(fSourceProject);
IPackageFragmentRoot src = JavaProjectHelper.addSourceContainer(fSourceProject, "src");
IPackageFragment pkg = src.createPackageFragment("testpkg", true, null);
pkg.createCompilationUnit("Lib.java",
"""
package testpkg;
public class Lib {
public void targetMethod() {}
public void anotherTarget() {}
public void callerMethod() { targetMethod(); anotherTarget(); }
}
""",
true, null);
fSourceProject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);

// Add source project's output as a class folder WITH source attachment
JavaProjectHelper.addRTJar9(fBinaryProject);
IPath outputPath = fSourceProject.getOutputLocation();
IFolder outputFolder = fSourceProject.getProject()
.getFolder(outputPath.removeFirstSegments(1));
JavaProjectHelper.addLibrary(fBinaryProject, outputFolder.getFullPath(),
src.getPath(), null);

IType binaryType = fBinaryProject.findType("testpkg.Lib");
assertNotNull("Binary type should be found", binaryType);
IMethod binaryCallerMethod = binaryType.getMethod("callerMethod", new String[0]);
assertTrue("Binary callerMethod should exist", binaryCallerMethod.exists());

// Verify preconditions: this is a class file with source attached
ITypeRoot typeRoot = binaryCallerMethod.getTypeRoot();
assertTrue("Should be a class file", typeRoot instanceof IClassFile);
assertNotNull("Class file with source attachment should have a buffer",
typeRoot.getBuffer());

MethodWrapper[] roots = CallHierarchyCore.getDefault().getCalleeRoots(
new IMember[] { binaryCallerMethod });
assertEquals(1, roots.length);
MethodWrapper[] callees = roots[0].getCalls(new NullProgressMonitor());

assertEquals("Should find 2 callees via Java AST from attached source",
2, callees.length);

boolean foundTarget = false;
boolean foundAnother = false;
for (MethodWrapper callee : callees) {
String name = callee.getMember().getElementName();
if ("targetMethod".equals(name)) foundTarget = true;
if ("anotherTarget".equals(name)) foundAnother = true;
}
assertTrue("Should find targetMethod as callee", foundTarget);
assertTrue("Should find anotherTarget as callee", foundAnother);
}

}
Loading