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

Stream API migration: do not convert continue statements which belong to the nested loops (IDEA-204250)

Browse Source
This commit is contained in:
Tagir Valeev
2018-12-18 12:21:54 +07:00
parent 7cad465cd2
commit 362b8d0b34
3 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInspection/streamMigration/TerminalBlock.java
View File

@@ -7,6 +7,7 @@ import com.intellij.psi.controlFlow.ControlFlow;
import com.intellij.psi.controlFlow.ControlFlowUtil;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.IntArrayList;
@@ -468,6 +469,8 @@ class TerminalBlock {
* @param factory factory to use to create new element if necessary
*/
void replaceContinueWithReturn(PsiElementFactory factory) {
PsiLoopStatement currentLoop = PsiTreeUtil.getParentOfType(myStatements[0], PsiLoopStatement.class);
if (currentLoop == null) return;
for (int i = 0, length = myStatements.length; i < length; i++) {
PsiStatement statement = myStatements[i];
if(statement instanceof PsiContinueStatement) {
@@ -476,6 +479,7 @@ class TerminalBlock {
}
StreamEx.ofTree(statement, (PsiElement s) -> StreamEx.of(s.getChildren()))
.select(PsiContinueStatement.class)
.filter(stmt -> stmt.findContinuedStatement() == currentLoop)
.forEach(stmt -> new CommentTracker().replaceAndRestoreComments(stmt, "return;"));
}
}

17
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterForEachNestedLoopContinue.java Normal file
View File

@@ -0,0 +1,17 @@
// "Replace with forEach" "true"
import java.util.Arrays;
import java.util.Collection;
public class Test {
void test(int[] arr, int[] arr2) {
Arrays.stream(arr).forEach(x -> {
int y = x * 2;
if (x > y) return; // comment
for (int i : arr2) {
if (i % 2 == 0) continue;
System.out.println(x);
}
});
}
}

16
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeForEachNestedLoopContinue.java Normal file
View File

@@ -0,0 +1,16 @@
// "Replace with forEach" "true"
import java.util.Collection;
public class Test {
void test(int[] arr, int[] arr2) {
for<caret>(int x : arr) {
int y = x*2;
if(x > y) continue; // comment
for(int i : arr2) {
if (i % 2 == 0) continue;
System.out.println(x);
}
}
}
}