From aa77cca14ba200919f2b715658b363358d45c42e Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 2 Dec 2014 15:31:44 +0100
Subject: [PATCH] don't use getScope in method usage search at all

---
 .../groovy/findUsages/AccessorMethodReferencesSearcher.java     | 2 +-
 .../plugins/groovy/findUsages/GrLiteralMethodSearcher.java      | 2 +-
 .../groovy/findUsages/MethodLateBoundReferencesSearcher.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/AccessorMethodReferencesSearcher.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/AccessorMethodReferencesSearcher.java
index 2c4dda5946cf..4b92a9a2426d 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/AccessorMethodReferencesSearcher.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/AccessorMethodReferencesSearcher.java
@@ -55,7 +55,7 @@ public class AccessorMethodReferencesSearcher extends QueryExecutorBase<PsiRefer
 
     if (propertyName == null) return;
 
-    final SearchScope onlyGroovyFiles = GroovyScopeUtil.restrictScopeToGroovyFiles(queryParameters.getScope(), GroovyScopeUtil.getEffectiveScope(method));
+    final SearchScope onlyGroovyFiles = GroovyScopeUtil.restrictScopeToGroovyFiles(queryParameters.getEffectiveSearchScope(), GroovyScopeUtil.getEffectiveScope(method));
 
     queryParameters.getOptimizer().searchWord(propertyName, onlyGroovyFiles, UsageSearchContext.IN_CODE, true, method);
 
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrLiteralMethodSearcher.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrLiteralMethodSearcher.java
index 491e84aaadb1..e6f4481965c6 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrLiteralMethodSearcher.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrLiteralMethodSearcher.java
@@ -46,7 +46,7 @@ public class GrLiteralMethodSearcher extends QueryExecutorBase<PsiReference, Met
     final PsiMethod[] methods = strictSignatureSearch ? new PsiMethod[]{method} : aClass.findMethodsByName(name, false);
 
     SearchScope accessScope = GroovyScopeUtil.getEffectiveScope(methods);
-    final SearchScope restrictedByAccess = GroovyScopeUtil.restrictScopeToGroovyFiles(p.getScope(), accessScope);
+    final SearchScope restrictedByAccess = GroovyScopeUtil.restrictScopeToGroovyFiles(p.getEffectiveSearchScope(), accessScope);
 
     final String textToSearch = findLongestWord(name);
 
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java
index c724485d3d16..9cb674308041 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/MethodLateBoundReferencesSearcher.java
@@ -46,7 +46,7 @@ public class MethodLateBoundReferencesSearcher extends QueryExecutorBase<PsiRefe
   @Override
   public void processQuery(@NotNull MethodReferencesSearch.SearchParameters queryParameters, @NotNull Processor<PsiReference> consumer) {
     final PsiMethod method = queryParameters.getMethod();
-    SearchScope searchScope = GroovyScopeUtil.restrictScopeToGroovyFiles(queryParameters.getScope()).intersectWith(getUseScope(method));
+    SearchScope searchScope = GroovyScopeUtil.restrictScopeToGroovyFiles(queryParameters.getEffectiveSearchScope()).intersectWith(getUseScope(method));
     PsiClass aClass = method.getContainingClass();
     String className = aClass == null ? null : aClass.getName();
     orderSearching(searchScope, method.getName(), method, queryParameters.getOptimizer(), method.getParameterList().getParametersCount());