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

Formatter: support trailing comma in value arguments

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2019-12-25 18:31:30 +07:00
parent 13ae4a28a8
commit c195cd46f2
70 changed files with 9829 additions and 1575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/formatter/parameterList/ArgumentListChopAsNeeded.after.kt
Vendored
+8 -5
View File
@@ -10,12 +10,15 @@ fun foo() {
testtest(foofoo)
testtesttesttest(
foofoofoofoofoofoofoofoofoofoofoofoo)
foofoofoofoofoofoofoofoofoofoofoofoo,
)
testtest(foobar, barfoo)
testtesttesttest(foofoo,
barbar,
foobar,
barfoo)
testtesttesttest(
foofoo,
barbar,
foobar,
barfoo,
)
}
idea/testData/formatter/parameterList/ArgumentListWrapAlways.after.kt
Vendored
+10 -6
View File
@@ -11,11 +11,15 @@ fun foo() {
testtesttesttest(foofoofoofoofoofoofoofoofoofoofoofoo)
testtest(foobar,
barfoo)
testtest(
foobar,
barfoo,
)
testtesttesttest(foofoo,
barbar,
foobar,
barfoo)
testtesttesttest(
foofoo,
barbar,
foobar,
barfoo,
)
}
idea/testData/formatter/parameterList/ArgumentListWrapAsNeeded.after.kt
Vendored
+8 -5
View File
@@ -10,12 +10,15 @@ fun foo() {
testtest(foofoo)
testtesttesttest(
foofoofoofoofoofoofoofoofoofoofoofoo)
foofoofoofoofoofoofoofoofoofoofoofoo,
)
testtest(foobar, barfoo)
testtesttesttest(foofoo,
barbar,
foobar,
barfoo)
testtesttesttest(
foofoo,
barbar,
foobar,
barfoo,
)
}
idea/testData/formatter/parameterList/ArgumentListWrapLParen.after.kt
Vendored
+6 -4
View File
@@ -4,8 +4,10 @@
fun foo() {
foo(bar, baz)
foo(object : Quux {
override fun foo() {
}
})
foo(
object : Quux {
override fun foo() {
}
},
)
}
idea/testData/formatter/parameterList/KT19727.after.kt
Vendored
+20 -11
View File
@@ -5,19 +5,28 @@ fun useCallable(tag: String, callable: Callable<*>) {
fun main(args: Array<String>) {
useCallable("A", Callable { println("Hello world") })
useCallable("B", Callable {
println("Hello world")
})
useCallable(
"B",
Callable {
println("Hello world")
},
)
useCallable("C", object : Callable<Unit> {
override fun call() {
println("Hello world")
}
})
useCallable(
"C",
object : Callable<Unit> {
override fun call() {
println("Hello world")
}
},
)
useCallable("B", fun() {
println("Hello world")
})
useCallable(
"B",
fun() {
println("Hello world")
},
)
}
// SET_TRUE: CALL_PARAMETERS_LPAREN_ON_NEXT_LINE
idea/testData/formatter/parameterList/ParameterListChopAsNeeded.after.kt
Vendored
+42 -34
View File
@@ -12,10 +12,11 @@ fun testtesttesttest(foofoo: Int)
fun test(foo: Int, bar: Int)
fun testtesttesttest(foofoo: Int,
barbar: Int,
foobar: Int,
barfoo: Int,
fun testtesttesttest(
foofoo: Int,
barbar: Int,
foobar: Int,
barfoo: Int,
)
fun test() {
@@ -40,7 +41,8 @@ class LongLongLongLongNameCLass
class ShorName
class SN
class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
class A(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
@@ -52,18 +54,21 @@ class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
}
}
class B(a: LongLongLongLongNameCLass,
class B(
a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
) {
constructor(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
constructor(
a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
) {
}
}
class C(sn1: ShorName,
class C(
sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
@@ -73,20 +78,22 @@ class C(sn1: ShorName,
sn8: ShorName,
sn9: ShorName,
) {
constructor(sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
sn5: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName,
constructor(
sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
sn5: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName,
) {
}
}
class D(sn1: SN,
class D(
sn1: SN,
sn2: SN,
sn3: SN,
sn4: SN,
@@ -101,20 +108,21 @@ class D(sn1: SN,
sn13: SN,
sn14: SN,
) {
constructor(sn1: SN,
sn2: SN,
sn3: SN,
sn4: SN,
sn5: SN,
sn6: SN,
sn6: SN,
sn8: SN,
sn9: SN,
sn10: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN,
constructor(
sn1: SN,
sn2: SN,
sn3: SN,
sn4: SN,
sn5: SN,
sn6: SN,
sn6: SN,
sn8: SN,
sn9: SN,
sn10: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN,
) {
}
}
idea/testData/formatter/parameterList/ParameterListWrapAlways.after.kt
Vendored
+78 -63
View File
@@ -10,26 +10,30 @@ fun testtest(foofoo: Int)
fun testtesttesttest(foofoo: Int)
fun test(foo: Int,
bar: Int,
fun test(
foo: Int,
bar: Int,
)
fun testtesttesttest(foofoo: Int,
barbar: Int,
foobar: Int,
barfoo: Int,
fun testtesttesttest(
foofoo: Int,
barbar: Int,
foobar: Int,
barfoo: Int,
)
fun testtesttesttest(foofoo: Int,
@Some barbar: Int,
foobar: Int,
barfoo: Int,
fun testtesttesttest(
foofoo: Int,
@Some barbar: Int,
foobar: Int,
barfoo: Int,
)
fun testtesttesttest(@Some foofoo: Int,
@Some barbar: Int,
@Some foobar: Int,
barfoo: Int,
fun testtesttesttest(
@Some foofoo: Int,
@Some barbar: Int,
@Some foobar: Int,
barfoo: Int,
)
fun test() {
@@ -54,29 +58,34 @@ class LongLongLongLongNameCLass
class ShorName
class SN
class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
class A(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
constructor(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
}
}
class B(a: LongLongLongLongNameCLass,
class B(
a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
) {
constructor(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
constructor(
a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
) {
}
}
class C(sn1: ShorName,
class C(
sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
@@ -86,20 +95,22 @@ class C(sn1: ShorName,
sn8: ShorName,
sn9: ShorName,
) {
constructor(sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
sn5: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName,
constructor(
sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
sn5: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName,
) {
}
}
class D(sn1: SN,
class D(
sn1: SN,
sn2: SN,
sn3: SN,
sn4: SN,
@@ -114,20 +125,21 @@ class D(sn1: SN,
sn13: SN,
sn14: SN,
) {
constructor(sn1: SN,
sn2: SN,
sn3: SN,
sn4: SN,
sn5: SN,
sn6: SN,
sn6: SN,
sn8: SN,
sn9: SN,
sn10: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN,
constructor(
sn1: SN,
sn2: SN,
sn3: SN,
sn4: SN,
sn5: SN,
sn6: SN,
sn6: SN,
sn8: SN,
sn9: SN,
sn10: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN,
) {
}
}
@@ -147,14 +159,16 @@ class G(sn1: ShorName) {
}
}
class H(sn1: SN,
class H(
sn1: SN,
sn2: SN,
) {
constructor(sn1: SN) {
}
}
class I(sn1: SN,
class I(
sn1: SN,
@field:Some val sn2: SN,
sn3: SN,
sn4: SN,
@@ -169,20 +183,21 @@ class I(sn1: SN,
sn13: SN,
sn14: SN,
) {
constructor(sn1: SN,
sn2: SN,
sn3: SN,
@Some sn4: SN,
sn5: SN,
sn6: SN,
sn6: SN,
sn8: SN,
sn9: SN,
sn10: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN,
constructor(
sn1: SN,
sn2: SN,
sn3: SN,
@Some sn4: SN,
sn5: SN,
sn6: SN,
sn6: SN,
sn8: SN,
sn9: SN,
sn10: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN,
) {
}
}
idea/testData/formatter/parameterList/ParameterListWrapAsNeeded.after.kt
Vendored
+33 -27
View File
@@ -43,7 +43,8 @@ class LongLongLongLongNameCLass
class ShorName
class SN
class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
class A(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
@@ -55,7 +56,8 @@ class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
}
}
class B(a: LongLongLongLongNameCLass,
class B(
a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
) {
@@ -67,7 +69,8 @@ class B(a: LongLongLongLongNameCLass,
}
}
class C(sn1: ShorName,
class C(
sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
@@ -77,20 +80,22 @@ class C(sn1: ShorName,
sn8: ShorName,
sn9: ShorName,
) {
constructor(sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
sn5: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName,
constructor(
sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
sn5: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName,
) {
}
}
class D(sn1: SN, sn2: SN,
class D(
sn1: SN, sn2: SN,
sn3: SN, sn4: SN,
sn5: SN, sn6: SN,
sn6: SN, sn8: SN,
@@ -98,20 +103,21 @@ class D(sn1: SN, sn2: SN,
sn11: SN, sn12: SN,
sn13: SN, sn14: SN,
) {
constructor(sn1: SN,
sn2: SN,
sn3: SN,
sn4: SN,
sn5: SN,
sn6: SN,
sn6: SN,
sn8: SN,
sn9: SN,
sn10: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN,
constructor(
sn1: SN,
sn2: SN,
sn3: SN,
sn4: SN,
sn5: SN,
sn6: SN,
sn6: SN,
sn8: SN,
sn9: SN,
sn10: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN,
) {
}
}