azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatter: support trailing comma in value parameters

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2019-12-18 21:01:08 +07:00
parent 463728a96a
commit 13ae4a28a8
51 changed files with 1644 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/formatter/trailingComma/valueParameters/Function.after.inv.kt
Vendored
+85
View File
@@ -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
Vendored
+85
View File
@@ -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
Vendored
+81
View File
@@ -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
Vendored
+75
View File
@@ -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
Vendored
+75
View File
@@ -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
Vendored
+69
View File
@@ -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
Vendored
+94
View File
@@ -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
Vendored
+94
View File
@@ -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
Vendored
+90
View File
@@ -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
Vendored
+184
View File
@@ -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
Vendored
+185
View File
@@ -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
Vendored
+178
View File
@@ -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