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

lambda: convert anonymous to lambda inspection & fix

Browse Source
This commit is contained in:
Anna Kozlova
2012-08-20 18:55:41 +04:00
parent 01970963cf
commit 8b0455ce93
19 changed files with 373 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
java/java-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java Normal file
View File

@@ -0,0 +1,155 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInspection;
import com.intellij.codeInsight.daemon.GroupNames;
import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
import com.intellij.codeInsight.intention.HighPriorityAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.Function;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
/**
* User: anna
*/
public class AnonymousCanBeLambdaInspection extends BaseJavaLocalInspectionTool {
public static final Logger LOG = Logger.getInstance("#" + AnonymousCanBeLambdaInspection.class.getName());
@Nls
@NotNull
@Override
public String getGroupDisplayName() {
return GroupNames.LANGUAGE_LEVEL_SPECIFIC_GROUP_NAME;
}
@Nls
@NotNull
@Override
public String getDisplayName() {
return "Anonymous type can be replaced with lambda";
}
@Override
public boolean isEnabledByDefault() {
return true;
}
@NotNull
@Override
public String getShortName() {
return "Convert2Lambda";
}
@NotNull
@Override
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override
public void visitAnonymousClass(PsiAnonymousClass aClass) {
super.visitAnonymousClass(aClass);
if (PsiUtil.getLanguageLevel(aClass).isAtLeast(LanguageLevel.JDK_1_8)&& LambdaUtil.isValidLambdaContext(aClass.getParent().getParent())) {
final PsiClassType baseClassType = aClass.getBaseClassType();
final String functionalInterfaceErrorMessage = LambdaUtil.checkInterfaceFunctional(baseClassType);
if (functionalInterfaceErrorMessage == null) {
final PsiMethod[] methods = aClass.getMethods();
if (methods.length == 1 && methods[0].getBody() != null) {
holder.registerProblem(aClass.getBaseClassReference(), "Anonymous #ref #loc can be replaced with lambda",
ProblemHighlightType.LIKE_UNUSED_SYMBOL, new ReplaceWithLambdaFix());
}
}
}
}
};
}
private static class ReplaceWithLambdaFix implements LocalQuickFix, HighPriorityAction {
@NotNull
@Override
public String getName() {
return "Replace with lambda";
}
@NotNull
@Override
public String getFamilyName() {
return getName();
}
@Override
public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
final PsiElement element = descriptor.getPsiElement();
if (element != null) {
final PsiAnonymousClass anonymousClass = PsiTreeUtil.getParentOfType(element, PsiAnonymousClass.class);
LOG.assertTrue(anonymousClass != null);
final PsiMethod method = anonymousClass.getMethods()[0];
LOG.assertTrue(method != null);
final String lambdaWithTypesDeclared = composeLambdaText(method, true);
boolean mustBeFinal = false;
for (PsiParameter parameter : method.getParameterList().getParameters()) {
for (PsiReference reference : ReferencesSearch.search(parameter)) {
if (HighlightControlFlowUtil.getInnerClassVariableReferencedFrom(parameter, reference.getElement()) != null) {
mustBeFinal = true;
break;
}
}
if (mustBeFinal) break;
}
PsiLambdaExpression lambdaExpression =
(PsiLambdaExpression)JavaPsiFacade.getElementFactory(project).createExpressionFromText(mustBeFinal ? lambdaWithTypesDeclared : composeLambdaText(method, false), anonymousClass);
final PsiNewExpression newExpression = (PsiNewExpression)anonymousClass.getParent();
lambdaExpression = (PsiLambdaExpression)newExpression.replace(lambdaExpression);
PsiType interfaceType = lambdaExpression.getFunctionalInterfaceType();
if (interfaceType == null || !LambdaUtil.isLambdaFullyInferred(lambdaExpression, interfaceType)) {
lambdaExpression.replace(JavaPsiFacade.getElementFactory(project).createExpressionFromText(lambdaWithTypesDeclared, lambdaExpression));
}
}
}
private static String composeLambdaText(PsiMethod method, final boolean appendType) {
final StringBuilder buf = new StringBuilder();
if (appendType) {
buf.append(method.getParameterList().getText());
} else {
buf.append("(").append(StringUtil.join(method.getParameterList().getParameters(),
new Function<PsiParameter, String>() {
@Override
public String fun(PsiParameter parameter) {
String parameterName = parameter.getName();
if (parameterName == null) {
parameterName = "";
}
return parameterName;
}
}, ",")).append(")");
}
buf.append("->");
final PsiCodeBlock body = method.getBody();
LOG.assertTrue(body != null);
buf.append(body.getText());
return buf.toString();
}
}
}

3
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
View File

