Move: More accurate visibility analysis

#KT-10553 Fixed

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

@@ -0,0 +1,9 @@
+class A {
+    private class B {
+        private class D
+
+        private class C {
+            private val d = D()
+        }
+    }
+}

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

@@ -0,0 +1,9 @@
+class A {
+    private class B {
+        private class D
+
+        private class <caret>C {
+            private val d = D()
+        }
+    }
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepPrivateClass/conflicts.txt

@@ -0,0 +1 @@
+Class C uses class D which will be inaccessible after move

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

@@ -0,0 +1,6 @@
+{
+  "mainFile": "main.kt",
+  "type": "MOVE_KOTLIN_NESTED_CLASS",
+  "targetClass": "A",
+  "withRuntime": "true"
+}

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

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

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

@@ -0,0 +1,13 @@
+class A {
+    open class B {
+        protected class D
+
+        protected class <caret>C {
+            private val d = D()
+        }
+    }
+}
+
+class X : A.B() {
+    private val c = A.B.C()
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/deepProtectedClass/conflicts.txt

@@ -0,0 +1,2 @@
+Class C uses class D which will be inaccessible after move
+Property c uses class C which will be inaccessible after move

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

@@ -0,0 +1,6 @@
+{
+  "mainFile": "main.kt",
+  "type": "MOVE_KOTLIN_NESTED_CLASS",
+  "targetClass": "A",
+  "withRuntime": "true"
+}

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

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

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

@@ -0,0 +1,9 @@
+class A {
+    private val a = B()
+
+    private class <caret>B {
+        private val c = C()
+    }
+
+    private class C()
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/privateClass/conflicts.txt

@@ -0,0 +1,2 @@
+Class B uses constructor C() which will be inaccessible after move
+Property a uses class B which will be inaccessible after move

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

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.kt",
+  "type": "MOVE_KOTLIN_NESTED_CLASS",
+  "withRuntime": "true"
+}

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

@@ -0,0 +1,13 @@
+open class A {
+    private val a = B()
+
+    protected class B {
+        private val c = C()
+    }
+
+    protected class C()
+}
+
+class X : A() {
+    private val b = B()
+}

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

@@ -0,0 +1,13 @@
+open class A {
+    private val a = B()
+
+    protected class <caret>B {
+        private val c = C()
+    }
+
+    protected class C()
+}
+
+class X : A() {
+    private val b = B()
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/protectedClass/conflicts.txt

@@ -0,0 +1 @@
+Class B uses constructor C() which will be inaccessible after move

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

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.kt",
+  "type": "MOVE_KOTLIN_NESTED_CLASS",
+  "withRuntime": "true"
+}

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

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

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

@@ -0,0 +1,9 @@
+open class A {
+    private val a = B()
+
+    class C()
+}
+
+class X : A() {
+    private val b = B()
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/protectedClassNoConflicts/before/main.kt

@@ -0,0 +1,13 @@
+open class A {
+    private val a = B()
+
+    protected class <caret>B {
+        private val c = C()
+    }
+
+    class C()
+}
+
+class X : A() {
+    private val b = B()
+}

idea/testData/refactoring/move/kotlin/moveNestedClass/protectedClassNoConflicts/protectedClass.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.kt",
+  "type": "MOVE_KOTLIN_NESTED_CLASS",
+  "withRuntime": "true"
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/conflicts.txt

@@ -1,4 +1,4 @@
-Class a.Test uses package-private class a.Foo
-Class a.Test uses package-private function a.foo
-Package-private class a.Test will no longer be accessible from method J.bar()
-Package-private class a.Test will no longer be accessible from variable a.bar.t
+Class Test uses class Foo which will be inaccessible after move
+Class Test uses function foo() which will be inaccessible after move
+Method bar() uses class Test which will be inaccessible after move
+Variable t uses class Test which will be inaccessible after move

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/conflicts.txt

@@ -1,4 +1,4 @@
-Function a.test uses package-private class a.Foo
-Function a.test uses package-private function a.foo
-Package-private function a.test will no longer be accessible from function a.bar
-Package-private function a.test will no longer be accessible from method J.bar()
+Function bar() uses function test() which will be inaccessible after move
+Function test() uses class Foo which will be inaccessible after move
+Function test() uses function foo() which will be inaccessible after move
+Method bar() uses function test() which will be inaccessible after move

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/conflicts.txt

@@ -1,4 +1,4 @@
-Object a.Test uses package-private class a.Foo
-Object a.Test uses package-private function a.foo
-Package-private object a.Test will no longer be accessible from method J.bar()
-Package-private object a.Test will no longer be accessible from variable a.bar.t
+Method bar() uses object Test which will be inaccessible after move
+Object Test uses class Foo which will be inaccessible after move
+Object Test uses function foo() which will be inaccessible after move
+Variable t uses object Test which will be inaccessible after move

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

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

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

@@ -0,0 +1,3 @@
+package a
+
+object Utils

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

@@ -0,0 +1,9 @@
+package a
+
+private fun <caret>foo() {
+    bar()
+}
+
+private fun bar() {
+    foo()
+}

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

@@ -0,0 +1,3 @@
+package a
+
+object Utils

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivateFun/conflicts.txt

@@ -0,0 +1,2 @@
+Function bar() uses function foo() which will be inaccessible after move
+Function foo() uses function bar() which will be inaccessible after move

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivateFun/movePrivateFun.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetFile": "utils.kt"
+}

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

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

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

@@ -0,0 +1,3 @@
+package a
+
+object Utils

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

@@ -0,0 +1,7 @@
+package a
+
+private val <caret>foo: Int
+    get() = bar
+
+private val bar: Int
+    get() = foo

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

@@ -0,0 +1,3 @@
+package a
+
+object Utils

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivateProperty/conflicts.txt

@@ -0,0 +1,2 @@
+Property bar uses property foo which will be inaccessible after move
+Property foo uses property bar which will be inaccessible after move

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePrivateProperty/movePrivateProperty.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetFile": "utils.kt"
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/conflicts.txt

@@ -1,4 +1,4 @@
-Package-private property a.test will no longer be accessible from function a.bar
-Package-private property a.test will no longer be accessible from method J.bar()
-Property a.test uses package-private class a.Foo
-Property a.test uses package-private function a.foo
+Function bar() uses property test which will be inaccessible after move
+Method bar() uses property test which will be inaccessible after move
+Property test uses class Foo which will be inaccessible after move
+Property test uses function foo() which will be inaccessible after move