IDEA-158249 Complete Current Statement of for loop: code is not reformatted

java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java

@@ -338,6 +338,16 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
       reformat(elt);
       settings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = old;
       editor.getCaretModel().moveToOffset(caretOffset - 1);
+
+      reformatBlockParentIfNeeded(editor, file);
+    }
+  }
+
+  private void reformatBlockParentIfNeeded(@NotNull Editor editor, @NotNull PsiFile file) {
+    commit(editor);
+    PsiCodeBlock block = PsiTreeUtil.findElementOfClassAtOffset(file, editor.getCaretModel().getOffset(), PsiCodeBlock.class, false);
+    if (block != null && psiElement().withParents(PsiBlockStatement.class, PsiForStatement.class).accepts(block)) {
+      reformat(block.getParent().getParent());
     }
   }
 

java/java-tests/testData/codeInsight/completeStatement/EmptyFor_after.java

@@ -1,6 +1,6 @@
 class Foo {
     {
-        for (;;) {
+        for (; ; ) {
             <caret>
         }
     }

java/java-tests/testData/codeInsight/completeStatement/ReformatForHeader.java

@@ -0,0 +1,5 @@
+public class Foo {
+    void test() {
+        for (int j=1; j<10; j++) <caret>
+   }
+}

java/java-tests/testData/codeInsight/completeStatement/ReformatForHeader_after.java

@@ -0,0 +1,7 @@
+public class Foo {
+    void test() {
+        for (int j = 1; j < 10; j++) {
+            <caret>
+        }
+   }
+}

java/java-tests/testSrc/com/intellij/java/codeInsight/CompleteStatementTest.java

@@ -165,6 +165,7 @@ public class CompleteStatementTest extends EditorActionTestCase {
   public void testSpaceAfterSemicolon() { mySettings.getCommonSettings(JavaLanguage.INSTANCE).SPACE_AFTER_SEMICOLON = true; doTest(); }
   public void testNoSpaceAfterSemicolon() { myJavaSettings.SPACE_AFTER_SEMICOLON = false; doTest(); }
   public void testForUpdateGeneration() { doTest(); }
+  public void testReformatForHeader() { doTest(); }
   public void testValidCodeBlock() { doTest(); }
   public void testValidCodeBlockWithEmptyLineAfterIt() { doTest(); }
   public void testFromJavadocParameterDescriptionEndToNextParameter() { doTest(); }