Add space between 'when' and '('

idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt

@@ -113,6 +113,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
             betweenInside(IF_KEYWORD, LPAR, IF).spacing(1, 1, 0, false, 0)
             betweenInside(WHILE_KEYWORD, LPAR, WHILE).spacing(1, 1, 0, false, 0)
             betweenInside(WHILE_KEYWORD, LPAR, DO_WHILE).spacing(1, 1, 0, false, 0)
+            betweenInside(WHEN_KEYWORD, LPAR, WHEN).spacing(1, 1, 0, false, 0)
 
             val TYPE_COLON_ELEMENTS = TokenSet.create(PROPERTY, FUN, VALUE_PARAMETER, MULTI_VARIABLE_DECLARATION_ENTRY, FUNCTION_LITERAL)
             beforeInside(COLON, TYPE_COLON_ELEMENTS) { spaceIf(jetSettings.SPACE_BEFORE_TYPE_COLON) }

idea/testData/formatter/When.after.inv.kt

@@ -3,6 +3,31 @@ fun some(x: Any) {
         is Number -> 0
         else      -> 1
     }
+    when {
+    }
+
+    when {
+    }
+
+
+    when {
+    }
+
+    when (true) {
+
+    }
+
+    when (true) {
+
+    }
+
+    when (true) {
+
+    }
+
+    when (true) {
+
+    }
 }
 
 // SET_FALSE: ALIGN_IN_COLUMNS_CASE_BRANCH

idea/testData/formatter/When.after.kt

@@ -3,6 +3,31 @@ fun some(x: Any) {
         is Number -> 0
         else -> 1
     }
+    when {
+    }
+
+    when {
+    }
+
+
+    when {
+    }
+
+    when (true) {
+
+    }
+
+    when (true) {
+
+    }
+
+    when (true) {
+
+    }
+
+    when (true) {
+
+    }
 }
 
 // SET_FALSE: ALIGN_IN_COLUMNS_CASE_BRANCH

idea/testData/formatter/When.kt

@@ -2,6 +2,42 @@ fun some(x : Any) {
 when (x) {
 is Number     ->     0
 else->1
+}
+    when    {
+    }
+
+    when{
+    }
+
+
+    when
+    {
+    }
+
+    when      (true)      {
+
+    }
+
+    when(true){
+
+    }
+
+    when
+    (true)
+    {
+
+    }
+
+    when
+
+
+
+    (true)
+
+
+
+    {
+
     }
 }
 

idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java

@@ -61,9 +61,7 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde
         }
         
         public void testAllFilesPresentInDirectSettings() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage",
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/indentationOnNewline"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true);
-                                                         new File("idea/testData/indentationOnNewline"),
-                                                         Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true);
         }
         
         @TestMetadata("ConsecutiveCallsAfterDot.after.kt")