From ae03dd9be7aecd673e3bd14403fe9f1983ac4115 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 1 Dec 2014 18:54:58 +0100
Subject: [PATCH] java method usage search: use effective scope

---
 .../psi/impl/search/MethodUsagesSearcher.java         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
index 5eae0cc64c01..125327195927 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, MethodReferencesSearch.SearchParameters> {
   @Override
-  public void processQuery(@NotNull MethodReferencesSearch.SearchParameters p, @NotNull final Processor<PsiReference> consumer) {
+  public void processQuery(@NotNull final MethodReferencesSearch.SearchParameters p, @NotNull final Processor<PsiReference> consumer) {
     final PsiMethod method = p.getMethod();
     final boolean[] isConstructor = new boolean[1];
     final PsiManager[] psiManager = new PsiManager[1];
@@ -65,11 +65,16 @@ public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, Method
 
     final SearchRequestCollector collector = p.getOptimizer();
 
-    final SearchScope searchScope = p.getScope();
+    final SearchScope searchScope = ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
+      @Override
+      public SearchScope compute() {
+        return p.getEffectiveSearchScope();
+      }
+    });
 
     if (isConstructor[0]) {
       new ConstructorReferencesSearchHelper(psiManager[0]).
-        processConstructorReferences(consumer, method, aClass, searchScope, !strictSignatureSearch, strictSignatureSearch, collector);
+        processConstructorReferences(consumer, method, aClass, searchScope, false, strictSignatureSearch, collector);
     }
 
     if (isValueAnnotation[0]) {