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

JavaCompletionUtil: use findMethodInSuperClassBySignatureInDerived

Browse Source 
Review ID: IDEA-CR-27564
This commit is contained in:
Tagir Valeev
2017-12-05 14:50:33 +07:00
parent f0e1044217
commit e9f00a8789
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+6 -6
View File
@@ -44,7 +44,6 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.JBIterable; import com.intellij.util.containers.JBIterable;
import com.siyeh.ig.psiutils.SideEffectChecker; import com.siyeh.ig.psiutils.SideEffectChecker;
import gnu.trove.THashSet; import gnu.trove.THashSet;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -365,12 +364,13 @@ public class JavaCompletionUtil {
PsiMethod method = (PsiMethod)o; PsiMethod method = (PsiMethod)o;
PsiClassType.ClassResolveResult plainResult = ((PsiClassType)plainQualifier).resolveGenerics(); PsiClassType.ClassResolveResult plainResult = ((PsiClassType)plainQualifier).resolveGenerics();
PsiClass plainClass = plainResult.getElement(); PsiClass plainClass = plainResult.getElement();
HierarchicalMethodSignature signature = method.getHierarchicalMethodSignature(); PsiClass castClass = ((PsiClassType)castType).resolveGenerics().getElement();
if (plainClass != null && StreamEx.of(signature.getSuperSignatures()).prepend(signature)
.anyMatch(sig -> MethodSignatureUtil.findMethodBySignature(plainClass, sig, true) != null)) {
PsiClass castClass = ((PsiClassType)castType).resolveGenerics().getElement();
if (castClass == null || !castClass.isInheritor(plainClass, true)) { if (plainClass != null && castClass != null &&
MethodSignatureUtil.findMethodInSuperClassBySignatureInDerived(
castClass, plainClass, method.getSignature(plainResult.getSubstitutor()), true) != null) {
if (!castClass.isInheritor(plainClass, true)) {
return false; return false;
} }