Move: Use KtNamedDeclaration as referrer when reporting a conflict

EA-103817 Fixed

idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt

@@ -380,7 +380,7 @@ class MoveConflictChecker(
             val targetVisibility = visibility.normalize()
             if (targetVisibility == Visibilities.PUBLIC) return true
 
-            val referrer = ref.element.getStrictParentOfType<KtDeclaration>()
+            val referrer = ref.element.getStrictParentOfType<KtNamedDeclaration>()
             val referrerDescriptor = referrer?.resolveToDescriptor() ?: return true
 
             if (!isVisibleIn(referrerDescriptor)) return true

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/classWithInitializer/after/source/Foo.kt

@@ -0,0 +1,4 @@
+package source
+
+private class X
+

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/classWithInitializer/after/target/Test.kt

@@ -0,0 +1,9 @@
+package target
+
+import source.X
+
+class Test {
+    init {
+        X()
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/classWithInitializer/before/source/Foo.kt

@@ -0,0 +1,9 @@
+package source
+
+private class X
+
+class <caret>Test {
+    init {
+        X()
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/classWithInitializer/conflicts.txt

@@ -0,0 +1 @@
+Class Test uses class X which will be inaccessible after move

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/classWithInitializer/delegateInObject.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "source/Foo.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetPackage": "target"
+}

idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java

@@ -504,6 +504,12 @@ public class MoveTestGenerated extends AbstractMoveTest {
         doTest(fileName);
     }
 
+    @TestMetadata("kotlin/moveTopLevelDeclarations/misc/classWithInitializer/delegateInObject.test")
+    public void testKotlin_moveTopLevelDeclarations_misc_classWithInitializer_DelegateInObject() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/classWithInitializer/delegateInObject.test");
+        doTest(fileName);
+    }
+
     @TestMetadata("kotlin/moveTopLevelDeclarations/misc/companionExtensionMemberRef/companionExtensionMemberRef.test")
     public void testKotlin_moveTopLevelDeclarations_misc_companionExtensionMemberRef_CompanionExtensionMemberRef() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/companionExtensionMemberRef/companionExtensionMemberRef.test");