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

PsiUtil.resolveClassInClassTypeOnly used (IDEA-CR-14722)

Browse Source
This commit is contained in:
Tagir Valeev
2016-10-27 10:35:04 +07:00
parent bbb491fab9
commit 60b6d1093a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java
+3 -7
View File
@@ -209,8 +209,7 @@ public class SimplifyStreamApiCallChainsInspection extends BaseJavaBatchLocalIns
} else if(isCallOf(collectorMethod, CommonClassNames.JAVA_UTIL_STREAM_COLLECTORS, SUMMING_DOUBLE_COLLECTOR, 1)) { } else if(isCallOf(collectorMethod, CommonClassNames.JAVA_UTIL_STREAM_COLLECTORS, SUMMING_DOUBLE_COLLECTOR, 1)) {
fix = new ReplaceCollectorFix(SUMMING_DOUBLE_COLLECTOR, "mapToDouble({0}).sum()", false); fix = new ReplaceCollectorFix(SUMMING_DOUBLE_COLLECTOR, "mapToDouble({0}).sum()", false);
} else { } else {
PsiType type = methodCall.getType(); if(PsiUtil.resolveClassInClassTypeOnly(methodCall.getType()) instanceof PsiTypeParameter) {
if(type instanceof PsiClassType && !(((PsiClassType)type).resolve() instanceof PsiTypeParameter)) {
String replacement = collectorToCollection(collectorCall); String replacement = collectorToCollection(collectorCall);
if (replacement != null) { if (replacement != null) {
PsiMethodCallExpression qualifier = getQualifierMethodCall(methodCall); PsiMethodCallExpression qualifier = getQualifierMethodCall(methodCall);
@@ -282,9 +281,7 @@ public class SimplifyStreamApiCallChainsInspection extends BaseJavaBatchLocalIns
PsiParameter parameter = list.getParameters()[0]; PsiParameter parameter = list.getParameters()[0];
PsiTypeElement typeElement = parameter.getTypeElement(); PsiTypeElement typeElement = parameter.getTypeElement();
if(typeElement == null) return false; if(typeElement == null) return false;
PsiType type = typeElement.getType(); PsiClass aClass = PsiUtil.resolveClassInClassTypeOnly(typeElement.getType());
if(!(type instanceof PsiClassType)) return false;
PsiClass aClass = ((PsiClassType)type).resolve();
if(aClass == null) return false; if(aClass == null) return false;
return CommonClassNames.JAVA_UTIL_COLLECTION.equals(aClass.getQualifiedName()); return CommonClassNames.JAVA_UTIL_COLLECTION.equals(aClass.getQualifiedName());
} }
@@ -781,8 +778,7 @@ public class SimplifyStreamApiCallChainsInspection extends BaseJavaBatchLocalIns
if(!(element instanceof PsiMethodCallExpression)) return; if(!(element instanceof PsiMethodCallExpression)) return;
PsiMethodCallExpression collectCall = (PsiMethodCallExpression)element; PsiMethodCallExpression collectCall = (PsiMethodCallExpression)element;
PsiType type = collectCall.getType(); PsiType type = collectCall.getType();
if(!(type instanceof PsiClassType)) return; PsiClass resolvedType = PsiUtil.resolveClassInClassTypeOnly(type);
PsiClass resolvedType = ((PsiClassType)type).resolve();
if(resolvedType == null || resolvedType instanceof PsiTypeParameter) return; if(resolvedType == null || resolvedType instanceof PsiTypeParameter) return;
PsiMethodCallExpression streamCall = getQualifierMethodCall(collectCall); PsiMethodCallExpression streamCall = getQualifierMethodCall(collectCall);
if(streamCall == null) return; if(streamCall == null) return;