From 382b5c50d732c28efc2327cb9595cf492f8ccb5b Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 5 Aug 2016 17:13:00 +0200
Subject: [PATCH] fun expr search: don't hold methods in memory for more time
 than needed

---
 .../JavaFunctionalExpressionSearcher.java     | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 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 b26a56b696a4..89da61c79150 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
@@ -168,16 +168,20 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
   }
 
   @NotNull
-  private static MultiMap<VirtualFile, Integer> getCandidateOffsets(SamDescriptor descriptor, MultiMap<Location, GlobalSearchScope> queries) {
-    MultiMap<VirtualFile, Integer> result = MultiMap.create();
+  private static MultiMap<VirtualFile, Integer> getCandidateOffsets(SamDescriptor descriptor, MultiMap<Location, GlobalSearchScope> queries, Set<VirtualFile> likelyFiles) {
+    MultiMap<VirtualFile, Integer> result = MultiMap.createLinked();
+    MultiMap<VirtualFile, Integer> unlikely = MultiMap.createLinked();
     for (Location location : queries.keySet()) {
       MultiMap<VirtualFile, Integer> offsets = getOffsetsForLocation(descriptor, location, queries.get(location));
-      result.putAllValues(offsets);
+      for (VirtualFile file : offsets.keySet()) {
+        (likelyFiles.contains(file) ? result : unlikely).putValues(file, offsets.get(file));
+      }
       if (LOG.isDebugEnabled()) {
         logIfLarge(offsets, location);
       }
     }
 
+    result.putAllValues(unlikely);
     if (LOG.isDebugEnabled()) {
       LOG.debug("checking " + result.values().size() + " fun-expressions in " + result.keySet().size() + " files");
     }
@@ -397,10 +401,11 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
       this.isVoid = PsiType.VOID.equals(samType);
     }
 
-    private boolean search(@NotNull Processor<PsiFunctionalExpression> consumer, Set<Module> highLevelModules) {
+    @NotNull
+    private MultiMap<VirtualFile, Integer> getOffsets(Set<Module> highLevelModules) {
       GlobalSearchScope visibleFromCandidates = ReadAction.compute(
         () -> samClass.isValid() ? combineResolveScopes(highLevelModules, samClass) : null);
-      if (visibleFromCandidates == null) return true;
+      if (visibleFromCandidates == null) return MultiMap.empty();
 
       Set<String> usedMethodNames = collectMethodNamesCalledWithFunExpressions(this);
       Set<PsiMethod> exactTypeMethods = getMethodsWithParameterType(usedMethodNames, useScope.intersectWith(visibleFromCandidates), getClassName());
@@ -408,21 +413,11 @@ public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunct
       LOG.debug("#methods: " + (exactTypeMethods.size() + genericMethods.size()));
 
       MultiMap<Location, GlobalSearchScope> queries = collectQueryKeys(this, ContainerUtil.concat(exactTypeMethods, genericMethods));
-      return processLikelyFirst(getMostLikelyFiles(exactTypeMethods), consumer, queries);
+      return getCandidateOffsets(this, queries, getMostLikelyFiles(exactTypeMethods));
     }
 
-    private boolean processLikelyFirst(Set<VirtualFile> likelyFiles,
-                                       @NotNull Processor<PsiFunctionalExpression> consumer,
-                                       MultiMap<Location, GlobalSearchScope> queries) {
-      MultiMap<VirtualFile, Integer> file2Offsets = getCandidateOffsets(this, queries);
-      for (VirtualFile file : likelyFiles) {
-        Collection<Integer> offsets = file2Offsets.remove(file);
-        if (offsets != null && !processFile(consumer, samClass, file, offsets)) {
-          return false;
-        }
-      }
-
-      for (Map.Entry<VirtualFile, Collection<Integer>> entry : file2Offsets.entrySet()) {
+    private boolean search(@NotNull Processor<PsiFunctionalExpression> consumer, Set<Module> highLevelModules) {
+      for (Map.Entry<VirtualFile, Collection<Integer>> entry : getOffsets(highLevelModules).entrySet()) {
         if (!processFile(consumer, samClass, entry.getKey(), entry.getValue())) {
           return false;
         }