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/codeInsight/surroundWith/when/enum.kt.after

@@ -5,7 +5,7 @@ enum class MyEnum {
 
 fun foo() {
     val a = MyEnum.FIRST
-    when(a) {
+    when (a) {
         <caret> -> {
         }
     }

idea/testData/codeInsight/surroundWith/when/multiExpression.kt.after

@@ -1,6 +1,6 @@
 fun foo() {
     val a = "aa"
-    when(a.capitalize()) {
+    when (a.capitalize()) {
         <caret> -> {
         }
         else -> {

idea/testData/codeInsight/surroundWith/when/singleExpression.kt.after

@@ -1,6 +1,6 @@
 fun foo() {
     val a = "aa"
-    when(a) {
+    when (a) {
         <caret> -> {
         }
         else -> {

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

@@ -3,6 +3,42 @@ when (x) {
 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/WhenLineBreak.after.inv.kt

@@ -1,5 +1,5 @@
 fun f() {
-    when(c) {
+    when (c) {
         a -> {
         }
         b -> j
@@ -7,7 +7,7 @@ fun f() {
         }
     }
 
-    when(c) {
+    when (c) {
         a -> {
         }
         b -> j
@@ -15,7 +15,7 @@ fun f() {
         }
     }
 
-    when(c) {
+    when (c) {
         a -> {
         }
         b -> j
@@ -23,7 +23,7 @@ fun f() {
         }
     }
 
-    when(c) //eol comment
+    when (c) //eol comment
     {
         a -> //eol comment
         {

idea/testData/formatter/WhenLineBreak.after.kt

@@ -1,6 +1,6 @@
 fun f()
 {
-    when(c)
+    when (c)
     {
         a ->
         {
@@ -11,7 +11,7 @@ fun f()
         }
     }
 
-    when(c)
+    when (c)
     {
         a ->
         {
@@ -22,7 +22,7 @@ fun f()
         }
     }
 
-    when(c)
+    when (c)
     {
         a ->
         {
@@ -33,7 +33,7 @@ fun f()
         }
     }
 
-    when(c) //eol comment
+    when (c) //eol comment
     {
         a -> //eol comment
         {

idea/testData/formatter/WhenLineBreak.kt

@@ -1,6 +1,6 @@
 fun f()
 {
-    when(c) {
+    when (c) {
         a -> {
         }
         b -> j
@@ -8,7 +8,7 @@ fun f()
         }
     }
 
-    when(c)
+    when (c)
     {
         a ->
         {
@@ -19,7 +19,7 @@ fun f()
         }
     }
 
-    when(c)
+    when (c)
 
     {
         a ->
@@ -33,7 +33,7 @@ fun f()
         }
     }
 
-    when(c) //eol comment
+    when (c) //eol comment
     {
         a -> //eol comment
         {

idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt

@@ -4,7 +4,7 @@ fun test(n: Int): String {
     var res: String
 
     if (3 > 2) {
-        <caret>when(n) {
+        <caret>when (n) {
             1 -> {
                 doSomething("***")
                 res = "one"

idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after

@@ -4,7 +4,7 @@ fun test(n: Int): String {
     var res: String
 
     if (3 > 2) {
-        <caret>res = when(n) {
+        <caret>res = when (n) {
             1 -> {
                 doSomething("***")
                 "one"

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt

@@ -1,7 +1,7 @@
 fun test(n: Int): String {
     var res: String
 
-    <caret>when(n) {
+    <caret>when (n) {
         1 -> res = "one"
         else -> res = "two"
     }

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt.after

@@ -1,7 +1,7 @@
 fun test(n: Int): String {
     var res: String
 
-    <caret>res = when(n) {
+    <caret>res = when (n) {
         1 -> "one"
         else -> "two"
     }

idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt

@@ -1,7 +1,7 @@
 fun doSomething<T>(a: T) {}
 
 fun test(n: Int): String {
-    <caret>when(n) {
+    <caret>when (n) {
         1 -> {
             doSomething("***")
             return "one"

idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after

@@ -1,7 +1,7 @@
 fun doSomething<T>(a: T) {}
 
 fun test(n: Int): String {
-    <caret>return when(n) {
+    <caret>return when (n) {
         1 -> {
             doSomething("***")
             "one"

idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt

@@ -1,5 +1,5 @@
 fun test(n: Int): String? {
-    val res<caret> = when(n) {
+    val res<caret> = when (n) {
         1 -> "one"
         2 -> "two"
         else -> null

idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String? {
     val res: String?
-    <caret>when(n) {
+    <caret>when (n) {
         1 -> res = "one"
         2 -> res = "two"
         else -> res = null

idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt

@@ -1,5 +1,5 @@
 fun test(n: Int): String? {
-    var res<caret> = when(n) {
+    var res<caret> = when (n) {
         1 -> "one"
         2 -> "two"
         else -> null

idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String? {
     var res: String?
-    <caret>when(n) {
+    <caret>when (n) {
         1 -> res = "one"
         2 -> res = "two"
         else -> res = null

idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt

@@ -1,5 +1,5 @@
 fun test(n: Int): String? {
-    val res<caret>: String? = when(n) {
+    val res<caret>: String? = when (n) {
         1 -> "one"
         2 -> "two"
         else -> null

idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after

@@ -1,6 +1,6 @@
 fun test(n: Int): String? {
     val res: String?
-    <caret>when(n) {
+    <caret>when (n) {
         1 -> res = "one"
         2 -> res = "two"
         else -> res = null

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")