Skip to content

Infer the source root only when necessary #2178

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 1 commit into from
Aug 4, 2022
Merged

Infer the source root only when necessary #2178

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
24 changes: 24 additions & 0 deletions org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ProjectUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,30 @@ public static boolean isVisibleProject(IProject project) {
return ResourceUtils.isContainedIn(project.getLocation(), rootPaths);
}

/**
* Check if the input project is an unmanaged folder. (aka invisible project)
* @param project
*/
public static boolean isUnmanagedFolder(IProject project) {
if (Objects.equals(project.getName(), ProjectsManager.DEFAULT_PROJECT_NAME)) {
return false;
}

if (isVisibleProject(project)) {
return false;
}

try {
String[] natureIds = project.getDescription().getNatureIds();
// TODO: we should consider assign a dedicate nature id for unmanaged folders.
// see: https://github.com/redhat-developer/vscode-java/issues/2552
return natureIds.length == 1 && Objects.equals(natureIds[0], JavaCore.NATURE_ID);
} catch (CoreException e) {
JavaLanguageServerPlugin.log(e);
}
return false;
}

public static List<IProject> getVisibleProjects(IPath workspaceRoot) {
List<IProject> projects = new ArrayList<>();
for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
Expand Down
6 changes: 1 addition & 5 deletions ...t.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/BaseDocumentLifeCycleHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,11 +575,7 @@ private void inferInvisibleProjectSourceRoot(ICompilationUnit unit) {
}

IProject project = javaProject.getProject();
if (project.getName().equals(ProjectsManager.DEFAULT_PROJECT_NAME)) {
return;
}

if (!ProjectUtils.isVisibleProject(project)) {
if (ProjectUtils.isUnmanagedFolder(project)) {
PreferenceManager preferencesManager = JavaLanguageServerPlugin.getPreferencesManager();
List<String> sourcePaths = preferencesManager.getPreferences().getInvisibleProjectSourcePaths();

Expand Down
14 changes: 14 additions & 0 deletions org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/ProjectUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,18 @@ public void testGetMaxProjectProblemSeverityForSubProject() throws Exception {
assertEquals(IMarker.SEVERITY_ERROR, ProjectUtils.getMaxProjectProblemSeverity());
}


@Test
public void testIsUnmanagedFolder1() throws Exception {
importProjects("maven/salut");
IProject project = WorkspaceHelper.getProject("salut");
assertEquals(false, ProjectUtils.isUnmanagedFolder(project));
}

@Test
public void testIsUnmanagedFolder2() throws Exception {
IProject unmanagedFolder = copyAndImportFolder("singlefile/lesson1", "src/org/samples/HelloWorld.java");
assertEquals(true, ProjectUtils.isUnmanagedFolder(unmanagedFolder));
}

}