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

ScopeView: extract method for IDEA-153822

Browse Source
This commit is contained in:
Sergey Malenkov
2018-04-06 22:53:14 +03:00
parent 4c001b84f7
commit e0fb3d8a3e
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java
+14 -12
View File
@@ -1056,20 +1056,22 @@ public final class ScopeViewTreeModel extends BaseTreeModel<AbstractTreeNode> im
SourceFolder folder = findSourceFolder(module, file);
if (folder != null) return getSourceRootIcon(folder);
ProjectFileIndex index = getProjectFileIndex(module.getProject());
if (index != null) {
if (index.isExcluded(file)) return AllIcons.Modules.ExcludeRoot;
if (element == null) element = node.getPsiElement();
if (element instanceof PsiDirectory && element.isValid()) {
PsiDirectoryFactory factory = PsiDirectoryFactory.getInstance(module.getProject());
if (factory != null && factory.isPackage((PsiDirectory)element)) {
// IDEA-153822: temporary solution to distinguish META-INF from other packages
if (factory.isValidPackageName(factory.getQualifiedName((PsiDirectory)element, false))) {
return AllIcons.Nodes.Package;
}
}
if (index == null) return AllIcons.Nodes.Folder;
if (index.isExcluded(file)) return AllIcons.Modules.ExcludeRoot;
if (element == null) element = node.getPsiElement();
if (isPackage(element)) return AllIcons.Nodes.Package;
return AllIcons.Nodes.Folder;
}
private static boolean isPackage(@Nullable PsiElement element) {
if (element instanceof PsiDirectory && element.isValid()) {
PsiDirectoryFactory factory = PsiDirectoryFactory.getInstance(element.getProject());
if (factory != null && factory.isPackage((PsiDirectory)element)) {
// IDEA-153822: temporary solution to distinguish META-INF from other packages
return factory.isValidPackageName(factory.getQualifiedName((PsiDirectory)element, false));
}
}
return AllIcons.Nodes.Folder;
return false;
}
@NotNull