Fix tests after implementing trailing comma in formatter

#KT-34744

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/SmartEnterCompletionTest.kt

@@ -115,8 +115,10 @@ class SmartEnterCompletionTest : KotlinLightCodeInsightFixtureTestCase() {
             fun foo(p:Int) {}
 
             fun test() {
-                foo(1 +
-                        2)<caret>
+                foo(
+                        1 +
+                                2,
+                )<caret>
             }
             """
         )

idea/idea-live-templates/testData/anonymous_1.exp.kt

@@ -1,9 +1,11 @@
 import javax.swing.SwingUtilities
 
 fun main(args : Array<String>) {
-    SwingUtilities.invokeLater(object : Runnable {
-        override fun run() {
-            TODO("Not yet implemented")
-        }
-    })
+    SwingUtilities.invokeLater(
+            object : Runnable {
+                override fun run() {
+                    TODO("Not yet implemented")
+                }
+            },
+    )
 }

idea/idea-live-templates/testData/anonymous_2.exp.kt

@@ -1,7 +1,9 @@
 import javax.swing.SwingUtilities
 
 fun main(args : Array<String>) {
-    SwingUtilities.invokeLater(object : Thread(<caret>) {
-        
-    })
+    SwingUtilities.invokeLater(
+            object : Thread(<caret>) {
+
+            },
+    )
 }

idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt

@@ -14,7 +14,7 @@ class A {
                     return JetBundle.message(
                             "x.in.y",
                             DescriptorRenderer.COMPACT.render(declarationDescriptor),
-                            IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor)
+                            IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor),
                     )
                 }
             }

idea/testData/inspectionsLocal/collections/simplifiableCallChain/joinToStringWithReferenceAndComment.kt.after

@@ -4,9 +4,8 @@ val x = listOf(1, 2, 3).joinToString(
         // comment2
         prefix = "= ",
         // comment3
-        separator = " + "
+        separator = " + ",
         // comment4
-        ,
         // comment1
-        transform = Int::toString
+        transform = Int::toString,
 )

idea/testData/inspectionsLocal/collections/simplifiableCallChain/joinToWithComment.kt.after

@@ -7,6 +7,6 @@ val x = listOf(1, 2, 3).joinTo(
         // comment2
         prefix = "= ",
         // comment3
-        separator = " + "
+        separator = " + ",
         // comment4
 ) { "$it*$it" }

idea/testData/inspectionsLocal/collections/simplifiableCallChain/listOfNotNullWithComment.kt.after

@@ -3,6 +3,6 @@
 fun test() {
     <caret>listOfNotNull(
             true, // comment1
-            null // comment2
+            null, // comment2
     ).first()
 }

idea/testData/inspectionsLocal/complexRedundantLet/callChainWithLineBreak.kt.after

@@ -2,6 +2,8 @@
 // HIGHLIGHT: INFORMATION
 
 fun test(list: List<Int>) {
-    println(list.filter { it > 1 }
-    .filter { it > 2 })
+    println(
+            list.filter { it > 1 }
+    .filter { it > 2 }
+    )
 }

idea/testData/inspectionsLocal/complexRedundantLet/multipleLines.kt.after

@@ -2,7 +2,9 @@
 // HIGHLIGHT: INFORMATION
 
 fun test() {
-    println(runCatching {
+    println(
+            runCatching {
         /* lots of code*/
-    })
+    }
+    )
 }

idea/testData/inspectionsLocal/constantConditionIf/expression.kt.after

@@ -3,9 +3,11 @@
 fun foo(x: Int) {}
 
 fun bar() {
-    foo(run {
-        foo(1)
-        foo(2)
-        1
-    })
+    foo(
+            run {
+                foo(1)
+                foo(2)
+                1
+            }
+    )
 }

idea/testData/inspectionsLocal/conventionNameCalls/replaceGetOrSet/argumentAndFunction.kt.after

@@ -3,9 +3,12 @@ fun test() {
         operator fun get(a: Int, b: Int, fn: (i: Int) -> Int) : Int = 0
     }
     val test = Test()
-    test<caret>[1, 2, { i ->
-        i
-    }]
+    test<caret>[
+            1, 2,
+            { i ->
+                i
+            }
+    ]
 }
 
 fun withSuppression() {

idea/testData/inspectionsLocal/conventionNameCalls/replaceGetOrSet/functionalArgument.kt.after

@@ -3,7 +3,9 @@ fun test() {
         operator fun get(fn: (i: Int) -> Int) : Int = 0
     }
     val test = Test()
-    test<caret>[{ i ->
-        i
-    }]
+    test<caret>[
+            { i ->
+                i
+            }
+    ]
 }

idea/testData/inspectionsLocal/redundantSamConstructor/simple.kt.after

@@ -1,5 +1,7 @@
 fun test() {
-    Foo.Bar().bar({
-        true
-    })
+    Foo.Bar().bar(
+            {
+                true
+            }
+    )
 }

idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextHandlesMultiline.kt.after

@@ -1,8 +1,10 @@
 // WITH_RUNTIME
 fun main(args: Array<String>) {
-    val doSomething = doSomething("one" + 1,
+    val doSomething = doSomething(
+            "one" + 1,
             "two",
-            3 * 4)
+            3 * 4
+    )
     val t = if (doSomething != null) doSomething else throw NullPointerException("Expression 'doSomething(\"one\" + 1, ...' must not be null")
 }
 

idea/testData/intentions/convertSecondaryConstructorToPrimary/withComments.kt.after

@@ -5,6 +5,7 @@ class WithComments/* Some parameter */
         /**
          * A very important property
          */
-        val veryImportant: Any) {
+        val veryImportant: Any
+) {
 
 }

idea/testData/intentions/convertSecondaryConstructorToPrimary/withComposedModifiers.kt.after

@@ -2,7 +2,9 @@ annotation class AnnParam
 
 annotation class AnnProperty
 
-abstract class WithComposedModifiers(@AnnParam vararg @AnnProperty
-open val x: String) {
+abstract class WithComposedModifiers(
+        @AnnParam vararg @AnnProperty
+        open val x: String
+) {
 
 }

idea/testData/intentions/lambdaToAnonymousFunction/argument.kt.after

@@ -1,7 +1,9 @@
 fun foo(f: (Int) -> String) {}
 
 fun test() {
-    foo(fun(it: Int): String {
-        return ""
-    })
+    foo(
+            fun(it: Int): String {
+                return ""
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/explicitParameterName.kt.after

@@ -1,7 +1,9 @@
 fun bar(f: (Int, Int) -> String) {}
 
 fun test() {
-    bar(fun(i: Int, j: Int): String {
-        return "$i$j"
-    })
+    bar(
+            fun(i: Int, j: Int): String {
+                return "$i$j"
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/extention1.kt.after

@@ -2,7 +2,9 @@ class Foo
 fun bar(f: Foo.() -> Unit) {}
 
 fun main(args: Array<String>) {
-    bar(fun Foo.() {
+    bar(
+            fun Foo.() {
 
-    })
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/extention2.kt.after

@@ -2,7 +2,9 @@ class Foo
 fun baz(f: Foo.(i: Int, j: Int) -> Int) {}
 
 fun main(args: Array<String>) {
-    baz(fun Foo.(i: Int, j: Int): Int {
-        return i + j
-    })
+    baz(
+            fun Foo.(i: Int, j: Int): Int {
+                return i + j
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified.kt.after

@@ -6,7 +6,9 @@ import java.util.*
 fun foo(f: () -> ArrayDeque<*>) {}
 
 fun test() {
-    foo(fun(): ArrayDeque<Int> {
-        return ArrayDeque<Int>()
-    })
+    foo(
+            fun(): ArrayDeque<Int> {
+                return ArrayDeque<Int>()
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified_ni.kt.after

@@ -6,7 +6,9 @@ import java.util.*
 fun foo(f: () -> ArrayDeque<*>) {}
 
 fun test() {
-    foo(fun(): ArrayDeque<*> {
-        return ArrayDeque<Int>()
-    })
+    foo(
+            fun(): ArrayDeque<*> {
+                return ArrayDeque<Int>()
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/hasComment.kt.after

@@ -1,9 +1,11 @@
 fun foo(f: (Int) -> String) {}
 
 fun test() {
-    foo(fun(it: Int): String {
-        // comment1
-        return ""
-        // comment2
-    })
+    foo(
+            fun(it: Int): String {
+                // comment1
+                return ""
+                // comment2
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn1.kt.after

@@ -1,7 +1,9 @@
 fun foo(f: (Int) -> String) {}
 
 fun test() {
-    foo(fun(it: Int): String {
-        return "$it"
-    })
+    foo(
+            fun(it: Int): String {
+                return "$it"
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn2.kt.after

@@ -1,10 +1,12 @@
 fun foo(f: (Int) -> String) {}
 
 fun test() {
-    foo(fun(it: Int): String {
-        if (it == 1) {
-            return "1"
-        }
-        return "$it"
-    })
+    foo(
+            fun(it: Int): String {
+                if (it == 1) {
+                    return "1"
+                }
+                return "$it"
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn3.kt.after

@@ -1,13 +1,15 @@
 fun foo(f: (Int) -> String) {}
 
 fun test() {
-    foo(fun(it: Int): String {
-        if (it == 1) {
-            return "1"
-        } else if (it == 2) {
-            return "2"
-        } else {
-            return "$it"
-        }
-    })
+    foo(
+            fun(it: Int): String {
+                if (it == 1) {
+                    return "1"
+                } else if (it == 2) {
+                    return "2"
+                } else {
+                    return "$it"
+                }
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn4.kt.after

@@ -2,10 +2,12 @@
 fun foo(f: (Int) -> String) {}
 
 fun test() {
-    foo(fun(it: Int): String {
-        listOf(1).map {
-            return@map 2
-        }
-        return "$it"
-    })
+    foo(
+            fun(it: Int): String {
+                listOf(1).map {
+                    return@map 2
+                }
+                return "$it"
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/hasSomeStatements.kt.after

@@ -1,8 +1,10 @@
 fun foo(f: (Int) -> String) {}
 
 fun test() {
-    foo(fun(it: Int): String {
-        val b = it == 1
-        return if (b) "1" else "2"
-    })
+    foo(
+            fun(it: Int): String {
+                val b = it == 1
+                return if (b) "1" else "2"
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/implicitParameterName.kt.after

@@ -1,7 +1,9 @@
 fun foo(f: (Int) -> String) {}
 
 fun test() {
-    foo(fun(it: Int): String {
-        return "$it"
-    })
+    foo(
+            fun(it: Int): String {
+                return "$it"
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/javaMethod.kt.after

@@ -1,5 +1,7 @@
 fun main() {
-    Test().foo(fun(it: Int) {
+    Test().foo(
+            fun(it: Int) {
 
-    })
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/namedArgument.kt.after

@@ -3,5 +3,6 @@ fun baz(name: String, f: (Int) -> String) {}
 fun test() {
     baz(name = "", f = fun(it: Int): String {
         return "$it"
-    })
+    }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/noParameter.kt.after

@@ -1,7 +1,9 @@
 fun foo(f: () -> String) {}
 
 fun test() {
-    foo(fun(): String {
-        return ""
-    })
+    foo(
+            fun(): String {
+                return ""
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/returnUnit.kt.after

@@ -3,8 +3,10 @@ fun unit(f: (Int) -> Unit) {}
 fun foo(i: Int) {}
 
 fun test() {
-    unit(fun(it: Int) {
-        foo(it)
-        foo(it)
-    })
+    unit(
+            fun(it: Int) {
+                foo(it)
+                foo(it)
+            }
+    )
 }

idea/testData/intentions/lambdaToAnonymousFunction/withPackage.kt.after

@@ -7,7 +7,9 @@ data class My(val x: Int)
 fun foo(f: () -> My) {}
 
 fun test() {
-    foo(fun(): My {
-        return My(42)
-    })
+    foo(
+            fun(): My {
+                return My(42)
+            }
+    )
 }

idea/testData/intentions/moveLambdaInsideParentheses/moveLambda1.kt.after

@@ -1,8 +1,10 @@
 // IS_APPLICABLE: true
 fun foo() {
-    bar(2, {
-        it * 3
-    })
+    bar(2,
+            {
+                it * 3
+            }
+    )
 }
 
 fun bar(a: Int, b: (Int) -> Int) {

idea/testData/intentions/moveLambdaInsideParentheses/moveLambda13.kt.after

@@ -1,8 +1,10 @@
 // IS_APPLICABLE: true
 fun foo() {
-    bar(b = {
-        it * 3
-    })
+    bar(
+            b = {
+                it * 3
+            }
+    )
 }
 
 fun bar(a : Int = 2, b: (Int) -> Int) {

idea/testData/intentions/moveLambdaInsideParentheses/moveLambda14.kt.after

@@ -1,8 +1,10 @@
 // IS_APPLICABLE: true
 fun foo() {
-    bar(1, b = {
-        it * 3
-    })
+    bar(1,
+            b = {
+                it * 3
+            }
+    )
 }
 
 fun bar(c: Int, a: Int = 2, b: (Int) -> Int) {

idea/testData/intentions/moveLambdaInsideParentheses/moveLambda3.kt.after

@@ -1,9 +1,11 @@
 // IS_APPLICABLE: true
 fun foo() {
-    bar(2, {
-        val x = 3
-        it * x
-    })
+    bar(2,
+            {
+                val x = 3
+                it * x
+            }
+    )
 }
 
 fun bar(a: Int, b: (Int) -> Int) {

idea/testData/intentions/moveLambdaInsideParentheses/moveLambda4.kt.after

@@ -1,9 +1,11 @@
 // IS_APPLICABLE: true
 fun foo() {
-    bar(a = 2, b = {
-        val x = 3
-        it * x
-    })
+    bar(a = 2,
+            b = {
+                val x = 3
+                it * x
+            }
+    )
 }
 
 fun bar(a: Int, b: (Int) -> Int) {

idea/testData/intentions/objectLiteralToLambda/QualifiedReturn.kt.after

@@ -3,11 +3,13 @@
 fun foo(runnable: Runnable) {}
 
 fun bar(list: List<String>) {
-    foo(Runnable {
-        list.filter(fun (element: String): Boolean {
-            if (element == "a") return false
-            if (element == "b") return@Runnable
-            return true
-        })
-    })
+    foo(
+            Runnable {
+                list.filter(fun (element: String): Boolean {
+                    if (element == "a") return false
+                    if (element == "b") return@Runnable
+                    return true
+                })
+            }
+    )
 }

idea/testData/intentions/objectLiteralToLambda/ReturnNoValue.kt.after

@@ -3,9 +3,11 @@
 fun foo(runnable: Runnable) {}
 
 fun bar(p: Int) {
-    foo(Runnable {
-        if (p < 0) return@Runnable
-        println("a")
-        println("b")
-    })
+    foo(
+            Runnable {
+                if (p < 0) return@Runnable
+                println("a")
+                println("b")
+            }
+    )
 }

idea/testData/intentions/objectLiteralToLambda/ReturnNotLast.kt.after

@@ -5,8 +5,10 @@ import java.io.FilenameFilter
 fun foo(filter: FilenameFilter) {}
 
 fun bar() {
-    foo(FilenameFilter { file, name ->
-        if (file.isDirectory) return@FilenameFilter true
-        name == "x"
-    })
+    foo(
+            FilenameFilter { file, name ->
+                if (file.isDirectory) return@FilenameFilter true
+                name == "x"
+            }
+    )
 }

idea/testData/intentions/objectLiteralToLambda/ReturnsInIf.kt.after

@@ -5,18 +5,20 @@ import java.io.FileFilter
 fun foo(filter: FileFilter) {}
 
 fun bar() {
-    foo(FileFilter { file ->
-        val name = file.name
-        if (name.startsWith("a")) {
-            false
-        }
-        else {
-            if (name.endsWith("b"))
-                true
-            else {
-                val l = name.length
-                l > 10
+    foo(
+            FileFilter { file ->
+                val name = file.name
+                if (name.startsWith("a")) {
+                    false
+                }
+                else {
+                    if (name.endsWith("b"))
+                        true
+                    else {
+                        val l = name.length
+                        l > 10
+                    }
+                }
             }
-        }
-    })
+    )
 }

idea/testData/intentions/objectLiteralToLambda/ReturnsInWhen.kt.after

@@ -5,17 +5,19 @@ import java.io.FileFilter
 fun foo(filter: FileFilter) {}
 
 fun bar() {
-    foo(FileFilter { file ->
-        val name = file.name
-        when (name) {
-            "foo" -> true
+    foo(
+            FileFilter { file ->
+                val name = file.name
+                when (name) {
+                    "foo" -> true
 
-            "bar" -> false
+                    "bar" -> false
 
-            else -> {
-                if (name.startsWith("a")) return@FileFilter true
-                false
+                    else -> {
+                        if (name.startsWith("a")) return@FileFilter true
+                        false
+                    }
+                }
             }
-        }
-    })
+    )
 }

idea/testData/intentions/objectLiteralToLambda/SamAdapterNeededBecauseOfLabeledReturn.kt.after

@@ -3,8 +3,10 @@
 import javax.swing.SwingUtilities
 
 fun bar(p: Int) {
-    SwingUtilities.invokeLater(Runnable {
-        if (p < 0) return@Runnable
-        throw UnsupportedOperationException()
-    })
+    SwingUtilities.invokeLater(
+            Runnable {
+                if (p < 0) return@Runnable
+                throw UnsupportedOperationException()
+            }
+    )
 }

idea/testData/intentions/objectLiteralToLambda/StatementAndReturn.kt.after

@@ -5,8 +5,10 @@ import java.io.FileFilter
 fun foo(filter: FileFilter) {}
 
 fun bar() {
-    foo(FileFilter { file ->
-        val name = file.name
-        name.startsWith("a")
-    })
+    foo(
+            FileFilter { file ->
+                val name = file.name
+                name.startsWith("a")
+            }
+    )
 }

idea/testData/intentions/operatorToFunction/keepComments.kt.after

@@ -4,7 +4,9 @@ interface C {
 
 class D(val c: C) {
     fun foo() {
-        this.c/* and this is c */.set("a", // it's "a"
-                "b" /* and this is "b" */, /* we use 10 */10)
+        this.c/* and this is c */.set(
+                "a", // it's "a"
+                "b" /* and this is "b" */, /* we use 10 */10
+        )
     }
 }

idea/testData/intentions/samConversionToAnonymousObject/nestedClass.kt.after

@@ -1,7 +1,9 @@
 fun main() {
-    J().foo(object : J.Sam {
-        override fun bar() {
+    J().foo(
+            object : J.Sam {
+                override fun bar() {
 
-        }
-    })
+                }
+            }
+    )
 }

idea/testData/quickfix/deprecatedSymbolUsage/keepComments/addArguments.kt.after

@@ -7,7 +7,9 @@ fun newFun(p1: Int, a: Int, p2: Int, p3: Int, b: Int){}
 
 
 fun foo() {
-    newFun(0, // 0
+    newFun(
+            0, // 0
             -1, 1, // 1
             2, // 2
-            -2)
+            -2
+    )

idea/testData/quickfix/deprecatedSymbolUsage/keepComments/commentBeforeArgument.kt.after

@@ -7,7 +7,12 @@ fun newFun(p4: Int, p3: Int, p2: Int, p1: Int, p0: Int){}
 
 
 fun foo() {
-    newFun(/* 4 */ 4, 3, 2, // 2
-            /* 1 */ 1,
-            /* 0 */ 0)
+    newFun(
+/* 4 */
+            4, 3, 2, // 2
+            /* 1 */
+            1,
+            /* 0 */
+            0
+    )
 }

idea/testData/quickfix/deprecatedSymbolUsage/keepComments/multipleArguments.kt.after

@@ -8,7 +8,8 @@ interface X {
 fun newFun(x: X, a: Int, b: Int){}
 
 fun foo(x: X) {
-    newFun(x/*receiver*/, 1, // pass 1
+    newFun(
+            x/*receiver*/, 1, // pass 1
             2 // pass 2
     )
 }

idea/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/addArgument.kt.after

@@ -11,5 +11,6 @@ fun foo(x: X) {
     x.newFun(
             1,
             2,
-            0)
+            0
+    )
 }

idea/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/simple.kt.after

@@ -8,7 +8,9 @@ interface X {
 }
 
 fun foo(x: X) {
-    x.<caret>newFun(1,
+    x.<caret>newFun(
+            1,
             2,
-            3)
+            3
+    )
 }

idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameterAndLambda.kt.after

@@ -18,7 +18,9 @@ fun useSimple(s: Int): Int {
 fun println(s: String) {}
 
 fun useIt() {
-    val t = useSimple(simple {
-        println("abc")
-    })
+    val t = useSimple(
+            simple {
+                println("abc")
+            }
+    )
 }

idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameterAndLambdaComplex.kt.after

@@ -36,5 +36,6 @@ fun createHi(any: Any) = "Hi $any"
 val unDeprecateMe = mutableListOf("Hello").apply {
     addA(d(::createHi, 1 ) { // Run the quick fix from the IDE and watch it produce broken code.
             println("Yo")
-        }, Unit)
+        }, Unit
+    )
 }

idea/testData/refactoring/changeSignature/AddParameterKeepFormatAfter.kt

@@ -3,15 +3,19 @@ fun <caret>foo(a: Int, b: Int, d: Int, c: Int, e: Int) {
 }
 
 fun test() {
-    foo(1,
+    foo(
+            1,
             2,
             4,
             3,
-            5)
-    foo(1, 2,
+            5
+    )
+    foo(
+            1, 2,
             4,
             3,
-            5)
+            5
+    )
     foo(
             1,
             2,

idea/testData/refactoring/changeSignature/MoveLambdaParameterAfter.kt

@@ -3,7 +3,11 @@ fun foo(x: Int, cl: () -> Int, y: Int): Int {
 }
 
 fun bar() {
-    foo(1, {
-        3
-    }, 2)
+    foo(
+            1,
+            {
+                3
+            },
+            2
+    )
 }

idea/testData/refactoring/changeSignature/NoDefaultValuesInOverridesAfter.kt

@@ -1,18 +1,24 @@
 interface T {
-    fun foo(a: Int = 1,
-            b: String = "2")
+    fun foo(
+            a: Int = 1,
+            b: String = "2"
+    )
 }
 
 open class A: T {
-    override fun foo(a: Int,
-                     b: String) {
+    override fun foo(
+            a: Int,
+            b: String
+    ) {
         throw UnsupportedOperationException()
     }
 }
 
 class B: A() {
-    override fun foo(a: Int,
-                     b: String) {
+    override fun foo(
+            a: Int,
+            b: String
+    ) {
         throw UnsupportedOperationException()
     }
 }

idea/testData/refactoring/changeSignature/RemoveParameterKeepFormat1After.kt

@@ -3,8 +3,10 @@ fun <caret>foo(b: Int, c: Int) {
 }
 
 fun test() {
-    foo(2,
-            3)
+    foo(
+            2,
+            3
+    )
     foo(2, 3)
     foo(
             2,

idea/testData/refactoring/changeSignature/RemoveParameterKeepFormat2After.kt

@@ -3,8 +3,10 @@ fun <caret>foo(a: Int, c: Int) {
 }
 
 fun test() {
-    foo(1,
-            3)
+    foo(
+            1,
+            3
+    )
     foo(1, 3)
     foo(
             1,

idea/testData/refactoring/changeSignature/RemoveParameterKeepFormat3After.kt

@@ -3,8 +3,10 @@ fun <caret>foo(a: Int, b: Int) {
 }
 
 fun test() {
-    foo(1,
-            2)
+    foo(
+            1,
+            2
+    )
     foo(1, 2)
     foo(
             1,

idea/testData/refactoring/changeSignature/SwapParametersKeepFormatAfter.kt

@@ -3,11 +3,15 @@ fun <caret>foo(c: Int, b: Int, a: Int) {
 }
 
 fun test() {
-    foo(3,
+    foo(
+            3,
             2,
-            1)
-    foo(3, 2,
-            1)
+            1
+    )
+    foo(
+            3, 2,
+            1
+    )
     foo(
             3,
             2,

idea/testData/refactoring/inline/function/returnAtEnd/DefaultParameter.kt.after

@@ -3,5 +3,6 @@ fun callInDefault(simple: List<String> = provideSimple(), complex: List<String>
     val result = mutableListOf("statement 1")
     result.add("statement 2")
     result
-}) {
+}
+) {
 }

idea/testData/refactoring/inline/function/returnAtEnd/ReturnFromLambda.kt.after

@@ -1,6 +1,8 @@
 fun g() {
-    println(listOf("a", "b").any {
-        if (it.isEmpty()) return@any false
-        it.length < 10
-    })
-}
+    println(
+            listOf("a", "b").any {
+                if (it.isEmpty()) return@any false
+                it.length < 10
+            }
+    )
+}

idea/testData/refactoring/introduceLambdaParameter/multiline/multilineBinaryExpression.kt.after

@@ -1,8 +1,10 @@
 fun foo(i: Int) { }
 
-fun test(i: () -> Int = {
-    (1
-            + 2)
-}) {
+fun test(
+        i: () -> Int = {
+            (1
+                    + 2)
+        }
+) {
     foo(i())
 }

idea/testData/refactoring/introduceLambdaParameter/multiline/multilineBinaryExpressionWithComments.kt.after

@@ -1,8 +1,10 @@
 fun foo(i: Int) { }
 
-fun test(i: () -> Int = {
-    (1 // abc
-            /*def*/ + 2)
-}) {
+fun test(
+        i: () -> Int = {
+            (1 // abc
+                    /*def*/ + 2)
+        }
+) {
     foo(i())
 }

idea/testData/refactoring/introduceLambdaParameter/multiline/multilineNestedBinaryExpression1.kt.after

@@ -1,8 +1,10 @@
 fun foo(i: Int) { }
 
-fun test(i: () -> Int = {
-    (1
-            + 2 - 3)
-}) {
+fun test(
+        i: () -> Int = {
+            (1
+                    + 2 - 3)
+        }
+) {
     foo(i())
 }

idea/testData/refactoring/introduceLambdaParameter/multiline/multilineNestedBinaryExpression2.kt.after

@@ -1,8 +1,10 @@
 fun foo(i: Int) { }
 
-fun test(i: () -> Int = {
-    (1 + 2
-            - 3)
-}) {
+fun test(
+        i: () -> Int = {
+            (1 + 2
+                    - 3)
+        }
+) {
     foo(i())
 }

idea/testData/refactoring/introduceLambdaParameter/stringTemplates/rawTemplateWithSubstring.kt.after

@@ -1,7 +1,10 @@
-fun foo(a: Int, s: (Int) -> String = { a ->
-    """c$a
+fun foo(
+        a: Int,
+        s: (Int) -> String = { a ->
+            """c$a
     :${a + 1}d"""
-}): String {
+        }
+): String {
     val x = """_${s(a)}_"""
     val y = "_$a:${a + 1}d_"
     val z = """_c$a:${a + 1}d_"""

idea/testData/refactoring/introduceParameter/multiline/multilineBinaryExpression.kt.after

@@ -1,6 +1,8 @@
 fun foo(i: Int) { }
 
-fun test(i: Int = (1
-        + 2)) {
+fun test(
+        i: Int = (1
+                + 2)
+) {
     foo(i)
 }

idea/testData/refactoring/introduceParameter/multiline/multilineBinaryExpressionWithComments.kt.after

@@ -1,6 +1,8 @@
 fun foo(i: Int) { }
 
-fun test(i: Int = (1 // abc
-        /*def*/ + 2)) {
+fun test(
+        i: Int = (1 // abc
+                /*def*/ + 2)
+) {
     foo(i)
 }

idea/testData/refactoring/introduceParameter/multiline/multilineNestedBinaryExpression1.kt.after

@@ -1,6 +1,8 @@
 fun foo(i: Int) { }
 
-fun test(i: Int = (1
-        + 2 - 3)) {
+fun test(
+        i: Int = (1
+                + 2 - 3)
+) {
     foo(i)
 }

idea/testData/refactoring/introduceParameter/multiline/multilineNestedBinaryExpression2.kt.after

@@ -1,6 +1,8 @@
 fun foo(i: Int) { }
 
-fun test(i: Int = (1 + 2
-        - 3)) {
+fun test(
+        i: Int = (1 + 2
+                - 3)
+) {
     foo(i)
 }

idea/testData/refactoring/introduceParameter/stringTemplates/rawTemplateWithSubstring.kt.after

@@ -1,5 +1,8 @@
-fun foo(a: Int, s: String = """c$a
-    :${a + 1}d"""): String {
+fun foo(
+        a: Int,
+        s: String = """c$a
+    :${a + 1}d"""
+): String {
     val x = """_${s}_"""
     val y = "_$a:${a + 1}d_"
     val z = """_c$a:${a + 1}d_"""

idea/testData/refactoring/rename/inplace/InvokeToGetWithQualifiedExpr.kt.after

@@ -10,8 +10,10 @@ fun boo(s: Second, body: () -> Unit) { }
 
 fun foo(s: Second) {
     boo(s) {
-        s.testInvoke[{
+        s.testInvoke[
+                {
             "Hello"
-        }]
+        }
+        ]
     }
 }

idea/testData/refactoring/rename/inplace/InvokeToGetWithSafeQualifiedExpr.kt.after

@@ -10,8 +10,10 @@ fun boo(s: Second?, body: () -> Unit) { }
 
 fun foo(s: Second?) {
     boo(s) {
-        s?.testInvoke[{
+        s?.testInvoke[
+                {
             "Hello"
-        }]
+        }
+        ]
     }
 }

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

@@ -994,7 +994,7 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
             }
             """,
         """
-            some { (p: Int) : Int ->
+            some { (p: Int): Int ->
                 <caret>
             }
             """
@@ -1007,8 +1007,7 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
             }
             """,
         """
-            some {
-                (p: Int) : Int ->
+            some { (p: Int): Int ->
                 <caret>
             }
             """
@@ -1463,7 +1462,7 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
         """
         fun foo(i: Int) = 1
         fun test4() {
-            foo(1, <caret>)
+            foo(1<caret>)
         }
         """
     )

j2k/testData/fileOrElement/annotations/annotationFromConstructorParamToProperty.kt

@@ -2,5 +2,7 @@ internal annotation class A
 
 internal annotation class B
 
-class U(@param:A @field:B
-        var i: Int)
+class U(
+        @param:A @field:B
+        var i: Int
+)

j2k/testData/fileOrElement/annotations/annotationInterface1.kt

@@ -1,5 +1,7 @@
-internal annotation class Anon(val stringArray: Array<String>, val intArray: IntArray, // string
-                               val string: String)
+internal annotation class Anon(
+        val stringArray: Array<String>, val intArray: IntArray, // string
+        val string: String
+)
 
 @Anon(string = "a", stringArray = ["a", "b"], intArray = [1, 2])
 @Target(AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD)

j2k/testData/fileOrElement/comments/fieldsInitializedFromParams.kt

@@ -1,6 +1,5 @@
 internal class C(
-        private val p1: Int /* parameter p1 */ // field p1
-        ,
+        private val p1: Int, /* parameter p1 */ // field p1
         /**
          * Field myP2
          */

j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt

@@ -1,12 +1,18 @@
-internal class C1(arg1: Int,
-                  arg2: Int,
-                  arg3: Int) {
+internal class C1(
+        arg1: Int,
+        arg2: Int,
+        arg3: Int
+) {
 
-    constructor(x: Int,
-                y: Int) : this(x, x + y, 0) {
+    constructor(
+            x: Int,
+            y: Int
+    ) : this(x, x + y, 0) {
     }
 }
 
-internal class C2(private val arg1: Int,
-                  private val arg2: Int,
-                  arg3: Int)
+internal class C2(
+        private val arg1: Int,
+        private val arg2: Int,
+        arg3: Int
+)

j2k/testData/fileOrElement/detectProperties/Comments.kt

@@ -1,4 +1,5 @@
-internal class A(// comment for field2 getter
+internal class A(
+// comment for field2 getter
         // comment for field2 setter
         var field2: Int // comment for field2
 ) {

j2k/testData/fileOrElement/detectProperties/DataClassWithAnnotations.kt

@@ -1,6 +1,8 @@
 internal annotation class TestAnnotation
 
-class Test(@param:TestAnnotation @field:TestAnnotation
-           @get:TestAnnotation
-           @set:TestAnnotation
-           var arg: String?)
+class Test(
+        @param:TestAnnotation @field:TestAnnotation
+        @get:TestAnnotation
+        @set:TestAnnotation
+        var arg: String?
+)

j2k/testData/fileOrElement/docComments/deprecatedDocTagWithMultiLineMessage.kt

@@ -1,7 +1,9 @@
-@Deprecated("Ph'nglui mglw'nafh\n" +
-        "  Cthulhu R'lyeh wgah'nagl fhtagn.\n" +
-        "  'In His House at R'lyeh\n" +
-        "  Dead Cthulhu waits dreaming,\n" +
-        "  yet He shall rise and His kingdom\n" +
-        "  shall cover the Earth.'")
+@Deprecated(
+        "Ph'nglui mglw'nafh\n" +
+                "  Cthulhu R'lyeh wgah'nagl fhtagn.\n" +
+                "  'In His House at R'lyeh\n" +
+                "  Dead Cthulhu waits dreaming,\n" +
+                "  yet He shall rise and His kingdom\n" +
+                "  shall cover the Earth.'"
+)
 class TestDeprecatedInJavadocWithMultilineMessage

j2k/testData/fileOrElement/enum/runnableImplementation.kt

@@ -2,7 +2,9 @@ internal enum class Color : Runnable {
     WHITE, BLACK, RED, YELLOW, BLUE;
 
     override fun run() {
-        println("name()=" + name +
-                ", toString()=" + toString())
+        println(
+                "name()=" + name +
+                        ", toString()=" + toString()
+        )
     }
 }

j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt

@@ -2,9 +2,10 @@ internal class F {
     fun f1(p1: Int, p2: Int, p3: Int, p4: Int, vararg p5: Int) {}
 
     fun f2(array: IntArray) {
-        f1(1, 2,
+        f1(
+                1, 2,
                 3, 4,
                 *array
         )
     }
-}
+}

j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.kt

@@ -3,11 +3,14 @@ internal class C {
 
     fun foo2(
             p1: Int,
-            p2: Int) {
+            p2: Int
+    ) {
     }
 
-    fun foo3(p1: Int,
-             p2: Int) {
+    fun foo3(
+            p1: Int,
+            p2: Int
+    ) {
     }
 
     fun foo4(

j2k/testData/fileOrElement/mutableCollections/FunctionParameters.kt

@@ -2,11 +2,13 @@
 import java.util.*
 
 internal class A<T> {
-    fun foo(nonMutableCollection: Collection<String>,
+    fun foo(
+            nonMutableCollection: Collection<String>,
             mutableCollection: MutableCollection<String>,
             mutableSet: MutableSet<T>,
-            mutableMap: MutableMap<String, T>) {
+            mutableMap: MutableMap<String, T>
+    ) {
         mutableCollection.addAll(nonMutableCollection)
         mutableSet.add(mutableMap.remove("a"))
     }
-}
+}

j2k/testData/fileOrElement/newClassExpression/lineBreaks.kt

@@ -2,8 +2,10 @@ internal class C(p1: Int, p2: Int, p3: Int)
 
 internal class User {
     fun foo() {
-        C(1,
+        C(
+                1,
                 2,
-                3)
+                3
+        )
     }
-}
+}

j2k/testData/fileOrElement/objectLiteral/MyFrame.kt

@@ -24,9 +24,11 @@ internal class Client : Frame() {
 
         addWindowListener(a)
 
-        addWindowListener(object : WindowAdapter() {
-            override fun windowClosing() {}
-        })
+        addWindowListener(
+                object : WindowAdapter() {
+                    override fun windowClosing() {}
+                }
+        )
 
         val b = object : EmptyWindowListener {
 

j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt

@@ -5,10 +5,12 @@ internal interface I {
 internal class C {
     val `object`: Any?
         get() {
-            foo(object : I {
-                override val int: Int
-                    get() = 0
-            })
+            foo(
+                    object : I {
+                        override val int: Int
+                            get() = 0
+                    }
+            )
             return string
         }
 

j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt

@@ -9,12 +9,15 @@ class C {
     @Throws(IOException::class)
     internal fun foo() {
         ByteArrayInputStream(ByteArray(10)).use { stream ->
-            bar(object : I {
-                @Throws(IOException::class)
-                override fun doIt(stream: InputStream): Int {
-                    return stream.available()
-                }
-            }, stream)
+            bar(
+                    object : I {
+                        @Throws(IOException::class)
+                        override fun doIt(stream: InputStream): Int {
+                            return stream.available()
+                        }
+                    },
+                    stream
+            )
         }
     }
 
@@ -22,4 +25,4 @@ class C {
     internal fun bar(i: I, stream: InputStream): Int {
         return i.doIt(stream)
     }
-}
+}

j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt

@@ -9,12 +9,15 @@ class C {
     @Throws(IOException::class)
     internal fun foo(): Int {
         ByteArrayInputStream(ByteArray(10)).use { stream ->
-            return bar(object : I {
-                @Throws(IOException::class)
-                override fun doIt(stream: InputStream): Int {
-                    return stream.available()
-                }
-            }, stream)
+            return bar(
+                    object : I {
+                        @Throws(IOException::class)
+                        override fun doIt(stream: InputStream): Int {
+                            return stream.available()
+                        }
+                    },
+                    stream
+            )
         }
     }
 
@@ -22,4 +25,4 @@ class C {
     internal fun bar(i: I, stream: InputStream): Int {
         return i.doIt(stream)
     }
-}
+}

nj2k/testData/copyPaste/SeveralMethodsSample.expected.kt

@@ -13,7 +13,7 @@ class A {
                     return JetBundle.message(
                             "x.in.y",
                             DescriptorRenderer.COMPACT.render(declarationDescriptor),
-                            IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor)
+                            IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.render(containingDescriptor),
                     )
                 }
             }

nj2k/testData/newJ2k/annotations/annotationInterface1.kt

@@ -1,5 +1,7 @@
-internal annotation class Anon(val stringArray: Array<String>, val intArray: IntArray,  // string
-                               val string: String)
+internal annotation class Anon(
+        val stringArray: Array<String>, val intArray: IntArray,  // string
+        val string: String
+)
 
 @Anon(string = "a", stringArray = ["a", "b"], intArray = [1, 2])
 @Target(AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD)

nj2k/testData/newJ2k/annotations/kt-31726.kt

@@ -1,7 +1,8 @@
 import javaApi.SpecialExternal
 
 //Annotation class:
-annotation class Special(val names: Array<String> //array is used
+annotation class Special(
+        val names: Array<String> //array is used
 )  //Class with annotation:
 
 @Special(names = ["name1"])

nj2k/testData/newJ2k/comments/fieldsInitializedFromParams.kt

@@ -1,7 +1,9 @@
-internal class C(// field p1
-        private val p1: Int /* parameter p1 */,
+internal class C(
+// field p1
+        private val p1: Int, /* parameter p1 */
         /**
          * Field myP2
          */
         private val myP2: Int, /* Field p3 */
-        var p3: Int)
+        var p3: Int
+)

nj2k/testData/newJ2k/constructors/lineBreaksBetweenParameters.kt

@@ -1,11 +1,17 @@
-internal class C1(arg1: Int,
-                  arg2: Int,
-                  arg3: Int) {
-    constructor(x: Int,
-                y: Int) : this(x, x + y, 0) {
+internal class C1(
+        arg1: Int,
+        arg2: Int,
+        arg3: Int
+) {
+    constructor(
+            x: Int,
+            y: Int
+    ) : this(x, x + y, 0) {
     }
 }
 
-internal class C2(private val arg1: Int,
-                  private val arg2: Int,
-                  arg3: Int) 
+internal class C2(
+        private val arg1: Int,
+        private val arg2: Int,
+        arg3: Int
+)

nj2k/testData/newJ2k/detectProperties/Comments.kt

@@ -1,7 +1,9 @@
-internal class A(// comment for field2 setter
+internal class A(
+// comment for field2 setter
         // comment for field2 getter
         var field2 // comment for field2
-        : Int) {
+        : Int
+) {
     /**
      * Comment for field1 setter
      */

nj2k/testData/newJ2k/detectProperties/DataClassWithAnnotations.kt

@@ -2,6 +2,8 @@ internal annotation class TestAnnotationField
 internal annotation class TestAnnotationParam
 internal annotation class TestAnnotationGet
 internal annotation class TestAnnotationSet
-class Test(@field:TestAnnotationField @set:TestAnnotationSet
-           @get:TestAnnotationGet
-           @param:TestAnnotationParam var arg: String)
+class Test(
+        @field:TestAnnotationField @set:TestAnnotationSet
+        @get:TestAnnotationGet
+        @param:TestAnnotationParam var arg: String
+)