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

SuspiciousMethodCallUtil: support retainAll (IDEA-201636)

Browse Source
This commit is contained in:
Tagir Valeev
2018-11-02 13:56:43 +07:00
parent 521b01417a
commit 39260a1ed8
3 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/SuspiciousMethodCallUtil.java
+23 -26
View File
@@ -28,35 +28,28 @@ public class SuspiciousMethodCallUtil {
GlobalSearchScope searchScope,
List<? super PatternMethod> patternMethods) {
final JavaPsiFacade javaPsiFacade = JavaPsiFacade.getInstance(manager.getProject());
final PsiClass
collectionClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_COLLECTION, searchScope);
PsiType[] javaLangObject = {PsiType.getJavaLangObject(manager, searchScope)};
MethodSignature removeSignature = MethodSignatureUtil
.createMethodSignature("remove", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
final PsiClass collectionClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_COLLECTION, searchScope);
PsiClassType object = PsiType.getJavaLangObject(manager, searchScope);
PsiType[] javaLangObject = {object};
MethodSignature removeSignature =
MethodSignatureUtil.createMethodSignature("remove", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
if (collectionClass != null) {
PsiMethod remove = MethodSignatureUtil.findMethodBySignature(collectionClass, removeSignature, false);
addMethod(remove, 0, patternMethods, 0);
MethodSignature containsSignature = MethodSignatureUtil.createMethodSignature("contains", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
PsiMethod contains = MethodSignatureUtil.findMethodBySignature(collectionClass, containsSignature, false);
addMethod(contains, 0, patternMethods, 0);
addSingleParameterMethod(patternMethods, collectionClass, "contains", object);
if (PsiUtil.isLanguageLevel5OrHigher(collectionClass)) {
PsiClassType wildcardCollection = javaPsiFacade.getElementFactory().createType(collectionClass, PsiWildcardType.createUnbounded(manager));
MethodSignature removeAllSignature = MethodSignatureUtil.createMethodSignature("removeAll", new PsiType[] {wildcardCollection}, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
PsiMethod removeAll = MethodSignatureUtil.findMethodBySignature(collectionClass, removeAllSignature, false);
addMethod(removeAll, 0, patternMethods, 0);
addSingleParameterMethod(patternMethods, collectionClass, "removeAll", wildcardCollection);
addSingleParameterMethod(patternMethods, collectionClass, "retainAll", wildcardCollection);
}
}
final PsiClass listClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_LIST, searchScope);
if (listClass != null) {
MethodSignature indexofSignature = MethodSignatureUtil.createMethodSignature("indexOf", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
PsiMethod indexof = MethodSignatureUtil.findMethodBySignature(listClass, indexofSignature, false);
addMethod(indexof, 0, patternMethods, 0);
MethodSignature lastindexofSignature = MethodSignatureUtil.createMethodSignature("lastIndexOf", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
PsiMethod lastindexof = MethodSignatureUtil.findMethodBySignature(listClass, lastindexofSignature, false);
addMethod(lastindexof, 0, patternMethods, 0);
addSingleParameterMethod(patternMethods, listClass, "indexOf", object);
addSingleParameterMethod(patternMethods, listClass, "lastIndexOf", object);
}
final PsiClass mapClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_MAP, searchScope);
@@ -64,29 +57,25 @@ public class SuspiciousMethodCallUtil {
PsiMethod remove = MethodSignatureUtil.findMethodBySignature(mapClass, removeSignature, false);
addMethod(remove, 0, patternMethods, 0);
MethodSignature getSignature = MethodSignatureUtil.createMethodSignature("get", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
PsiMethod get = MethodSignatureUtil.findMethodBySignature(mapClass, getSignature, false);
addMethod(get, 0, patternMethods, 0);
addSingleParameterMethod(patternMethods, mapClass, "get", object);
PsiTypeParameter[] typeParameters = mapClass.getTypeParameters();
if (typeParameters.length > 0) {
MethodSignature getOrDefaultSignature = MethodSignatureUtil.createMethodSignature("getOrDefault",
new PsiType[] {javaLangObject[0],
new PsiType[]{object,
PsiSubstitutor.EMPTY.substitute(typeParameters[1])}, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
PsiMethod getOrDefault = MethodSignatureUtil.findMethodBySignature(mapClass, getOrDefaultSignature, false);
addMethod(getOrDefault, 0, patternMethods, 0);
}
MethodSignature removeWithDefaultSignature = MethodSignatureUtil.createMethodSignature("remove",
new PsiType[] {javaLangObject[0], javaLangObject[0]},
new PsiType[]{object, object},
PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
PsiMethod removeWithDefault = MethodSignatureUtil.findMethodBySignature(mapClass, removeWithDefaultSignature, false);
addMethod(removeWithDefault, 0, patternMethods, 0);
addMethod(removeWithDefault, 1, patternMethods, 1);
MethodSignature containsKeySignature = MethodSignatureUtil.createMethodSignature("containsKey", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
PsiMethod containsKey = MethodSignatureUtil.findMethodBySignature(mapClass, containsKeySignature, false);
addMethod(containsKey, 0, patternMethods, 0);
addSingleParameterMethod(patternMethods, mapClass, "containsKey", object);
MethodSignature containsValueSignature = MethodSignatureUtil.createMethodSignature("containsValue", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
PsiMethod containsValue = MethodSignatureUtil.findMethodBySignature(mapClass, containsValueSignature, false);
@@ -101,6 +90,14 @@ public class SuspiciousMethodCallUtil {
}
}
private static void addSingleParameterMethod(List<? super PatternMethod> patternMethods,
PsiClass methodClass, String methodName, PsiClassType parameterType) {
MethodSignature signature = MethodSignatureUtil
.createMethodSignature(methodName, new PsiType[]{parameterType}, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
PsiMethod method = MethodSignatureUtil.findMethodBySignature(methodClass, signature, false);
addMethod(method, 0, patternMethods, 0);
}
private static void addMethod(final PsiMethod patternMethod,
int typeParamIndex,
List<? super PatternMethod> patternMethods,
@@ -190,7 +187,7 @@ public class SuspiciousMethodCallUtil {
if (typeParamMapping == null) return null;
PsiParameter[] parameters = method.getParameterList().getParameters();
if (parameters.length == 1 && "removeAll".equals(method.getName())) {
if (parameters.length == 1 && ("removeAll".equals(method.getName()) || "retainAll".equals(method.getName()))) {
PsiType paramType = parameters[0].getType();
if (InheritanceUtil.isInheritor(paramType, CommonClassNames.JAVA_UTIL_COLLECTION)) {
PsiType qualifierType = qualifier.getType();
java/java-tests/testData/inspection/suspiciousCalls/RetainAllCall.java
+10
View File
@@ -0,0 +1,10 @@
import java.util.*;
class Simple {
public static void main(String[] args) {
List<Long> a = new ArrayList<>();
List<String> b = new ArrayList<>();
a.retainAll(<warning descr="'List<Long>' may not contain objects of type 'String'">b</warning>);
}
}
java/java-tests/testSrc/com/intellij/java/codeInspection/SuspiciousCollectionMethodCallsTest.java
+1
View File
@@ -42,6 +42,7 @@ public class SuspiciousCollectionMethodCallsTest extends LightCodeInsightFixture
public void testConcurrentHashMap() { doTest(); }
public void testRemoveAllCall() { doTest(); }
public void testRetainAllCall() { doTest(); }
public void testSetList() { doTest(); }
public void testUseDfa() { doTest(); }
public void testWildcard() { doTest(); }