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

lambda -> method ref: ensure that capture is checked according to the param ref; avoid wildcards in method ref qualifiers (IDEA-139529)

Browse Source
This commit is contained in:
Anna Kozlova
2015-04-24 12:00:00 +02:00
parent 4ce0d65554
commit e5097dfc24
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
View File

@@ -334,7 +334,7 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
if (qualifierExpression != null) {
boolean isReceiverType = false;
if (qualifierExpression instanceof PsiReferenceExpression && ArrayUtil.find(parameters, ((PsiReferenceExpression)qualifierExpression).resolve()) > -1) {
isReceiverType = PsiMethodReferenceUtil.isReceiverType(PsiMethodReferenceUtil.getFirstParameterType(functionalInterfaceType, methodCall), containingClass, substitutor);
isReceiverType = PsiMethodReferenceUtil.isReceiverType(PsiMethodReferenceUtil.getFirstParameterType(functionalInterfaceType, qualifierExpression), containingClass, substitutor);
}
return isReceiverType ? composeReceiverQualifierText(parameters, psiMethod, containingClass, qualifierExpression)
: qualifierExpression.getText();
@@ -390,7 +390,8 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
}
final PsiType qualifierExpressionType = qualifierExpression.getType();
return qualifierExpressionType != null ? qualifierExpressionType.getCanonicalText() : getClassReferenceName(containingClass);
return qualifierExpressionType != null && !TypeConversionUtil.containsWildcards(qualifierExpressionType)
? qualifierExpressionType.getCanonicalText() : getClassReferenceName(containingClass);
}
private static String getClassReferenceName(PsiClass containingClass) {

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/afterWildcardsInReceiverType.java Normal file
View File

@@ -0,0 +1,5 @@
// "Replace lambda with method reference" "true"
import java.util.function.Function;
class Bar {
Function<Class<?> , String> s = Class::getCanonicalName;
}

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeWildcardsInReceiverType.java Normal file
View File

@@ -0,0 +1,5 @@
// "Replace lambda with method reference" "true"
import java.util.function.Function;
class Bar {
Function<Class<?> , String> s = (c) -> c.getCanonica<caret>lName();
}