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

Formatter: support trailing comma in value parameters

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2019-12-18 21:01:08 +07:00
parent 463728a96a
commit 13ae4a28a8
51 changed files with 1644 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/formatter/parameterList/DefaultParameterValues.after.inv.kt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
fun foo(
x: Int =
42
42,
) {
}
class C(
val x: Int =
42
42,
)
// SET_TRUE: CONTINUATION_INDENT_FOR_EXPRESSION_BODIES
idea/testData/formatter/parameterList/DefaultParameterValues.after.kt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
fun foo(
x: Int =
42
42,
) {
}
class C(
val x: Int =
42
42,
)
// SET_TRUE: CONTINUATION_INDENT_FOR_EXPRESSION_BODIES
idea/testData/formatter/parameterList/ParameterListChopAsNeeded.after.kt
Vendored
+20 -10
View File
@@ -15,7 +15,8 @@ fun test(foo: Int, bar: Int)
fun testtesttesttest(foofoo: Int,
barbar: Int,
foobar: Int,
barfoo: Int)
barfoo: Int,
)
fun test() {
for (foo: Int in bar) {
@@ -41,20 +42,24 @@ class SN
class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
constructor(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
}
}
class B(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass) {
c: LongLongLongLongNameCLass,
) {
constructor(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass) {
c: LongLongLongLongNameCLass,
) {
}
}
@@ -66,7 +71,8 @@ class C(sn1: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName) {
sn9: ShorName,
) {
constructor(sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
@@ -75,7 +81,8 @@ class C(sn1: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName) {
sn9: ShorName,
) {
}
}
@@ -92,7 +99,8 @@ class D(sn1: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN) {
sn14: SN,
) {
constructor(sn1: SN,
sn2: SN,
sn3: SN,
@@ -106,13 +114,15 @@ class D(sn1: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN) {
sn14: SN,
) {
}
}
class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
constructor(
longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
) {
}
}
idea/testData/formatter/parameterList/ParameterListWrapAlways.after.kt
Vendored
+30 -15
View File
@@ -11,22 +11,26 @@ fun testtest(foofoo: Int)
fun testtesttesttest(foofoo: Int)
fun test(foo: Int,
bar: Int)
bar: Int,
)
fun testtesttesttest(foofoo: Int,
barbar: Int,
foobar: Int,
barfoo: Int)
barfoo: Int,
)
fun testtesttesttest(foofoo: Int,
@Some barbar: Int,
foobar: Int,
barfoo: Int)
barfoo: Int,
)
fun testtesttesttest(@Some foofoo: Int,
@Some barbar: Int,
@Some foobar: Int,
barfoo: Int)
barfoo: Int,
)
fun test() {
for (foo: Int in bar) {
@@ -52,19 +56,23 @@ class SN
class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
}
}
class B(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass) {
c: LongLongLongLongNameCLass,
) {
constructor(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass) {
c: LongLongLongLongNameCLass,
) {
}
}
@@ -76,7 +84,8 @@ class C(sn1: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName) {
sn9: ShorName,
) {
constructor(sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
@@ -85,7 +94,8 @@ class C(sn1: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName) {
sn9: ShorName,
) {
}
}
@@ -102,7 +112,8 @@ class D(sn1: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN) {
sn14: SN,
) {
constructor(sn1: SN,
sn2: SN,
sn3: SN,
@@ -116,7 +127,8 @@ class D(sn1: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN) {
sn14: SN,
) {
}
}
@@ -136,7 +148,8 @@ class G(sn1: ShorName) {
}
class H(sn1: SN,
sn2: SN) {
sn2: SN,
) {
constructor(sn1: SN) {
}
}
@@ -154,7 +167,8 @@ class I(sn1: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN) {
sn14: SN,
) {
constructor(sn1: SN,
sn2: SN,
sn3: SN,
@@ -168,6 +182,7 @@ class I(sn1: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN) {
sn14: SN,
) {
}
}
idea/testData/formatter/parameterList/ParameterListWrapAsNeeded.after.kt
Vendored
+26 -13
View File
@@ -9,7 +9,8 @@ fun testtesttesttesttesttesttesttesttest()
fun testtest(foofoo: Int)
fun testtesttesttest(
foofoo: Int)
foofoo: Int,
)
fun test(foo: Int, bar: Int)
@@ -17,7 +18,8 @@ fun testtesttesttest(
foofoo: Int,
barbar: Int,
foobar: Int,
barfoo: Int)
barfoo: Int,
)
fun test() {
for (foo: Int in bar) {
@@ -43,21 +45,25 @@ class SN
class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
constructor(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
}
}
class B(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass) {
c: LongLongLongLongNameCLass,
) {
constructor(
a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass) {
c: LongLongLongLongNameCLass,
) {
}
}
@@ -69,7 +75,8 @@ class C(sn1: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName) {
sn9: ShorName,
) {
constructor(sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
@@ -78,7 +85,8 @@ class C(sn1: ShorName,
sn6: ShorName,
sn6: ShorName,
sn8: ShorName,
sn9: ShorName) {
sn9: ShorName,
) {
}
}
@@ -88,7 +96,8 @@ class D(sn1: SN, sn2: SN,
sn6: SN, sn8: SN,
sn9: SN, sn10: SN,
sn11: SN, sn12: SN,
sn13: SN, sn14: SN) {
sn13: SN, sn14: SN,
) {
constructor(sn1: SN,
sn2: SN,
sn3: SN,
@@ -102,25 +111,29 @@ class D(sn1: SN, sn2: SN,
sn11: SN,
sn12: SN,
sn13: SN,
sn14: SN) {
sn14: SN,
) {
}
}
class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
constructor(
longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
) {
}
}
class F(a: LongLongLongLongNameCLass) {
constructor(
a: LongLongLongLongNameCLass) {
a: LongLongLongLongNameCLass,
) {
}
}
class G(sn1: ShorName) {
constructor(
sn1: ShorName) {
sn1: ShorName,
) {
}
}