@@ -70,7 +70,8 @@ public class LambdaUtil {
context instanceof PsiLambdaExpression ||
context instanceof PsiReturnStatement ||
context instanceof PsiExpressionList ||
context instanceof PsiParenthesizedExpression;
context instanceof PsiParenthesizedExpression ||
context instanceof PsiArrayInitializerExpression;
}
public static boolean isLambdaFullyInferred(PsiLambdaExpression expression, PsiType functionalInterfaceType) {

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterComparable.java Normal file
View File

@@ -0,0 +1,8 @@
// "Replace with lambda" "true"
class Test {
{
Comparable<String> c = (o)->{
return 0;
};
}
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterComparableNeedToBeFinal.java Normal file
View File

@@ -0,0 +1,14 @@
// "Replace with lambda" "true"
class Test {
{
Comparable<String> c = (final String o)->{
Runnable r = new Runnable() {
@Override
public void run() {
System.out.println(o);
}
};
return 0;
};
}
}

15
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterFormalTypes.java Normal file
View File

@@ -0,0 +1,15 @@
// "Replace with lambda" "true"
class Test2 {
interface I<X> {
X foo(List<X> list);
}
static <T> I<T> bar(I<T> i){return i;}
{
bar((List<String> list)->{
return null; //To change body of implemented methods use File | Settings | File Templates.
});
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterRunnable.java Normal file
View File

@@ -0,0 +1,8 @@
// "Replace with lambda" "true"
class Test {
{
Runnable r = ()->{
System.out.println("");
};
}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterRunnableInArrayInitializer.java Normal file
View File

@@ -0,0 +1,8 @@
// "Replace with lambda" "true"
class Test {
{
Runnable[] r = new Runnable[] {()->{
System.out.println("");
}};
}
}

16
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeClassAsSuperType.java Normal file
View File

@@ -0,0 +1,16 @@
// "Replace with lambda" "false"
class Test {
{
A a = new A<caret>("str") {
@Override
public void foo() {
}
};
}
static class A {
A(String s) {
}
public void foo(){}
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeClassObjectAccess.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace with lambda" "false"
class Test {
{
new Ru<caret>nnable() {
@Override
public void run() {
//To change body of implemented methods use File | Settings | File Templates.
}
}.getClass();;
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeComparable.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace with lambda" "true"
class Test {
{
Comparable<String> c = new Compa<caret>rable<String>() {
@Override
public int compareTo(String o) {
return 0;
}
};
}
}

17
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeComparableNeedToBeFinal.java Normal file
View File

@@ -0,0 +1,17 @@
// "Replace with lambda" "true"
class Test {
{
Comparable<String> c = new Compa<caret>rable<String>() {
@Override
public int compareTo(final String o) {
Runnable r = new Runnable() {
@Override
public void run() {
System.out.println(o);
}
};
return 0;
}
};
}
}

18
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeFormalTypes.java Normal file
View File

@@ -0,0 +1,18 @@
// "Replace with lambda" "true"
class Test2 {
interface I<X> {
X foo(List<X> list);
}
static <T> I<T> bar(I<T> i){return i;}
{
bar(new I<Stri<caret>ng>() {
@Override
public String foo(List<String> list) {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
});
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeNoMethodBody.java Normal file
View File

@@ -0,0 +1,9 @@
// "Replace with lambda" "false"
class Test {
{
Runnable a = new Run<caret>nable() {
@Override
public void run()
};
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeRunnable.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace with lambda" "true"
class Test {
{
Runnable r = new Run<caret>nable() {
@Override
public void run() {
System.out.println("");
}
};
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeRunnableInArrayInitializer.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace with lambda" "true"
class Test {
{
Runnable[] r = new Runnable[] {new Run<caret>nable() {
@Override
public void run() {
System.out.println("");
}
}};
}
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeRunnableWithHelpMethod.java Normal file
View File

@@ -0,0 +1,12 @@
// "Replace with lambda" "false"
class Test {
{
Runnable r = new Ru<caret>nnable() {
@Override
public void run() {
helper();
}
private void helper(){}
};
}
}

37
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Anonymous2LambdaInspectionTest.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInsight.daemon.quickFix;
import com.intellij.codeInspection.AnonymousCanBeLambdaInspection;
import com.intellij.codeInspection.LocalInspectionTool;
public class Anonymous2LambdaInspectionTest extends LightQuickFixTestCase {
@Override
protected LocalInspectionTool[] configureLocalInspectionTools() {
return new LocalInspectionTool[]{
new AnonymousCanBeLambdaInspection(),
};
}
public void test() throws Exception { doAllTests(); }
@Override
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda";
}
}

7
resources-en/src/inspectionDescriptions/Convert2Lambda.html Normal file
View File

@@ -0,0 +1,7 @@
<html>
<body>
This inspection reports all anonymous classes which can be replaced with lambda expressions
<p>
Lambda syntax is not supported under Java 1.7 or earlier JVMs.
</body>
</html>

3
resources/src/META-INF/IdeaPlugin.xml
View File

@@ -533,6 +533,9 @@
<localInspection language="JAVA" shortName="Convert2Diamond" displayName="Explicit type can be replaced with &lt;&gt;"
groupName="Java language level migration aids" enabledByDefault="true" level="WARNING"
implementationClass="com.intellij.codeInspection.ExplicitTypeCanBeDiamondInspection" />
<localInspection language="JAVA" shortName="Convert2Lambda" displayName="Anonymous type can be replaced with lambda"
groupName="Java language level migration aids" enabledByDefault="true" level="WARNING"
implementationClass="com.intellij.codeInspection.AnonymousCanBeLambdaInspection" />
<localInspection language="JAVA" suppressId="unchecked" shortName="SafeVarargsDetector"
displayName="Possible heap pollution from parameterized vararg type" groupName="Java language level migration aids"
enabledByDefault="true" level="WARNING"