From ba48a5b7fc002e1ac380dc16298c868624ddcf5d Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Mon, 3 Aug 2015 18:34:12 +0300
Subject: [PATCH] Formatter: space between type argument list and function
 literal argument

---
 .../org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt  | 3 ++-
 .../formatter/ReferenceExpressionFunctionLiteral.after.kt      | 3 +++
 idea/testData/formatter/ReferenceExpressionFunctionLiteral.kt  | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 79850c27a7e..c2312e64d2c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/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 {
 
diff --git a/idea/testData/formatter/ReferenceExpressionFunctionLiteral.after.kt b/idea/testData/formatter/ReferenceExpressionFunctionLiteral.after.kt
index 6cc8094939c..cf01659a896 100644
--- a/idea/testData/formatter/ReferenceExpressionFunctionLiteral.after.kt
+++ b/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 }
 }
\ No newline at end of file
diff --git a/idea/testData/formatter/ReferenceExpressionFunctionLiteral.kt b/idea/testData/formatter/ReferenceExpressionFunctionLiteral.kt
index 226ba86f1e4..743d585cd67 100644
--- a/idea/testData/formatter/ReferenceExpressionFunctionLiteral.kt
+++ b/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 }
 }
\ No newline at end of file