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/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/A/src/a2/internalSource.kt

@@ -1,5 +1,5 @@
 package a2
 
-import a1.internalTargetVal
+import b.internalTargetVal
 
-internal val sourceVal = internalTargetVal
+internal val sourceVal = b.internalTargetVal

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFileWithDeclarationsToUnrelatedModuleConflict/after/B/src/b/internalTarget.kt

@@ -1,3 +1,3 @@
-package a1
+package b
 
 internal val internalTargetVal = 0

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/A/src/a/test.kt

@@ -1,4 +1,3 @@
 package a
 
-val val1 = 0
-val val2 = val1
+val val2 = target.val1

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveToUnrelatedModuleConflict/after/B/src/target/val1.kt

@@ -0,0 +1,3 @@
+package target
+
+val val1 = 0

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/A/src/a2/internalSource.kt

@@ -1,3 +1,3 @@
 package a2
 
-import a1.internalTargetVal
+import b.internalTargetVal

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/visibilityConflictInImport/after/B/src/b/internalTarget.kt

@@ -1,3 +1,3 @@
-package a1
+package b
 
 internal val internalTargetVal = 0

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/main.kt

@@ -1,7 +1,2 @@
 package a
 
-private class Test {
-    fun test {
-        foo(Foo())
-    }
-}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/noImports.java

@@ -1,5 +1,7 @@
 package a;
 
+import b.Test;
+
 class J {
     void bar() {
         Test t = new Test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/noImports.kt

@@ -1,5 +1,7 @@
 package a
 
+import b.Test
+
 fun bar() {
     val t: Test = Test()
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/b/Test.kt

@@ -0,0 +1,10 @@
+package b
+
+import a.Foo
+import a.foo
+
+private class Test {
+    fun test {
+        foo(Foo())
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/main.kt

@@ -1,5 +1,2 @@
 package a
 
-private fun test() {
-    foo(Foo())
-}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/noImports.java

@@ -1,7 +1,9 @@
 package a;
 
+import b.TestKt;
+
 class J {
     void bar() {
-        MainKt.test();
+        TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/noImports.kt

@@ -1,5 +1,7 @@
 package a
 
+import b.test
+
 fun bar() {
     test()
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/b/test.kt

@@ -0,0 +1,8 @@
+package b
+
+import a.Foo
+import a.foo
+
+private fun test() {
+    foo(Foo())
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/main.kt

@@ -1,7 +1,2 @@
 package a
 
-private object Test {
-    fun test {
-        foo(Foo())
-    }
-}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java

@@ -1,5 +1,7 @@
 package a;
 
+import b.Test;
+
 class J {
     void bar() {
         Test t = Test.INSTANCE;

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.kt

@@ -1,5 +1,7 @@
 package a
 
+import b.Test
+
 fun bar() {
     val t: Test = Test
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/b/Test.kt

@@ -0,0 +1,10 @@
+package b
+
+import a.Foo
+import a.foo
+
+private object Test {
+    fun test {
+        foo(Foo())
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivateClassWithUsagesInBothAccessors/after/target.kt

@@ -1 +1,3 @@
-package test
+package test
+
+private class TempY

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivateClassWithUsagesInBothAccessors/after/test.kt

@@ -1,7 +1,7 @@
 package test
 
-private class TempY
-
 var tempY: Int = 0
-    get() { TempY(); return field }
-    set(p: Int) { TempY(); field = p }
+    get() {
+        TempY(); return field }
+    set(p: Int) {
+        TempY(); field = p }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivateFun/after/main.kt

@@ -1,9 +1,5 @@
 package a
 
-private fun foo() {
-    bar()
-}
-
 private fun bar() {
     foo()
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivateFun/after/utils.kt

@@ -1,3 +1,7 @@
 package a
 
-object Utils
+object Utils
+
+private fun foo() {
+    bar()
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivateProperty/after/main.kt

@@ -1,7 +1,4 @@
 package a
 
-private val foo: Int
-    get() = bar
-
 private val bar: Int
     get() = foo

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivateProperty/after/utils.kt

@@ -1,3 +1,6 @@
 package a
 
-object Utils
+object Utils
+
+private val foo: Int
+    get() = bar

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivatePropertyWithDefaultAccessors/after/main.kt

@@ -1,4 +1,3 @@
 package a
 
-private val used: Int = 2
 val using: Int = used + 1

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivatePropertyWithDefaultAccessors/after/utils.kt

@@ -1,3 +1,5 @@
 package a
 
-object Utils
+object Utils
+
+private val used: Int = 2

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/main.kt

@@ -1,7 +1,2 @@
 package a
 
-private var test: String
-    get() = ""
-    set(value: String) {
-        foo(Foo())
-    }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/noImports.java

@@ -1,8 +1,10 @@
 package a;
 
+import b.TestKt;
+
 class J {
     void bar() {
-        MainKt.setTest("");
-        System.out.println(MainKt.getTest());
+        TestKt.setTest("");
+        System.out.println(TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/noImports.kt

@@ -1,5 +1,7 @@
 package a
 
+import b.test
+
 fun bar() {
     test = ""
     println(test)

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/b/test.kt

@@ -0,0 +1,10 @@
+package b
+
+import a.Foo
+import a.foo
+
+private var test: String
+    get() = ""
+    set(value: String) {
+        foo(Foo())
+    }