Formatter: support trailing comma in value parameters

#KT-34744

idea/testData/formatter/BlankLinesAfterClassHeader.after.kt

@@ -19,7 +19,7 @@ class FooM
 }
 
 class FooC(
-        val x: String
+        val x: String,
 ) {
 
     fun bar()

idea/testData/formatter/ContinuationIndentInParameterLists.after.kt

@@ -1,5 +1,5 @@
 fun foo(
-        x: Int
+        x: Int,
 ) {
 }
 

idea/testData/formatter/FunctionDefParametersAlign.after.kt

@@ -1,3 +1,5 @@
 fun test(a: Int,
          b: Int) {
-}
+}
+
+// TRAILING_COMMA: false

idea/testData/formatter/FunctionDefParametersAlign.kt

@@ -1,3 +1,5 @@
 fun test(a : Int,
          b : Int) {
-}
+}
+
+// TRAILING_COMMA: false

idea/testData/formatter/FunctionExpression.after.kt

@@ -28,8 +28,10 @@ fun test() {
     test(fun test() = 4)
 }
 
-fun d = fun(a: Int,
-            b: String) {
+fun d = fun(
+        a: Int,
+        b: String,
+) {
 }
 
 fun e = fun() {

idea/testData/formatter/LineBreakBeforeExtendsColon.after.kt

@@ -1,4 +1,4 @@
 open class GFMOutputBuilder(
-        to: StringBuilder
+        to: StringBuilder,
 ) : MarkdownOutputBuilder(to) {
 }

idea/testData/formatter/LineBreakBeforeExtendsColonWrap.after.kt

@@ -1,5 +1,5 @@
 open class GFMOutputBuilder(
-        to: StringBuilder
+        to: StringBuilder,
 ) : MarkdownOutputBuilder(to) {
 }
 

idea/testData/formatter/MethodLParenthOnNextLine.after.inv.kt

@@ -2,3 +2,4 @@ fun foo(a: String,
         b: String)
 
 // SET_TRUE: METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE
+// TRAILING_COMMA: false

idea/testData/formatter/MethodLParenthOnNextLine.after.kt

@@ -3,3 +3,4 @@ fun foo(
         b: String)
 
 // SET_TRUE: METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE
+// TRAILING_COMMA: false

idea/testData/formatter/MethodLParenthOnNextLine.kt

@@ -2,3 +2,4 @@ fun foo(a: String,
         b: String)
 
 // SET_TRUE: METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE
+// TRAILING_COMMA: false

idea/testData/formatter/MethodRParenthOnNextLine.after.inv.kt

@@ -2,3 +2,4 @@ fun foo(a: String,
         b: String)
 
 // SET_TRUE: METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE
+// TRAILING_COMMA: false

idea/testData/formatter/MethodRParenthOnNextLine.after.kt

@@ -3,3 +3,4 @@ fun foo(a: String,
 )
 
 // SET_TRUE: METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE
+// TRAILING_COMMA: false

idea/testData/formatter/MethodRParenthOnNextLine.kt

@@ -2,3 +2,4 @@ fun foo(a: String,
         b: String)
 
 // SET_TRUE: METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE
+// TRAILING_COMMA: false

idea/testData/formatter/NewLineForRBrace.after.kt

@@ -45,4 +45,6 @@ fun commented1() {}
 fun commented2() {}
 
 // Comment
-fun commented3() {}
+fun commented3() {}
+
+// TRAILING_COMMA: false

idea/testData/formatter/NewLineForRBrace.kt

@@ -39,4 +39,6 @@ fun commented1() {}
 fun commented2() {}
 
 // Comment
-fun commented3() {}
+fun commented3() {}
+
+// TRAILING_COMMA: false

idea/testData/formatter/ParameterAnnotationWrap.after.kt

@@ -2,6 +2,7 @@ fun foo(@Deprecated("x")
         x: Int,
         @Deprecated("y")
         @Deprecated("z")
-        y: Int)
+        y: Int,
+)
 
 // SET_INT: PARAMETER_ANNOTATION_WRAP = 2

idea/testData/formatter/ParameterDocComments.after.kt

@@ -8,7 +8,8 @@ class A(
         /**
          * Doc
          */
-        val p2: String)
+        val p2: String,
+)
 
 class B(
         /** Doc1 */
@@ -17,5 +18,5 @@ class B(
         /**
          *  Doc2
          */
-        val v2: Int
+        val v2: Int,
 )

idea/testData/formatter/Parameters.after.inv.kt

@@ -1,7 +1,7 @@
 fun some(
         a :Int,
         b :String, c :Int,
-        d :String, e :Int
+        d :String, e :Int,
 ) {
 }
 

idea/testData/formatter/Parameters.after.kt

@@ -1,7 +1,7 @@
 fun some(
         a: Int,
         b: String, c: Int,
-        d: String, e: Int
+        d: String, e: Int,
 ) {
 }
 

idea/testData/formatter/RightBracketOnNewLine.after.inv.kt

@@ -4,4 +4,5 @@ class Test {
     }
 }
 
