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

TrailingCommaPostFormatProcessor: should be completed in one round

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2020-01-10 12:59:36 +07:00
parent 8a45d2eb58
commit 9511348497
48 changed files with 782 additions and 913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/formatter/trailingComma/valueParameters/LambdaValueParameters.after.inv.kt
Vendored
+6 -6
View File
@@ -17,6 +17,10 @@ fun main() {
10
}
val x: (y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>,
) -> Int = {
@@ -27,9 +31,7 @@ fun main() {
10
}
val x: (
y: Comparable<Comparable<Number>>,
) -> Int = {
val x: (y: Comparable<Comparable<Number>>) -> Int = {
10
}
@@ -69,9 +71,7 @@ fun main() {
10
}
val x: (
y: Comparable<Comparable<Number>>,/**/
) -> Int = {
val x: (y: Comparable<Comparable<Number>>/**/) -> Int = {
10
}
idea/testData/formatter/trailingComma/valueParameters/LambdaValueParameters.after.kt
Vendored
+6 -6
View File
@@ -17,6 +17,10 @@ fun main() {
10
}
val x: (y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>,
) -> Int = {
@@ -27,9 +31,7 @@ fun main() {
10
}
val x: (
y: Comparable<Comparable<Number>>,
) -> Int = {
val x: (y: Comparable<Comparable<Number>>) -> Int = {
10
}
@@ -73,9 +75,7 @@ fun main() {
10
}
val x: (
y: Comparable<Comparable<Number>>,/**/
) -> Int = {
val x: (y: Comparable<Comparable<Number>>/**/) -> Int = {
10
}
idea/testData/formatter/trailingComma/valueParameters/LambdaValueParameters.kt
Vendored
+5
View File
@@ -21,6 +21,11 @@ fun main() {
10
}
val x: (y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>,
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>) -> Int = {
10
}
idea/testData/formatter/trailingComma/valueParameters/ParameterListChopAsNeeded.after.inv.kt
Vendored
+3 -9
View File
@@ -117,9 +117,7 @@ class D2 {
class A3 {
val x: String
constructor(
x: String,
) {
constructor(x: String) {
this.x = x
}
}
@@ -306,15 +304,11 @@ val foo5: (Int) -> Int = fun(
x
): Int = 42
val foo6: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(x): Int = 42
val foo7: (Int) -> Int = fun(x): Int = 42
val foo8: (Int, Int, Int) -> Int = fun(
x, y: Int, z,
): Int {
val foo8: (Int, Int, Int) -> Int = fun(x, y: Int, z): Int {
return x + y
}
idea/testData/formatter/trailingComma/valueParameters/ParameterListChopAsNeeded.after.kt
Vendored
+3 -9
View File
@@ -117,9 +117,7 @@ class D2 {
class A3 {
val x: String
constructor(
x: String,
) {
constructor(x: String) {
this.x = x
}
}
@@ -309,15 +307,11 @@ val foo5: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(x): Int = 42
val foo7: (Int) -> Int = fun(x): Int = 42
val foo8: (Int, Int, Int) -> Int = fun(
x, y: Int, z,
): Int {
val foo8: (Int, Int, Int) -> Int = fun(x, y: Int, z): Int {
return x + y
}
idea/testData/formatter/trailingComma/valueParameters/ParameterListDoNotWrap.after.inv.kt
Vendored
+3 -9
View File
@@ -117,9 +117,7 @@ class D2 {
class A3 {
val x: String
constructor(
x: String,
) {
constructor(x: String) {
this.x = x
}
}
@@ -306,15 +304,11 @@ val foo5: (Int) -> Int = fun(
x
): Int = 42
val foo6: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(x): Int = 42
val foo7: (Int) -> Int = fun(x): Int = 42
val foo8: (Int, Int, Int) -> Int = fun(
x, y: Int, z,
): Int {
val foo8: (Int, Int, Int) -> Int = fun(x, y: Int, z): Int {
return x + y
}
idea/testData/formatter/trailingComma/valueParameters/ParameterListDoNotWrap.after.kt
Vendored
+3 -9
View File
@@ -117,9 +117,7 @@ class D2 {
class A3 {
val x: String
constructor(
x: String,
) {
constructor(x: String) {
this.x = x
}
}
@@ -309,15 +307,11 @@ val foo5: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(x): Int = 42
val foo7: (Int) -> Int = fun(x): Int = 42
val foo8: (Int, Int, Int) -> Int = fun(
x, y: Int, z,
): Int {
val foo8: (Int, Int, Int) -> Int = fun(x, y: Int, z): Int {
return x + y
}
idea/testData/formatter/trailingComma/valueParameters/ParameterListWrapAlways.after.inv.kt
Vendored
+2 -6
View File
@@ -117,9 +117,7 @@ class D2 {
class A3 {
val x: String
constructor(
x: String,
) {
constructor(x: String) {
this.x = x
}
}
@@ -315,9 +313,7 @@ val foo5: (Int) -> Int = fun(
x
): Int = 42
val foo6: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(x): Int = 42
val foo7: (Int) -> Int = fun(x): Int = 42
idea/testData/formatter/trailingComma/valueParameters/ParameterListWrapAlways.after.kt
Vendored
+2 -6
View File
@@ -117,9 +117,7 @@ class D2 {
class A3 {
val x: String
constructor(
x: String,
) {
constructor(x: String) {
this.x = x
}
}
@@ -316,9 +314,7 @@ val foo5: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(x): Int = 42
val foo7: (Int) -> Int = fun(x): Int = 42
idea/testData/formatter/trailingComma/valueParameters/ParameterListWrapAsNeeded.after.inv.kt
Vendored
+3 -9
View File
@@ -117,9 +117,7 @@ class D2 {
class A3 {
val x: String
constructor(
x: String,
) {
constructor(x: String) {
this.x = x
}
}
@@ -306,15 +304,11 @@ val foo5: (Int) -> Int = fun(
x
): Int = 42
val foo6: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(x): Int = 42
val foo7: (Int) -> Int = fun(x): Int = 42
val foo8: (Int, Int, Int) -> Int = fun(
x, y: Int, z,
): Int {
val foo8: (Int, Int, Int) -> Int = fun(x, y: Int, z): Int {
return x + y
}
idea/testData/formatter/trailingComma/valueParameters/ParameterListWrapAsNeeded.after.kt
Vendored
+3 -9
View File
@@ -117,9 +117,7 @@ class D2 {
class A3 {
val x: String
constructor(
x: String,
) {
constructor(x: String) {
this.x = x
}
}
@@ -309,15 +307,11 @@ val foo5: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(
x,
): Int = 42
val foo6: (Int) -> Int = fun(x): Int = 42
val foo7: (Int) -> Int = fun(x): Int = 42
val foo8: (Int, Int, Int) -> Int = fun(
x, y: Int, z,
): Int {
val foo8: (Int, Int, Int) -> Int = fun(x, y: Int, z): Int {
return x + y
}