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

Formatter: support trailing comma in lambda parameters

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2019-12-27 16:19:11 +07:00
parent 07bda5a759
commit 4adfaab3ec
12 changed files with 711 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/formatter/trailingComma/collectionLiteralExpression/CollectionLiteralInAnnotation.after.inv.kt
Vendored
+2 -2
View File
@@ -97,8 +97,8 @@ fun a() = Unit
@Anno([
1,
2/*
*/,/*
2,/*
*//*
*/
])
fun a() = Unit
idea/testData/formatter/trailingComma/collectionLiteralExpression/CollectionLiteralInAnnotation.after.kt
Vendored
+2 -2
View File
@@ -148,8 +148,8 @@ fun a() = Unit
@Anno(
[
1,
2/*
*/,/*
2,/*
*//*
*/
],
)
idea/testData/formatter/trailingComma/lambdaParameters/LambdaParameterList.after.inv.kt
Vendored
+190
View File
@@ -0,0 +1,190 @@
val x = {
x: Comparable<Comparable<Number>>,
y: String,
->
println("1")
}
val x = { x: Comparable<Comparable<Number>>, y: String ->
println("1")
}
val x = { x: String, y
: String ->
println("1")
}
val x = { x: String,
y: String
->
println("1")
}
val x = {
x: String,
y: Comparable<Comparable<Number>>,
->
println("1")
}
val x = {
x: Comparable<Comparable<Number>>,
y: String,
->
println("1")
}
val x = {
x: String,
y: Comparable<Comparable<Number>>,
z: String,
->
println("1")
}
val x = { x: String,
y: String,
z: String
->
println("1")
}
val x = {
x: String,
y: String,
z: String,
->
println("1")
}
val x = {
x: String,
y: String,
z: String,
->
println("1")
}
val x = {
x: String,
->
println("1")
}
val x = { x: String
->
println("1")
}
val x = {
x: String,
->
println("1")
}
val x = {
x: String,
->
println("1")
}
val x = {
x: String,
y: String,
->
println("1")
}
val x = { x: String,
z: String
->
println("1")
}
val x = {
x: String,
y: String,
z: String,
->
println("1")
}
val x = {
x: String,
z: String,
->
println("1")
}
val x = {
x, y: String,
z: String,
->
println("1")
}
val x = { x: String, y: String, z: String
->
println("1")
}
val x = {
z: String, v: Comparable<Comparable<Number>>,
->
println("1")
}
val x = {
x: String,
y: Comparable<Comparable<Number>>,
->
println("1")
}
val x = { x: Int
->
println("1")
}
val x = { x: String, y: String, /* */ z: String
->
println("1")
}
val x = { x: String, y: String
/* */, /* */ z: String
->
println("1")
}()
val x = {
x: String, /*
*/
y: String,
z: String,
->
println("1")
}
val x = {
x: String, y: String,
z: String, /*
*/
->
println("1")
}
val x = {
x: Comparable<Comparable<Number>>, y: String,
z: String,
->
println("1")
}
val x = { x: String, y: String, z: String
->
println("1")
}
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/lambdaParameters/LambdaParameterList.after.kt
Vendored
+205
View File
@@ -0,0 +1,205 @@
val x = {
x: Comparable<Comparable<Number>>,
y: String,
->
println("1")
}
val x = { x: Comparable<Comparable<Number>>, y: String ->
println("1")
}
val x = {
x: String,
y
: String,
->
println("1")
}
val x = {
x: String,
y: String,
->
println("1")
}
val x = {
x: String,
y: Comparable<Comparable<Number>>,
->
println("1")
}
val x = {
x: Comparable<Comparable<Number>>,
y: String,
->
println("1")
}
val x = {
x: String,
y: Comparable<Comparable<Number>>,
z: String,
->
println("1")
}
val x = {
x: String,
y: String,
z: String,
->
println("1")
}
val x = {
x: String,
y: String,
z: String,
->
println("1")
}
val x = {
x: String,
y: String,
z: String,
->
println("1")
}
val x = {
x: String,
->
println("1")
}
val x = {
x: String,
->
println("1")
}
val x = {
x: String,
->
println("1")
}
val x = {
x: String,
->
println("1")
}
val x = {
x: String,
y: String,
->
println("1")
}
val x = {
x: String,
z: String,
->
println("1")
}
val x = {
x: String,
y: String,
z: String,
->
println("1")
}
val x = {
x: String,
z: String,
->
println("1")
}
val x = {
x, y: String,
z: String,
->
println("1")
}
val x = {
x: String, y: String, z: String,
->
println("1")
}
val x = {
z: String, v: Comparable<Comparable<Number>>,
->
println("1")
}
val x = {
x: String,
y: Comparable<Comparable<Number>>,
->
println("1")
}
val x = {
x: Int,
->
println("1")
}
val x = {
x: String, y: String, /* */
z: String,
->
println("1")
}
val x = {
x: String,
y: String,
/* */ /* */
z: String,
->
println("1")
}()
val x = {
x: String, /*
*/
y: String,
z: String,
->
println("1")
}
val x = {
x: String, y: String,
z: String, /*
*/
->
println("1")
}
val x = {
x: Comparable<Comparable<Number>>, y: String,
z: String,
->
println("1")
}
val x = {
x: String, y: String, z: String,
->
println("1")
}
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/lambdaParameters/LambdaParameterList.kt
Vendored
+192
View File
@@ -0,0 +1,192 @@
val x = {
x: Comparable<Comparable<Number>>,
y: String,
->
println("1")
}
val x = {x: Comparable<Comparable<Number>>, y: String->
println("1")
}
val x = {x: String, y
: String->
println("1")
}
val x = {
x: String,
y: String
->
println("1")
}
val x = {
x: String,
y: Comparable<Comparable<Number>>,->
println("1")
}
val x = {
x: Comparable<Comparable<Number>>,
y: String
,->
println("1")
}
val x = {
x: String,
y: Comparable<Comparable<Number>>,
z: String,
->
println("1")
}
val x = {
x: String,
y: String,
z: String
->
println("1")
}
val x = {
x: String,
y: String,
z: String,->
println("1")
}
val x = {
x: String,
y: String,
z: String
,->
println("1")
}
val x = {
x: String,
->
println("1")
}
val x = {
x: String
->
println("1")
}
val x = {
x: String,->
println("1")
}
val x = {
x: String
,->
println("1")
}
val x = {
x: String ,
y: String,
->
println("1")
}
val x = {
x: String,
z: String
->
println("1")
}
val x = {
x: String,
y: String,
z: String ,->
println("1")
}
val x = {
x: String,
z: String
, ->
println("1")
}
val x = {
x, y: String,
z: String
, ->
println("1")
}
val x = {
x: String, y: String, z: String
->
println("1")
}
val x = {
z: String, v: Comparable<Comparable<Number>>,
->
println("1")
}
val x = {x: String,
y: Comparable<Comparable<Number>>,
->
println("1")
}
val x = {
x: Int
->
println("1")
}
val x = {
x: String, y: String
, /* */ z: String
->
println("1")
}
val x = {
x: String, y: String
/* */, /* */ z: String
->
println("1")
}()
val x = {
x: String, /*
*/ y: String,
z: String ,->
println("1")
}
val x = {
x: String, y: String , z: String /*
*/
, ->
println("1")
}
val x = {
x: Comparable<Comparable<Number>>, y: String,
z: String
, ->
println("1")
}
val x = {
x: String, y: String, z: String
->
println("1")
}
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/typeParameters/TypeParameterList.after.inv.kt
Vendored
+2 -2
View File
@@ -226,8 +226,8 @@ class H<
class J<
x : String, y : String,
z : String /*
*/,
z : String, /*
*/
>
class K<
idea/testData/formatter/trailingComma/typeParameters/TypeParameterList.after.kt
Vendored
+2 -2
View File
@@ -234,8 +234,8 @@ class H<
class J<
x : String, y : String,
z : String /*
*/,
z : String, /*
*/
>
class K<