MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin][formatter] fix indent for array indices arguments

Browse Source 
should be consistent with call arguments

^KTIJ-22690 Fixed

GitOrigin-RevId: 6836783b5b34cf43413ff6960568b4c5d871b8f8
This commit is contained in:
Dmitry Gridin
2022-09-05 20:33:28 +00:00
committed by intellij-monorepo-bot
parent 9eefd5f7cf
commit 2a9f883d64
10 changed files with 256 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+1 -1
View File
@@ -1027,7 +1027,7 @@ private val INDENT_RULES = arrayOf(
strategy("Indices")
.within(INDICES)
.notForType(RBRACKET)
.set(Indent.getContinuationIndent(false)),
.continuationIf(KotlinCodeStyleSettings::CONTINUATION_INDENT_IN_ARGUMENT_LISTS),
strategy("Binary expressions")
.within(BINARY_EXPRESSIONS)
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+5
View File
@@ -1761,6 +1761,11 @@ public abstract class FormatterTestGenerated extends AbstractFormatterTest {
runTest("testData/formatter/AnonymousInitializersLineBreak.after.inv.kt");
}
@TestMetadata("ArrayAccess.after.inv.kt")
public void testArrayAccess() throws Exception {
runTest("testData/formatter/ArrayAccess.after.inv.kt");
}
@TestMetadata("BinaryExpressions.after.inv.kt")
public void testBinaryExpressions() throws Exception {
runTest("testData/formatter/BinaryExpressions.after.inv.kt");
plugins/kotlin/idea/tests/testData/formatter/ArrayAccess.after.inv.kt
+26
View File
@@ -0,0 +1,26 @@
fun test() {
a[1]
a[1, 2]
a[1, 2]
a[
1, 2
]
a[
1, 2
]
a[
1, 2
]
}
// SET_FALSE: CONTINUATION_INDENT_IN_ARGUMENT_LISTS
plugins/kotlin/idea/tests/testData/formatter/ArrayAccess.after.kt
+6 -4
View File
@@ -5,20 +5,22 @@ fun test() {
a[1, 2]
a[
1, 2
1, 2
]
a[
1, 2
1, 2
]
a[
1, 2
1, 2
]
}
}
// SET_FALSE: CONTINUATION_INDENT_IN_ARGUMENT_LISTS
plugins/kotlin/idea/tests/testData/formatter/ArrayAccess.kt
+3 -1
View File
@@ -24,4 +24,6 @@ fun test() {
]
}
}
// SET_FALSE: CONTINUATION_INDENT_IN_ARGUMENT_LISTS
plugins/kotlin/idea/tests/testData/formatter/trailingComma/indices/IndicesAccess.after.inv.kt
+32 -32
View File
@@ -2,27 +2,27 @@
fun foo() {
testtest[foofoo, foofoo, foofoo,
foofoo, bar]
foofoo, bar]
testtest[
foofoo, foofoo, foofoo, foofoo, bar
foofoo, foofoo, foofoo, foofoo, bar
]
testtest[foofoo, foofoo, foofoo, foofoo, bar
]
testtest[foofoo, foofoo, foofoo, foofoo,
bar
bar
]
testtest[foofoo
]
testtest[
foofoo]
foofoo]
testtest[
foofoo
foofoo
]
testtest[foofoo]
@@ -30,8 +30,8 @@ fun foo() {
testtest[foofoo, testtest[testtest[foofoo]]]
testtest[
foofoo, fososos,
testtest[testtest[foofoo]],
foofoo, fososos,
testtest[testtest[foofoo]],
]
testtest[foofoo, testtest[testtest[foofoo]], testsa]
@@ -51,9 +51,9 @@ fun foo() {
useCallable[Callable { println["Hello world"] }]
useCallable[
Callable {
println["Hello world"]
},
Callable {
println["Hello world"]
},
]
useCallable[Callable { println["Hello world"] }
@@ -64,7 +64,7 @@ fun foo() {
}
useCallable[
Callable { println["Hello world"] }]
Callable { println["Hello world"] }]
useCallable["A", { println["Hello world"] }]
@@ -79,14 +79,14 @@ fun foo() {
useCallable[{ println["Hello world"] }]
useCallable[
{ println["Hello world"] },
{ println["Hello world"] },
]
useCallable[{ println["Hello world"] }
]
useCallable[
{ println["Hello world"] }]
{ println["Hello world"] }]
useCallable["A", object : Callable<Unit> {
override fun call() {
@@ -113,11 +113,11 @@ fun foo() {
}]
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
]
useCallable[object : Callable<Unit> {
@@ -136,15 +136,15 @@ fun foo() {
}
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
}]
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
}]
testtest[
foofoo, foofoo, foofoo, foofoo,
bar /*
foofoo, foofoo, foofoo, foofoo,
bar /*
*/, /* */ foo
]
@@ -152,7 +152,7 @@ fun foo() {
*/foofoo, foofoo, foofoo, /*
*/
foofoo, bar]
foofoo, bar]
testtest[foofoo, foofoo, foofoo, foofoo, bar/*
*/]
@@ -163,14 +163,14 @@ fun foo() {
testtest[foofoo, foofoo, foofoo, foofoo, /*
*/
bar
bar
]
testtest[foofoo // fd
]
testtest[ /**/
foofoo
foofoo
]
testtest[foofoo/**/]
@@ -183,16 +183,16 @@ fun foo() {
]
testtest[ /**/
foofoo
foofoo
]
testtest[foofoo/**/]
testtest[
foofoo, fososos,
/*
foofoo, fososos,
/*
*/
testtest[testtest[foofoo]],
testtest[testtest[foofoo]],
]
testtest[foofoo, testtest[testtest[foofoo]], /**/testsa]
plugins/kotlin/idea/tests/testData/formatter/trailingComma/indices/IndicesAccess.after.kt
+32 -32
View File
@@ -2,27 +2,27 @@
fun foo() {
testtest[foofoo, foofoo, foofoo,
foofoo, bar]
foofoo, bar]
testtest[
foofoo, foofoo, foofoo, foofoo, bar
foofoo, foofoo, foofoo, foofoo, bar
]
testtest[foofoo, foofoo, foofoo, foofoo, bar
]
testtest[foofoo, foofoo, foofoo, foofoo,
bar
bar
]
testtest[foofoo
]
testtest[
foofoo]
foofoo]
testtest[
foofoo
foofoo
]
testtest[foofoo]
@@ -30,8 +30,8 @@ fun foo() {
testtest[foofoo, testtest[testtest[foofoo]]]
testtest[
foofoo, fososos,
testtest[testtest[foofoo]],
foofoo, fososos,
testtest[testtest[foofoo]],
]
testtest[foofoo, testtest[testtest[foofoo]], testsa]
@@ -51,9 +51,9 @@ fun foo() {
useCallable[Callable { println["Hello world"] }]
useCallable[
Callable {
println["Hello world"]
},
Callable {
println["Hello world"]
},
]
useCallable[Callable { println["Hello world"] }
@@ -64,7 +64,7 @@ fun foo() {
}
useCallable[
Callable { println["Hello world"] }]
Callable { println["Hello world"] }]
useCallable["A", { println["Hello world"] }]
@@ -79,14 +79,14 @@ fun foo() {
useCallable[{ println["Hello world"] }]
useCallable[
{ println["Hello world"] },
{ println["Hello world"] },
]
useCallable[{ println["Hello world"] }
]
useCallable[
{ println["Hello world"] }]
{ println["Hello world"] }]
useCallable["A", object : Callable<Unit> {
override fun call() {
@@ -113,11 +113,11 @@ fun foo() {
}]
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
]
useCallable[object : Callable<Unit> {
@@ -136,15 +136,15 @@ fun foo() {
}
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
}]
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
}]
testtest[
foofoo, foofoo, foofoo, foofoo,
bar /*
foofoo, foofoo, foofoo, foofoo,
bar /*
*/, /* */ foo
]
@@ -152,7 +152,7 @@ fun foo() {
*/foofoo, foofoo, foofoo, /*
*/
foofoo, bar]
foofoo, bar]
testtest[foofoo, foofoo, foofoo, foofoo, bar/*
*/]
@@ -163,14 +163,14 @@ fun foo() {
testtest[foofoo, foofoo, foofoo, foofoo, /*
*/
bar
bar
]
testtest[foofoo // fd
]
testtest[ /**/
foofoo
foofoo
]
testtest[foofoo/**/]
@@ -183,16 +183,16 @@ fun foo() {
]
testtest[ /**/
foofoo
foofoo
]
testtest[foofoo/**/]
testtest[
foofoo, fososos,
/*
foofoo, fososos,
/*
*/
testtest[testtest[foofoo]],
testtest[testtest[foofoo]],
]
testtest[foofoo, testtest[testtest[foofoo]], /**/testsa]
plugins/kotlin/idea/tests/testData/formatter/trailingComma/indices/IndicesAccess.call.after.inv.kt
+32 -32
View File
@@ -2,27 +2,27 @@
fun foo() {
testtest[foofoo, foofoo, foofoo,
foofoo, bar]
foofoo, bar]
testtest[
foofoo, foofoo, foofoo, foofoo, bar
foofoo, foofoo, foofoo, foofoo, bar
]
testtest[foofoo, foofoo, foofoo, foofoo, bar
]
testtest[foofoo, foofoo, foofoo, foofoo,
bar
bar
]
testtest[foofoo
]
testtest[
foofoo]
foofoo]
testtest[
foofoo
foofoo
]
testtest[foofoo]
@@ -30,8 +30,8 @@ fun foo() {
testtest[foofoo, testtest[testtest[foofoo]]]
testtest[
foofoo, fososos,
testtest[testtest[foofoo]],
foofoo, fososos,
testtest[testtest[foofoo]],
]
testtest[foofoo, testtest[testtest[foofoo]], testsa]
@@ -51,9 +51,9 @@ fun foo() {
useCallable[Callable { println["Hello world"] }]
useCallable[
Callable {
println["Hello world"]
},
Callable {
println["Hello world"]
},
]
useCallable[Callable { println["Hello world"] }
@@ -64,7 +64,7 @@ fun foo() {
}
useCallable[
Callable { println["Hello world"] }]
Callable { println["Hello world"] }]
useCallable["A", { println["Hello world"] }]
@@ -79,14 +79,14 @@ fun foo() {
useCallable[{ println["Hello world"] }]
useCallable[
{ println["Hello world"] },
{ println["Hello world"] },
]
useCallable[{ println["Hello world"] }
]
useCallable[
{ println["Hello world"] }]
{ println["Hello world"] }]
useCallable["A", object : Callable<Unit> {
override fun call() {
@@ -113,11 +113,11 @@ fun foo() {
}]
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
]
useCallable[object : Callable<Unit> {
@@ -136,15 +136,15 @@ fun foo() {
}
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
}]
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
}]
testtest[
foofoo, foofoo, foofoo, foofoo,
bar /*
foofoo, foofoo, foofoo, foofoo,
bar /*
*/, /* */ foo
]
@@ -152,7 +152,7 @@ fun foo() {
*/foofoo, foofoo, foofoo, /*
*/
foofoo, bar]
foofoo, bar]
testtest[foofoo, foofoo, foofoo, foofoo, bar/*
*/]
@@ -163,14 +163,14 @@ fun foo() {
testtest[foofoo, foofoo, foofoo, foofoo, /*
*/
bar
bar
]
testtest[foofoo // fd
]
testtest[ /**/
foofoo
foofoo
]
testtest[foofoo/**/]
@@ -183,16 +183,16 @@ fun foo() {
]
testtest[ /**/
foofoo
foofoo
]
testtest[foofoo/**/]
testtest[
foofoo, fososos,
/*
foofoo, fososos,
/*
*/
testtest[testtest[foofoo]],
testtest[testtest[foofoo]],
]
testtest[foofoo, testtest[testtest[foofoo]], /**/testsa]
plugins/kotlin/idea/tests/testData/formatter/trailingComma/indices/IndicesAccess.call.after.kt
+118 -118
View File
@@ -2,33 +2,33 @@
fun foo() {
testtest[
foofoo, foofoo, foofoo,
foofoo, bar,
foofoo, foofoo, foofoo,
foofoo, bar,
]
testtest[
foofoo, foofoo, foofoo, foofoo, bar,
foofoo, foofoo, foofoo, foofoo, bar,
]
testtest[
foofoo, foofoo, foofoo, foofoo, bar,
foofoo, foofoo, foofoo, foofoo, bar,
]
testtest[
foofoo, foofoo, foofoo, foofoo,
bar,
foofoo, foofoo, foofoo, foofoo,
bar,
]
testtest[
foofoo,
foofoo,
]
testtest[
foofoo,
foofoo,
]
testtest[
foofoo,
foofoo,
]
testtest[foofoo]
@@ -36,8 +36,8 @@ fun foo() {
testtest[foofoo, testtest[testtest[foofoo]]]
testtest[
foofoo, fososos,
testtest[testtest[foofoo]],
foofoo, fososos,
testtest[testtest[foofoo]],
]
testtest[foofoo, testtest[testtest[foofoo]], testsa]
@@ -47,13 +47,13 @@ fun foo() {
useCallable["A", Callable { println["Hello world"] }]
useCallable[
"B", "C",
Callable {
println["Hello world"]
},
Callable {
println["Hello world"]
},
"B", "C",
Callable {
println["Hello world"]
},
Callable {
println["Hello world"]
},
]
useCallable[Callable { println["Hello world"] }]
@@ -61,13 +61,13 @@ fun foo() {
useCallable[Callable { println["Hello world"] }]
useCallable[
Callable {
println["Hello world"]
},
Callable {
println["Hello world"]
},
]
useCallable[
Callable { println["Hello world"] },
Callable { println["Hello world"] },
]
useCallable[Callable { println["Hello world"] }]{
@@ -75,19 +75,19 @@ fun foo() {
}
useCallable[
Callable { println["Hello world"] },
Callable { println["Hello world"] },
]
useCallable["A", { println["Hello world"] }]
useCallable[
"B", "C",
{
println["Hello world"]
},
{
println["Hello world"]
},
"B", "C",
{
println["Hello world"]
},
{
println["Hello world"]
},
]
useCallable[{ println["Hello world"] }]
@@ -95,157 +95,157 @@ fun foo() {
useCallable[{ println["Hello world"] }]
useCallable[
{ println["Hello world"] },
{ println["Hello world"] },
]
useCallable[
{ println["Hello world"] },
{ println["Hello world"] },
]
useCallable[
{ println["Hello world"] },
{ println["Hello world"] },
]
useCallable[
"A",
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
"A",
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
]
useCallable[
"A",
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
"A",
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
]
useCallable[
"B", "C",
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
foo[0],
"B", "C",
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
foo[0],
]
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
]
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
]
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
]
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
] {
}
useCallable[
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
object : Callable<Unit> {
override fun call() {
println["Hello world"]
}
},
]
testtest[
foofoo, foofoo, foofoo, foofoo,
bar,
/*
foofoo, foofoo, foofoo, foofoo,
bar,
/*
*/
/* */ foo,
/* */ foo,
]
testtest[
/*
/*
*/
foofoo, foofoo, foofoo,
/*
foofoo, foofoo, foofoo,
/*
*/
foofoo, bar,
foofoo, bar,
]
testtest[
foofoo, foofoo, foofoo, foofoo, bar,
/*
foofoo, foofoo, foofoo, foofoo, bar,
/*
*/
]
testtest[
foofoo, foofoo, foofoo, foofoo, bar, // awdawda
foofoo, foofoo, foofoo, foofoo, bar, // awdawda
]
testtest[
foofoo, foofoo, foofoo, foofoo,
/*
foofoo, foofoo, foofoo, foofoo,
/*
*/
bar,
bar,
]
testtest[
foofoo, // fd
foofoo, // fd
]
testtest[
/**/
foofoo,
/**/
foofoo,
]
testtest[foofoo/**/]
testtest[
foofoo, foofoo, foofoo, foofoo,
/*
foofoo, foofoo, foofoo, foofoo,
/*
*/
/* */ bar,
/* */ bar,
]
testtest[
foofoo, // fd
foofoo, // fd
]
testtest[
/**/
foofoo,
/**/
foofoo,
]
testtest[foofoo/**/]
testtest[
foofoo, fososos,
/*
foofoo, fososos,
/*
*/
testtest[testtest[foofoo]],
testtest[testtest[foofoo]],
]
testtest[foofoo, testtest[testtest[foofoo]], /**/testsa]
@@ -253,33 +253,33 @@ fun foo() {
testtest[foofoo, testtest[testtest[foofoo]]/* */, /**/testsa]
testtest[
foofoo, testtest[testtest[foofoo]],
/*
foofoo, testtest[testtest[foofoo]],
/*
*/
testsa,
testsa,
]
testtest[foofoo, seee, testtest[testtest[foofoo]], /**/testsa]
testtest[
foofoo, seee, testtest[testtest[foofoo]],
/*
foofoo, seee, testtest[testtest[foofoo]],
/*
*/
testsa,
testsa,
]
useCallable[
"B", "C",
Callable {
println["Hello world"]
},
/* */
Callable {
println["Hello world"]
},
"B", "C",
Callable {
println["Hello world"]
},
/* */
Callable {
println["Hello world"]
},
]
useCallable[
Callable { println["Hello world"] }, // ffd
Callable { println["Hello world"] }, // ffd
]
}
plugins/kotlin/idea/tests/testData/inspectionsLocal/trailingComma/indices.kt.after
+1 -1
View File
@@ -4,6 +4,6 @@
fun a() {
g[
1, 2, 3,/**/
1, 2, 3,/**/
]
}