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

lambda -> methref: respect laziness (IDEA-133372)

Browse Source
This commit is contained in:
Anna Kozlova
2014-11-24 11:52:20 +01:00
parent a22d87f6b2
commit efc2dc0c59
4 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
return null;
}
private static boolean isSimpleCall(PsiParameter[] parameters, PsiCallExpression callExpression, PsiMethod psiMethod) {
private static boolean isSimpleCall(final PsiParameter[] parameters, PsiCallExpression callExpression, PsiMethod psiMethod) {
final PsiExpressionList argumentList = callExpression.getArgumentList();
if (argumentList == null) {
return false;
@@ -155,7 +155,28 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
}
}
return offset == 0 || resolvesToParameter(qualifier, parameters[0]);
if (offset == 0) {
if (qualifier != null) {
final boolean[] parameterUsed = new boolean[] {false};
qualifier.accept(new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitElement(PsiElement element) {
if (parameterUsed[0]) return;
super.visitElement(element);
}
@Override
public void visitReferenceExpression(PsiReferenceExpression expression) {
super.visitReferenceExpression(expression);
parameterUsed[0] |= ArrayUtil.find(parameters, expression.resolve()) >= 0;
}
});
return !parameterUsed[0];
}
return true;
}
return resolvesToParameter(qualifier, parameters[0]);
}
private static boolean resolvesToParameter(PsiExpression expression, PsiParameter parameter) {
@@ -164,7 +185,21 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
public static PsiCallExpression extractMethodCallFromBlock(PsiElement body) {
final PsiExpression expression = LambdaUtil.extractSingleExpressionFromBody(body);
return expression instanceof PsiCallExpression ? (PsiCallExpression)expression : null;
if (expression instanceof PsiNewExpression) {
if (checkQualifier(((PsiNewExpression)expression).getQualifier())) {
return (PsiCallExpression)expression;
}
}
if (expression instanceof PsiMethodCallExpression) {
if (checkQualifier(((PsiMethodCallExpression)expression).getMethodExpression().getQualifier())) {
return (PsiCallExpression)expression;
}
}
return null;
}
private static boolean checkQualifier(PsiElement qualifier) {
return !(qualifier instanceof PsiCallExpression);
}
@Nullable

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/afterNoParamsQualifier.java
View File

@@ -1,13 +0,0 @@
// "Replace lambda with method reference" "true"
class Example {
public void m() {
}
{
Runnable r = ex()::m;
}
Example ex() {
return this;
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeNoParamsQualifier.java
View File

@@ -1,4 +1,4 @@
// "Replace lambda with method reference" "true"
// "Replace lambda with method reference" "false"
class Example {
public void m() {
}

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeParamsQualifier.java Normal file
View File

@@ -0,0 +1,13 @@
// "Replace lambda with method reference" "false"
class Example {
public void m(Example a) {
}
{
A aA = (a) -> a.<caret>m(a);
}
}
interface A {
void a(Example a);
}