MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-202118 always show project roots in Project View

Browse Source 
GitOrigin-RevId: 7b8b9e2834552cd960204097aefcff8edc65b9b5
This commit is contained in:
Liudmila Kornilova
2025-08-19 12:10:28 +00:00
committed by intellij-monorepo-bot
parent 6469f97b0d
commit ede9c8e272
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewProjectNode.java
+9 -11
View File
@@ -5,8 +5,8 @@ import com.intellij.ide.projectView.ViewSettings;
import com.intellij.ide.projectView.impl.ModuleGroup;
import com.intellij.ide.projectView.impl.ProjectRootsUtil;
import com.intellij.ide.util.treeView.AbstractTreeNode;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.*;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.impl.LoadedModuleDescriptionImpl;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VfsUtilCore;
@@ -47,11 +47,11 @@ public class ProjectViewProjectNode extends AbstractProjectNode {
List<VirtualFile> projectRoots = ProjectRootUtilsKt.getProjectRoots(project);
// top level roots but not under project roots
List<VirtualFile> topLevelContentRoots = ContainerUtil
List<VirtualFile> topLevelRootsOutsideOfProjectRoots = ContainerUtil
.filter(projectViewHelper.getTopLevelRoots(), topLevelRoot -> !VfsUtilCore.isUnderFiles(topLevelRoot, projectRoots));
Set<ModuleDescription> modules = new LinkedHashSet<>(topLevelContentRoots.size());
for (VirtualFile root : topLevelContentRoots) {
Set<ModuleDescription> modules = new LinkedHashSet<>(topLevelRootsOutsideOfProjectRoots.size());
for (VirtualFile root : topLevelRootsOutsideOfProjectRoots) {
Module module = ModuleUtilCore.findModuleForFile(root, project);
if (module != null) {
modules.add(new LoadedModuleDescriptionImpl(module));
@@ -65,13 +65,11 @@ public class ProjectViewProjectNode extends AbstractProjectNode {
}
List<AbstractTreeNode<?>> nodes = new ArrayList<>(modulesAndGroups(modules));
if (!ContainerUtil.exists(nodes, node -> node instanceof ModuleGroupNode)) {
PsiManager psiManager = PsiManager.getInstance(project);
for (var projectRoot : projectRoots) {
var psiDirectory = psiManager.findDirectory(projectRoot);
if (psiDirectory != null) {
nodes.add(new PsiDirectoryNode(myProject, psiDirectory, getSettings()));
}
PsiManager psiManager = PsiManager.getInstance(project);
for (var projectRoot : projectRoots) {
var psiDirectory = psiManager.findDirectory(projectRoot);
if (psiDirectory != null) {
nodes.add(new PsiDirectoryNode(myProject, psiDirectory, getSettings()));
}
}