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

LambdaCanBeMethodReferenceInspection#replaceLambdaWithMethodReference: short-cuts

Browse Source 
Do not run expensive lambda.getFunctionalInterfaceType() if lambda body does not even look like as method reference candidate; do not resolve method call if its arguments are not references
This commit is contained in:
Tagir Valeev
2018-05-30 18:23:39 +07:00
parent 77a5238f3e
commit ff0db95b3b
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
+15 -4
View File
@@ -250,11 +250,19 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI
return null;
}
if (expression instanceof PsiNewExpression) {
PsiExpression qualifier = ((PsiNewExpression)expression).getQualifier();
if (qualifier != null) return null;
PsiNewExpression newExpression = (PsiNewExpression)expression;
if (newExpression.getQualifier() != null ||
newExpression.getAnonymousClass() != null ||
newExpression.getArrayInitializer() != null) {
return null;
}
return new MethodReferenceCandidate(expression, true, true);
}
else if (expression instanceof PsiMethodCallExpression) {
for (PsiExpression arg : ((PsiMethodCallExpression)expression).getArgumentList().getExpressions()) {
arg = PsiUtil.skipParenthesizedExprDown(arg);
if (!(arg instanceof PsiReferenceExpression) || ((PsiReferenceExpression)arg).getQualifier() != null) return null;
}
return new MethodReferenceCandidate(expression,
checkQualifier(((PsiMethodCallExpression)expression).getMethodExpression().getQualifier()), true);
}
@@ -296,8 +304,11 @@ public class LambdaCanBeMethodReferenceInspection extends AbstractBaseJavaLocalI
@NotNull
public static PsiExpression replaceLambdaWithMethodReference(@NotNull PsiLambdaExpression lambda) {
PsiElement body = LambdaUtil.extractSingleExpressionFromBody(lambda.getBody());
final PsiExpression candidate = canBeMethodReferenceProblem(body, lambda.getParameterList().getParameters(), lambda.getFunctionalInterfaceType(), lambda);
MethodReferenceCandidate methodRefCandidate = extractMethodReferenceCandidateExpression(lambda.getBody());
if (methodRefCandidate == null || !methodRefCandidate.mySafeQualifier || !methodRefCandidate.myConformsCodeStyle) return lambda;
PsiExpression candidate =
canBeMethodReferenceProblem(lambda.getParameterList().getParameters(), lambda.getFunctionalInterfaceType(), lambda,
methodRefCandidate.myExpression);
return tryConvertToMethodReference(lambda, candidate);
}