Put lambda parameters on the same line as opening curly brace

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

@@ -399,20 +399,16 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
 
             inPosition(parent = FUNCTION_LITERAL,
                        left = LBRACE)
-                    .customRule {
+                    .customRule { _, _, right ->
-                _, _, right ->
                 val rightNode = right.node!!
                 val rightType = rightNode.elementType
-                var numSpaces = spacesInSimpleFunction
+                val numSpaces = spacesInSimpleFunction
                 if (rightType == VALUE_PARAMETER_LIST) {
-                    val firstParamListNode = rightNode.firstChildNode
+                    createSpacing(numSpaces, keepLineBreaks = false)
-                    if (firstParamListNode != null && firstParamListNode.elementType == LPAR) {
+                }
-                        // Don't put space for situation {<here>(a: Int) -> a }
+                else {
-                        numSpaces = 0
+                    createSpacing(numSpaces)
-                    }
                 }
-
-                createSpacing(numSpaces)
             }
 
             inPosition(parent = CLASS_BODY, right = RBRACE).lineBreakIfLineBreakInParent(numSpacesOtherwise = 1)

idea/testData/formatter/BinaryExpressionAlignmentSpread.after.kt

@@ -7,8 +7,7 @@ fun test() {
         }
     }
 
-    2 ?: some {
+    2 ?: some { s ->
-        s ->
         val a = 12
     }
 }

idea/testData/intentions/destructuringInLambda/noItVariables.kt.after

@@ -4,7 +4,6 @@ data class XY(val x: String, val y: String)
 
 fun convert(xy: XY, foo: (XY) -> Unit) = foo(xy)
 
-fun foo(xy: XY) = convert(xy) {
+fun foo(xy: XY) = convert(xy) { (x, y) ->
-    (x, y) ->
     println(x + y)
 }

idea/testData/intentions/destructuringInLambda/noItWithDestructuring.kt.after

@@ -2,7 +2,6 @@ data class XY(val x: String, val y: String)
 
 fun convert(xy: XY, foo: (XY) -> String) = foo(xy)
 
-fun foo(xy: XY) = convert(xy) {
+fun foo(xy: XY) = convert(xy) { (x, y) ->
-    (x, y) ->
     x + y
 }

idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithWhiteSpace.kt.after

@@ -1,6 +1,5 @@
 fun main() {
-    val oom: (Int)->Int = {
+    val oom: (Int)->Int = { it: Int ->
-        it: Int ->
         it * 2
     }
 }

idea/testData/intentions/specifyExplicitLambdaSignature/manyNewlines.kt.after

@@ -1,5 +1,4 @@
-val foo: (Long) -> String = {
+val foo: (Long) -> String = { it: Long ->
-    it: Long ->
 
 
     it.toString()

idea/testData/refactoring/inline/inlineVariableOrProperty/explicateParameterTypes/ItMultiLine.kt.after

@@ -1,6 +1,5 @@
 fun foo() {
-    val ff = {
+    val ff = { it: Int ->
-        it: Int ->
         it
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt

@@ -986,13 +986,11 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
 
     fun testInLambda2() = doFunTest(
             """
-            some {
+            some { p<caret> ->
-                p<caret> ->
             }
             """,
             """
-            some {
+            some { p ->
-                p ->
                 <caret>
             }
             """
@@ -1000,13 +998,11 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
 
     fun testInLambda3() = doFunTest(
             """
-            some {
+            some { (<caret>p: Int) : Int ->
-                (<caret>p: Int) : Int ->
             }
             """,
             """
-            some {
+            some { (p: Int) : Int ->
-                (p: Int) : Int ->
                 <caret>
             }
             """