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

Formatter: support trailing comma in when entry

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2019-12-27 18:04:51 +07:00
parent 4adfaab3ec
commit d013fc2234
9 changed files with 307 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/formatter/WhenEntryExpr.after.kt
Vendored
+3 -3
View File
@@ -39,16 +39,16 @@ fun some(x: Any) {
}
when (x) {
is
Int
Int,
-> {
0
}
3
3,
-> {
2
}
in
0..3
0..3,
-> {
2
}
idea/testData/formatter/trailingComma/whenEntry/WhenEntry.after.inv.kt
Vendored
+67
View File
@@ -0,0 +1,67 @@
fun foo(x: Any) = when (x) {
Comparable::class, Iterable::class, String::class, // trailing comma
-> println(1)
else -> println(3)
}
fun foo(x: Any) {
when (x) {
Comparable::class, Iterable::class, String::class, /*// trailing comma*/
-> println(1)
else -> println(3)
}
when (x) {
Comparable::class, Iterable::class, String::class /*// trailing comma*/ -> println(1)
else -> println(3)
}
when (x) {
1 -> {
}
else -> println(3)
}
when (x) {
1,
-> {
}
else -> println(3)
}
when (x) {
1
-> {
}
else -> println(3)
}
when (x) {
1, 2,
3 /**/ -> {
}
else -> println(3)
}
when (val c = x) {
1, 2,
3 /**/ -> {
}
else -> println(3)
}
when {
x in coll
-> {
}
else -> println(3)
}
}
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/whenEntry/WhenEntry.after.kt
Vendored
+69
View File
@@ -0,0 +1,69 @@
fun foo(x: Any) = when (x) {
Comparable::class, Iterable::class, String::class, // trailing comma
-> println(1)
else -> println(3)
}
fun foo(x: Any) {
when (x) {
Comparable::class, Iterable::class, String::class, /*// trailing comma*/
-> println(1)
else -> println(3)
}
when (x) {
Comparable::class, Iterable::class, String::class /*// trailing comma*/ -> println(1)
else -> println(3)
}
when (x) {
1 -> {
}
else -> println(3)
}
when (x) {
1,
-> {
}
else -> println(3)
}
when (x) {
1,
-> {
}
else -> println(3)
}
when (x) {
1, 2,
3, /**/
-> {
}
else -> println(3)
}
when (val c = x) {
1, 2,
3, /**/
-> {
}
else -> println(3)
}
when {
x in coll,
-> {
}
else -> println(3)
}
}
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/whenEntry/WhenEntry.kt
Vendored
+65
View File
@@ -0,0 +1,65 @@
fun foo(x: Any) = when (x) {
Comparable::class, Iterable::class, String::class, // trailing comma
-> println(1)
else -> println(3)
}
fun foo(x: Any) {
when (x) {
Comparable::class, Iterable::class, String::class, /*// trailing comma*/ -> println(1)
else -> println(3)
}
when (x) {
Comparable::class, Iterable::class, String::class /*// trailing comma*/ -> println(1)
else -> println(3)
}
when (x) {
1 -> {
}
else -> println(3)
}
when (x) {
1, -> {
}
else -> println(3)
}
when (x) {
1
-> {
}
else -> println(3)
}
when (x) {
1, 2,
3 /**/ -> {
}
else -> println(3)
}
when (val c = x) {
1, 2,
3 /**/ -> {
}
else -> println(3)
}
when {
x in coll
-> {
}
else -> println(3)
}
}
// SET_TRUE: ALLOW_TRAILING_COMMA