From fa2142d2ea4edec1c886d1bf1df4646e69c9848c Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 24 Aug 2016 17:21:16 +0200
Subject: [PATCH] cache effective reference search scopes

---
 .../psi/search/searches/MethodReferencesSearch.java    |  8 ++++++--
 .../intellij/psi/search/searches/ReferencesSearch.java | 10 ++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java
index 895205dad35e..995314ad6b1c 100644
--- a/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java
+++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/MethodReferencesSearch.java
@@ -38,6 +38,7 @@ public class MethodReferencesSearch extends ExtensibleQueryFactory<PsiReference,
     private final PsiMethod myMethod;
     private final Project myProject;
     private final SearchScope myScope;
+    private volatile SearchScope myEffectiveScope;
     private final boolean myStrictSignatureSearch;
     private final SearchRequestCollector myOptimizer;
     private final boolean isSharedOptimizer;
@@ -93,8 +94,11 @@ public class MethodReferencesSearch extends ExtensibleQueryFactory<PsiReference,
 
     @NotNull
     public SearchScope getEffectiveSearchScope () {
-      SearchScope accessScope = PsiSearchHelper.SERVICE.getInstance(myMethod.getProject()).getUseScope(myMethod);
-      return myScope.intersectWith(accessScope);
+      SearchScope scope = myEffectiveScope;
+      if (scope == null) {
+        myEffectiveScope = scope = myScope.intersectWith(PsiSearchHelper.SERVICE.getInstance(myMethod.getProject()).getUseScope(myMethod));
+      }
+      return scope;
     }
   }
 
diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java
index 467a066a9e1b..8c4b157fae81 100644
--- a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java
+++ b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java
@@ -43,6 +43,7 @@ public class ReferencesSearch extends ExtensibleQueryFactory<PsiReference, Refer
   public static class SearchParameters implements DumbAwareSearchParameters {
     private final PsiElement myElementToSearch;
     private final SearchScope myScope;
+    private volatile SearchScope myEffectiveScope;
     private final boolean myIgnoreAccessScope;
     private final SearchRequestCollector myOptimizer;
     private final Project myProject;
@@ -104,8 +105,13 @@ public class ReferencesSearch extends ExtensibleQueryFactory<PsiReference, Refer
       if (myIgnoreAccessScope) {
         return myScope;
       }
-      SearchScope accessScope = PsiSearchHelper.SERVICE.getInstance(myElementToSearch.getProject()).getUseScope(myElementToSearch);
-      return myScope.intersectWith(accessScope);
+
+      SearchScope scope = myEffectiveScope;
+      if (scope == null) {
+        SearchScope useScope = PsiSearchHelper.SERVICE.getInstance(myElementToSearch.getProject()).getUseScope(myElementToSearch);
+        myEffectiveScope = scope = myScope.intersectWith(useScope);
+      }
+      return scope;
     }
   }