MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-06 13:20:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

redundant type arguments: check all methods applicability till top level (IDEA-166696)

Browse Source
This commit is contained in:
Anna Kozlova
2017-01-19 17:25:30 +03:00
parent ac44e446fb
commit f28bfb5bcb
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/java-psi-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
View File

@@ -23,6 +23,7 @@ import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.infos.MethodCandidateInfo;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiTypesUtil;
import com.intellij.psi.util.PsiUtil;
@@ -243,7 +244,8 @@ public class PsiDiamondTypeUtil {
return false;
}
}
return true;
return checkParentApplicability(exprCopy);
}
private static boolean isInferenceEquivalent(PsiType[] typeArguments,
@@ -283,6 +285,18 @@ public class PsiDiamondTypeUtil {
return false;
}
}
return checkParentApplicability(exprCopy);
}
private static boolean checkParentApplicability(PsiCallExpression exprCopy) {
while (exprCopy != null){
final JavaResolveResult resolveResult = exprCopy.resolveMethodGenerics();
if (resolveResult instanceof MethodCandidateInfo && !((MethodCandidateInfo)resolveResult).isApplicable()) {
return false;
}
exprCopy = PsiTreeUtil.getParentOfType(exprCopy, PsiCallExpression.class, true);
}
return true;
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantTypeArgs/beforeNestedCallWithMethodRef.java Normal file
View File

@@ -0,0 +1,12 @@
// "Remove explicit type arguments" "false"
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
class Test {
void foo(List<String> input, Function<String, Integer> length) {
input.stream().collect(Collectors.groupingBy(length,
Collectors.collectingAndThen(Collectors.<St<caret>ring>maxBy(Comparator.naturalOrder()), Optional::get)));
}
}