-// SET_FALSE: ALIGN_MULTILINE_METHOD_BRACKETS
+// SET_FALSE: ALIGN_MULTILINE_METHOD_BRACKETS
+// TRAILING_COMMA: false

idea/testData/formatter/RightBracketOnNewLine.after.kt

@@ -4,4 +4,5 @@ class Test {
     }
 }
 
-// SET_FALSE: ALIGN_MULTILINE_METHOD_BRACKETS
+// SET_FALSE: ALIGN_MULTILINE_METHOD_BRACKETS
+// TRAILING_COMMA: false

idea/testData/formatter/RightBracketOnNewLine.kt

@@ -4,4 +4,5 @@ fun someLong(a : Int
 }
 }
 
-// SET_FALSE: ALIGN_MULTILINE_METHOD_BRACKETS
+// SET_FALSE: ALIGN_MULTILINE_METHOD_BRACKETS
+// TRAILING_COMMA: false

idea/testData/formatter/ValVarSpaces.after.kt

@@ -2,4 +2,6 @@ class Foo(val x: Int,
           var y: Int) {
     val a = 1
     var b = 2
-}
+}
+
+// TRAILING_COMMA: false

idea/testData/formatter/ValVarSpaces.kt

@@ -2,4 +2,6 @@ class Foo(val    x: Int,
           var   y: Int) {
     val     a = 1
     var   b = 2
-}
+}
+
+// TRAILING_COMMA: false

idea/testData/formatter/WhereClause.after.kt

