From dddde11c6a66369c692edab522a683ba0a98b26d Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Mon, 11 Nov 2013 17:08:43 +0400
Subject: [PATCH] Configure spacing after 'while' in while statement

---
 .../formatter/JetFormattingModelBuilder.java  |  1 +
 idea/testData/formatter/WhileSpacing.after.kt | 22 ++++++++++++++++++
 idea/testData/formatter/WhileSpacing.kt       | 23 +++++++++++++++++++
 .../formatter/JetFormatterTestGenerated.java  |  8 ++++++-
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/formatter/WhileSpacing.after.kt
 create mode 100644 idea/testData/formatter/WhileSpacing.kt

diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
index dd90a933881..f36391e0ab1 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
+++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java
@@ -92,6 +92,7 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder {
 
                 .betweenInside(FOR_KEYWORD, LPAR, FOR).spacing(1, 1, 0, false, 0)
                 .betweenInside(IF_KEYWORD, LPAR, IF).spacing(1, 1, 0, false, 0)
+                .betweenInside(WHILE_KEYWORD, LPAR, WHILE).spacing(1, 1, 0, false, 0)
 
                 // TODO: Ask for better API
                 // Type of the declaration colon
diff --git a/idea/testData/formatter/WhileSpacing.after.kt b/idea/testData/formatter/WhileSpacing.after.kt
new file mode 100644
index 00000000000..c63fa078509
--- /dev/null
+++ b/idea/testData/formatter/WhileSpacing.after.kt
@@ -0,0 +1,22 @@
+fun test() {
+    while (1 == 2) {
+    }
+    while (1 == 2) {
+    }
+    while (1 == 2) {
+    }
+
+    while (true) {
+    }
+
+    while (true) {
+    }
+
+    while (true)
+    {
+    }
+
+    while (true)
+    {
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/formatter/WhileSpacing.kt b/idea/testData/formatter/WhileSpacing.kt
new file mode 100644
index 00000000000..ce8f285f47f
--- /dev/null
+++ b/idea/testData/formatter/WhileSpacing.kt
@@ -0,0 +1,23 @@
+fun test() {
+    while   (1 == 2) {
+    }
+    while(1 == 2)   {
+    }
+    while
+    (1 == 2) {
+    }
+
+    while (true) {
+    }
+
+    while (true){
+    }
+
+    while (true)
+    {
+    }
+
+    while (true)
+    {
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
index 7048e88cf49..377ba7425c7 100644
--- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
@@ -34,7 +34,8 @@ import org.jetbrains.jet.formatter.AbstractJetFormatterTest;
 @InnerTestClasses({JetFormatterTestGenerated.ModifierList.class})
 public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
     public void testAllFilesPresentInFormatter() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests",
+                                                     new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
     }
     
     @TestMetadata("BlockFor.kt")
@@ -212,6 +213,11 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
         doTest("idea/testData/formatter/WhenLinesBeforeLbrace.kt");
     }
     
+    @TestMetadata("WhileSpacing.kt")
+    public void testWhileSpacing() throws Exception {
+        doTest("idea/testData/formatter/WhileSpacing.kt");
+    }
+    
     @TestMetadata("idea/testData/formatter/modifierList")
     public static class ModifierList extends AbstractJetFormatterTest {
         public void testAllFilesPresentInModifierList() throws Exception {