Formatter: Leave single space between val/var and value parameter

idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt

@@ -144,6 +144,10 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
             betweenInside(VAR_KEYWORD, IDENTIFIER, PROPERTY).spaces(1)
             betweenInside(VAL_KEYWORD, TYPE_REFERENCE, PROPERTY).spaces(1)
             betweenInside(VAR_KEYWORD, TYPE_REFERENCE, PROPERTY).spaces(1)
+            betweenInside(VAL_KEYWORD, IDENTIFIER, VALUE_PARAMETER).spaces(1)
+            betweenInside(VAR_KEYWORD, IDENTIFIER, VALUE_PARAMETER).spaces(1)
+            betweenInside(VAL_KEYWORD, TYPE_REFERENCE, VALUE_PARAMETER).spaces(1)
+            betweenInside(VAR_KEYWORD, TYPE_REFERENCE, VALUE_PARAMETER).spaces(1)
             betweenInside(TYPE_PARAMETER_LIST, IDENTIFIER, PROPERTY).spaces(1)
             betweenInside(TYPE_REFERENCE, DOT, PROPERTY).spacing(0, 0, 0, false, 0)
             betweenInside(DOT, IDENTIFIER, PROPERTY).spacing(0, 0, 0, false, 0)

idea/testData/formatter/ValVarSpaces.after.kt

@@ -0,0 +1,5 @@
+class Foo(val x: Int,
+          var y: Int) {
+    val a = 1
+    var b = 2
+}

idea/testData/formatter/ValVarSpaces.kt

@@ -0,0 +1,5 @@
+class Foo(val    x: Int,
+          var   y: Int) {
+    val     a = 1
+    var   b = 2
+}

idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java

@@ -517,6 +517,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
             doTest(fileName);
         }
 
+        @TestMetadata("ValVarSpaces.after.kt")
+        public void testValVarSpaces() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ValVarSpaces.after.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("When.after.kt")
         public void testWhen() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/When.after.kt");