@@ -1,6 +1,6 @@
 abstract class RustNavigationContributorBase<T> protected constructor(
         private val indexKey: StubIndexKey<String, T>,
-        private val clazz: Class<T>
+        private val clazz: Class<T>,
 ) : ChooseByNameContributor, GotoClassContributor
         where T : NavigationItem,
               T : RustNamedElement {

idea/testData/formatter/parameterList/DefaultParameterValues.after.inv.kt

@@ -1,12 +1,12 @@
 fun foo(
         x: Int =
-            42
+            42,
 ) {
 }
 
 class C(
         val x: Int =
-            42
+            42,
 )
 
 // SET_TRUE: CONTINUATION_INDENT_FOR_EXPRESSION_BODIES

idea/testData/formatter/parameterList/DefaultParameterValues.after.kt

@@ -1,12 +1,12 @@
 fun foo(
         x: Int =
-                42
+                42,
 ) {
 }
 
 class C(
         val x: Int =
-                42
+                42,
 )
 
 // SET_TRUE: CONTINUATION_INDENT_FOR_EXPRESSION_BODIES

idea/testData/formatter/parameterList/ParameterListChopAsNeeded.after.kt

@@ -15,7 +15,8 @@ fun test(foo: Int, bar: Int)
 fun testtesttesttest(foofoo: Int,
                      barbar: Int,
                      foobar: Int,
-                     barfoo: Int)
+                     barfoo: Int,
+)
 
 fun test() {
     for (foo: Int in bar) {
@@ -41,20 +42,24 @@ class SN
 
 class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
         longLongLongLongNameCLass2: LongLongLongLongNameCLass,
-        longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+        longLongLongLongNameCLass3: LongLongLongLongNameCLass,
+) {
     constructor(
             longLongLongLongNameCLass1: LongLongLongLongNameCLass,
             longLongLongLongNameCLass2: LongLongLongLongNameCLass,
-            longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+            longLongLongLongNameCLass3: LongLongLongLongNameCLass,
+    ) {
     }
 }
 
 class B(a: LongLongLongLongNameCLass,
         b: LongLongLongLongNameCLass,
-        c: LongLongLongLongNameCLass) {
+        c: LongLongLongLongNameCLass,
+) {
     constructor(a: LongLongLongLongNameCLass,
                 b: LongLongLongLongNameCLass,
-                c: LongLongLongLongNameCLass) {
+                c: LongLongLongLongNameCLass,
+    ) {
     }
 }
 
@@ -66,7 +71,8 @@ class C(sn1: ShorName,
         sn6: ShorName,
         sn6: ShorName,
         sn8: ShorName,
-        sn9: ShorName) {
+        sn9: ShorName,
+) {
     constructor(sn1: ShorName,
                 sn2: ShorName,
                 sn3: ShorName,
@@ -75,7 +81,8 @@ class C(sn1: ShorName,
                 sn6: ShorName,
                 sn6: ShorName,
                 sn8: ShorName,
-                sn9: ShorName) {
+                sn9: ShorName,
+    ) {
     }
 }
 
@@ -92,7 +99,8 @@ class D(sn1: SN,
         sn11: SN,
         sn12: SN,
         sn13: SN,
-        sn14: SN) {
+        sn14: SN,
+) {
     constructor(sn1: SN,
                 sn2: SN,
                 sn3: SN,
@@ -106,13 +114,15 @@ class D(sn1: SN,
                 sn11: SN,
                 sn12: SN,
                 sn13: SN,
-                sn14: SN) {
+                sn14: SN,
+    ) {
     }
 }
 
 class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
     constructor(
-            longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+            longLongLongLongNameCLass1: LongLongLongLongNameCLass,
+    ) {
     }
 }
 

idea/testData/formatter/parameterList/ParameterListWrapAlways.after.kt

@@ -11,22 +11,26 @@ fun testtest(foofoo: Int)
 fun testtesttesttest(foofoo: Int)
 
 fun test(foo: Int,
-         bar: Int)
+         bar: Int,
+)
 
 fun testtesttesttest(foofoo: Int,
                      barbar: Int,
                      foobar: Int,
-                     barfoo: Int)
+                     barfoo: Int,
+)
 
 fun testtesttesttest(foofoo: Int,
                      @Some barbar: Int,
                      foobar: Int,
-                     barfoo: Int)
+                     barfoo: Int,
+)
 
 fun testtesttesttest(@Some foofoo: Int,
                      @Some barbar: Int,
                      @Some foobar: Int,
-                     barfoo: Int)
+                     barfoo: Int,
+)
 
 fun test() {
     for (foo: Int in bar) {
@@ -52,19 +56,23 @@ class SN
 
 class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
         longLongLongLongNameCLass2: LongLongLongLongNameCLass,
-        longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+        longLongLongLongNameCLass3: LongLongLongLongNameCLass,
+) {
     constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
                 longLongLongLongNameCLass2: LongLongLongLongNameCLass,
-                longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+                longLongLongLongNameCLass3: LongLongLongLongNameCLass,
+    ) {
     }
 }
 
 class B(a: LongLongLongLongNameCLass,
         b: LongLongLongLongNameCLass,
-        c: LongLongLongLongNameCLass) {
+        c: LongLongLongLongNameCLass,
+) {
     constructor(a: LongLongLongLongNameCLass,
                 b: LongLongLongLongNameCLass,
-                c: LongLongLongLongNameCLass) {
+                c: LongLongLongLongNameCLass,
+    ) {
     }
 }
 
