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

StandardInstructionVisitor#findSpecificMethod: PsiUtil#canBeOverridden, JavaOverridingMethodsSearcher#findOverridingMethod used

Browse Source 
Review ID: IDEA-CR-24590
This commit is contained in:
Tagir Valeev
2017-09-15 15:29:28 +07:00
parent c844f5731b
commit 8c5b14da77
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java
+4 -6
View File
@@ -20,10 +20,10 @@ import com.intellij.codeInspection.dataFlow.instructions.*;
import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet;
import com.intellij.codeInspection.dataFlow.value.*;
import com.intellij.codeInspection.dataFlow.value.DfaRelationValue.RelationType;
import com.intellij.lang.jvm.JvmModifier;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.*;
import com.intellij.psi.impl.search.JavaOverridingMethodsSearcher;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiTreeUtil;
@@ -480,10 +480,7 @@ public class StandardInstructionVisitor extends InstructionVisitor {
@NotNull
private static PsiMethod findSpecificMethod(@NotNull PsiMethod method, @NotNull DfaMemoryState state, @Nullable DfaValue qualifier) {
if (qualifier == null ||
method.hasModifier(JvmModifier.STATIC) ||
method.hasModifier(JvmModifier.FINAL) ||
method.hasModifier(JvmModifier.PRIVATE)) {
if (qualifier == null || !PsiUtil.canBeOverridden(method)) {
return method;
}
TypeConstraint constraint = state.getValueFact(DfaFactType.TYPE_CONSTRAINT, qualifier);
@@ -492,7 +489,8 @@ public class StandardInstructionVisitor extends InstructionVisitor {
if (specificQualifierClass != null && qualifierClass != null &&
!specificQualifierClass.equals(qualifierClass) &&
InheritanceUtil.isInheritorOrSelf(specificQualifierClass, qualifierClass, true)) {
PsiMethod realMethod = specificQualifierClass.findMethodBySignature(method, true);
PsiMethod realMethod =
JavaOverridingMethodsSearcher.findOverridingMethod(method.getProject(), specificQualifierClass, method, qualifierClass);
if (realMethod != null) {
return realMethod;
}
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaOverridingMethodsSearcher.java
+4 -4
View File
@@ -147,10 +147,10 @@ public class JavaOverridingMethodsSearcher implements QueryExecutor<PsiMethod, O
}
@Nullable
static PsiMethod findOverridingMethod(@NotNull Project project,
@NotNull PsiClass inheritor,
@NotNull PsiMethod method,
@NotNull PsiClass methodContainingClass) {
public static PsiMethod findOverridingMethod(@NotNull Project project,
@NotNull PsiClass inheritor,
@NotNull PsiMethod method,
@NotNull PsiClass methodContainingClass) {
String name = method.getName();
if (inheritor.findMethodsByName(name, false).length > 0) {
PsiMethod found = MethodSignatureUtil.findMethodBySuperSignature(inheritor, getSuperSignature(inheritor, methodContainingClass, method), false);