Move: Fix processing of calls and callable references

Fix CCE on callable references to Java methods.
Fix qualification of callable references without receivers.
Fix processing of calls/callable references to object extensions
and extension members.
Do not explicate short companion references

 #KT-16809 Fixed

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithFqNames/after/bar/usages.kt

@@ -0,0 +1,4 @@
+package bar
+
+class X
+

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithFqNames/after/baz/test.kt

@@ -0,0 +1,55 @@
+package baz
+
+import foo.O.objectExtensionMember2
+import foo.classExtension
+import foo.companionExtension
+import foo.objectExtension
+
+fun test() {
+    foo.A().classMember()
+    foo.A().classExtension()
+    foo.O.objectMember1()
+    foo.O.objectMember2()
+    foo.O.objectExtension()
+    foo.A.companionMember()
+    foo.A.companionExtension()
+    foo.J().javaClassMember()
+    foo.J.javaClassStaticMember()
+    foo.topLevel()
+    with(foo.O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(foo.A) { 1.companionExtensionMember() }
+
+    foo.A()::classMember
+    foo.A::classMember
+    foo.A()::classExtension
+    foo.A::classExtension
+    foo.O::objectMember1
+    foo.O::objectMember2
+    foo.O::objectExtension
+    foo.A.Companion::companionMember
+    (foo.A)::companionMember
+    foo.A.Companion::companionExtension
+    (foo.A)::companionExtension
+    foo.J()::javaClassMember
+    foo.J::javaClassMember
+    foo.J::javaClassStaticMember
+    //::topLevel // not usable without import
+
+    with(foo.A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(foo.J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithFqNames/after/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithFqNames/after/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithFqNames/before/bar/usages.kt

@@ -0,0 +1,57 @@
+package bar
+
+import foo.O.objectExtensionMember2
+import foo.classExtension
+import foo.companionExtension
+import foo.objectExtension
+
+class X
+
+fun <caret>test() {
+    foo.A().classMember()
+    foo.A().classExtension()
+    foo.O.objectMember1()
+    foo.O.objectMember2()
+    foo.O.objectExtension()
+    foo.A.companionMember()
+    foo.A.companionExtension()
+    foo.J().javaClassMember()
+    foo.J.javaClassStaticMember()
+    foo.topLevel()
+    with(foo.O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(foo.A) { 1.companionExtensionMember() }
+
+    foo.A()::classMember
+    foo.A::classMember
+    foo.A()::classExtension
+    foo.A::classExtension
+    foo.O::objectMember1
+    foo.O::objectMember2
+    foo.O::objectExtension
+    foo.A.Companion::companionMember
+    (foo.A)::companionMember
+    foo.A.Companion::companionExtension
+    (foo.A)::companionExtension
+    foo.J()::javaClassMember
+    foo.J::javaClassMember
+    foo.J::javaClassStaticMember
+    //::topLevel // not usable without import
+
+    with(foo.A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(foo.J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithFqNames/before/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithFqNames/before/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithFqNames/differentSourceAndTargetWithFqNames.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "bar/usages.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetPackage": "baz"
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/bar/usages.kt

@@ -0,0 +1,4 @@
+package bar
+
+class X
+

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/baz/test.kt

@@ -0,0 +1,59 @@
+package baz
+
+import foo.A
+import foo.J
+import foo.O
+import foo.O.objectExtensionMember2
+import foo.classExtension
+import foo.companionExtension
+import foo.objectExtension
+import foo.topLevel
+
+fun test() {
+    A().classMember()
+    A().classExtension()
+    O.objectMember1()
+    O.objectMember2()
+    O.objectExtension()
+    A.companionMember()
+    A.companionExtension()
+    J().javaClassMember()
+    J.javaClassStaticMember()
+    topLevel()
+    with(O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(A) { 1.companionExtensionMember() }
+
+    A()::classMember
+    A::classMember
+    A()::classExtension
+    A::classExtension
+    O::objectMember1
+    O::objectMember2
+    O::objectExtension
+    A.Companion::companionMember
+    (A)::companionMember
+    A.Companion::companionExtension
+    (A)::companionExtension
+    J()::javaClassMember
+    J::javaClassMember
+    J::javaClassStaticMember
+    ::topLevel
+
+    with(A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/after/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/bar/usages.kt

@@ -0,0 +1,56 @@
+package bar
+
+import foo.*
+import foo.O.objectMember2
+import foo.O.objectExtensionMember2
+
+class X
+
+fun <caret>test() {
+    A().classMember()
+    A().classExtension()
+    O.objectMember1()
+    objectMember2()
+    O.objectExtension()
+    A.companionMember()
+    A.companionExtension()
+    J().javaClassMember()
+    J.javaClassStaticMember()
+    topLevel()
+    with(O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(A) { 1.companionExtensionMember() }
+
+    A()::classMember
+    A::classMember
+    A()::classExtension
+    A::classExtension
+    O::objectMember1
+    ::objectMember2
+    O::objectExtension
+    A.Companion::companionMember
+    (A)::companionMember
+    A.Companion::companionExtension
+    (A)::companionExtension
+    J()::javaClassMember
+    J::javaClassMember
+    J::javaClassStaticMember
+    ::topLevel
+
+    with(A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/before/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceAndTargetWithImports/differentSourceAndTargetWithImports.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "bar/usages.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetPackage": "baz"
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithFqNames/after/bar/usages.kt

@@ -0,0 +1,4 @@
+package bar
+
+class X
+

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithFqNames/after/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithFqNames/after/foo/test.kt

@@ -0,0 +1,52 @@
+package foo
+
+import foo.O.objectExtensionMember2
+
+fun test() {
+    A().classMember()
+    A().classExtension()
+    O.objectMember1()
+    O.objectMember2()
+    O.objectExtension()
+    A.companionMember()
+    A.companionExtension()
+    J().javaClassMember()
+    J.javaClassStaticMember()
+    topLevel()
+    with(O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(A) { 1.companionExtensionMember() }
+
+    A()::classMember
+    A::classMember
+    A()::classExtension
+    A::classExtension
+    O::objectMember1
+    O::objectMember2
+    O::objectExtension
+    A.Companion::companionMember
+    (A)::companionMember
+    A.Companion::companionExtension
+    (A)::companionExtension
+    J()::javaClassMember
+    J::javaClassMember
+    J::javaClassStaticMember
+    //::topLevel // not usable without import
+
+    with(A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithFqNames/after/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithFqNames/before/bar/usages.kt

@@ -0,0 +1,57 @@
+package bar
+
+import foo.O.objectExtensionMember2
+import foo.classExtension
+import foo.companionExtension
+import foo.objectExtension
+
+class X
+
+fun <caret>test() {
+    foo.A().classMember()
+    foo.A().classExtension()
+    foo.O.objectMember1()
+    foo.O.objectMember2()
+    foo.O.objectExtension()
+    foo.A.companionMember()
+    foo.A.companionExtension()
+    foo.J().javaClassMember()
+    foo.J.javaClassStaticMember()
+    foo.topLevel()
+    with(foo.O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(foo.A) { 1.companionExtensionMember() }
+
+    foo.A()::classMember
+    foo.A::classMember
+    foo.A()::classExtension
+    foo.A::classExtension
+    foo.O::objectMember1
+    foo.O::objectMember2
+    foo.O::objectExtension
+    foo.A.Companion::companionMember
+    (foo.A)::companionMember
+    foo.A.Companion::companionExtension
+    (foo.A)::companionExtension
+    foo.J()::javaClassMember
+    foo.J::javaClassMember
+    foo.J::javaClassStaticMember
+    //::topLevel // not usable without import
+
+    with(foo.A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(foo.J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithFqNames/before/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithFqNames/before/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithFqNames/differentSourceWithFqNames.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "bar/usages.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetPackage": "foo"
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/bar/usages.kt

@@ -0,0 +1,4 @@
+package bar
+
+class X
+

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/test.kt

@@ -0,0 +1,52 @@
+package foo
+
+import foo.O.objectExtensionMember2
+
+fun test() {
+    A().classMember()
+    A().classExtension()
+    O.objectMember1()
+    O.objectMember2()
+    O.objectExtension()
+    A.companionMember()
+    A.companionExtension()
+    J().javaClassMember()
+    J.javaClassStaticMember()
+    topLevel()
+    with(O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(A) { 1.companionExtensionMember() }
+
+    A()::classMember
+    A::classMember
+    A()::classExtension
+    A::classExtension
+    O::objectMember1
+    O::objectMember2
+    O::objectExtension
+    A.Companion::companionMember
+    (A)::companionMember
+    A.Companion::companionExtension
+    (A)::companionExtension
+    J()::javaClassMember
+    J::javaClassMember
+    J::javaClassStaticMember
+    ::topLevel
+
+    with(A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/after/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/bar/usages.kt

@@ -0,0 +1,56 @@
+package bar
+
+import foo.*
+import foo.O.objectMember2
+import foo.O.objectExtensionMember2
+
+class X
+
+fun <caret>test() {
+    A().classMember()
+    A().classExtension()
+    O.objectMember1()
+    objectMember2()
+    O.objectExtension()
+    A.companionMember()
+    A.companionExtension()
+    J().javaClassMember()
+    J.javaClassStaticMember()
+    topLevel()
+    with(O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(A) { 1.companionExtensionMember() }
+
+    A()::classMember
+    A::classMember
+    A()::classExtension
+    A::classExtension
+    O::objectMember1
+    ::objectMember2
+    O::objectExtension
+    A.Companion::companionMember
+    (A)::companionMember
+    A.Companion::companionExtension
+    (A)::companionExtension
+    J()::javaClassMember
+    J::javaClassMember
+    J::javaClassStaticMember
+    ::topLevel
+
+    with(A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/before/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentSourceWithImports/differentSourceWithImports.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "bar/usages.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetPackage": "foo"
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/bar/test.kt

@@ -0,0 +1,59 @@
+package bar
+
+import foo.A
+import foo.J
+import foo.O
+import foo.O.objectExtensionMember2
+import foo.classExtension
+import foo.companionExtension
+import foo.objectExtension
+import foo.topLevel
+
+fun test() {
+    A().classMember()
+    A().classExtension()
+    O.objectMember1()
+    O.objectMember2()
+    O.objectExtension()
+    A.companionMember()
+    A.companionExtension()
+    J().javaClassMember()
+    J.javaClassStaticMember()
+    topLevel()
+    with(O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(A) { 1.companionExtensionMember() }
+
+    A()::classMember
+    A::classMember
+    A()::classExtension
+    A::classExtension
+    O::objectMember1
+    O::objectMember2
+    O::objectExtension
+    A.Companion::companionMember
+    (A)::companionMember
+    A.Companion::companionExtension
+    (A)::companionExtension
+    J()::javaClassMember
+    J::javaClassMember
+    J::javaClassStaticMember
+    ::topLevel
+
+    with(A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/usages.kt

@@ -0,0 +1,4 @@
+package foo
+
+class X
+

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/after/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/usages.kt

@@ -0,0 +1,55 @@
+package foo
+
+import foo.O.objectMember2
+import foo.O.objectExtensionMember2
+
+class X
+
+fun <caret>test() {
+    A().classMember()
+    A().classExtension()
+    O.objectMember1()
+    objectMember2()
+    O.objectExtension()
+    A.companionMember()
+    A.companionExtension()
+    J().javaClassMember()
+    J.javaClassStaticMember()
+    topLevel()
+    with(O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(A) { 1.companionExtensionMember() }
+
+    A()::classMember
+    A::classMember
+    A()::classExtension
+    A::classExtension
+    O::objectMember1
+    ::objectMember2
+    O::objectExtension
+    A.Companion::companionMember
+    (A)::companionMember
+    A.Companion::companionExtension
+    (A)::companionExtension
+    J()::javaClassMember
+    J::javaClassMember
+    J::javaClassStaticMember
+    ::topLevel
+
+    with(A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/before/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTarget/differentTarget.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "foo/usages.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetPackage": "bar"
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/bar/test.kt

@@ -0,0 +1,59 @@
+package bar
+
+import foo.A
+import foo.J
+import foo.O
+import foo.O.objectExtensionMember2
+import foo.classExtension
+import foo.companionExtension
+import foo.objectExtension
+import foo.topLevel
+
+fun test() {
+    A().classMember()
+    A().classExtension()
+    O.objectMember1()
+    O.objectMember2()
+    O.objectExtension()
+    A.companionMember()
+    A.companionExtension()
+    J().javaClassMember()
+    J.javaClassStaticMember()
+    topLevel()
+    with(O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(A) { 1.companionExtensionMember() }
+
+    A()::classMember
+    A::classMember
+    A()::classExtension
+    A::classExtension
+    O::objectMember1
+    O::objectMember2
+    O::objectExtension
+    A.Companion::companionMember
+    (A)::companionMember
+    A.Companion::companionExtension
+    (A)::companionExtension
+    J()::javaClassMember
+    J::javaClassMember
+    J::javaClassStaticMember
+    ::topLevel
+
+    with(A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/usages.kt

@@ -0,0 +1,4 @@
+package foo
+
+class X
+

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/after/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/J.java

@@ -0,0 +1,11 @@
+package foo;
+
+public class J {
+    public void javaClassMember() {
+
+    }
+
+    public static void javaClassStaticMember() {
+
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/usages.kt

@@ -0,0 +1,54 @@
+package foo
+
+import foo.O.objectExtensionMember2
+
+class X
+
+fun <caret>test() {
+    foo.A().classMember()
+    foo.A().classExtension()
+    foo.O.objectMember1()
+    foo.O.objectMember2()
+    foo.O.objectExtension()
+    foo.A.companionMember()
+    foo.A.companionExtension()
+    foo.J().javaClassMember()
+    foo.J.javaClassStaticMember()
+    foo.topLevel()
+    with(foo.O) { 1.objectExtensionMember1() }
+    1.objectExtensionMember2()
+    with(foo.A) { 1.companionExtensionMember() }
+
+    foo.A()::classMember
+    foo.A::classMember
+    foo.A()::classExtension
+    foo.A::classExtension
+    foo.O::objectMember1
+    foo.O::objectMember2
+    foo.O::objectExtension
+    foo.A.Companion::companionMember
+    (foo.A)::companionMember
+    foo.A.Companion::companionExtension
+    (foo.A)::companionExtension
+    foo.J()::javaClassMember
+    foo.J::javaClassMember
+    foo.J::javaClassStaticMember
+    ::topLevel
+
+    with(foo.A()) {
+        classMember()
+        this.classMember()
+        classExtension()
+        this.classExtension()
+
+        this::classMember
+        this::classExtension
+    }
+
+    with(foo.J()) {
+        javaClassMember()
+        this.javaClassMember()
+
+        this::javaClassMember
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/before/foo/utils.kt

@@ -0,0 +1,51 @@
+package foo
+
+class A {
+    fun classMember() {
+
+    }
+
+    companion object {
+        fun companionMember() {
+
+        }
+
+        fun Int.companionExtensionMember() {
+
+        }
+    }
+}
+
+fun A.classExtension() {
+
+}
+
+object O {
+    fun objectMember1() {
+
+    }
+
+    fun objectMember2() {
+
+    }
+
+    fun Int.objectExtensionMember1() {
+
+    }
+
+    fun Int.objectExtensionMember2() {
+
+    }
+}
+
+fun O.objectExtension() {
+
+}
+
+fun A.Companion.companionExtension() {
+
+}
+
+fun topLevel() {
+
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/callsAndCallableRefs/internalUsages/differentTargetWithFqNames/differentTargetWithFqNames.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "foo/usages.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetPackage": "bar"
+}