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

Formatter: support trailing comma in collection literal expression

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2019-12-26 20:21:02 +07:00
parent bf92517500
commit 07bda5a759
7 changed files with 490 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/formatter/ArrayLiteral.after.kt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@
modules = [
AppModule::class,
DataModule::class,
DomainModule::class
DomainModule::class,
],
)
idea/testData/formatter/trailingComma/collectionLiteralExpression/CollectionLiteralInAnnotation.after.inv.kt
Vendored
+131
View File
@@ -0,0 +1,131 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
@Anno([1])
fun a() = Unit
@Anno([
1,
])
fun a() = Unit
@Anno([1
])
fun a() = Unit
@Anno([
1,
])
fun a() = Unit
@Anno([
1])
fun a() = Unit
@Anno([1, 2])
fun a() = Unit
@Anno([
1, 2,
])
fun a() = Unit
@Anno([1, 2
])
fun a() = Unit
@Anno([
1, 2,
])
fun a() = Unit
@Anno([
1, 2])
fun a() = Unit
@Anno([1, 2, 2])
fun a() = Unit
@Anno([
1, 2, 2,
])
fun a() = Unit
@Anno(["1"
])
fun a() = Unit
@Anno([
1,
])
fun a() = Unit
@Anno([
1, 2, 2])
fun a() = Unit
@Anno([1/*
*/])
fun a() = Unit
@Anno([
1, //dw
])
fun a() = Unit
@Anno([1 // ds
])
fun a() = Unit
@Anno([
/*
*/
// d
1,/*
*//*
*/
])
fun a() = Unit
@Anno([
/*
*/ 1])
fun a() = Unit
@Anno([1/*
*/, 2])
fun a() = Unit
@Anno([
1,
2/*
*/,/*
*/
])
fun a() = Unit
@Anno([/*
*/1, 2
])
fun a() = Unit
@Anno(["1"
])
fun a() = Unit
@Anno([
1,
])
fun a() = Unit
@Anno([
1, 2 /*
*/])
fun a() = Unit
@Component(
modules = [
AppModule::class, DataModule::class,
DomainModule::class
],
)
fun b() = Unit
idea/testData/formatter/trailingComma/collectionLiteralExpression/CollectionLiteralInAnnotation.after.kt
Vendored
+196
View File
@@ -0,0 +1,196 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
@Anno([1])
fun a() = Unit
@Anno(
[
1,
],
)
fun a() = Unit
@Anno(
[
1,
],
)
fun a() = Unit
@Anno(
[
1,
],
)
fun a() = Unit
@Anno(
[
1,
],
)
fun a() = Unit
@Anno([1, 2])
fun a() = Unit
@Anno(
[
1, 2,
],
)
fun a() = Unit
@Anno(
[
1, 2,
],
)
fun a() = Unit
@Anno(
[
1, 2,
],
)
fun a() = Unit
@Anno(
[
1, 2,
],
)
fun a() = Unit
@Anno([1, 2, 2])
fun a() = Unit
@Anno(
[
1, 2, 2,
],
)
fun a() = Unit
@Anno(
[
"1",
],
)
fun a() = Unit
@Anno(
[
1,
],
)
fun a() = Unit
@Anno(
[
1, 2, 2,
],
)
fun a() = Unit
@Anno(
[
1,/*
*/
],
)
fun a() = Unit
@Anno(
[
1, //dw
],
)
fun a() = Unit
@Anno(
[
1, // ds
],
)
fun a() = Unit
@Anno(
[
/*
*/
// d
1,/*
*//*
*/
],
)
fun a() = Unit
@Anno(
[
/*
*/
1,
],
)
fun a() = Unit
@Anno(
[
1,/*
*/
2,
],
)
fun a() = Unit
@Anno(
[
1,
2/*
*/,/*
*/
],
)
fun a() = Unit
@Anno(
[
/*
*/
1, 2,
],
)
fun a() = Unit
@Anno(
[
"1",
],
)
fun a() = Unit
@Anno(
[
1,
],
)
fun a() = Unit
@Anno(
[
1,
2, /*
*/
],
)
fun a() = Unit
@Component(
modules = [
AppModule::class, DataModule::class,
DomainModule::class,
],
)
fun b() = Unit
idea/testData/formatter/trailingComma/collectionLiteralExpression/CollectionLiteralInAnnotation.kt
Vendored
+114
View File
@@ -0,0 +1,114 @@
// SET_TRUE: ALLOW_TRAILING_COMMA
@Anno([1])
fun a() = Unit
@Anno([1,])
fun a() = Unit
@Anno([1
])
fun a() = Unit
@Anno([
1, ])
fun a() = Unit
@Anno([
1 ])
fun a() = Unit
@Anno([1,2])
fun a() = Unit
@Anno([1, 2,])
fun a() = Unit
@Anno([1, 2
])
fun a() = Unit
@Anno([
1, 2, ])
fun a() = Unit
@Anno([
1, 2 ])
fun a() = Unit
@Anno([1, 2, 2])
fun a() = Unit
@Anno([1, 2, 2,])
fun a() = Unit
@Anno(["1"
])
fun a() = Unit
@Anno([
1, ])
fun a() = Unit
@Anno([
1 , 2 , 2 ])
fun a() = Unit
@Anno([1/*
*/])
fun a() = Unit
@Anno([1, //dw
])
fun a() = Unit
@Anno([1 // ds
])
fun a() = Unit
@Anno([/*
*/ // d
1/*
*/,/*
*/ ])
fun a() = Unit
@Anno([
/*
*/ 1 ])
fun a() = Unit
@Anno([1/*
*/,2])
fun a() = Unit
@Anno([1, 2/*
*/,/*
*/])
fun a() = Unit
@Anno([/*
*/1, 2
])
fun a() = Unit
@Anno(["1"
])
fun a() = Unit
@Anno([
1, ])
fun a() = Unit
@Anno([
1 , 2 /*
*/ ])
fun a() = Unit
@Component(
modules = [
AppModule::class, DataModule::class,
DomainModule::class
],
)
fun b() = Unit