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

forbid anonymous -> lambda when conflicting local vars exist (IDEA-93589)

Browse Source
This commit is contained in:
anna
2012-10-31 13:14:25 +01:00
parent 846f6ab1fd
commit ec4df495b5
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
java/java-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
View File

@@ -26,9 +26,12 @@ import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.HashSet;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import java.util.Set;
/**
* User: anna
*/
@@ -76,6 +79,7 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaLocalInspectionTool
final PsiCodeBlock body = methods[0].getBody();
if (body != null) {
final boolean [] bodyContainsForbiddenRefs = new boolean[1];
final Set<PsiLocalVariable> locals = new HashSet<PsiLocalVariable>();
body.accept(new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitMethodCallExpression(PsiMethodCallExpression methodCallExpression) {
@@ -103,8 +107,19 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaLocalInspectionTool
bodyContainsForbiddenRefs[0] = true;
}
}
@Override
public void visitLocalVariable(PsiLocalVariable variable) {
super.visitLocalVariable(variable);
locals.add(variable);
}
});
if (!bodyContainsForbiddenRefs[0]) {
PsiResolveHelper helper = PsiResolveHelper.SERVICE.getInstance(body.getProject());
for (PsiLocalVariable local : locals) {
final String localName = local.getName();
if (localName != null && helper.resolveReferencedVariable(localName, aClass) != null) return;
}
holder.registerProblem(aClass.getBaseClassReference(), "Anonymous #ref #loc can be replaced with lambda",
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, new ReplaceWithLambdaFix());
}

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeLocalVariableConflicts.java Normal file
View File

@@ -0,0 +1,13 @@
// "Replace with lambda" "false"
class Foo11 {
Runnable runnable = new Runnable() {
public void run() {
int x = 5;
new Runn<caret>able() {
public void run () {
int x = 10;
}
} ;
}
};
}