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

lambda -> method ref: forbid inside anonymous; qualify this (IDEA-126750)

Browse Source
This commit is contained in:
Anna Kozlova
2014-07-01 19:31:10 +02:00
parent 60c18e802f
commit b524d609c1
4 changed files with 73 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,6 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
containingClass = psiMethod.getContainingClass();
isConstructor = psiMethod.isConstructor();
}
if (containingClass == null) return null;
boolean isReceiverType = PsiMethodReferenceUtil.isReceiverType(functionalInterfaceType, containingClass, psiMethod);
if (isReceiverType && psiMethod != null) {
PsiMethod nonAmbiguousMethod = ensureNonAmbiguousMethod(parameters, psiMethod);
@@ -120,6 +119,7 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
psiMethod = nonAmbiguousMethod;
containingClass = nonAmbiguousMethod.getContainingClass();
}
if (containingClass == null) return null;
final boolean staticOrValidConstructorRef;
if (isConstructor) {
staticOrValidConstructorRef =
@@ -182,6 +182,8 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
}
});
if (usedInQualifier.get()) return null;
} else if (containingClass != PsiTreeUtil.getParentOfType(body, PsiClass.class) && containingClass.getName() == null) {
return null;
}
return methodCall;
} else if (methodCall instanceof PsiNewExpression) {
@@ -275,8 +277,16 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
methodRefText = qualifier + "::" + ((PsiMethodCallExpression)element).getTypeArgumentList().getText() + methodReferenceName;
}
else {
methodRefText =
(psiMethod.hasModifierProperty(PsiModifier.STATIC) ? getClassReferenceName(containingClass) : "this") + "::" + methodReferenceName;
if (psiMethod.hasModifierProperty(PsiModifier.STATIC)) {
methodRefText = getClassReferenceName(containingClass);
} else {
if (containingClass != PsiTreeUtil.getParentOfType(element, PsiClass.class) ) {
methodRefText = containingClass.getName() + ".this";
} else {
methodRefText = "this";
}
}
methodRefText += "::" + methodReferenceName;
}
}
else if (element instanceof PsiNewExpression) {
@@ -343,7 +353,13 @@ public class LambdaCanBeMethodReferenceInspection extends BaseJavaBatchLocalInsp
private static String getClassReferenceName(PsiClass containingClass) {
final String qualifiedName = containingClass.getQualifiedName();
return qualifiedName != null ? qualifiedName : containingClass.getName();
if (qualifiedName != null) {
return qualifiedName;
}
else {
final String containingClassName = containingClass.getName();
return containingClassName != null ? containingClassName : "";
}
}
private static class ReplaceWithMethodRefFix implements LocalQuickFix {

18
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/afterInsideNestedInner.java Normal file
View File

@@ -0,0 +1,18 @@
// "Replace lambda with method reference" "true"
class Example {
class Bar {
void foo() {
}
class Foo {
void bar() {
new Object() {
void baz() {
Runnable runnable = Bar.this::foo;
}
};
}
}
}
}

17
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeInsideAnonymous.java Normal file
View File

@@ -0,0 +1,17 @@
// "Replace lambda with method reference" "false"
class Example {
{
new Object() {
void foo() {
}
void bar() {
new Object() {
void baz() {
Runnable runnable = () -> fo<caret>o();
}
};
}
};
}
}

18
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambda2methodReference/beforeInsideNestedInner.java Normal file
View File

@@ -0,0 +1,18 @@
// "Replace lambda with method reference" "true"
class Example {
class Bar {
void foo() {
}
class Foo {
void bar() {
new Object() {
void baz() {
Runnable runnable = () -> fo<caret>o();
}
};
}
}
}
}