EA-55507 - IOE: PsiJavaParserFacadeImpl.createStatementFromText

java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java

@@ -255,7 +255,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
           final PsiParameter parameter = foreachStatement.getIterationParameter();
           final PsiIfStatement ifStmt = extractIfStatement(body);
 
-          String foreEachText = body.getText();
+          String foreEachText = wrapInBlock(body);
           String iterated = iteratedValue.getText();
           if (ifStmt != null) {
             final PsiExpression condition = ifStmt.getCondition();
@@ -264,7 +264,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
               LOG.assertTrue(thenBranch != null);
               if (InheritanceUtil.isInheritor(iteratedValue.getType(), CommonClassNames.JAVA_UTIL_COLLECTION)) {
                 body = thenBranch;
-                foreEachText = thenBranch.getText();
+                foreEachText = wrapInBlock(thenBranch);
                 iterated += ".stream().filter(" + parameter.getName() + " -> " + condition.getText() +")";
               }
             }
@@ -298,6 +298,19 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
         }
       }
     }
+
+    private static String wrapInBlock(PsiStatement body) {
+
+      if (body instanceof PsiExpressionStatement) {
+        return ((PsiExpressionStatement)body).getExpression().getText();
+      }
+
+      final String bodyText = body.getText();
+      if (!(body instanceof PsiBlockStatement)) {
+        return "{" + bodyText + "}";
+      }
+      return bodyText;
+    }
   }
 
   private static class ReplaceWithCollectCallFix implements LocalQuickFix {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterMissedBraces.java

@@ -0,0 +1,13 @@
+// "Replace with forEach" "true"
+import java.util.ArrayList;
+import java.util.List;
+
+class Sample {
+  List<String> foo = new ArrayList<>();
+  String foo(){
+      foo.stream().filter(s -> s == null).forEach(s -> {
+          int i = 0;
+      });
+    return null;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeMissedBraces.java

@@ -0,0 +1,13 @@
+// "Replace with forEach" "true"
+import java.util.ArrayList;
+import java.util.List;
+
+class Sample {
+  List<String> foo = new ArrayList<>();
+  String foo(){
+    for (String s : fo<caret>o) {
+      if (s == null) int i = 0;
+    }
+    return null;
+  }
+}