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

LambdaCanBeMethodReferenceInspection: fix EA-140341 CCE; cleanup

Browse Source
This commit is contained in:
Tagir Valeev
2019-03-26 10:42:03 +07:00
parent 850c429b46
commit e85e0ebdfb
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/afterCastInQualifier.java Normal file
View File

@@ -0,0 +1,6 @@
// "Replace lambda with method reference" "true"
class Bar extends Random {
public void test(Object obj) {
Runnable r = ((String) obj)::trim;
}
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeCastInQualifier.java Normal file
View File

@@ -0,0 +1,6 @@
// "Replace lambda with method reference" "true"
class Bar extends Random {
public void test(Object obj) {
Runnable r = () -> <caret>((String)obj).trim();
}
}

19
plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
View File

@@ -6,6 +6,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Conditions;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
import com.intellij.psi.*;
@@ -484,11 +485,7 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI
return null;
}
int dim = newExprType.getArrayDimensions();
while (dim-- > 0) {
classOrPrimitiveName += "[]";
}
return classOrPrimitiveName;
return classOrPrimitiveName + StringUtil.repeat("[]", newExprType.getArrayDimensions());
}
@Nullable
@@ -498,15 +495,16 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI
final PsiMethod psiMethod,
final PsiSubstitutor substitutor) {
final PsiExpression qualifierExpression = PsiUtil.skipParenthesizedExprDown(methodCall.getMethodExpression().getQualifierExpression());
final PsiExpression qualifierExpression = methodCall.getMethodExpression().getQualifierExpression();
final PsiClass containingClass = psiMethod.getContainingClass();
LOG.assertTrue(containingClass != null);
if (qualifierExpression != null) {
boolean isReceiverType = false;
if (qualifierExpression instanceof PsiReferenceExpression && ArrayUtil.find(parameters, ((PsiReferenceExpression)qualifierExpression).resolve()) > -1) {
isReceiverType = PsiMethodReferenceUtil.isReceiverType(PsiMethodReferenceUtil.getFirstParameterType(functionalInterfaceType, qualifierExpression), containingClass, substitutor);
if (ExpressionUtils.isReferenceTo(qualifierExpression, ArrayUtil.getFirstElement(parameters))) {
PsiType type = PsiMethodReferenceUtil.getFirstParameterType(functionalInterfaceType, qualifierExpression);
isReceiverType = PsiMethodReferenceUtil.isReceiverType(type, containingClass, substitutor);
}
return isReceiverType ? composeReceiverQualifierText(parameters, psiMethod, containingClass, qualifierExpression)
: qualifierExpression.getText();
@@ -553,14 +551,13 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI
}
final PsiClass nonAmbiguousContainingClass = nonAmbiguousMethod.getContainingClass();
if (!containingClass.equals(nonAmbiguousContainingClass)) {
if (nonAmbiguousContainingClass != null && !containingClass.equals(nonAmbiguousContainingClass)) {
return getClassReferenceName(nonAmbiguousContainingClass);
}
if (containingClass.isPhysical() &&
qualifierExpression instanceof PsiReferenceExpression &&
!PsiTypesUtil.isGetClass(psiMethod) &&
ArrayUtil.find(parameters, ((PsiReferenceExpression)qualifierExpression).resolve()) > -1) {
ExpressionUtils.isReferenceTo(qualifierExpression, ArrayUtil.getFirstElement(parameters))) {
return getClassReferenceName(containingClass);
}