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 completion: correct overriding resolution check (IDEA-CR-21402)

Browse Source
This commit is contained in:
peter
2017-05-30 13:19:46 +02:00
parent a2ac5de6b4
commit 71a3865e31
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/codeInsight/completion/scope/CompletionElement.java
+4 -5
View File
@@ -97,15 +97,14 @@ public class CompletionElement{
Object anotherElement = another.getElement();
if (!(anotherElement instanceof PsiMethod && myElement instanceof PsiMethod)) return false;
if (isInterfaceMethod((PsiMethod)myElement) && !isInterfaceMethod((PsiMethod)anotherElement)) return false;
if (((PsiMethod)myElement).hasModifierProperty(PsiModifier.ABSTRACT) &&
!((PsiMethod)anotherElement).hasModifierProperty(PsiModifier.ABSTRACT)) {
return false;
}
PsiType prevType = another.getSubstitutor().substitute(((PsiMethod)anotherElement).getReturnType());
PsiType candidateType = mySubstitutor.substitute(((PsiMethod)myElement).getReturnType());
return prevType != null && candidateType != null && !prevType.equals(candidateType) && prevType.isAssignableFrom(candidateType);
}
private static boolean isInterfaceMethod(PsiMethod anotherElement) {
PsiClass aClass = anotherElement.getContainingClass();
return aClass != null && aClass.isInterface();
}
}