Fix moving of value/type parameters

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/keyword.kt

@@ -0,0 +1,9 @@
+// MOVE: down
+class A {
+    fun <caret>foo() {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/keyword.kt.after

@@ -0,0 +1,9 @@
+// MOVE: down
+class A {
+    class B {
+        fun <caret>foo() {
+
+        }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/name.kt

@@ -0,0 +1,9 @@
+// MOVE: down
+class A {
+    fun <caret>foo() {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/name.kt.after

@@ -0,0 +1,9 @@
+// MOVE: down
+class A {
+    class B {
+        fun <caret>foo() {
+
+        }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/returnType.kt

@@ -0,0 +1,9 @@
+// MOVE: down
+class A {
+    fun foo(): Unit<caret> {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/returnType.kt.after

@@ -0,0 +1,9 @@
+// MOVE: down
+class A {
+    class B {
+        fun foo(): Unit<caret> {
+
+        }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt

@@ -0,0 +1,15 @@
+// MOVE: down
+class A {
+    fun foo<<caret>T,
+            U,
+            W>(
+            b: Int,
+            a: Int,
+            c: Int
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt.after

@@ -0,0 +1,15 @@
+// MOVE: down
+class A {
+    class B {
+        fun foo<<caret>T,
+                U,
+                W>(
+                b: Int,
+                a: Int,
+                c: Int
+        ) {
+
+        }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt

@@ -0,0 +1,15 @@
+// MOVE: down
+class A {
+    fun foo<T,
+            U<caret>,
+            W>(
+            b: Int,
+            a: Int,
+            c: Int
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt.after

@@ -0,0 +1,15 @@
+// MOVE: down
+class A {
+    class B {
+        fun foo<T,
+                U<caret>,
+                W>(
+                b: Int,
+                a: Int,
+                c: Int
+        ) {
+
+        }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt

@@ -0,0 +1,15 @@
+// MOVE: down
+class A {
+    fun foo<T,
+            U,
+            W<caret>>(
+            b: Int,
+            a: Int,
+            c: Int
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt.after

@@ -0,0 +1,15 @@
+// MOVE: down
+class A {
+    class B {
+        fun foo<T,
+                U,
+                W<caret>>(
+                b: Int,
+                a: Int,
+                c: Int
+        ) {
+
+        }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams1.kt

@@ -0,0 +1,16 @@
+// MOVE: down
+// MOVER_CLASS: org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover
+class A {
+    fun foo<T,
+            U,
+            W>(
+            b:<caret> Int,
+            a: Int,
+            c: Int
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams1.kt.after

@@ -0,0 +1,16 @@
+// MOVE: down
+// MOVER_CLASS: org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover
+class A {
+    fun foo<T,
+            U,
+            W>(
+            a: Int,
+            b:<caret> Int,
+            c: Int
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams2.kt

@@ -0,0 +1,16 @@
+// MOVE: down
+// MOVER_CLASS: org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover
+class A {
+    fun foo<T,
+            U,
+            W>(
+            b: Int,
+            <caret>a: Int,
+            c: Int
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams2.kt.after

@@ -0,0 +1,16 @@
+// MOVE: down
+// MOVER_CLASS: org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover
+class A {
+    fun foo<T,
+            U,
+            W>(
+            b: Int,
+            c: Int
+            <caret>a: Int,
+            ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams3.kt

@@ -0,0 +1,16 @@
+// MOVE: up
+// MOVER_CLASS: org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover
+class A {
+    fun foo<T,
+            U,
+            W>(
+            a: Int,
+            b:<caret> Int,
+            c: Int
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams3.kt.after

@@ -0,0 +1,16 @@
+// MOVE: up
+// MOVER_CLASS: org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover
+class A {
+    fun foo<T,
+            U,
+            W>(
+            b:<caret> Int,
+            a: Int,
+            c: Int
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams4.kt

@@ -0,0 +1,16 @@
+// MOVE: up
+// MOVER_CLASS: org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover
+class A {
+    fun foo<T,
+            U,
+            W>(
+            b: Int,
+            c: Int
+            <caret>a: Int,
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams4.kt.after

@@ -0,0 +1,16 @@
+// MOVE: up
+// MOVER_CLASS: org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover
+class A {
+    fun foo<T,
+            U,
+            W>(
+            b: Int,
+            <caret>a: Int,
+            c: Int
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams5.kt

@@ -0,0 +1,17 @@
+// MOVE: down
+// MOVER_CLASS: org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover
+// IS_APPLICABLE: false
+class A {
+    fun foo<T,
+            U,
+            W>(
+            b: Int,
+            c: Int
+            <caret>a: Int,
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams6.kt

@@ -0,0 +1,17 @@
+// MOVE: up
+// MOVER_CLASS: org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover
+// IS_APPLICABLE: false
+class A {
+    fun foo<T,
+            U,
+            W>(
+            b: Int<caret>,
+            c: Int
+            a: Int,
+    ) {
+
+    }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/keyword.kt

@@ -0,0 +1,13 @@
+// MOVE: down
+class A {
+    <caret>val x: String
+        get() {
+            return ""
+        }
+        set(v: String) {
+
+        }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/keyword.kt.after

@@ -0,0 +1,13 @@
+// MOVE: down
+class A {
+    class B {
+        <caret>val x: String
+            get() {
+                return ""
+            }
+            set(v: String) {
+
+            }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/name.kt

@@ -0,0 +1,13 @@
+// MOVE: down
+class A {
+    val x<caret>: String
+        get() {
+            return ""
+        }
+        set(v: String) {
+
+        }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/name.kt.after

@@ -0,0 +1,13 @@
+// MOVE: down
+class A {
+    class B {
+        val x<caret>: String
+            get() {
+                return ""
+            }
+            set(v: String) {
+
+            }
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/returnType.kt

@@ -0,0 +1,13 @@
+// MOVE: down
+class A {
+    val x: String<caret>
+        get() {
+            return ""
+        }
+        set(v: String) {
+
+        }
+    class B {
+
+    }
+}

idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/returnType.kt.after

@@ -0,0 +1,13 @@
+// MOVE: down
+class A {
+    class B {
+        val x: String<caret>
+            get() {
+                return ""
+            }
+            set(v: String) {
+
+            }
+
+    }
+}