Formatter: space between type argument list and function literal argument

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

@@ -195,12 +195,13 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
             beforeInside(COLON, EXTEND_COLON_ELEMENTS) { spaceIf(jetSettings.SPACE_BEFORE_EXTEND_COLON) }
             afterInside(COLON, EXTEND_COLON_ELEMENTS) { spaceIf(jetSettings.SPACE_AFTER_EXTEND_COLON) }
 
-            between(VALUE_ARGUMENT_LIST, FUNCTION_LITERAL_ARGUMENT).spaces(1)
             beforeInside(ARROW, FUNCTION_LITERAL).spaceIf(jetSettings.SPACE_BEFORE_LAMBDA_ARROW)
 
             aroundInside(ARROW, FUNCTION_TYPE).spaceIf(jetSettings.SPACE_AROUND_FUNCTION_TYPE_ARROW)
 
+            between(VALUE_ARGUMENT_LIST, FUNCTION_LITERAL_ARGUMENT).spaces(1)
             betweenInside(REFERENCE_EXPRESSION, FUNCTION_LITERAL_ARGUMENT, CALL_EXPRESSION).spaces(1)
+            betweenInside(TYPE_ARGUMENT_LIST, FUNCTION_LITERAL_ARGUMENT, CALL_EXPRESSION).spaces(1)
         }
         custom {
 

idea/testData/formatter/ReferenceExpressionFunctionLiteral.after.kt

@@ -1,3 +1,6 @@
 fun f() {
     array(1, 2, 3).map { v -> v }
+    array(1, 2, 3).map<Int> { v -> v }
+    array(1, 2, 3).map() { v -> v }
+    array(1, 2, 3).map<Int>() { v -> v }
 }

idea/testData/formatter/ReferenceExpressionFunctionLiteral.kt

@@ -1,3 +1,6 @@
 fun f() {
     array(1, 2, 3).map{ v -> v }
+    array(1, 2, 3).map<Int>{ v -> v }
+    array(1, 2, 3).map(){ v -> v }
+    array(1, 2, 3).map<Int>(){ v -> v }
 }