Skip to content

Improve ResolveMainClassHandler.resolveMainClassUnderPaths #596

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
wenytang-ms merged 2 commits into from
Aug 13, 2025
Merged

Improve ResolveMainClassHandler.resolveMainClassUnderPaths #596

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab8a532
Improve ResolveMainClassHandler.resolveMainClassUnderPaths
snjeza Jul 20, 2025
5c2a0bb
Merge branch 'main' into issue-595
wenytang-ms Aug 13, 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
15 changes: 13 additions & 2 deletions ...lugin/src/main/java/com/microsoft/java/debug/plugin/internal/ResolveMainClassHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.search.IJavaSearchConstants;
import org.eclipse.jdt.core.search.IJavaSearchScope;
Expand Down Expand Up @@ -100,8 +101,18 @@ private List<ResolutionItem> resolveMainClassCore(List<Object> arguments) {

private List<ResolutionItem> resolveMainClassUnderPaths(List<IPath> parentPaths) {
// Limit to search main method from source code only.
IJavaSearchScope searchScope = SearchEngine.createJavaSearchScope(ProjectUtils.getJavaProjects(),
IJavaSearchScope.REFERENCED_PROJECTS | IJavaSearchScope.SOURCES);
IJavaProject[] projects;
if (parentPaths == null || parentPaths.isEmpty()) {
projects = ProjectUtils.getJavaProjects();
} else {
projects = Stream.of(ProjectUtils.getAllProjects())
.filter(p -> ProjectUtils.isJavaProject(p) && p.getLocation() != null && ResourceUtils.isContainedIn(p.getLocation(), parentPaths))
.map(p -> JavaCore.create(p))
.filter(p -> p.exists())
.toArray(IJavaProject[]::new);
}
IJavaSearchScope searchScope = SearchEngine.createJavaSearchScope(projects,
IJavaSearchScope.SOURCES);
SearchPattern pattern = createMainMethodSearchPattern();
final List<ResolutionItem> res = new ArrayList<>();
SearchRequestor requestor = new SearchRequestor() {
Expand Down
Loading