@@ -76,7 +84,8 @@ class C(sn1: ShorName,
         sn6: ShorName,
         sn6: ShorName,
         sn8: ShorName,
-        sn9: ShorName) {
+        sn9: ShorName,
+) {
     constructor(sn1: ShorName,
                 sn2: ShorName,
                 sn3: ShorName,
@@ -85,7 +94,8 @@ class C(sn1: ShorName,
                 sn6: ShorName,
                 sn6: ShorName,
                 sn8: ShorName,
-                sn9: ShorName) {
+                sn9: ShorName,
+    ) {
     }
 }
 
@@ -102,7 +112,8 @@ class D(sn1: SN,
         sn11: SN,
         sn12: SN,
         sn13: SN,
-        sn14: SN) {
+        sn14: SN,
+) {
     constructor(sn1: SN,
                 sn2: SN,
                 sn3: SN,
@@ -116,7 +127,8 @@ class D(sn1: SN,
                 sn11: SN,
                 sn12: SN,
                 sn13: SN,
-                sn14: SN) {
+                sn14: SN,
+    ) {
     }
 }
 
@@ -136,7 +148,8 @@ class G(sn1: ShorName) {
 }
 
 class H(sn1: SN,
-        sn2: SN) {
+        sn2: SN,
+) {
     constructor(sn1: SN) {
     }
 }
@@ -154,7 +167,8 @@ class I(sn1: SN,
         sn11: SN,
         sn12: SN,
         sn13: SN,
-        sn14: SN) {
+        sn14: SN,
+) {
     constructor(sn1: SN,
                 sn2: SN,
                 sn3: SN,
@@ -168,6 +182,7 @@ class I(sn1: SN,
                 sn11: SN,
                 sn12: SN,
                 sn13: SN,
-                sn14: SN) {
+                sn14: SN,
+    ) {
     }
 }

idea/testData/formatter/parameterList/ParameterListWrapAsNeeded.after.kt

@@ -9,7 +9,8 @@ fun testtesttesttesttesttesttesttesttest()
 fun testtest(foofoo: Int)
 
 fun testtesttesttest(
-        foofoo: Int)
+        foofoo: Int,
+)
 
 fun test(foo: Int, bar: Int)
 
@@ -17,7 +18,8 @@ fun testtesttesttest(
         foofoo: Int,
         barbar: Int,
         foobar: Int,
-        barfoo: Int)
+        barfoo: Int,
+)
 
 fun test() {
     for (foo: Int in bar) {
@@ -43,21 +45,25 @@ class SN
 
 class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
         longLongLongLongNameCLass2: LongLongLongLongNameCLass,
-        longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+        longLongLongLongNameCLass3: LongLongLongLongNameCLass,
+) {
     constructor(
             longLongLongLongNameCLass1: LongLongLongLongNameCLass,
             longLongLongLongNameCLass2: LongLongLongLongNameCLass,
-            longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+            longLongLongLongNameCLass3: LongLongLongLongNameCLass,
+    ) {
     }
 }
 
 class B(a: LongLongLongLongNameCLass,
         b: LongLongLongLongNameCLass,
-        c: LongLongLongLongNameCLass) {
+        c: LongLongLongLongNameCLass,
+) {
     constructor(
             a: LongLongLongLongNameCLass,
             b: LongLongLongLongNameCLass,
-            c: LongLongLongLongNameCLass) {
+            c: LongLongLongLongNameCLass,
+    ) {
     }
 }
 
@@ -69,7 +75,8 @@ class C(sn1: ShorName,
         sn6: ShorName,
         sn6: ShorName,
         sn8: ShorName,
-        sn9: ShorName) {
+        sn9: ShorName,
+) {
     constructor(sn1: ShorName,
                 sn2: ShorName,
                 sn3: ShorName,
@@ -78,7 +85,8 @@ class C(sn1: ShorName,
                 sn6: ShorName,
                 sn6: ShorName,
                 sn8: ShorName,
-                sn9: ShorName) {
+                sn9: ShorName,
+    ) {
     }
 }
 
@@ -88,7 +96,8 @@ class D(sn1: SN, sn2: SN,
         sn6: SN, sn8: SN,
         sn9: SN, sn10: SN,
         sn11: SN, sn12: SN,
-        sn13: SN, sn14: SN) {
+        sn13: SN, sn14: SN,
+) {
     constructor(sn1: SN,
                 sn2: SN,
                 sn3: SN,
@@ -102,25 +111,29 @@ class D(sn1: SN, sn2: SN,
                 sn11: SN,
                 sn12: SN,
                 sn13: SN,
-                sn14: SN) {
+                sn14: SN,
+    ) {
     }
 }
 
 class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
     constructor(
-            longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+            longLongLongLongNameCLass1: LongLongLongLongNameCLass,
+    ) {
     }
 }
 
 class F(a: LongLongLongLongNameCLass) {
     constructor(
-            a: LongLongLongLongNameCLass) {
+            a: LongLongLongLongNameCLass,
+    ) {
     }
 }
 
 class G(sn1: ShorName) {
     constructor(
-            sn1: ShorName) {
+            sn1: ShorName,
+    ) {
     }
 }
 

idea/testData/formatter/trailingComma/valueParameters/Function.after.inv.kt

@@ -0,0 +1,85 @@
+fun a1(
+        x: String,
+        y: String,
+) = Unit
+
+fun b1(
+        x: String,
+        y: String
+) = Unit
+
+fun c1(
+        x: String,
+        y: String,
+) = Unit
+
+fun d1(
+        x: String,
+        y: String,
+) = Unit
+
+fun a2(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun b2(
+        x: String,
+        y: String,
+        z: String
+) = Unit
+
+fun c2(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun d2(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun a3(
+        x: String,
+) = Unit
+
+fun b3(
+        x: String
+) = Unit
+
+fun c3(
+        x: String,
+) = Unit
+
+fun d3(
+        x: String,
+) = Unit
+
+fun a4(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun b4(
+        x: String,
+        y: String,
+        z: String
+) = Unit
+
+fun c4(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun d4(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/Function.after.kt

@@ -0,0 +1,85 @@
+fun a1(
+        x: String,
+        y: String,
+) = Unit
+
+fun b1(
+        x: String,
+        y: String,
+) = Unit
+
+fun c1(
+        x: String,
+        y: String,
+) = Unit
+
+fun d1(
+        x: String,
+        y: String,
+) = Unit
+
+fun a2(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun b2(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun c2(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun d2(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun a3(
+        x: String,
+) = Unit
+
+fun b3(
+        x: String,
+) = Unit
+
+fun c3(
+        x: String,
+) = Unit
+
+fun d3(
+        x: String,
+) = Unit
+
+fun a4(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun b4(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun c4(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+fun d4(
+        x: String,
+        y: String,
+        z: String,
+) = Unit
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/Function.kt

@@ -0,0 +1,81 @@
+fun a1(
+    x: String,
+    y: String,
+) = Unit
+
+fun b1(
+    x: String,
+    y: String
+) = Unit
+
+fun c1(
+    x: String,
+    y: String,) = Unit
+
+fun d1(
+    x: String,
+    y: String
+    ,) = Unit
+
+fun a2(
+    x: String,
+    y: String,
+    z: String,
+) = Unit
+
+fun b2(
+    x: String,
+    y: String,
+    z: String
+) = Unit
+
+fun c2(
+    x: String,
+    y: String,
+    z: String,) = Unit
+
+fun d2(
+    x: String,
+    y: String,
+    z: String
+    ,) = Unit
+
+fun a3(
+    x: String,
+) = Unit
+
+fun b3(
+    x: String
+) = Unit
+
+fun c3(
+    x: String,) = Unit
+
+fun d3(
+    x: String
+    ,) = Unit
+
+fun a4(
+    x: String
+    ,
+        y: String,
+    z: String   ,
+) = Unit
+
+fun b4(
+    x: String,
+    y: String,
+    z: String
+) = Unit
+
+fun c4(x: String,
+    y: String,
+    z: String   ,) = Unit
+
+fun d4(
+    x: String,
+    y: String,
+    z: String
+,   ) = Unit
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/OptionalTypes.after.inv.kt

@@ -0,0 +1,75 @@
+val foo1: (Int, Int) -> Int = fun(
+        x,
+        y,
+): Int = 42
+
+val foo2: (Int, Int) -> Int = fun(
+        x,
+        y
+): Int {
+    return x + y
+}
+
+val foo3: (Int, Int) -> Int = fun(
+        x, y,
+): Int {
+    return x + y
+}
+
+val foo4: (Int) -> Int = fun(
+        x,
+): Int = 42
+
+val foo5: (Int) -> Int = fun(
+        x
+): Int = 42
+
+val foo6: (Int) -> Int = fun(
+        x,
+): Int = 42
+
+val foo7: (Int) -> Int = fun(x): Int = 42
+
+val foo8: (Int, Int, Int) -> Int = fun(
+        x, y: Int, z,
+): Int {
+    return x + y
+}
+
+val foo9: (Int, Int, Int) -> Int = fun(
+        x,
+        y: Int,
+        z,
+): Int = 42
+
+val foo10: (Int, Int, Int) -> Int = fun(
+        x,
+        y: Int,
+        z: Int
+): Int = 43
+
+val foo10 = fun(
+        x: Int,
+        y: Int,
+        z: Int
+): Int = 43
+
+val foo11 = fun(
+        x: Int,
+        y: Int,
+        z: Int,
+): Int = 43
+
+val foo12 = fun(
+        x: Int, y: Int, z: Int,
+): Int = 43
+
+val foo13 = fun(
+        x: Int, y: Int, z: Int,
+): Int = 43
+
+val foo14 = fun(
+        x: Int, y: Int, z: Int,
+): Int = 43
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/OptionalTypes.after.kt

@@ -0,0 +1,75 @@
+val foo1: (Int, Int) -> Int = fun(
+        x,
+        y,
+): Int = 42
+
+val foo2: (Int, Int) -> Int = fun(
+        x,
+        y,
+): Int {
+    return x + y
+}
+
+val foo3: (Int, Int) -> Int = fun(
+        x, y,
+): Int {
+    return x + y
+}
+
+val foo4: (Int) -> Int = fun(
+        x,
+): Int = 42
+
+val foo5: (Int) -> Int = fun(
+        x,
+): Int = 42
+
+val foo6: (Int) -> Int = fun(
+        x,
+): Int = 42
+
+val foo7: (Int) -> Int = fun(x): Int = 42
+
+val foo8: (Int, Int, Int) -> Int = fun(
+        x, y: Int, z,
+): Int {
+    return x + y
+}
+
+val foo9: (Int, Int, Int) -> Int = fun(
+        x,
+        y: Int,
+        z,
+): Int = 42
+
+val foo10: (Int, Int, Int) -> Int = fun(
+        x,
+        y: Int,
+        z: Int,
+): Int = 43
+
+val foo10 = fun(
+        x: Int,
+        y: Int,
+        z: Int,
+): Int = 43
+
+val foo11 = fun(
+        x: Int,
+        y: Int,
+        z: Int,
+): Int = 43
+
+val foo12 = fun(
+        x: Int, y: Int, z: Int,
+): Int = 43
+
+val foo13 = fun(
+        x: Int, y: Int, z: Int,
+): Int = 43
+
+val foo14 = fun(
+        x: Int, y: Int, z: Int,
+): Int = 43
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/OptionalTypes.kt

@@ -0,0 +1,69 @@
+val foo1: (Int, Int) -> Int = fun(
+    x,
+    y,
+): Int = 42
+
+val foo2: (Int, Int) -> Int = fun(
+    x,
+    y
+): Int {
+    return x + y
+}
+
+val foo3: (Int, Int) -> Int = fun(
+    x, y,
+): Int {
+    return x + y
+}
+
+val foo4: (Int) -> Int = fun(
+    x,
+): Int = 42
+
+val foo5: (Int) -> Int = fun(
+    x
+): Int = 42
+
+val foo6: (Int) -> Int = fun(x,): Int = 42
+
+val foo7: (Int) -> Int = fun(x): Int = 42
+
+val foo8: (Int, Int, Int) -> Int = fun (x, y: Int, z,): Int {
+        return x + y
+    }
+
+val foo9: (Int, Int, Int) -> Int = fun (
+    x,
+    y: Int,
+    z,
+): Int = 42
+
+val foo10: (Int, Int, Int) -> Int = fun (
+    x,
+    y: Int,
+    z: Int
+): Int = 43
+
+val foo10 = fun (
+    x: Int,
+    y: Int,
+    z: Int
+): Int = 43
+
+val foo11 = fun (
+    x: Int,
+    y: Int,
+    z: Int,
+): Int = 43
+
+val foo12 = fun (
+    x: Int, y: Int, z: Int,
+): Int = 43
+
+val foo13 = fun (x: Int, y: Int, z: Int,
+): Int = 43
+
+val foo14 = fun (x: Int, y: Int, z: Int
+                 ,): Int = 43
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/PrimaryConstructor.after.inv.kt

@@ -0,0 +1,94 @@
+class A1(
+        val x: String,
+        y: String,
+)
+
+class B1(
+        val x: String,
+        val y: String
+)
+
+class C1(
+        val x: String,
+        val y: String,
+)
+
+class D1(
+        val x: String,
+        val y: String,
+)
+
+class A2(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class B2(
+        val x: String,
+        val y: String,
+        val z: String
+)
+
+class C2(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class D2(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class A3(
+        val x: String,
+)
+
+class B3(
+        val x: String
+)
+
+class C3(
+        val x: String,
+)
+
+class D3(
+        val x: String,
+)
+
+class A4(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class B4(
+        val x: String,
+        val y: String,
+        val z: String
+)
+
+class C4(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class D4(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class E1(
+        val x: String, val y: String,
+        val z: String,
+)
+
+class E2(
+        val x: String, val y: String, val z: String
+)
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/PrimaryConstructor.after.kt

@@ -0,0 +1,94 @@
+class A1(
+        val x: String,
+        y: String,
+)
+
+class B1(
+        val x: String,
+        val y: String,
+)
+
+class C1(
+        val x: String,
+        val y: String,
+)
+
+class D1(
+        val x: String,
+        val y: String,
+)
+
+class A2(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class B2(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class C2(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class D2(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class A3(
+        val x: String,
+)
+
+class B3(
+        val x: String,
+)
+
+class C3(
+        val x: String,
+)
+
+class D3(
+        val x: String,
+)
+
+class A4(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class B4(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class C4(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class D4(
+        val x: String,
+        val y: String,
+        val z: String,
+)
+
+class E1(
+        val x: String, val y: String,
+        val z: String,
+)
+
+class E2(
+        val x: String, val y: String, val z: String,
+)
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/PrimaryConstructor.kt

@@ -0,0 +1,90 @@
+class A1(
+    val x: String,
+    y: String,
+)
+
+class B1(
+    val x: String,
+    val y: String
+)
+
+class C1(
+    val x: String,
+    val y: String,)
+
+class D1(
+    val x: String,
+    val y: String
+    ,)
+
+class A2(
+    val x: String,
+    val y: String,
+    val z: String,
+)
+
+class B2(
+    val x: String,
+    val y: String,
+    val z: String
+)
+
+class C2(
+    val x: String,
+    val y: String,
+    val z: String,)
+
+class D2(
+    val x: String,
+    val y: String,
+    val z: String
+    ,)
+
+class A3(
+    val x: String,
+)
+
+class B3(
+    val x: String
+)
+
+class C3(
+    val x: String,)
+
+class D3(
+    val x: String
+    ,)
+
+class A4(
+    val x: String   ,
+    val y: String,
+    val z: String   ,
+)
+
+class B4(
+    val x: String,
+    val y: String,
+    val z: String
+)
+
+class C4(
+    val x: String,
+    val y: String,
+    val z: String   ,)
+
+class D4(
+    val x: String,
+    val y: String,
+    val z: String
+,   )
+
+class E1(
+    val x: String, val y: String,
+    val z: String
+,   )
+
+class E2(
+    val x: String, val y: String, val z: String
+)
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/SecondConstructor.after.inv.kt

@@ -0,0 +1,184 @@
+class A1 {
+    val x: String
+    val y: String
+
+    constructor(
+            x: String,
+            y: String,
+    ) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class B1 {
+    val x: String
+    val y: String
+
+    constructor(
+            x: String,
+            y: String
+    ) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class C1 {
+    val x: String
+    val y: String
+
+    constructor(
+            x: String,
+            y: String,
+    ) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class D1 {
+    val x: String
+    val y: String
+
+    constructor(
+            x: String,
+            y: String,
+    ) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class A2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String,
+            z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class B2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String,
+            z: String
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class C2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String,
+            z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class D2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String,
+            z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class A3 {
+    val x: String
+
+    constructor(
+            x: String,
+    ) {
+        this.x = x
+    }
+}
+
+class B3 {
+    val x: String
+
+    constructor(x: String) {
+        this.x = x
+    }
+}
+
+class C3 {
+    val x: String
+
+    constructor(
+            x: String,
+    ) {
+        this.x = x
+    }
+}
+
+class D3 {
+    val x: String
+
+    constructor(
+            x: String,
+    ) {
+        this.x = x
+    }
+}
+
+class E1 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String, z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class E2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String, z: String) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/SecondConstructor.after.kt

@@ -0,0 +1,185 @@
+class A1 {
+    val x: String
+    val y: String
+
+    constructor(
+            x: String,
+            y: String,
+    ) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class B1 {
+    val x: String
+    val y: String
+
+    constructor(
+            x: String,
+            y: String,
+    ) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class C1 {
+    val x: String
+    val y: String
+
+    constructor(
+            x: String,
+            y: String,
+    ) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class D1 {
+    val x: String
+    val y: String
+
+    constructor(
+            x: String,
+            y: String,
+    ) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class A2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String,
+            z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class B2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String,
+            z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class C2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String,
+            z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class D2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String,
+            z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class A3 {
+    val x: String
+
+    constructor(
+            x: String,
+    ) {
+        this.x = x
+    }
+}
+
+class B3 {
+    val x: String
+
+    constructor(x: String) {
+        this.x = x
+    }
+}
+
+class C3 {
+    val x: String
+
+    constructor(
+            x: String,
+    ) {
+        this.x = x
+    }
+}
+
+class D3 {
+    val x: String
+
+    constructor(
+            x: String,
+    ) {
+        this.x = x
+    }
+}
+
+class E1 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String, z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class E2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+            x: String,
+            y: String, z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+// SET_TRUE: ALLOW_TRAILING_COMMA

idea/testData/formatter/trailingComma/valueParameters/SecondConstructor.kt

@@ -0,0 +1,178 @@
+class A1 {
+    val x: String
+    val y: String
+
+    constructor(
+        x: String,
+        y: String,
+    ) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class B1 {
+    val x: String
+    val y: String
+
+    constructor(
+        x: String,
+        y: String
+    ) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class C1 {
+    val x: String
+    val y: String
+
+    constructor(
+        x: String,
+        y: String,) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class D1 {
+    val x: String
+    val y: String
+
+    constructor(
+        x: String,
+        y: String
+    ,) {
+        this.x = x
+        this.y = y
+    }
+}
+
+class A2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+        x: String,
+        y: String,
+        z: String,
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class B2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+        x: String,
+        y: String,
+        z: String
+    ) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class C2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+        x: String,
+        y: String,
+        z: String,) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class D2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+        x: String,
+        y: String,
+        z: String
+    ,) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class A3 {
+    val x: String
+
+    constructor(x: String,) {
+        this.x = x
+    }
+}
+
+class B3 {
+    val x: String
+
+    constructor(x: String) {
+        this.x = x
+    }
+}
+
+class C3 {
+    val x: String
+
+    constructor(
+        x: String,) {
+        this.x = x
+    }
+}
+
+class D3 {
+    val x: String
+
+    constructor(
+        x: String
+    ,) {
+        this.x = x
+    }
+}
+
+class E1 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+        x: String,
+        y: String, z: String,) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+class E2 {
+    val x: String
+    val y: String
+    val z: String
+
+    constructor(
+        x: String,
+        y: String, z: String) {
+        this.x = x
+        this.y = y
+        this.z = z
+    }
+}
+
+// SET_TRUE: ALLOW_TRAILING_COMMA