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

redundant lambda code block: do not suggest change void/value compatibility

Browse Source
This commit is contained in:
Anna Kozlova
2014-09-03 16:53:02 +04:00
parent 9097465506
commit 32448804ae
4 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java
View File

@@ -67,6 +67,9 @@ public class RedundantLambdaCodeBlockInspection extends BaseJavaBatchLocalInspec
if (body instanceof PsiCodeBlock) {
PsiExpression psiExpression = getExpression((PsiCodeBlock)body);
if (psiExpression != null) {
if (!expression.isVoidCompatible() && LambdaUtil.isExpressionStatementExpression(psiExpression)) {
return;
}
final PsiElement errorElement;
final PsiElement parent = psiExpression.getParent();
if (parent instanceof PsiReturnStatement) {

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

@@ -477,6 +477,16 @@ public class LambdaUtil {
return true;
}
//JLS 14.8 Expression Statements
public static boolean isExpressionStatementExpression(PsiElement body) {
return body instanceof PsiAssignmentExpression ||
body instanceof PsiPrefixExpression &&
(((PsiPrefixExpression)body).getOperationTokenType() == JavaTokenType.PLUSPLUS ||
((PsiPrefixExpression)body).getOperationTokenType() == JavaTokenType.MINUSMINUS) ||
body instanceof PsiPostfixExpression ||
body instanceof PsiCallExpression;
}
public static class TypeParamsChecker extends PsiTypeVisitor<Boolean> {
private PsiMethod myMethod;
private final PsiClass myClass;

8
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
View File

@@ -225,13 +225,7 @@ public class PsiLambdaExpressionImpl extends ExpressionPsiElement implements Psi
if (body instanceof PsiCodeBlock) {
return isVoidCompatible();
} else {
//JLS 14.8 Expression Statements
return body instanceof PsiAssignmentExpression ||
body instanceof PsiPrefixExpression &&
(((PsiPrefixExpression)body).getOperationTokenType() == JavaTokenType.PLUSPLUS ||
((PsiPrefixExpression)body).getOperationTokenType() == JavaTokenType.MINUSMINUS) ||
body instanceof PsiPostfixExpression ||
body instanceof PsiCallExpression;
return LambdaUtil.isExpressionStatementExpression(body);
}
} else {
if (body instanceof PsiCodeBlock) {

19
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/beforeVoidValueChanged.java Normal file
View File

@@ -0,0 +1,19 @@
// "Replace with expression lambda" "false"
interface A {
int m(int x);
}
interface B {
void m(boolean x);
}
abstract class X {
abstract void foo(A j);
abstract void foo(B i);
void bar(Object o) {
foo(x -> {
retu<caret>rn x += 1;
});
}
}