Move: Nested classes support

#KT-9027 In Progress

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/C.kt

@@ -0,0 +1,26 @@
+package test
+
+class C(private val b: A.B) {
+    fun test() {
+        A.X()
+
+        A.Companion.Y()
+        A.foo(A.bar)
+        //1.extFoo(1.extBar) // conflict
+
+        b.OuterY()
+        b.outerFoo(b.outerBar)
+
+        b.OuterY()
+        b.outerFoo(b.outerBar)
+
+        A.O.Y()
+        A.O.foo(A.O.bar)
+
+        with (A.O) {
+            A.Companion.Y()
+            foo(bar)
+            1.extFoo(1.extBar)
+        }
+    }
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/test.kt

@@ -0,0 +1,42 @@
+package test
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()
+
+class A {
+    class X {
+
+    }
+
+    companion object {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    object O {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    inner class B {
+        inner class OuterY
+
+        fun outerFoo(n: Int) {}
+
+        val outerBar = 1
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/test2/usages.java

@@ -0,0 +1,10 @@
+package test2;
+
+import test.A;
+import test.C;
+
+class Test {
+    C foo() {
+        return new C(new A().new B());
+    }
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/test2/usages2.java

@@ -0,0 +1,10 @@
+package test2;
+
+import test.A;
+import test.C;
+
+class Test {
+    C foo() {
+        return new C(new A().new B());
+    }
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/test2/usages3.java

@@ -0,0 +1,10 @@
+package test2;
+
+import test.A;
+import test.C;
+
+class Test {
+    C foo() {
+        return new C(new A().new B());
+    }
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/usages.kt

@@ -0,0 +1,8 @@
+package test2
+
+import test.A
+import test.C
+
+fun foo(): C {
+    return C(A().B())
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/usages2.kt

@@ -0,0 +1,8 @@
+package test2
+
+import test.A
+import test.C
+
+fun foo2(): C {
+    return C(A().B())
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/usages3.kt

@@ -0,0 +1,9 @@
+package test2
+
+import test.A
+import test.A.B
+import test.C
+
+fun foo2(): C {
+    return C(A().B())
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/before/test.kt

@@ -0,0 +1,66 @@
+package test
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()
+
+class A {
+    class X {
+
+    }
+
+    companion object {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    object O {
+        class Y
+
+        fun foo(n: Int) {}
+
+        val bar = 1
+
+        fun Int.extFoo(n: Int) {}
+
+        val Int.extBar: Int get() = 1
+    }
+
+    inner class B {
+        inner class OuterY
+
+        fun outerFoo(n: Int) {}
+
+        val outerBar = 1
+
+        inner class <caret>C {
+            fun test() {
+                X()
+
+                Y()
+                foo(bar)
+                //1.extFoo(1.extBar) // conflict
+
+                OuterY()
+                outerFoo(outerBar)
+
+                this@B.OuterY()
+                this@B.outerFoo(this@B.outerBar)
+
+                O.Y()
+                O.foo(O.bar)
+
+                with (O) {
+                    Y()
+                    foo(bar)
+                    1.extFoo(1.extBar)
+                }
+            }
+        }
+    }
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/before/test2/usages.java

@@ -0,0 +1,9 @@
+package test2;
+
+import test.A;
+
+class Test {
+    A.B.C foo() {
+        return new A().new B().new C();
+    }
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/before/test2/usages2.java

@@ -0,0 +1,10 @@
+package test2;
+
+import test.A;
+import test.A.B.C;
+
+class Test {
+    C foo() {
+        return new A().new B().new C();
+    }
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/before/test2/usages3.java

@@ -0,0 +1,10 @@
+package test2;
+
+import test.A;
+import test.A.B;
+
+class Test {
+    B.C foo() {
+        return new A().new B().new C();
+    }
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/before/usages.kt

@@ -0,0 +1,7 @@
+package test2
+
+import test.A
+
+fun foo(): A.B.C {
+    return A().B().C()
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/before/usages2.kt

@@ -0,0 +1,8 @@
+package test2
+
+import test.A
+import test.A.B.C
+
+fun foo2(): C {
+    return A().B().C()
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/before/usages3.kt

@@ -0,0 +1,8 @@
+package test2
+
+import test.A
+import test.A.B
+
+fun foo2(): B.C {
+    return A().B().C()
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/deepInnerToTopLevelWithThis.test

@@ -0,0 +1,6 @@
+{
+  "mainFile": "test.kt",
+  "type": "MOVE_KOTLIN_NESTED_CLASS",
+  "outerInstanceParameter": "b",
+  "withRuntime": "true"
+}