From 367620d2cba200448b53e273a068aee72efc50b8 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 16 Aug 2016 14:07:54 +0200
Subject: [PATCH] reuse GlobalSearchScopeUtil.toGlobalSearchScope

---
 .../JavaFunctionalExpressionSearcher.java     | 21 +------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
index 024201b8591e..ed05eb281898 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
@@ -39,8 +39,6 @@ import com.intellij.psi.stubs.StubIndex;
 import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
-import com.intellij.psi.util.PsiUtilCore;
-import com.intellij.util.ObjectUtils;
 import com.intellij.util.PairProcessor;
 import com.intellij.util.Processor;
 import com.intellij.util.Processors;
@@ -104,7 +102,7 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
           if (samType == null) continue;
 
           SearchScope scope = samClass.getUseScope().intersectWith(queryParameters.getEffectiveSearchScope());
-          descriptors.add(new SamDescriptor(samClass, saMethod, samType, convertToGlobalScope(project, scope)));
+          descriptors.add(new SamDescriptor(samClass, saMethod, samType, GlobalSearchScopeUtil.toGlobalSearchScope(scope, project)));
         }
       }
     });
@@ -232,23 +230,6 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
     return false;
   }
 
-  @NotNull
-  private static GlobalSearchScope convertToGlobalScope(Project project, SearchScope useScope) {
-    final GlobalSearchScope scope;
-    if (useScope instanceof GlobalSearchScope) {
-      scope = (GlobalSearchScope)useScope;
-    }
-    else if (useScope instanceof LocalSearchScope) {
-      final Set<VirtualFile> files = new HashSet<>();
-      ContainerUtil.addAllNotNull(files, ContainerUtil.map(((LocalSearchScope)useScope).getScope(), PsiUtilCore::getVirtualFile));
-      scope = GlobalSearchScope.filesScope(project, files);
-    }
-    else {
-      scope = new EverythingGlobalScope(project);
-    }
-    return scope;
-  }
-
   private static Set<PsiClass> processSubInterfaces(PsiClass base) {
     Set<PsiClass> result = new HashSet<>();
     new Object() {