Skip to content
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

[performance] determineIfOnClasspath with last project used #3470 #3475

Merged
merged 1 commit into from
Dec 20, 2024
Merged

[performance] determineIfOnClasspath with last project used #3470 #3475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaModelTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,31 @@ public void testCreatePkgHandleInDifferentProject() throws CoreException {
try {
createJavaProject("P1", new String[] {}, "bin");
IFolder folder = createFolder("/P1/lib/x/y");
createJavaProject("P2", new String[] {}, new String[] {"/P1/lib"}, "");
IJavaProject p2 = createJavaProject("P2", new String[] {}, new String[] {"/P1/lib"}, "");
IJavaElement element = JavaCore.create(folder);
assertElementEquals(
"Unexpected element",
"x.y [in /P1/lib [in P2]]",
element
);
IFolder folder2 = createFolder("/P1/lib/x/z");
assertElementEquals(
"Unexpected element",
"x.z [in /P1/lib [in P2]]",
JavaCore.create(folder2)
);
p2.getProject().close(null);
assertElementEquals(
"Unexpected element",
"<null>", // closed
JavaCore.create(folder2)
);
p2.getProject().open(null);
assertElementEquals(
"Unexpected element",
"x.z [in /P1/lib [in P2]]", // open again
JavaCore.create(folder2)
);
} finally {
deleteProjects(new String[] {"P1", "P2"});
}
Expand Down
22 changes: 18 additions & 4 deletions org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,8 @@ public static IJavaElement create(IFile file, IJavaProject project) {
return null;
}

private static volatile String lastProjectNameUsed;

/**
* Returns the package fragment or package fragment root corresponding to the given folder,
* its parent or great parent being the given project.
Expand All @@ -999,6 +1001,15 @@ public static IJavaElement create(IFolder folder, IJavaProject project) {
project = JavaCore.create(folder.getProject());
element = determineIfOnClasspath(folder, project);
if (element == null) {
IJavaProject lastProject = lastProjectNameUsed == null ? null
: JavaModelManager.getJavaModelManager().getJavaModel().getJavaProject(lastProjectNameUsed);
if (lastProject != null) {
// try to avoid searching through all projects
element = determineIfOnClasspath(folder, lastProject);
iloveeclipse marked this conversation as resolved.
Show resolved Hide resolved
if (element != null) {
return element;
}
}
// walk all projects and find one that have the given folder on its classpath
IJavaProject[] projects;
try {
Expand All @@ -1007,10 +1018,13 @@ public static IJavaElement create(IFolder folder, IJavaProject project) {
return null;
}
for (IJavaProject p : projects) {
project = p;
element = determineIfOnClasspath(folder, project);
if (element != null)
break;
if (!p.equals(lastProject)) {
element = determineIfOnClasspath(folder, p);
if (element != null) {
lastProjectNameUsed = p.getElementName();
return element;
}
}
}
}
} else {
Expand Down
Loading