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

revert WeakestTypeFinder work with super method return type

Browse Source
This commit is contained in:
Roman Ivanov
2017-11-10 12:28:00 +03:00
parent 10dfa05277
commit aa4da50572
1 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java
+1 -26
View File
@@ -24,14 +24,11 @@ import com.intellij.psi.search.searches.DirectClassInheritorsSearch;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.search.searches.SuperMethodsSearch;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.*;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiTypesUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Query;
import com.siyeh.HardcodedMethodConstants;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -132,28 +129,6 @@ public class WeakestTypeFinder {
!findWeakestType(methodCallExpression, weakestTypeClasses)) {
return Collections.emptyList();
}
// consider method can have super methods with weaker return type
PsiType expectedType = ExpectedTypeUtils.findExpectedType(methodCallExpression, false);
if (expectedType != null) {
PsiMethod method = methodCallExpression.resolveMethod();
if (method == null) return Collections.emptyList();
PsiType returnType = method.getReturnType();
if (returnType == null) return Collections.emptyList();
PsiMethod[] superMethods = method.findSuperMethods();
boolean supersHaveDifferentReturnType = StreamEx.of(superMethods).anyMatch(m -> !m.getReturnType().equals(returnType));
if (supersHaveDifferentReturnType) {
boolean assigned = false;
for (PsiMethod superMethod : superMethods) {
if (expectedType.isAssignableFrom(superMethod.getReturnType())) {
checkClass(superMethod.getContainingClass(), weakestTypeClasses);
assigned = true;
}
}
if(!assigned) {
return Collections.emptyList();
}
}
}
}
else if (referenceParent instanceof PsiAssignmentExpression) {
final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)referenceParent;