Move: Update test data for tests with conflicts

Check refactoring result for the case when conflicts are ignored.
Fix move destination when moving to another source root

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

@@ -0,0 +1,8 @@
+package test
+
+class C(private val a: A.B) {
+    fun test() {
+        OuterOuterY()
+        this@A.OuterOuterY()
+    }
+}

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

@@ -4,11 +4,5 @@ class A {
     inner class OuterOuterY
 
     inner class B {
-        inner class C {
-            fun test() {
-                OuterOuterY()
-                this@A.OuterOuterY()
-            }
-        }
     }
 }

idea/testData/refactoring/move/kotlin/moveNestedClass/deepPrivateClass/after/main.kt

@@ -2,8 +2,9 @@ class A {
     private class B {
         private class D
 
-        private class C {
-            private val d = D()
-        }
+    }
+
+    private class C {
+        private val d = B.D()
     }
 }

idea/testData/refactoring/move/kotlin/moveNestedClass/deepProtectedClass/after/main.kt

@@ -2,12 +2,13 @@ class A {
     open class B {
         protected class D
 
-        protected class C {
-            private val d = D()
-        }
+    }
+
+    protected class C {
+        private val d = B.D()
     }
 }
 
 class X : A.B() {
-    private val c = A.B.C()
+    private val c = A.C()
 }

idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelWithThisOuterRefConflicts/after/Y.kt

@@ -0,0 +1,9 @@
+package test
+
+class Y(private val a: X) {
+    fun test() {
+        1.foo()
+        with(1) { foo() }
+        with(A()) { bar() }
+    }
+}

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

@@ -9,11 +9,4 @@ class A() {
 class X {
     fun Int.foo() {}
 
-    inner class Y {
-        fun test() {
-            1.foo()
-            with(1) { foo() }
-            with(A()) { bar() }
-        }
-    }
 }

idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevelCompanionConflict/after/B.kt

@@ -0,0 +1,7 @@
+package test
+
+class B {
+    fun test() {
+        1.extFoo(1.extBar)
+    }
+}

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

@@ -7,9 +7,4 @@ class A {
         val Int.extBar: Int get() = 1
     }
 
-    class B {
-        fun test() {
-            1.extFoo(1.extBar)
-        }
-    }
 }

idea/testData/refactoring/move/kotlin/moveNestedClass/privateClass/after/B.kt

@@ -0,0 +1,3 @@
+private class B {
+    private val c = A.C()
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/privateClass/after/main.kt

@@ -1,9 +1,5 @@
 class A {
     private val a = B()
 
-    private class B {
-        private val c = C()
-    }
-
     private class C()
 }

idea/testData/refactoring/move/kotlin/moveNestedClass/protectedClass/after/B.kt

@@ -0,0 +1,3 @@
+class B {
+    private val c = A.C()
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/protectedClass/after/main.kt

@@ -1,10 +1,6 @@
 open class A {
     private val a = B()
 
-    protected class B {
-        private val c = C()
-    }
-
     protected class C()
 }