Fix tests after disabling trailing comma

#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
@@ -1,10 +1,8 @@
// WITH_RUNTIME
fun main(args: Array<String>) {
val doSomething = doSomething(
"one" + 1,
val doSomething = doSomething("one" + 1,
"two",
3 * 4
)
3 * 4)
val t = if (doSomething != null) doSomething else throw NullPointerException("Expression 'doSomething(\"one\" + 1, ...' must not be null")
}
@@ -5,7 +5,6 @@ class WithComments/* Some parameter */
/**
* A very important property
*/
val veryImportant: Any
) {
val veryImportant: Any) {
}
@@ -2,9 +2,7 @@ annotation class AnnParam
annotation class AnnProperty
abstract class WithComposedModifiers(
@AnnParam vararg @AnnProperty
open val x: String
) {
abstract class WithComposedModifiers(@AnnParam vararg @AnnProperty
open val x: String) {
}
@@ -1,9 +1,7 @@
fun foo(f: (Int) -> String) {}
fun test() {
foo(
fun(it: Int): String {
return ""
}
)
foo(fun(it: Int): String {
return ""
})
}
@@ -1,9 +1,7 @@
fun bar(f: (Int, Int) -> String) {}
fun test() {
bar(
fun(i: Int, j: Int): String {
return "$i$j"
}
)
bar(fun(i: Int, j: Int): String {
return "$i$j"
})
}
@@ -2,9 +2,7 @@ class Foo
fun bar(f: Foo.() -> Unit) {}
fun main(args: Array<String>) {
bar(
fun Foo.() {
bar(fun Foo.() {
}
)
})
}
@@ -2,9 +2,7 @@ class Foo
fun baz(f: Foo.(i: Int, j: Int) -> Int) {}
fun main(args: Array<String>) {
baz(
fun Foo.(i: Int, j: Int): Int {
return i + j
}
)
baz(fun Foo.(i: Int, j: Int): Int {
return i + j
})
}
@@ -6,9 +6,7 @@ import java.util.*
fun foo(f: () -> ArrayDeque<*>) {}
fun test() {
foo(
fun(): ArrayDeque<Int> {
return ArrayDeque<Int>()
}
)
foo(fun(): ArrayDeque<Int> {
return ArrayDeque<Int>()
})
}
@@ -6,9 +6,7 @@ import java.util.*
fun foo(f: () -> ArrayDeque<*>) {}
fun test() {
foo(
fun(): ArrayDeque<*> {
return ArrayDeque<Int>()
}
)
foo(fun(): ArrayDeque<*> {
return ArrayDeque<Int>()
})
}
@@ -1,11 +1,9 @@
fun foo(f: (Int) -> String) {}
fun test() {
foo(
fun(it: Int): String {
// comment1
return ""
// comment2
}
)
foo(fun(it: Int): String {
// comment1
return ""
// comment2
})
}
@@ -1,9 +1,7 @@
fun foo(f: (Int) -> String) {}
fun test() {
foo(
fun(it: Int): String {
return "$it"
}
)
foo(fun(it: Int): String {
return "$it"
})
}
@@ -1,12 +1,10 @@
fun foo(f: (Int) -> String) {}
fun test() {
foo(
fun(it: Int): String {
if (it == 1) {
return "1"
}
return "$it"
}
)
foo(fun(it: Int): String {
if (it == 1) {
return "1"
}
return "$it"
})
}
@@ -1,15 +1,13 @@
fun foo(f: (Int) -> String) {}
fun test() {
foo(
fun(it: Int): String {
if (it == 1) {
return "1"
} else if (it == 2) {
return "2"
} else {
return "$it"
}
}
)
foo(fun(it: Int): String {
if (it == 1) {
return "1"
} else if (it == 2) {
return "2"
} else {
return "$it"
}
})
}
@@ -2,12 +2,10 @@
fun foo(f: (Int) -> String) {}
fun test() {
foo(
fun(it: Int): String {
listOf(1).map {
return@map 2
}
return "$it"
}
)
foo(fun(it: Int): String {
listOf(1).map {
return@map 2
}
return "$it"
})
}
@@ -1,10 +1,8 @@
fun foo(f: (Int) -> String) {}
fun test() {
foo(
fun(it: Int): String {
val b = it == 1
return if (b) "1" else "2"
}
)
foo(fun(it: Int): String {
val b = it == 1
return if (b) "1" else "2"
})
}
@@ -1,9 +1,7 @@
fun foo(f: (Int) -> String) {}
fun test() {
foo(
fun(it: Int): String {
return "$it"
}
)
foo(fun(it: Int): String {
return "$it"
})
}
@@ -1,7 +1,5 @@
fun main() {
Test().foo(
fun(it: Int) {
Test().foo(fun(it: Int) {
}
)
})
}
@@ -3,6 +3,5 @@ fun baz(name: String, f: (Int) -> String) {}
fun test() {
baz(name = "", f = fun(it: Int): String {
return "$it"
}
)
})
}
@@ -1,9 +1,7 @@
fun foo(f: () -> String) {}
fun test() {
foo(
fun(): String {
return ""
}
)
foo(fun(): String {
return ""
})
}
@@ -3,10 +3,8 @@ fun unit(f: (Int) -> Unit) {}
fun foo(i: Int) {}
fun test() {
unit(
fun(it: Int) {
foo(it)
foo(it)
}
)
unit(fun(it: Int) {
foo(it)
foo(it)
})
}
@@ -7,9 +7,7 @@ data class My(val x: Int)
fun foo(f: () -> My) {}
fun test() {
foo(
fun(): My {
return My(42)
}
)
foo(fun(): My {
return My(42)
})
}
@@ -1,10 +1,8 @@
// IS_APPLICABLE: true
fun foo() {
bar(2,
{
it * 3
}
)
bar(2, {
it * 3
})
}
fun bar(a: Int, b: (Int) -> Int) {
@@ -1,10 +1,8 @@
// IS_APPLICABLE: true
fun foo() {
bar(
b = {
it * 3
}
)
bar(b = {
it * 3
})
}
fun bar(a : Int = 2, b: (Int) -> Int) {
@@ -1,10 +1,8 @@
// IS_APPLICABLE: true
fun foo() {
bar(1,
b = {
it * 3
}
)
bar(1, b = {
it * 3
})
}
fun bar(c: Int, a: Int = 2, b: (Int) -> Int) {
@@ -1,11 +1,9 @@
// IS_APPLICABLE: true
fun foo() {
bar(2,
{
val x = 3
it * x
}
)
bar(2, {
val x = 3
it * x
})
}
fun bar(a: Int, b: (Int) -> Int) {
@@ -1,11 +1,9 @@
// IS_APPLICABLE: true
fun foo() {
bar(a = 2,
b = {
val x = 3
it * x
}
)
bar(a = 2, b = {
val x = 3
it * x
})
}
fun bar(a: Int, b: (Int) -> Int) {
@@ -3,13 +3,11 @@
fun foo(runnable: Runnable) {}
fun bar(list: List<String>) {
foo(
Runnable {
list.filter(fun (element: String): Boolean {
if (element == "a") return false
if (element == "b") return@Runnable
return true
})
}
)
foo(Runnable {
list.filter(fun (element: String): Boolean {
if (element == "a") return false
if (element == "b") return@Runnable
return true
})
})
}
@@ -3,11 +3,9 @@
fun foo(runnable: Runnable) {}
fun bar(p: Int) {
foo(
Runnable {
if (p < 0) return@Runnable
println("a")
println("b")
}
)
foo(Runnable {
if (p < 0) return@Runnable
println("a")
println("b")
})
}
@@ -5,10 +5,8 @@ import java.io.FilenameFilter
fun foo(filter: FilenameFilter) {}
fun bar() {
foo(
FilenameFilter { file, name ->
if (file.isDirectory) return@FilenameFilter true
name == "x"
}
)
foo(FilenameFilter { file, name ->
if (file.isDirectory) return@FilenameFilter true
name == "x"
})
}
@@ -5,20 +5,18 @@ import java.io.FileFilter
fun foo(filter: FileFilter) {}
fun bar() {
foo(
FileFilter { file ->
val name = file.name
if (name.startsWith("a")) {
false
}
else {
if (name.endsWith("b"))
true
else {
val l = name.length
l > 10
}
}
foo(FileFilter { file ->
val name = file.name
if (name.startsWith("a")) {
false
}
else {
if (name.endsWith("b"))
true
else {
val l = name.length
l > 10
}
)
}
})
}
@@ -5,19 +5,17 @@ import java.io.FileFilter
fun foo(filter: FileFilter) {}
fun bar() {
foo(
FileFilter { file ->
val name = file.name
when (name) {
"foo" -> true
foo(FileFilter { file ->
val name = file.name
when (name) {
"foo" -> true
"bar" -> false
"bar" -> false
else -> {
if (name.startsWith("a")) return@FileFilter true
false
}
}
else -> {
if (name.startsWith("a")) return@FileFilter true
false
}
)
}
})
}
@@ -3,10 +3,8 @@
import javax.swing.SwingUtilities
fun bar(p: Int) {
SwingUtilities.invokeLater(
Runnable {
if (p < 0) return@Runnable
throw UnsupportedOperationException()
}
)
SwingUtilities.invokeLater(Runnable {
if (p < 0) return@Runnable
throw UnsupportedOperationException()
})
}
@@ -5,10 +5,8 @@ import java.io.FileFilter
fun foo(filter: FileFilter) {}
fun bar() {
foo(
FileFilter { file ->
val name = file.name
name.startsWith("a")
}
)
foo(FileFilter { file ->
val name = file.name
name.startsWith("a")
})
}
@@ -4,9 +4,7 @@ interface C {
class D(val c: C) {
fun foo() {
this.c/* and this is c */.set(
"a", // it's "a"
"b" /* and this is "b" */, /* we use 10 */10
)
this.c/* and this is c */.set("a", // it's "a"
"b" /* and this is "b" */, /* we use 10 */10)
}
}
@@ -1,9 +1,7 @@
fun main() {
J().foo(
object : J.Sam {
override fun bar() {
J().foo(object : J.Sam {
override fun bar() {
}
}
)
}
})
}