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/refactoring/changeSignature/AddParameterKeepFormatAfter.kt
Vendored
+4 -8
View File
@@ -3,19 +3,15 @@ fun <caret>foo(a: Int, b: Int, d: Int, c: Int, e: Int) {
}
fun test() {
foo(
1,
foo(1,
2,
4,
3,
5
)
foo(
1, 2,
5)
foo(1, 2,
4,
3,
5
)
5)
foo(
1,
2,
idea/testData/refactoring/changeSignature/MoveLambdaParameterAfter.kt
Vendored
+3 -7
View File
@@ -3,11 +3,7 @@ fun foo(x: Int, cl: () -> Int, y: Int): Int {
}
fun bar() {
foo(
1,
{
3
},
2
)
foo(1, {
3
}, 2)
}
idea/testData/refactoring/changeSignature/NoDefaultValuesInOverridesAfter.kt
Vendored
+6 -12
View File
@@ -1,24 +1,18 @@
interface T {
fun foo(
a: Int = 1,
b: String = "2"
)
fun foo(a: Int = 1,
b: String = "2")
}
open class A: T {
override fun foo(
a: Int,
b: String
) {
override fun foo(a: Int,
b: String) {
throw UnsupportedOperationException()
}
}
class B: A() {
override fun foo(
a: Int,
b: String
) {
override fun foo(a: Int,
b: String) {
throw UnsupportedOperationException()
}
}
idea/testData/refactoring/changeSignature/RemoveParameterKeepFormat1After.kt
Vendored
+2 -4
View File
@@ -3,10 +3,8 @@ fun <caret>foo(b: Int, c: Int) {
}
fun test() {
foo(
2,
3
)
foo(2,
3)
foo(2, 3)
foo(
2,
idea/testData/refactoring/changeSignature/RemoveParameterKeepFormat2After.kt
Vendored
+2 -4
View File
@@ -3,10 +3,8 @@ fun <caret>foo(a: Int, c: Int) {
}
fun test() {
foo(
1,
3
)
foo(1,
3)
foo(1, 3)
foo(
1,
idea/testData/refactoring/changeSignature/RemoveParameterKeepFormat3After.kt
Vendored
+2 -4
View File
@@ -3,10 +3,8 @@ fun <caret>foo(a: Int, b: Int) {
}
fun test() {
foo(
1,
2
)
foo(1,
2)
foo(1, 2)
foo(
1,
idea/testData/refactoring/changeSignature/SwapParametersKeepFormatAfter.kt
Vendored
+4 -8
View File
@@ -3,15 +3,11 @@ fun <caret>foo(c: Int, b: Int, a: Int) {
}
fun test() {
foo(
3,
foo(3,
2,
1
)
foo(
3, 2,
1
)
1)
foo(3, 2,
1)
foo(
3,
2,
idea/testData/refactoring/inline/function/returnAtEnd/DefaultParameter.kt.after
Vendored
+1 -2
View File
@@ -3,6 +3,5 @@ fun callInDefault(simple: List<String> = provideSimple(), complex: List<String>
val result = mutableListOf("statement 1")
result.add("statement 2")
result
}
) {
}) {
}
idea/testData/refactoring/inline/function/returnAtEnd/ReturnFromLambda.kt.after
Vendored
+5 -7
View File
@@ -1,8 +1,6 @@
fun g() {
println(
listOf("a", "b").any {
if (it.isEmpty()) return@any false
it.length < 10
}
)
}
println(listOf("a", "b").any {
if (it.isEmpty()) return@any false
it.length < 10
})
}
idea/testData/refactoring/introduceLambdaParameter/multiline/multilineBinaryExpression.kt.after
Vendored
+4 -6
View File
@@ -1,10 +1,8 @@
fun foo(i: Int) { }
fun test(
i: () -> Int = {
(1
+ 2)
}
) {
fun test(i: () -> Int = {
(1
+ 2)
}) {
foo(i())
}
idea/testData/refactoring/introduceLambdaParameter/multiline/multilineBinaryExpressionWithComments.kt.after
Vendored
+4 -6
View File
@@ -1,10 +1,8 @@
fun foo(i: Int) { }
fun test(
i: () -> Int = {
(1 // abc
/*def*/ + 2)
}
) {
fun test(i: () -> Int = {
(1 // abc
/*def*/ + 2)
}) {
foo(i())
}
idea/testData/refactoring/introduceLambdaParameter/multiline/multilineNestedBinaryExpression1.kt.after
Vendored
+4 -6
View File
@@ -1,10 +1,8 @@
fun foo(i: Int) { }
fun test(
i: () -> Int = {
(1
+ 2 - 3)
}
) {
fun test(i: () -> Int = {
(1
+ 2 - 3)
}) {
foo(i())
}
idea/testData/refactoring/introduceLambdaParameter/multiline/multilineNestedBinaryExpression2.kt.after
Vendored
+4 -6
View File
@@ -1,10 +1,8 @@
fun foo(i: Int) { }
fun test(
i: () -> Int = {
(1 + 2
- 3)
}
) {
fun test(i: () -> Int = {
(1 + 2
- 3)
}) {
foo(i())
}
idea/testData/refactoring/introduceLambdaParameter/stringTemplates/rawTemplateWithSubstring.kt.after
Vendored
+3 -6
View File
@@ -1,10 +1,7 @@
fun foo(
a: Int,
s: (Int) -> String = { a ->
"""c$a
fun foo(a: Int, s: (Int) -> String = { a ->
"""c$a
:${a + 1}d"""
}
): String {
}): String {
val x = """_${s(a)}_"""
val y = "_$a:${a + 1}d_"
val z = """_c$a:${a + 1}d_"""
idea/testData/refactoring/introduceParameter/multiline/multilineBinaryExpression.kt.after
Vendored
+2 -4
View File
@@ -1,8 +1,6 @@
fun foo(i: Int) { }
fun test(
i: Int = (1
+ 2)
) {
fun test(i: Int = (1
+ 2)) {
foo(i)
}
idea/testData/refactoring/introduceParameter/multiline/multilineBinaryExpressionWithComments.kt.after
Vendored
+2 -4
View File
@@ -1,8 +1,6 @@
fun foo(i: Int) { }
fun test(
i: Int = (1 // abc
/*def*/ + 2)
) {
fun test(i: Int = (1 // abc
/*def*/ + 2)) {
foo(i)
}
idea/testData/refactoring/introduceParameter/multiline/multilineNestedBinaryExpression1.kt.after
Vendored
+2 -4
View File
@@ -1,8 +1,6 @@
fun foo(i: Int) { }
fun test(
i: Int = (1
+ 2 - 3)
) {
fun test(i: Int = (1
+ 2 - 3)) {
foo(i)
}
idea/testData/refactoring/introduceParameter/multiline/multilineNestedBinaryExpression2.kt.after
Vendored
+2 -4
View File
@@ -1,8 +1,6 @@
fun foo(i: Int) { }
fun test(
i: Int = (1 + 2
- 3)
) {
fun test(i: Int = (1 + 2
- 3)) {
foo(i)
}
idea/testData/refactoring/introduceParameter/stringTemplates/rawTemplateWithSubstring.kt.after
Vendored
+2 -5
View File
@@ -1,8 +1,5 @@
fun foo(
a: Int,
s: String = """c$a
:${a + 1}d"""
): String {
fun foo(a: Int, s: String = """c$a
:${a + 1}d"""): String {
val x = """_${s}_"""
val y = "_$a:${a + 1}d_"
val z = """_c$a:${a + 1}d_"""
idea/testData/refactoring/rename/inplace/InvokeToGetWithQualifiedExpr.kt.after
Vendored
+2 -4
View File
@@ -10,10 +10,8 @@ fun boo(s: Second, body: () -> Unit) { }
fun foo(s: Second) {
boo(s) {
s.testInvoke[
{
s.testInvoke[{
"Hello"
}
]
}]
}
}
idea/testData/refactoring/rename/inplace/InvokeToGetWithSafeQualifiedExpr.kt.after
Vendored
+2 -4
View File
@@ -10,10 +10,8 @@ fun boo(s: Second?, body: () -> Unit) { }
fun foo(s: Second?) {
boo(s) {
s?.testInvoke[
{
s?.testInvoke[{
"Hello"
}
]
}]
}
}