From ea77124966a48208d963b2a5c815cb5fefa51da3 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Fri, 6 Apr 2018 21:06:21 +0300 Subject: [PATCH] ScopeView: temporary solution for IDEA-153822 --- .../src/com/intellij/ide/scopeView/ScopeViewTreeModel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java index b688c13abf6a..e7ab7bd8d009 100644 --- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java +++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java @@ -1061,7 +1061,12 @@ public final class ScopeViewTreeModel extends BaseTreeModel im 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)) return AllIcons.Nodes.Package; + 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; + } + } } } return AllIcons.Nodes.Folder;