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

Fix tests after disabling trailing comma

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2020-01-31 16:18:13 +07:00
parent 3fb34596ae
commit c34b417d0c
146 changed files with 612 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/formatter/parameterList/ArgumentListChopAsNeeded.after.kt
Vendored
+5 -8
View File
@@ -10,15 +10,12 @@ 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
+6 -10
View File
@@ -11,15 +11,11 @@ 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
+5 -8
View File
@@ -10,15 +10,12 @@ 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
+4 -6
View File
@@ -4,10 +4,8 @@
fun foo() {
foo(bar, baz)
foo(
object : Quux {
override fun foo() {
}
},
)
foo(object : Quux {
override fun foo() {
}
})
}
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/KT19727.after.kt
Vendored
+11 -20
View File
@@ -5,28 +5,19 @@ 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
+40 -58
View File
@@ -12,12 +12,10 @@ 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() {
for (foo: Int in bar) {
@@ -41,34 +39,26 @@ class LongLongLongLongNameCLass
class ShorName
class SN
class A(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
constructor(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
}
}
class B(
a: LongLongLongLongNameCLass,
class B(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
) {
constructor(
a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
) {
c: LongLongLongLongNameCLass) {
constructor(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass) {
}
}
class C(
sn1: ShorName,
class C(sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
@@ -76,24 +66,20 @@ class C(
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,
) {
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,
@@ -106,31 +92,27 @@ class D(
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,
) {
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) {
}
}
class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
constructor(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
) {
longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
}
}
idea/testData/formatter/parameterList/ParameterListWrapAlways.after.kt
Vendored
+69 -99
View File
@@ -10,31 +10,23 @@ 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() {
for (foo: Int in bar) {
@@ -58,34 +50,25 @@ 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,
) {
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,
) {
c: LongLongLongLongNameCLass) {
constructor(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass) {
}
}
class C(
sn1: ShorName,
class C(sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
@@ -93,24 +76,20 @@ class C(
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,
) {
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,
@@ -123,24 +102,21 @@ class D(
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,
) {
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) {
}
}
@@ -159,16 +135,13 @@ class G(sn1: ShorName) {
}
}
class H(
sn1: SN,
sn2: 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,
@@ -181,23 +154,20 @@ class I(
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,
) {
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
+38 -57
View File
@@ -9,8 +9,7 @@ fun testtesttesttesttesttesttesttesttest()
fun testtest(foofoo: Int)
fun testtesttesttest(
foofoo: Int,
)
foofoo: Int)
fun test(foo: Int, bar: Int)
@@ -18,8 +17,7 @@ fun testtesttesttest(
foofoo: Int,
barbar: Int,
foobar: Int,
barfoo: Int,
)
barfoo: Int)
fun test() {
for (foo: Int in bar) {
@@ -43,34 +41,27 @@ class LongLongLongLongNameCLass
class ShorName
class SN
class A(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
constructor(
longLongLongLongNameCLass1: LongLongLongLongNameCLass,
longLongLongLongNameCLass2: LongLongLongLongNameCLass,
longLongLongLongNameCLass3: LongLongLongLongNameCLass,
) {
longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
}
}
class B(
a: LongLongLongLongNameCLass,
class B(a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
) {
c: LongLongLongLongNameCLass) {
constructor(
a: LongLongLongLongNameCLass,
b: LongLongLongLongNameCLass,
c: LongLongLongLongNameCLass,
) {
c: LongLongLongLongNameCLass) {
}
}
class C(
sn1: ShorName,
class C(sn1: ShorName,
sn2: ShorName,
sn3: ShorName,
sn4: ShorName,
@@ -78,68 +69,58 @@ class C(
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,
) {
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,
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,
) {
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) {
}
}
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) {
}
}