mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
don't use getScope in method usage search at all
This commit is contained in:
+1
-1
@@ -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);
|
||||
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
|
||||
+1
-1
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user