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

Formatter: support trailing comma in destruction declarations

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2019-12-30 20:52:54 +07:00
parent 96a11707ca
commit b72da6c4fc
11 changed files with 700 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/formatter/trailingComma/destructionDeclaration/DestructionDeclarationsInLambda.after.inv.kt
Vendored
+102
View File
@@ -0,0 +1,102 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x, y,
), /* FIXME: The result should converge in one iteration */ z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(x, y), z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(x,
y),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x,
y),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x, // adw
y,
),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x, /* val x: (Pair<Int, Int>, Int) -> Unit = { (x, y), z, ->
println(x)
}*/
),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(x, y), z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(x, y/**/), z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(x, y/*
*/),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(/**/x /**/ /*
*/, // awdawd
y/*
*/),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(/**/x /**/ /*
*/, // awdawd
y/*
*/),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x, y,
),
z,
->
println(x)
}
idea/testData/formatter/trailingComma/destructionDeclaration/DestructionDeclarationsInLambda.after.kt
Vendored
+114
View File
@@ -0,0 +1,114 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x, y,
), /* FIXME: The result should converge in one iteration */ z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(x, y), z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x,
y,
),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x,
y,
),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x, // adw
y,
),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x, /* val x: (Pair<Int, Int>, Int) -> Unit = { (x, y), z, ->
println(x)
}*/
),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(x, y), z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(x, y/**/), z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x,
y,/*
*/
),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
/**/
x, /**/ /*
*/ // awdawd
y,/*
*/
),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
/**/
x, /**/ /*
*/ // awdawd
y,/*
*/
),
z,
->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(
x, y,
),
z,
->
println(x)
}
idea/testData/formatter/trailingComma/destructionDeclaration/DestructionDeclarationsInLambda.kt
Vendored
+66
View File
@@ -0,0 +1,66 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
val x: (Pair<Int, Int>, Int) -> Unit = { (x, y,), /* FIXME: The result should converge in one iteration */ z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = { (x, y), z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = { (x,
y), z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = { (
x,
y), z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = { (
x // adw
,y,), z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = { (x /* val x: (Pair<Int, Int>, Int) -> Unit = { (x, y), z, ->
println(x)
}*/,), z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = { (x, y), z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = { (x, y/**/), z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = { (x, y/*
*/), z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = { (/**/x /**/ /*
*/, // awdawd
y/*
*/), z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = {
(/**/x /**/ /*
*/, // awdawd
y/*
*/),
z, ->
println(x)
}
val x: (Pair<Int, Int>, Int) -> Unit = { (x, y,),
z, ->
println(x)
}
idea/testData/formatter/trailingComma/destructionDeclaration/MultiVariableDeclaration.after.inv.kt
Vendored
+105
View File
@@ -0,0 +1,105 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
fun test() {
val (a, b) = 1 to 2
val (a, b) = 1 to
2
val (a, b) = 1
to
2
val (
a, b,
) = 1 to 2
val (
a,
) =
b
val (
a,
) = b
val (a, b
) = 1 to 2
val (a,
b) = 1 to 2
val (
a, b
) = 1 to 2
val (
a, b,
) = 1 to 2
val (a, b, c,
d, f
) = 1 to 2
val (
a, b, c,
d, f,
) = 1 to 2
val (a, b/**/) = 1 to 2
val (a, /**/b/**/) /**/ =/**/ 1 to
2
val (a,/**/ b) = 1
to
2
val (
a, b,/**/
) = 1 to 2
val (
a,/**/ b,/**//**/
) = 1 to 2
val (
a,/**//**/
) =
b
val (
a,
) = b
val (a, b/**/
) = 1 to 2
val (a, b// awd
) = 1 to 2
val (a,/**/ b /**/ // awd
) = 1 to 2
val (a, // ad
/**/b) = 1 to 2
val (
a, b // fe
/**/)/**/ = 1 to 2
val (
a, b, // awd
) = 1 to 2
val (a, b, c,
d, f // awd
/*
*/) = 1 to 2
val (
a, b, c,
d, f, // awd
) = 1 to 2
}
idea/testData/formatter/trailingComma/destructionDeclaration/MultiVariableDeclaration.after.kt
Vendored
+120
View File
@@ -0,0 +1,120 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
fun test() {
val (a, b) = 1 to 2
val (a, b) = 1 to
2
val (a, b) = 1
to
2
val (
a, b,
) = 1 to 2
val (
a,
) =
b
val (
a,
) = b
val (
a, b,
) = 1 to 2
val (
a,
b,
) = 1 to 2
val (
a, b,
) = 1 to 2
val (
a, b,
) = 1 to 2
val (
a, b, c,
d, f,
) = 1 to 2
val (
a, b, c,
d, f,
) = 1 to 2
val (a, b/**/) = 1 to 2
val (a, /**/b/**/) /**/ =/**/ 1 to
2
val (a,/**/ b) = 1
to
2
val (
a, b,/**/
) = 1 to 2
val (
a,/**/ b,/**//**/
) = 1 to 2
val (
a,/**//**/
) =
b
val (
a,
) = b
val (
a, b,/**/
) = 1 to 2
val (
a, b,// awd
) = 1 to 2
val (
a,/**/ b, /**/ // awd
) = 1 to 2
val (
a, // ad
/**/
b,
) = 1 to 2
val (
a,
b, // fe
/**/
)/**/ = 1 to 2
val (
a, b, // awd
) = 1 to 2
val (
a, b, c,
d,
f, // awd
/*
*/
) = 1 to 2
val (
a, b, c,
d, f, // awd
) = 1 to 2
}
idea/testData/formatter/trailingComma/destructionDeclaration/MultiVariableDeclaration.kt
Vendored
+90
View File
@@ -0,0 +1,90 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
fun test() {
val (a, b) = 1 to 2
val (a, b) = 1 to
2
val (a, b) = 1
to
2
val (a, b,) = 1 to 2
val (a,) =
b
val (a,) = b
val (a, b
) = 1 to 2
val (a,
b) = 1 to 2
val (
a, b
) = 1 to 2
val (
a, b,
) = 1 to 2
val (a, b, c,
d, f
) = 1 to 2
val (a, b, c,
d, f,
) = 1 to 2
val (a, b/**/) = 1 to 2
val (a, /**/b/**/) /**/=/**/ 1 to
2
val (a,/**/ b) = 1
to
2
val (a, b/**/,) = 1 to 2
val (a/**/, b/**/,/**/) = 1 to 2
val (a/**/,/**/) =
b
val (a,) = b
val (a, b/**/
) = 1 to 2
val (a, b// awd
) = 1 to 2
val (a,/**/ b /**/ // awd
) = 1 to 2
val (a, // ad
/**/b) = 1 to 2
val (
a, b // fe
/**/)/**/ = 1 to 2
val (
a, b, // awd
) = 1 to 2
val (a, b, c,
d, f // awd
/*
*/) = 1 to 2
val (a, b, c,
d, f // awd
,
) = 1 to 2
}