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

Formatter: support trailing comma in lambda value parameters & fix comments in KtParameter

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2019-12-27 19:32:08 +07:00
parent d013fc2234
commit 96a11707ca
21 changed files with 468 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/formatter/trailingComma/typeParameters/TypeParameterList.after.inv.kt
Vendored
+38
View File
@@ -239,4 +239,42 @@ class L<
x : String, y : String, z : String
>
class C<
x : Int // adad
>
class G<
x : String, y : String, /* */ z : String // adad
>
class G<
x : String,
y : String,
/* */ /* */
z : String, /**/
>()
class H<
x : String, /*
*/
y : String,
z : String, /*
*/
>
class J<
x : String, y : String,
z : String, /*
*/ /**/
>
class K<
x : String, y : String,
z : String, // aw
>
class L<
x : String, y : String, z : String //awd
>
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/typeParameters/TypeParameterList.after.kt
Vendored
+39
View File
@@ -247,4 +247,43 @@ class L<
x : String, y : String, z : String,
>
class C<
x : Int, // adad
>
class G<
x : String, y : String, /* */
z : String, // adad
>
class G<
x : String,
y : String,
/* */ /* */
z : String, /**/
>()
class H<
x : String, /*
*/
y : String,
z : String, /*
*/
>
class J<
x : String, y : String,
z : String, /*
*/ /**/
>
class K<
x : String, y : String,
z : String, // aw
>
class L<
x : String, y : String, z : String, //awd
>
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/typeParameters/TypeParameterList.kt
Vendored
+34
View File
@@ -226,4 +226,38 @@ class L<
x: String, y: String, z: String
>
class C<
x: Int // adad
>
class G<
x: String, y: String
, /* */ z: String // adad
>
class G<
x: String, y: String
/* */, /* */ z: String /**/,
>()
class H<
x: String, /*
*/ y: String,
z: String /*
*/ ,>
class J<
x: String, y: String , z: String /*
*/
, /**/ >
class K<
x: String, y: String,
z: String // aw
, >
class L<
x: String, y: String, z: String //awd
>
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/LambdaValueParameters.after.inv.kt
Vendored
+89
View File
@@ -0,0 +1,89 @@
fun main() {
val x: (
y: Comparable<Comparable<Number>>,
z: Iterable<Iterable<Number>> // trailing comma
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,
z: Iterable<Iterable<Number>>
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>,
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>, //
z: Iterable<Iterable<Number>> // /**/
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>
// wd
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,/*
*/
z: Iterable<Iterable<Number>>, /* //
*/
) -> Int = {
10
}
val x: (/**/y: Comparable<Comparable<Number>>/**/) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,/**/
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>
) -> Int = {
10
}
val x: ( /*
*/y: Comparable<Comparable<Number>>) -> Int = {
10
}
}
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/LambdaValueParameters.after.kt
Vendored
+97
View File
@@ -0,0 +1,97 @@
fun main() {
val x: (
y: Comparable<Comparable<Number>>,
z: Iterable<Iterable<Number>>, // trailing comma
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,
z: Iterable<Iterable<Number>>,
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>,
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>, //
z: Iterable<Iterable<Number>>, // /**/
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,
z: Iterable<Iterable<Number>>,
// wd
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,/*
*/
z: Iterable<Iterable<Number>>, /* //
*/
) -> Int = {
10
}
val x: (/**/y: Comparable<Comparable<Number>>/**/) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,/**/
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,
) -> Int = {
10
}
val x: (
/*
*/
y: Comparable<Comparable<Number>>,
) -> Int = {
10
}
}
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/LambdaValueParameters.kt
Vendored
+80
View File
@@ -0,0 +1,80 @@
fun main() {
val x: (
y: Comparable<Comparable<Number>>,
z: Iterable<Iterable<Number>> // trailing comma
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>,
z: Iterable<Iterable<Number>>
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>,) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>,) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>
) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>) -> Int = {
10
}
val x: (
y: Comparable<Comparable<Number>>, //
z: Iterable<Iterable<Number>> // /**/
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>, z: Iterable<Iterable<Number>>
// wd
) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>/*
*/, z: Iterable<Iterable<Number>>, /* //
*/) -> Int = {
10
}
val x: (/**/y: Comparable<Comparable<Number>>/**/) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>/**/,) -> Int = {
10
}
val x: (y: Comparable<Comparable<Number>>
) -> Int = {
10
}
val x: ( /*
*/y: Comparable<Comparable<Number>>) -> Int = {
10
}
}
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListChopAsNeeded.after.inv.kt
Vendored
+3 -3
View File
@@ -468,8 +468,8 @@ class H(
class J(
val x: String, val y: String,
val z: String /*
*/,
val z: String, /*
*/
)
class K(
@@ -478,7 +478,7 @@ class K(
)
class L(
val x: String, val y: String, val z: String
val x: String, val y: String, val z: String // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListChopAsNeeded.after.kt
Vendored
+4 -4
View File
@@ -462,7 +462,7 @@ class G(
class G(
val x: String,
val y: String
= "" /* */, /* */
= "", /* */ /* */
val z: String,
)
@@ -475,8 +475,8 @@ class H(
class J(
val x: String, val y: String,
val z: String /*
*/,
val z: String, /*
*/
)
class K(
@@ -485,7 +485,7 @@ class K(
)
class L(
val x: String, val y: String, val z: String,
val x: String, val y: String, val z: String, // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListChopAsNeeded.kt
Vendored
+1 -1
View File
@@ -454,7 +454,7 @@ class K(
, )
class L(
val x: String, val y: String, val z: String
val x: String, val y: String, val z: String // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListDoNotWrap.after.inv.kt
Vendored
+3 -3
View File
@@ -468,8 +468,8 @@ class H(
class J(
val x: String, val y: String,
val z: String /*
*/,
val z: String, /*
*/
)
class K(
@@ -478,7 +478,7 @@ class K(
)
class L(
val x: String, val y: String, val z: String
val x: String, val y: String, val z: String // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListDoNotWrap.after.kt
Vendored
+4 -4
View File
@@ -462,7 +462,7 @@ class G(
class G(
val x: String,
val y: String
= "" /* */, /* */
= "", /* */ /* */
val z: String,
)
@@ -475,8 +475,8 @@ class H(
class J(
val x: String, val y: String,
val z: String /*
*/,
val z: String, /*
*/
)
class K(
@@ -485,7 +485,7 @@ class K(
)
class L(
val x: String, val y: String, val z: String,
val x: String, val y: String, val z: String, // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListDoNotWrap.kt
Vendored
+1 -1
View File
@@ -454,7 +454,7 @@ class K(
, )
class L(
val x: String, val y: String, val z: String
val x: String, val y: String, val z: String // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListWrapAlways.after.inv.kt
Vendored
+3 -3
View File
@@ -490,8 +490,8 @@ class H(
class J(
val x: String,
val y: String,
val z: String /*
*/,
val z: String, /*
*/
)
class K(
@@ -503,7 +503,7 @@ class K(
class L(
val x: String,
val y: String,
val z: String
val z: String // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListWrapAlways.after.kt
Vendored
+4 -4
View File
@@ -477,7 +477,7 @@ class G(
class G(
val x: String,
val y: String
= "" /* */, /* */
= "", /* */ /* */
val z: String,
)
@@ -491,8 +491,8 @@ class H(
class J(
val x: String,
val y: String,
val z: String /*
*/,
val z: String, /*
*/
)
class K(
@@ -504,7 +504,7 @@ class K(
class L(
val x: String,
val y: String,
val z: String,
val z: String, // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListWrapAlways.kt
Vendored
+1 -1
View File
@@ -454,7 +454,7 @@ class K(
, )
class L(
val x: String, val y: String, val z: String
val x: String, val y: String, val z: String // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListWrapAsNeeded.after.inv.kt
Vendored
+3 -3
View File
@@ -468,8 +468,8 @@ class H(
class J(
val x: String, val y: String,
val z: String /*
*/,
val z: String, /*
*/
)
class K(
@@ -478,7 +478,7 @@ class K(
)
class L(
val x: String, val y: String, val z: String
val x: String, val y: String, val z: String // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListWrapAsNeeded.after.kt
Vendored
+4 -4
View File
@@ -462,7 +462,7 @@ class G(
class G(
val x: String,
val y: String
= "" /* */, /* */
= "", /* */ /* */
val z: String,
)
@@ -475,8 +475,8 @@ class H(
class J(
val x: String, val y: String,
val z: String /*
*/,
val z: String, /*
*/
)
class K(
@@ -485,7 +485,7 @@ class K(
)
class L(
val x: String, val y: String, val z: String,
val x: String, val y: String, val z: String, // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA
idea/testData/formatter/trailingComma/valueParameters/ParameterListWrapAsNeeded.kt
Vendored
+1 -1
View File
@@ -454,7 +454,7 @@ class K(
, )
class L(
val x: String, val y: String, val z: String
val x: String, val y: String, val z: String // adwd
)
// SET_TRUE: ALLOW_TRAILING_COMMA