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

IDEA-151982 The new Gradle import creates an unnecessary top-level groups

Browse Source
This commit is contained in:
Vladislav.Soroka
2016-02-25 15:30:55 +03:00
parent efedd80561
commit e3284357e0
1 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/projectView/GradleTreeStructureProvider.java
+53
View File
@@ -21,6 +21,7 @@ import com.intellij.ide.projectView.ViewSettings;
import com.intellij.ide.projectView.impl.ProjectRootsUtil;
import com.intellij.ide.projectView.impl.nodes.ProjectViewModuleGroupNode;
import com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode;
import com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode;
import com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode;
import com.intellij.ide.util.treeView.AbstractTreeNode;
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
@@ -29,8 +30,10 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
import com.intellij.ui.SimpleTextAttributes;
@@ -54,6 +57,10 @@ public class GradleTreeStructureProvider implements TreeStructureProvider {
Project project = parent.getProject();
if (project == null) return children;
if (parent instanceof ProjectViewProjectNode) {
return getProjectNodeChildren(project, children);
}
if (parent instanceof ProjectViewModuleGroupNode) {
Collection<AbstractTreeNode> modifiedChildren = ContainerUtil.newSmartList();
for (AbstractTreeNode child : children) {
@@ -126,6 +133,52 @@ public class GradleTreeStructureProvider implements TreeStructureProvider {
return true;
}
@NotNull
private static Collection<AbstractTreeNode> getProjectNodeChildren(@NotNull Project project,
@NotNull Collection<AbstractTreeNode> children) {
Collection<AbstractTreeNode> modifiedChildren = ContainerUtil.newSmartList();
ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
for (AbstractTreeNode child : children) {
Pair<VirtualFile, PsiDirectoryNode> parentNodePair = null;
if (child instanceof ProjectViewModuleGroupNode) {
final ProjectViewModuleGroupNode groupNode = (ProjectViewModuleGroupNode)child;
final Collection<AbstractTreeNode> groupNodeChildren = groupNode.getChildren();
for (final AbstractTreeNode node : groupNodeChildren) {
if (node instanceof PsiDirectoryNode) {
final PsiDirectoryNode psiDirectoryNode = (PsiDirectoryNode)node;
final PsiDirectory psiDirectory = psiDirectoryNode.getValue();
if (psiDirectory == null) {
parentNodePair = null;
break;
}
final VirtualFile virtualFile = psiDirectory.getVirtualFile();
final Module module = fileIndex.getModuleForFile(virtualFile);
if (!ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, module)) {
parentNodePair = null;
break;
}
if (parentNodePair == null || VfsUtilCore.isAncestor(virtualFile, parentNodePair.first, false)) {
parentNodePair = Pair.pair(virtualFile, psiDirectoryNode);
}
else if (!VfsUtilCore.isAncestor(parentNodePair.first, virtualFile, false)) {
parentNodePair = null;
break;
}
}
else {
parentNodePair = null;
break;
}
}
}
modifiedChildren.add(parentNodePair != null ? parentNodePair.second : child);
}
return modifiedChildren;
}
@Nullable
private static GradleProjectViewModuleNode getGradleSourceSetNode(@NotNull Project project,
@NotNull ProjectViewModuleNode moduleNode,