MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

java method search: create a single request per method when occurrences for overloads are requested (optimize search scopes) (IDEA-165761)

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-12-21 21:23:23 +03:00
parent 69fad35300
commit 00b4a8c803
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
+7 -8
View File
@@ -89,20 +89,19 @@ public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, Method
DumbService.getInstance(p.getProject()).runReadActionInSmartMode(()-> {
final PsiMethod[] methods = strictSignatureSearch ? new PsiMethod[]{method} : aClass.findMethodsByName(methodName[0], false);
short searchContext = UsageSearchContext.IN_CODE | UsageSearchContext.IN_COMMENTS | UsageSearchContext.IN_FOREIGN_LANGUAGES;
for (PsiMethod m : methods) {
collector.searchWord(methodName[0], searchScope.intersectWith(m.getUseScope()), searchContext, true, m,
getTextOccurrenceProcessor(new PsiMethod[] {m}, aClass, strictSignatureSearch));
}
SearchScope accessScope = methods[0].getUseScope();
for (int i = 1; i < methods.length; i++) {
PsiMethod method1 = methods[i];
accessScope = accessScope.union(method1.getUseScope());
}
SearchScope restrictedByAccessScope = searchScope.intersectWith(accessScope);
short searchContext = UsageSearchContext.IN_CODE | UsageSearchContext.IN_COMMENTS | UsageSearchContext.IN_FOREIGN_LANGUAGES;
for (PsiMethod m : methods) {
collector.searchWord(methodName[0], restrictedByAccessScope, searchContext, true, m,
getTextOccurrenceProcessor(new PsiMethod[] {m}, aClass, strictSignatureSearch));
}
SimpleAccessorReferenceSearcher.addPropertyAccessUsages(method, restrictedByAccessScope, collector);
return null;
});