TerminalBlock: preserve comments after continue statement (not in the proper place though)

java/java-impl/src/com/intellij/codeInspection/streamMigration/TerminalBlock.java

@@ -253,7 +253,7 @@ class TerminalBlock {
     FilterOp filter = tb.getLastOperation(FilterOp.class);
     if (filter == null) return this;
     PsiBinaryExpression binOp = tryCast(PsiUtil.skipParenthesizedExprDown(filter.getExpression()), PsiBinaryExpression.class);
-    if (binOp == null || !ComparisonUtils.isComparison(binOp)) return this;
+    if (!ComparisonUtils.isComparison(binOp)) return this;
     String comparison = filter.isNegated() ? ComparisonUtils.getNegatedComparison(binOp.getOperationTokenType())
                         : binOp.getOperationSign().getText();
     boolean flipped = false;
@@ -477,7 +477,7 @@ class TerminalBlock {
       }
       StreamEx.ofTree(statement, (PsiElement s) -> StreamEx.of(s.getChildren()))
         .select(PsiContinueStatement.class)
-        .forEach(stmt -> stmt.replace(factory.createStatementFromText("return;", null)));
+        .forEach(stmt -> new CommentTracker().replaceAndRestoreComments(stmt, "return;"));
     }
   }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/afterForEachContinue.java

@@ -5,6 +5,7 @@ import java.util.Collection;
 
 public class Test {
   void test(int[] arr) {
+      // comment
       Arrays.stream(arr).forEach(x -> {
           int y = x * 2;
           if (x > y) return;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/continue/beforeForEachContinue.java

@@ -6,7 +6,7 @@ public class Test {
   void test(int[] arr) {
     for<caret>(int x : arr) {
       int y = x*2;
-      if(x > y) continue;
+      if(x > y) continue; // comment
       System.out.println(x);
     }
   }