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

cleanup

Browse Source 
IDEA-CR-32099
This commit is contained in:
Anna.Kozlova
2018-04-25 19:33:37 +02:00
parent f05f48c17f
commit 2b26d30895
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
+20 -16
View File
@@ -1184,22 +1184,7 @@ public class ExpectedTypesProvider {
}
final PsiManager manager = methodCallExpr.getManager();
final JavaPsiFacade facade = JavaPsiFacade.getInstance(manager.getProject());
final PsiMethod[] methods = myClassProvider.findDeclaredMethods(manager, reference.getReferenceName());
LinkedHashSet<PsiMethod> psiMethods = new LinkedHashSet<>();
for (PsiMethod m : methods) {
if (m.hasModifierProperty(PsiModifier.STATIC) || m.hasModifierProperty(PsiModifier.PRIVATE)) {
psiMethods.add(m);
}
else {
PsiMethod[] superMethods = m.findDeepestSuperMethods();
if (superMethods.length > 0) {
psiMethods.addAll(Arrays.asList(superMethods));
}
else {
psiMethods.add(m);
}
}
}
Set<PsiMethod> psiMethods = mapToDeepestSuperMethods(myClassProvider.findDeclaredMethods(manager, reference.getReferenceName()));
Set<ExpectedTypeInfo> types = new THashSet<>();
for (PsiMethod method : psiMethods) {
final PsiClass aClass = method.getContainingClass();
@@ -1220,6 +1205,25 @@ public class ExpectedTypesProvider {
return types.toArray(ExpectedTypeInfo.EMPTY_ARRAY);
}
private static Set<PsiMethod> mapToDeepestSuperMethods(PsiMethod[] methods) {
LinkedHashSet<PsiMethod> psiMethods = new LinkedHashSet<>();
for (PsiMethod m : methods) {
if (m.hasModifierProperty(PsiModifier.STATIC) || m.hasModifierProperty(PsiModifier.PRIVATE)) {
psiMethods.add(m);
}
else {
PsiMethod[] superMethods = m.findDeepestSuperMethods();
if (superMethods.length > 0) {
psiMethods.addAll(Arrays.asList(superMethods));
}
else {
psiMethods.add(m);
}
}
}
return psiMethods;
}
@NotNull
private ExpectedTypeInfo[] findClassesWithDeclaredField(@NotNull PsiReferenceExpression expression) {
final JavaPsiFacade facade = JavaPsiFacade.getInstance(expression.getProject());
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/CreateMethodFromUsageTemplateTest.groovy
+1 -1
View File
@@ -282,7 +282,7 @@ public class InvalidClass {
'''
}
void 'test expected types'() {
void 'test deepest super methods are included in expected info when available'() {
configureFromFileText 'a.java', '''\
class A {
{