MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-12-21 20:55:05 +03:00
parent f3e6c2591c
commit 69fad35300
5 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java
View File

@@ -98,8 +98,10 @@ public class MethodUsagesSearcher extends QueryExecutorBase<PsiReference, Method
SearchScope restrictedByAccessScope = searchScope.intersectWith(accessScope);
short searchContext = UsageSearchContext.IN_CODE | UsageSearchContext.IN_COMMENTS | UsageSearchContext.IN_FOREIGN_LANGUAGES;
collector.searchWord(methodName[0], restrictedByAccessScope, searchContext, true, method,
getTextOccurrenceProcessor(methods, aClass, strictSignatureSearch));
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;

5
java/java-tests/testData/compiler/compilerReferenceFindUsages/testOverloadedMethods/A.java Normal file
View File

@@ -0,0 +1,5 @@
public class A {
void m(Foo foo) {
foo.bar();
}
}

5
java/java-tests/testData/compiler/compilerReferenceFindUsages/testOverloadedMethods/B.java Normal file
View File

@@ -0,0 +1,5 @@
public class B {
void m(Foo foo) {
foo.bar(100);
}
}

10
java/java-tests/testData/compiler/compilerReferenceFindUsages/testOverloadedMethods/Foo.java Normal file
View File

@@ -0,0 +1,10 @@
public class Foo {
public void bar() {
}
public void bar(int param) {
}
}

8
java/java-tests/testSrc/com/intellij/compiler/CompilerReferencesFindUsagesTest.java
View File

@@ -158,6 +158,14 @@ public class CompilerReferencesFindUsagesTest extends DaemonAnalyzerTestCase {
}, 2, "Foo.java", "Bar.java");
}
public void testOverloadedMethods() throws Exception {
configureByFiles(getName(), getName() + "/Foo.java", getName() + "/A.java", getName() + "/B.java");
PsiMethod methodToSearch = findClass("Foo").findMethodsByName("bar", false)[0];
assertSize(2, MethodReferencesSearch.search(methodToSearch, false).findAll());
myCompilerTester.rebuild();
assertSize(2, MethodReferencesSearch.search(methodToSearch, false).findAll());
}
private void doTestRunnableFindUsagesWithExcludesConfiguration(@NotNull Consumer<ExcludesConfiguration> excludesConfigurationPatcher,
int expectedUsagesCount,
String... testFiles) {