From 89139a6e07ebe5270a8a1ea118f63c320e08acbd Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Mon, 13 Jul 2020 18:39:21 +0300 Subject: [PATCH] Reformat test data for `MoveStatementTestGenerated`. It fixes appropriate tests Those test failures was caused by: "Fix path handling in a number of Kotlin tests". In this coomit we extend `AbstractCodeMoverTest` from `KotlinLightCodeInsightFixtureTestCase`. `KotlinLightCodeInsightFixtureTestCase` enables official Kotlin code style in `setUp` what caused test failures because test data wasn't properly formatted. The only problem here is that now we are in the middle of transitioning between current Kotlin code style and official one. So if you user has some old sandbox for debug IDE then he/she has different behaviour in tests and IDE what may lead to misunderstanding (what actually happened to me). One of the ways to solve this problem is to check that test data is properly formatted before running any test: KT-40264. This may be implemented in future GitOrigin-RevId: 9efc69ae4b33bf363e6aeb9a416bf216ee33553e --- .../classBodyDeclarations/class/classAtBrace2.kt.after | 2 +- .../classBodyDeclarations/class/classAtBrace3.kt.after | 2 +- .../classBodyDeclarations/class/classAtBrace4.kt.after | 2 +- .../classBodyDeclarations/class/classAtBrace5.kt.after | 2 +- .../classBodyDeclarations/class/classAtBrace6.kt.after | 2 +- .../classBodyDeclarations/class/classWithoutBody1.kt.after | 2 +- .../classBodyDeclarations/class/classWithoutBody2.kt.after | 2 +- .../classBodyDeclarations/class/classWithoutBody3.kt.after | 2 +- .../classBodyDeclarations/function/functionAtBrace2.kt | 2 +- .../function/functionAtBrace3.kt.after | 2 +- .../function/functionAtBrace4.kt.after | 2 +- .../function/functionAtBrace5.kt.after | 2 +- .../function/functionAtBrace6.kt.after | 2 +- .../classBodyDeclarations/functionAnchors/typeParams1.kt | 6 +++--- .../functionAnchors/typeParams1.kt.after | 6 +++--- .../classBodyDeclarations/functionAnchors/typeParams2.kt | 6 +++--- .../functionAnchors/typeParams2.kt.after | 6 +++--- .../classBodyDeclarations/functionAnchors/typeParams3.kt | 6 +++--- .../functionAnchors/typeParams3.kt.after | 6 +++--- .../classBodyDeclarations/property/propertyAtBrace2.kt | 2 +- .../classBodyDeclarations/property/propertyAtBrace4.kt | 2 +- .../classBodyDeclarations/property/propertyAtBrace6.kt | 2 +- .../moveUpDown/parametersAndArguments/callArgs1.kt | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs1.kt.after | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs2.kt | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs2.kt.after | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs4.kt | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs4.kt.after | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs5.kt | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs5.kt.after | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs7.kt | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs7.kt.after | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs8.kt | 6 +++--- .../moveUpDown/parametersAndArguments/callArgs8.kt.after | 6 +++--- .../parametersAndArguments/callArgsWithComment1.kt | 6 +++--- .../parametersAndArguments/callArgsWithComment1.kt.after | 6 +++--- .../moveUpDown/parametersAndArguments/classParams3.kt | 6 +++--- .../moveUpDown/parametersAndArguments/classParams3.kt.after | 6 +++--- .../parametersAndArguments/classParamsWithComment4.kt | 6 +++--- .../parametersAndArguments/classParamsWithComment4.kt.after | 6 +++--- .../moveUpDown/parametersAndArguments/funParams3.kt | 6 +++--- .../moveUpDown/parametersAndArguments/funParams3.kt.after | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs1.kt | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs1.kt.after | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs2.kt | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs2.kt.after | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs4.kt | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs4.kt.after | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs5.kt | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs5.kt.after | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs7.kt | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs7.kt.after | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs8.kt | 6 +++--- .../codeInsight/moveUpDown/trailingComma/callArgs8.kt.after | 6 +++--- .../codeInsight/moveUpDown/trailingComma/classParams3.kt | 6 +++--- .../moveUpDown/trailingComma/classParams3.kt.after | 6 +++--- .../codeInsight/moveUpDown/trailingComma/funParams3.kt | 6 +++--- .../moveUpDown/trailingComma/funParams3.kt.after | 6 +++--- 58 files changed, 142 insertions(+), 142 deletions(-) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace2.kt.after index 70ddca709a7a..5e73f9e4be38 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace2.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace2.kt.after @@ -9,4 +9,4 @@ class A { // val y val y = "" -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace3.kt.after index ee0ef88f9a70..936a9ed7de32 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace3.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace3.kt.after @@ -9,4 +9,4 @@ class A { class C { } -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace4.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace4.kt.after index ed0b091a091f..58df71b7feab 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace4.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace4.kt.after @@ -9,4 +9,4 @@ class A { // class B class B { } -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace5.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace5.kt.after index 6e11128046c2..85d1b5bbabbd 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace5.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace5.kt.after @@ -9,4 +9,4 @@ fun foo() { class B { } -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace6.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace6.kt.after index 77059ccb191a..05411f3c93a7 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace6.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace6.kt.after @@ -9,4 +9,4 @@ fun foo() { // class A class A { } -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody1.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody1.kt.after index e9430edcaa02..64ab0ea99746 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody1.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody1.kt.after @@ -9,4 +9,4 @@ class D { class C { } -// SET_FALSE: KEEP_FIRST_COLUMN_COMMENT +// SET_FALSE: KEEP_FIRST_COLUMN_COMMENT \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody2.kt.after index 54c99ab80008..cda1d1742d41 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody2.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody2.kt.after @@ -7,4 +7,4 @@ class D { // class C class C { -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody3.kt.after index 42078a992e30..82650bfbbe7f 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody3.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody3.kt.after @@ -3,4 +3,4 @@ class D { // MOVE: down // class A class A -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace2.kt index 77aecef8cd22..52b21ad27576 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace2.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace2.kt @@ -8,4 +8,4 @@ class A { // val y val y = "" -} \ No newline at end of file +} diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace3.kt.after index 54781b5e58fc..c4553fb5f3b6 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace3.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace3.kt.after @@ -9,4 +9,4 @@ class A { fun foo() { } -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace4.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace4.kt.after index 23e3167c5267..314a5c1bbdde 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace4.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace4.kt.after @@ -9,4 +9,4 @@ class A { // class B class B { } -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace5.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace5.kt.after index b74c76826db5..2a275f994a1a 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace5.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace5.kt.after @@ -9,4 +9,4 @@ fun foo() { fun foo() { } -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace6.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace6.kt.after index 385ef6af432e..5f2e0df71c60 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace6.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace6.kt.after @@ -9,4 +9,4 @@ fun foo() { // class B class B { } -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt index 76b00ab230e8..1ebc6efc294a 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt @@ -3,9 +3,9 @@ class A { fun foo<T, U, W>( - b: Int, - a: Int, - c: Int + b: Int, + a: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt.after index 5599dc1ec8d9..913f6453e975 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt.after @@ -4,9 +4,9 @@ class A { fun foo<T, U, W>( - b: Int, - a: Int, - c: Int + b: Int, + a: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt index 06d46bf4afe9..0a2ee151cf4f 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt @@ -3,9 +3,9 @@ class A { fun foo, W>( - b: Int, - a: Int, - c: Int + b: Int, + a: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt.after index 717f68b83663..d8d93885a495 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt.after @@ -4,9 +4,9 @@ class A { fun foo, W>( - b: Int, - a: Int, - c: Int + b: Int, + a: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt index 57ea5dd84daa..f71325d88a4b 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt @@ -3,9 +3,9 @@ class A { fun foo>( - b: Int, - a: Int, - c: Int + b: Int, + a: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt.after index 8fe9444b7d83..c09209cf9a04 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt.after @@ -4,9 +4,9 @@ class A { fun foo>( - b: Int, - a: Int, - c: Int + b: Int, + a: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace2.kt index f2f5ec773612..1b75517500c1 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace2.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace2.kt @@ -6,4 +6,4 @@ class A { // val y val y = "" -} \ No newline at end of file +} diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace4.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace4.kt index 7fb2668b3f66..e32a43379b3c 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace4.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace4.kt @@ -6,4 +6,4 @@ class A { // val y val y = "" } -} \ No newline at end of file +} diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace6.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace6.kt index 20b3d10d5353..71e78af9c565 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace6.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace6.kt @@ -6,4 +6,4 @@ fun foo() { // val y val y = "" } -} \ No newline at end of file +} diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt index ddcdf0afd8c4..ecb7139fc00c 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt @@ -1,6 +1,6 @@ // MOVE: down val x = foo( - a, - b, - c + a, + b, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt.after index 70201d6d48a9..07b4e5ad8cc3 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt.after @@ -1,6 +1,6 @@ // MOVE: down val x = foo( - b, - a, - c + b, + a, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt index 70201d6d48a9..07b4e5ad8cc3 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt @@ -1,6 +1,6 @@ // MOVE: down val x = foo( - b, - a, - c + b, + a, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt.after index 6d8e166a1566..5a48efd6de52 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt.after @@ -1,6 +1,6 @@ // MOVE: down val x = foo( - b, - c, - a + b, + c, + a ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt index cf2f424f93b8..f29ce089cfa1 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt @@ -1,6 +1,6 @@ // MOVE: up val x = foo( - b, - c, - a + b, + c, + a ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt.after index 29979bbb2dce..26633f26184f 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt.after @@ -1,6 +1,6 @@ // MOVE: up val x = foo( - b, - a, - c + b, + a, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt index 29979bbb2dce..26633f26184f 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt @@ -1,6 +1,6 @@ // MOVE: up val x = foo( - b, - a, - c + b, + a, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt.after index 5f9224a94572..25cbd4951baf 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt.after @@ -1,6 +1,6 @@ // MOVE: up val x = foo( - a, - b, - c + a, + b, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs7.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs7.kt index 30e4444b0704..c2e1dbb4f8cf 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs7.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs7.kt @@ -1,6 +1,6 @@ // MOVE: down val x = listOf( - 1, - 2, 3, - 4 + 1, + 2, 3, + 4 ) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs7.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs7.kt.after index a2f584901357..76db0dd07ac2 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs7.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs7.kt.after @@ -1,6 +1,6 @@ // MOVE: down val x = listOf( - 1, - 4, - 2, 3 + 1, + 4, + 2, 3 ) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs8.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs8.kt index 0131c250d2e1..411c017bb25a 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs8.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs8.kt @@ -1,6 +1,6 @@ // MOVE: up val x = listOf( - 1, - 4, - 2, 3 + 1, + 4, + 2, 3 ) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs8.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs8.kt.after index bf9e92803cab..074aca626e08 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs8.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs8.kt.after @@ -1,6 +1,6 @@ // MOVE: up val x = listOf( - 1, - 2, 3, - 4 + 1, + 2, 3, + 4 ) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgsWithComment1.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgsWithComment1.kt index 88b1b07c7451..cb1184f9423a 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgsWithComment1.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgsWithComment1.kt @@ -1,6 +1,6 @@ // MOVE: down val x = foo( - a, // a - b, // b - c // c + a, // a + b, // b + c // c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgsWithComment1.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgsWithComment1.kt.after index 39cd04fd5ebb..b693c22c39a2 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgsWithComment1.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/callArgsWithComment1.kt.after @@ -1,6 +1,6 @@ // MOVE: down val x = foo( - b, // b - a, // a - c // c + b, // b + a, // a + c // c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt index b8e9b5eedffd..e6ff93d91ee8 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt @@ -1,8 +1,8 @@ // MOVE: up class A( - a: Int, - b: Int, - c: Int + a: Int, + b: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after index 68195d037346..9a2eaa49ed46 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after @@ -1,8 +1,8 @@ // MOVE: up class A( - b: Int, - a: Int, - c: Int + b: Int, + a: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParamsWithComment4.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParamsWithComment4.kt index 3a0c9e5491b2..66a1ed4ac200 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParamsWithComment4.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParamsWithComment4.kt @@ -1,6 +1,6 @@ // MOVE: up class A( - val b: Int, // b - val a: Int, // a - val c: Int // c + val b: Int, // b + val a: Int, // a + val c: Int // c ) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParamsWithComment4.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParamsWithComment4.kt.after index 449b46323088..d86febf8b67e 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParamsWithComment4.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/classParamsWithComment4.kt.after @@ -1,6 +1,6 @@ // MOVE: up class A( - val a: Int, // a - val b: Int, // b - val c: Int // c + val a: Int, // a + val b: Int, // b + val c: Int // c ) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt index 6c5e80305e6f..86fa6d9b010b 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt @@ -1,9 +1,9 @@ // MOVE: up class A { fun foo( - a: Int, - b: Int, - c: Int + a: Int, + b: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after index 26ca1ccf1b71..a579dddde223 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after @@ -1,9 +1,9 @@ // MOVE: up class A { fun foo( - b: Int, - a: Int, - c: Int + b: Int, + a: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs1.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs1.kt index ddcdf0afd8c4..ecb7139fc00c 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs1.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs1.kt @@ -1,6 +1,6 @@ // MOVE: down val x = foo( - a, - b, - c + a, + b, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs1.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs1.kt.after index 70201d6d48a9..07b4e5ad8cc3 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs1.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs1.kt.after @@ -1,6 +1,6 @@ // MOVE: down val x = foo( - b, - a, - c + b, + a, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs2.kt index 70201d6d48a9..07b4e5ad8cc3 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs2.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs2.kt @@ -1,6 +1,6 @@ // MOVE: down val x = foo( - b, - a, - c + b, + a, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs2.kt.after index 6d8e166a1566..5a48efd6de52 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs2.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs2.kt.after @@ -1,6 +1,6 @@ // MOVE: down val x = foo( - b, - c, - a + b, + c, + a ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs4.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs4.kt index cf2f424f93b8..f29ce089cfa1 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs4.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs4.kt @@ -1,6 +1,6 @@ // MOVE: up val x = foo( - b, - c, - a + b, + c, + a ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs4.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs4.kt.after index 29979bbb2dce..26633f26184f 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs4.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs4.kt.after @@ -1,6 +1,6 @@ // MOVE: up val x = foo( - b, - a, - c + b, + a, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs5.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs5.kt index 29979bbb2dce..26633f26184f 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs5.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs5.kt @@ -1,6 +1,6 @@ // MOVE: up val x = foo( - b, - a, - c + b, + a, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs5.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs5.kt.after index 5f9224a94572..25cbd4951baf 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs5.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs5.kt.after @@ -1,6 +1,6 @@ // MOVE: up val x = foo( - a, - b, - c + a, + b, + c ) diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs7.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs7.kt index 30e4444b0704..c2e1dbb4f8cf 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs7.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs7.kt @@ -1,6 +1,6 @@ // MOVE: down val x = listOf( - 1, - 2, 3, - 4 + 1, + 2, 3, + 4 ) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs7.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs7.kt.after index a2f584901357..76db0dd07ac2 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs7.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs7.kt.after @@ -1,6 +1,6 @@ // MOVE: down val x = listOf( - 1, - 4, - 2, 3 + 1, + 4, + 2, 3 ) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs8.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs8.kt index 0131c250d2e1..411c017bb25a 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs8.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs8.kt @@ -1,6 +1,6 @@ // MOVE: up val x = listOf( - 1, - 4, - 2, 3 + 1, + 4, + 2, 3 ) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs8.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs8.kt.after index bf9e92803cab..074aca626e08 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs8.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/callArgs8.kt.after @@ -1,6 +1,6 @@ // MOVE: up val x = listOf( - 1, - 2, 3, - 4 + 1, + 2, 3, + 4 ) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/classParams3.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/classParams3.kt index b8e9b5eedffd..e6ff93d91ee8 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/classParams3.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/classParams3.kt @@ -1,8 +1,8 @@ // MOVE: up class A( - a: Int, - b: Int, - c: Int + a: Int, + b: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/classParams3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/classParams3.kt.after index 68195d037346..9a2eaa49ed46 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/classParams3.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/classParams3.kt.after @@ -1,8 +1,8 @@ // MOVE: up class A( - b: Int, - a: Int, - c: Int + b: Int, + a: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/funParams3.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/funParams3.kt index 6c5e80305e6f..86fa6d9b010b 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/funParams3.kt +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/funParams3.kt @@ -1,9 +1,9 @@ // MOVE: up class A { fun foo( - a: Int, - b: Int, - c: Int + a: Int, + b: Int, + c: Int ) { } diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/funParams3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/funParams3.kt.after index 26ca1ccf1b71..a579dddde223 100644 --- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/funParams3.kt.after +++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/trailingComma/funParams3.kt.after @@ -1,9 +1,9 @@ // MOVE: up class A { fun foo( - b: Int, - a: Int, - c: Int + b: Int, + a: Int, + c: Int ) { }