From e0fb3d8a3e786680f3351be1537a0a7cae2552f9 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Fri, 6 Apr 2018 22:53:14 +0300
Subject: [PATCH] ScopeView: extract method for IDEA-153822

---
 .../ide/scopeView/ScopeViewTreeModel.java     | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

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 e7ab7bd8d009..fd25f628113e 100644
--- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewTreeModel.java
@@ -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