Skip to content

Improve ProjectCommand.getMainClasses #883

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
merged 3 commits into from
Aug 11, 2025
Merged

Improve ProjectCommand.getMainClasses #883

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15605e3
Improve ProjectCommand.getMainClasses
snjeza Jul 20, 2025
6108d0f
Merge branch 'main' into issue-882
wenytang-ms Aug 7, 2025
58f431b
Merge branch 'main' into issue-882
wenytang-ms Aug 8, 2025
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
37 changes: 24 additions & 13 deletions jdtls.ext/com.microsoft.jdtls.ext.core/src/com/microsoft/jdtls/ext/core/ProjectCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -65,6 +66,7 @@
import org.eclipse.jdt.ls.core.internal.managers.ProjectsManager;
import org.eclipse.jdt.ls.core.internal.managers.UpdateClasspathJob;
import org.eclipse.jdt.ls.core.internal.preferences.Preferences.ReferencedLibraries;
import org.eclipse.jdt.ls.core.internal.preferences.Preferences.SearchScope;
import org.eclipse.lsp4j.jsonrpc.json.adapters.CollectionTypeAdapter;
import org.eclipse.lsp4j.jsonrpc.json.adapters.EnumTypeAdapter;

Expand Down Expand Up @@ -232,23 +234,32 @@ private static boolean exportJarExecution(String mainClass, Classpath[] classpat
}

public static List<MainClassInfo> getMainClasses(List<Object> arguments, IProgressMonitor monitor) throws Exception {
List<PackageNode> projectList = listProjects(arguments, monitor);
final List<MainClassInfo> res = new ArrayList<>();
List<IJavaElement> searchRoots = new ArrayList<>();
List<Object> args = new ArrayList<>(arguments);
if (args.size() <= 1) {
args.add(Boolean.TRUE);
} else {
args.set(1, Boolean.TRUE);
}
List<PackageNode> projectList = listProjects(args, monitor);
if (projectList.size() == 0) {
return res;
return Collections.emptyList();
}
for (PackageNode project : projectList) {
final List<MainClassInfo> res = new ArrayList<>();
List<IJavaProject> javaProjects = new ArrayList<>();
for (PackageNode project: projectList) {
IJavaProject javaProject = PackageCommand.getJavaProject(project.getUri());
for (IPackageFragmentRoot packageFragmentRoot : javaProject.getAllPackageFragmentRoots()) {
if (!packageFragmentRoot.isArchive()) {
searchRoots.add(packageFragmentRoot);
}
if (javaProject != null && javaProject.exists()) {
javaProjects.add(javaProject);
}
}
IJavaSearchScope scope = SearchEngine.createJavaSearchScope(searchRoots.toArray(new IJavaElement[0]));
SearchPattern pattern = SearchPattern.createPattern("main(String[]) void", IJavaSearchConstants.METHOD,
IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE);
int includeMask = IJavaSearchScope.SOURCES;
IJavaSearchScope scope = SearchEngine.createJavaSearchScope(javaProjects.toArray(new IJavaProject[0]),
includeMask);
SearchPattern pattern1 = SearchPattern.createPattern("main(String[]) void", IJavaSearchConstants.METHOD,
IJavaSearchConstants.DECLARATIONS, SearchPattern.R_CASE_SENSITIVE | SearchPattern.R_EXACT_MATCH);
SearchPattern pattern2 = SearchPattern.createPattern("main() void", IJavaSearchConstants.METHOD,
IJavaSearchConstants.DECLARATIONS, SearchPattern.R_CASE_SENSITIVE | SearchPattern.R_EXACT_MATCH);
SearchPattern pattern = SearchPattern.createOrPattern(pattern1, pattern2);
SearchRequestor requestor = new SearchRequestor() {
@Override
public void acceptSearchMatch(SearchMatch match) {
Expand All @@ -275,7 +286,7 @@ public void acceptSearchMatch(SearchMatch match) {
SearchEngine searchEngine = new SearchEngine();
try {
searchEngine.search(pattern, new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()}, scope,
requestor, new NullProgressMonitor());
requestor, monitor);
} catch (CoreException e) {
// ignore
}
Expand Down
Loading