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
j2k/testData/fileOrElement/annotations/annotationFromConstructorParamToProperty.kt
Vendored
+2 -4
View File
@@ -2,7 +2,5 @@ internal annotation class A
internal annotation class B
class U(
@param:A @field:B
var i: Int
)
class U(@param:A @field:B
var i: Int)
j2k/testData/fileOrElement/annotations/annotationInterface1.kt
Vendored
+2 -4
View File
@@ -1,7 +1,5 @@
internal annotation class Anon(
val stringArray: Array<String>, val intArray: IntArray, // string
val string: String
)
internal annotation class Anon(val stringArray: Array<String>, val intArray: IntArray, // string
val string: String)
@Anon(string = "a", stringArray = ["a", "b"], intArray = [1, 2])
@Target(AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD)
j2k/testData/fileOrElement/comments/fieldsInitializedFromParams.kt
Vendored
+2 -1
View File
@@ -1,5 +1,6 @@
internal class C(
private val p1: Int, /* parameter p1 */ // field p1
private val p1: Int /* parameter p1 */ // field p1
,
/**
* Field myP2
*/
j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt
Vendored
+8 -14
View File
@@ -1,18 +1,12 @@
internal class C1(
arg1: Int,
arg2: Int,
arg3: Int
) {
internal class C1(arg1: Int,
arg2: Int,
arg3: Int) {
constructor(
x: Int,
y: Int
) : this(x, x + y, 0) {
constructor(x: Int,
y: Int) : this(x, x + y, 0) {
}
}
internal class C2(
private val arg1: Int,
private val arg2: Int,
arg3: Int
)
internal class C2(private val arg1: Int,
private val arg2: Int,
arg3: Int)
j2k/testData/fileOrElement/detectProperties/Comments.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
internal class A(
// comment for field2 getter
internal class A(// comment for field2 getter
// comment for field2 setter
var field2: Int // comment for field2
) {
j2k/testData/fileOrElement/detectProperties/DataClassWithAnnotations.kt
Vendored
+4 -6
View File
@@ -1,8 +1,6 @@
internal annotation class TestAnnotation
class Test(
@param:TestAnnotation @field:TestAnnotation
@get:TestAnnotation
@set:TestAnnotation
var arg: String?
)
class Test(@param:TestAnnotation @field:TestAnnotation
@get:TestAnnotation
@set:TestAnnotation
var arg: String?)
j2k/testData/fileOrElement/docComments/deprecatedDocTagWithMultiLineMessage.kt
Vendored
+6 -8
View File
@@ -1,9 +1,7 @@
@Deprecated(
"Ph'nglui mglw'nafh\n" +
" Cthulhu R'lyeh wgah'nagl fhtagn.\n" +
" 'In His House at R'lyeh\n" +
" Dead Cthulhu waits dreaming,\n" +
" yet He shall rise and His kingdom\n" +
" shall cover the Earth.'"
)
@Deprecated("Ph'nglui mglw'nafh\n" +
" Cthulhu R'lyeh wgah'nagl fhtagn.\n" +
" 'In His House at R'lyeh\n" +
" Dead Cthulhu waits dreaming,\n" +
" yet He shall rise and His kingdom\n" +
" shall cover the Earth.'")
class TestDeprecatedInJavadocWithMultilineMessage
j2k/testData/fileOrElement/enum/runnableImplementation.kt
Vendored
+2 -4
View File
@@ -2,9 +2,7 @@ internal enum class Color : Runnable {
WHITE, BLACK, RED, YELLOW, BLUE;
override fun run() {
println(
"name()=" + name +
", toString()=" + toString()
)
println("name()=" + name +
", toString()=" + toString())
}
}
j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt
Vendored
+2 -3
View File
@@ -2,10 +2,9 @@ internal class F {
fun f1(p1: Int, p2: Int, p3: Int, p4: Int, vararg p5: Int) {}
fun f2(array: IntArray) {
f1(
1, 2,
f1(1, 2,
3, 4,
*array
)
}
}
}
j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.kt
Vendored
+3 -6
View File
@@ -3,14 +3,11 @@ internal class C {
fun foo2(
p1: Int,
p2: Int
) {
p2: Int) {
}
fun foo3(
p1: Int,
p2: Int
) {
fun foo3(p1: Int,
p2: Int) {
}
fun foo4(
j2k/testData/fileOrElement/mutableCollections/FunctionParameters.kt
Vendored
+3 -5
View File
@@ -2,13 +2,11 @@
import java.util.*
internal class A<T> {
fun foo(
nonMutableCollection: Collection<String>,
fun foo(nonMutableCollection: Collection<String>,
mutableCollection: MutableCollection<String>,
mutableSet: MutableSet<T>,
mutableMap: MutableMap<String, T>
) {
mutableMap: MutableMap<String, T>) {
mutableCollection.addAll(nonMutableCollection)
mutableSet.add(mutableMap.remove("a"))
}
}
}
j2k/testData/fileOrElement/newClassExpression/lineBreaks.kt
Vendored
+3 -5
View File
@@ -2,10 +2,8 @@ internal class C(p1: Int, p2: Int, p3: Int)
internal class User {
fun foo() {
C(
1,
C(1,
2,
3
)
3)
}
}
}
j2k/testData/fileOrElement/objectLiteral/MyFrame.kt
Vendored
+3 -5
View File
@@ -24,11 +24,9 @@ internal class Client : Frame() {
addWindowListener(a)
addWindowListener(
object : WindowAdapter() {
override fun windowClosing() {}
}
)
addWindowListener(object : WindowAdapter() {
override fun windowClosing() {}
})
val b = object : EmptyWindowListener {
j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt
Vendored
+4 -6
View File
@@ -5,12 +5,10 @@ internal interface I {
internal class C {
val `object`: Any?
get() {
foo(
object : I {
override val int: Int
get() = 0
}
)
foo(object : I {
override val int: Int
get() = 0
})
return string
}
j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt
Vendored
+7 -10
View File
@@ -9,15 +9,12 @@ class C {
@Throws(IOException::class)
internal fun foo() {
ByteArrayInputStream(ByteArray(10)).use { stream ->
bar(
object : I {
@Throws(IOException::class)
override fun doIt(stream: InputStream): Int {
return stream.available()
}
},
stream
)
bar(object : I {
@Throws(IOException::class)
override fun doIt(stream: InputStream): Int {
return stream.available()
}
}, stream)
}
}
@@ -25,4 +22,4 @@ class C {
internal fun bar(i: I, stream: InputStream): Int {
return i.doIt(stream)
}
}
}
j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt
Vendored
+7 -10
View File
@@ -9,15 +9,12 @@ class C {
@Throws(IOException::class)
internal fun foo(): Int {
ByteArrayInputStream(ByteArray(10)).use { stream ->
return bar(
object : I {
@Throws(IOException::class)
override fun doIt(stream: InputStream): Int {
return stream.available()
}
},
stream
)
return bar(object : I {
@Throws(IOException::class)
override fun doIt(stream: InputStream): Int {
return stream.available()
}
}, stream)
}
}
@@ -25,4 +22,4 @@ class C {
internal fun bar(i: I, stream: InputStream): Int {
return i.doIt(stream)
}
}
}