MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

simplification following IDEA-CR-21392

Browse Source
This commit is contained in:
Anna Kozlova
2017-05-26 13:36:45 +03:00
parent 51bcfcecf9
commit 5e77c443de
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/trivialFunctionalExpressionUsage/beforeBlockLambdaWithReturnInside.java
+2 -3
View File
@@ -2,11 +2,10 @@
class Test {
void foo() {
Runnable r = () -> {
((Runnable) () -> {
if (true) return;
System.out.println("");
};
r.r<caret>un();
}).r<caret>un();
System.out.println("");
}
}
plugins/InspectionGadgets/src/com/intellij/codeInspection/TrivialFunctionalExpressionUsageInspection.java
+12 -13
View File
@@ -32,7 +32,6 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.List;
public class TrivialFunctionalExpressionUsageInspection extends BaseJavaBatchLocalInspectionTool {
@NotNull
@@ -62,22 +61,22 @@ public class TrivialFunctionalExpressionUsageInspection extends BaseJavaBatchLoc
|| statements[0] instanceof PsiReturnStatement && expression.isValueCompatible();
}
final List<PsiExpression> returnExpressions = LambdaUtil.getReturnExpressions(expression);
if (returnExpressions.size() > 1 ||
(returnExpressions.size() == 1 && !(ArrayUtil.getLastElement(statements) instanceof PsiReturnStatement))) {
final PsiReturnStatement[] returnStatements = PsiUtil.findReturnStatements((PsiCodeBlock)body);
if (returnStatements.length > 1) {
return false;
}
if (!returnExpressions.isEmpty()) {
if (callParent instanceof PsiLocalVariable) {
return true;
if (returnStatements.length == 1) {
if (!(ArrayUtil.getLastElement(statements) instanceof PsiReturnStatement)) {
return false;
}
}
else {
PsiReturnStatement[] returnStatements = PsiUtil.findReturnStatements((PsiCodeBlock)body);
if (returnStatements.length > 0) {
//accept redundant return which would be deleted
return returnStatements.length == 1 && returnStatements[0] == statements[statements.length - 1];
if (returnStatements[0].getReturnValue() != null) {
if (callParent instanceof PsiLocalVariable) {
return true;
}
}
else {
return true;
}
}