Skip to content

Search references doesn't work when a referenced project has module-info #4815

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

Open
jarthana wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Search references doesn't work when a referenced project has module-info #4815

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
fb3e8df
Search references doesn't work when a referenced project has module-info
jarthana Feb 3, 2026
09b1324
Simplify the condition for module determination
jarthana Feb 4, 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
76 changes: 76 additions & 0 deletions ...clipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15678,7 +15678,83 @@ void methodHelper() {
"src/issue3308b/Test.java void issue3308b.Test$OriginalClass$NestedOriginalClass.setup():<anonymous>#1.j [j] EXACT_MATCH"
);
}
public void testGH4677() throws Exception {
String reproducer = "reproducer";
String reproducer2 = "reproducer2";
try {
IJavaProject reproducerPrj = createJavaProject("reproducer", new String[] {"src"}, new String[] {"JCL11_LIB"}, "bin", "11");
IJavaProject reproducer2Prj = createJavaProject("reproducer2", new String[] {"src"}, new String[] {"JCL11_LIB"}, "bin", "11");

createFolder("/" + reproducer2 + "/src/reproducer2/");
createFile("/" + reproducer2 + "/src/reproducer2/I18NKEY.java",
"""
package reproducer2;
public interface I18NKEY {}
""");
createFile("/" + reproducer2 + "/src/module-info.java",
"""
module reproducer2 {}
""");

createFolder("/" + reproducer + "/src/reproducer/");
createFile("/" + reproducer + "/src/reproducer/ERROR.java",
"""
package reproducer;
import reproducer2.I18NKEY;
public enum ERROR implements I18NKEY {
A,
B;
}
""");
createFile("/" + reproducer + "/src/reproducer/Foo.java",
"""
package reproducer;
import reproducer2.I18NKEY;
public class Foo {
public void addSuccessNotification(I18NKEY code,
String defaultMessage,
Object... params) {
}
}
""");
createFolder("/" + reproducer + "/src/otherpackage/");
createFile("/" + reproducer + "/src/otherpackage/Bar.java",
"""
package otherpackage;
import reproducer.ERROR;
import reproducer.Foo;
public class Bar {
public void bar() {
Foo foo = new Foo();
call(foo);
}
public void call(Foo foo) {
foo.addSuccessNotification(ERROR.A, "some message", "");
}
public void call2(Foo foo) {
foo.addSuccessNotification(ERROR.B, "some message");
}
public void call3(Foo foo) {
foo.addSuccessNotification(ERROR.B, "some message", "", "");
}
}
""");

addClasspathEntry(reproducerPrj, JavaCore.newProjectEntry(reproducer2Prj.getPath()));
buildAndExpectNoProblems(reproducer2Prj, reproducerPrj);

IType type = reproducerPrj.findType("reproducer.Foo");
IMethod method = type.getMethod("addSuccessNotification", new String [] {"QI18NKEY;", "QString;", "[QObject;"});
search(method, REFERENCES, EXACT_RULE, SearchEngine.createWorkspaceScope(), this.resultCollector);
assertSearchResults(
"src/otherpackage/Bar.java void otherpackage.Bar.call(Foo) [addSuccessNotification(ERROR.A, \"some message\", \"\")] EXACT_MATCH\n" +
"src/otherpackage/Bar.java void otherpackage.Bar.call2(Foo) [addSuccessNotification(ERROR.B, \"some message\")] EXACT_MATCH\n" +
"src/otherpackage/Bar.java void otherpackage.Bar.call3(Foo) [addSuccessNotification(ERROR.B, \"some message\", \"\", \"\")] EXACT_MATCH");
} finally {
deleteProject(reproducer);
deleteProject(reproducer2);
}
}
private static String toString(char[][] modules) {
StringBuilder sb = new StringBuilder();
for (char[] m : modules) {
Expand Down
14 changes: 12 additions & 2 deletions ...t.core/search/org/eclipse/jdt/internal/core/search/matching/ClasspathSourceDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.internal.compiler.env.IModule;
import org.eclipse.jdt.internal.compiler.env.IModulePathEntry;
import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
import org.eclipse.jdt.internal.core.JavaModelManager;
Expand All @@ -40,18 +41,27 @@ public class ClasspathSourceDirectory extends ClasspathLocation implements IModu
private static final Map<String, IResource> missingPackageHolder = new HashMap<>();
final char[][] fullExclusionPatternChars;
final char[][] fulInclusionPatternChars;
private boolean isOnModulePath = false;

ClasspathSourceDirectory(IContainer sourceFolder, char[][] fullExclusionPatternChars, char[][] fulInclusionPatternChars) {
ClasspathSourceDirectory(IContainer sourceFolder,
char[][] fullExclusionPatternChars,
char[][] fulInclusionPatternChars,
boolean isOnModulePath) {
this.sourceFolder = sourceFolder;
this.fullExclusionPatternChars = fullExclusionPatternChars;
this.fulInclusionPatternChars = fulInclusionPatternChars;
this.isOnModulePath = isOnModulePath;
}

@Override
public void cleanup() {
this.directoryCache.clear();
}

@Override
public void setModule (IModule mod) {
if (this.isOnModulePath)
this.module = mod;
}
Map<String, IResource> directoryTable(String qualifiedPackageName) {
Map<String, IResource> dirTable = this.directoryCache.get(qualifiedPackageName);
if (dirTable == missingPackageHolder) return null; // package exists in another classpath directory or jar
Expand Down
4 changes: 2 additions & 2 deletions ....core/search/org/eclipse/jdt/internal/core/search/matching/JavaSearchNameEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,11 @@ private ClasspathLocation mapToClassPathLocation(JavaModelManager manager, Packa
ClasspathLocation.forLibrary(manager.getZipFile(path), rawClasspathEntry.getAccessRuleSet(), rawClasspathEntry.isModular(), compliance) ;
} else {
Object target = JavaModel.getTarget(root, true);
ClasspathEntry rawClasspathEntry = (ClasspathEntry) root.getRawClasspathEntry();
if (target != null) {
if (root.getKind() == IPackageFragmentRoot.K_SOURCE) {
cp = new ClasspathSourceDirectory((IContainer)target, root.fullExclusionPatternChars(), root.fullInclusionPatternChars());
cp = new ClasspathSourceDirectory((IContainer)target, root.fullExclusionPatternChars(), root.fullInclusionPatternChars(), defaultModule != null);
} else {
ClasspathEntry rawClasspathEntry = (ClasspathEntry) root.getRawClasspathEntry();
cp = ClasspathLocation.forBinaryFolder((IContainer) target, false, rawClasspathEntry.getAccessRuleSet(),
null, rawClasspathEntry.isModular());
}
Expand Down
Loading