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

IDEA-161002 Support cases like if(...) { for(...) {...} } return false;

Browse Source
This commit is contained in:
Tagir Valeev
2016-09-13 12:21:27 +07:00
parent 9540aeb8c2
commit c29dc4e3a4
6 changed files with 97 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java
+24 -8
View File
@@ -185,9 +185,8 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
PsiExpression value = returnStatement.getReturnValue();
if(isLiteral(value, Boolean.TRUE) || isLiteral(value, Boolean.FALSE)) {
boolean foundResult = (boolean)((PsiLiteralExpression)value).getValue();
PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(statement, PsiWhiteSpace.class, PsiComment.class);
if(nextStatement instanceof PsiReturnStatement) {
PsiReturnStatement nextReturnStatement = (PsiReturnStatement)nextStatement;
PsiReturnStatement nextReturnStatement = getNextReturnStatement(statement);
if(nextReturnStatement != null) {
if(isLiteral(nextReturnStatement.getReturnValue(), !foundResult)) {
String methodName;
if (foundResult) {
@@ -223,6 +222,22 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
};
}
@Nullable
static PsiReturnStatement getNextReturnStatement(PsiStatement statement) {
PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(statement, PsiWhiteSpace.class, PsiComment.class);
if(nextStatement instanceof PsiReturnStatement) return (PsiReturnStatement)nextStatement;
PsiElement parent = statement.getParent();
if(parent instanceof PsiCodeBlock) {
PsiStatement[] statements = ((PsiCodeBlock)parent).getStatements();
if(statements.length == 0 || statements[statements.length-1] != statement) return null;
parent = parent.getParent();
if(!(parent instanceof PsiBlockStatement)) return null;
parent = parent.getParent();
}
if(parent instanceof PsiIfStatement) return getNextReturnStatement((PsiStatement)parent);
return null;
}
@NotNull
private TextRange getRange(PsiForeachStatement statement, boolean isOnTheFly) {
boolean wholeStatement = false;
@@ -894,10 +909,8 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
PsiExpression value = returnStatement.getReturnValue();
if(!isLiteral(value, Boolean.TRUE) && !isLiteral(value, Boolean.FALSE)) return;
boolean foundResult = (boolean)((PsiLiteralExpression)value).getValue();
PsiElement nextStatement = PsiTreeUtil.skipSiblingsForward(foreachStatement, PsiWhiteSpace.class, PsiComment.class);
if(!(nextStatement instanceof PsiReturnStatement)) return;
PsiReturnStatement nextReturnStatement = (PsiReturnStatement)nextStatement;
if(!isLiteral(nextReturnStatement.getReturnValue(), !foundResult)) return;
PsiReturnStatement nextReturnStatement = getNextReturnStatement(foreachStatement);
if (nextReturnStatement == null || !isLiteral(nextReturnStatement.getReturnValue(), !foundResult)) return;
String methodName = foundResult ? "anyMatch" : "noneMatch";
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
String streamText = generateStream(iteratedValue, intermediateOps).toString();
@@ -930,8 +943,11 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
} else {
streamText += "."+methodName+"("+tb.getVariable().getName()+" -> true)";
}
boolean siblings = nextReturnStatement.getParent() == foreachStatement.getParent();
PsiElement result = foreachStatement.replace(elementFactory.createStatementFromText("return " + streamText + ";", foreachStatement));
nextReturnStatement.delete();
if(siblings) {
nextReturnStatement.delete();
}
simplifyAndFormat(project, result);
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchEnclosingIf.java
+12
View File
@@ -0,0 +1,12 @@
// "Replace with anyMatch()" "true"
import java.util.Arrays;
import java.util.Objects;
public class Main {
boolean contains(String[][] haystack, String needle) {
if(haystack != null)
return Arrays.stream(haystack).filter(Objects::nonNull).flatMap(Arrays::stream).anyMatch(needle::equals);
return false;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterAnyMatchEnclosingIfBlock.java
+13
View File
@@ -0,0 +1,13 @@
// "Replace with anyMatch()" "true"
import java.util.Arrays;
import java.util.Objects;
public class Main {
boolean contains(String[][] haystack, String needle) {
if(haystack != null) {
return Arrays.stream(haystack).filter(Objects::nonNull).flatMap(Arrays::stream).anyMatch(needle::equals);
}
return false;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchEnclosingIf.java
+15
View File
@@ -0,0 +1,15 @@
// "Replace with anyMatch()" "true"
public class Main {
boolean contains(String[][] haystack, String needle) {
if(haystack != null)
for (String[] row : haysta<caret>ck) {
if (row == null) continue;
for (String str : row) {
if (needle.equals(str))
return true;
}
}
return false;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchEnclosingIfBlock.java
+16
View File
@@ -0,0 +1,16 @@
// "Replace with anyMatch()" "true"
public class Main {
boolean contains(String[][] haystack, String needle) {
if(haystack != null) {
for (String[] row : haysta<caret>ck) {
if (row == null) continue;
for (String str : row) {
if (needle.equals(str))
return true;
}
}
}
return false;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeAnyMatchEnclosingIfInterrupted.java
+17
View File
@@ -0,0 +1,17 @@
// "Replace with anyMatch()" "false"
public class Main {
boolean contains(String[][] haystack, String needle) {
if(haystack != null) {
for (String[] row : haysta<caret>ck) {
if (row == null) continue;
for (String str : row) {
if (needle.equals(str))
return true;
}
}
System.out.println("Oops");
}
return false;
}
}