From ef970b3a9b7e869aad44200a3d01aa5ddeb89c91 Mon Sep 17 00:00:00 2001
From: Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Date: Wed, 29 Jun 2016 12:58:04 +0300
Subject: [PATCH] [java-formatter] reformat added while added block

---
 .../psi/formatter/java/AbstractJavaBlock.java |  2 +-
 .../formatter/java/FormatWithContextTest.kt   | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
index 161fa89399c6..60ee49a540a7 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
@@ -1289,7 +1289,7 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
 
     int startOffset = getTextRange().getStartOffset();
     if (ranges.isOnInsertedLine(startOffset)) {
-      if (myNode instanceof PsiForStatement || myNode instanceof PsiIfStatement) {
+      if (myNode instanceof PsiForStatement || myNode instanceof PsiIfStatement || myNode instanceof PsiWhileStatement) {
         return new ExtraReformatRanges(myNode.getTextRange());
       }
     }
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatWithContextTest.kt b/java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatWithContextTest.kt
index 97689ed4a453..bb4e1a6e2bd7 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatWithContextTest.kt
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatWithContextTest.kt
@@ -83,6 +83,32 @@ class X {
         }
     }
 }
+"""
+    )
+  }
+  
+  fun `test while block`() {
+    myLineRange = TextRange(3, 3)
+    check(
+        """
+class X {
+    void test() {
+       while (true) {
+        int a = 2;
+        int b = 3;
+        }
+    }
+}
+""",
+        """
+class X {
+    void test() {
+        while (true) {
+            int a = 2;
+            int b = 3;
+        }
+    }
+}
 """
     )
   }