Shorten references inserts imports for global functions and properties too

idea/testData/copyPaste/imports/DeepInnerClasses.expected.kt

@@ -1,7 +1,7 @@
 package to
 
-import a.with
 import a.Outer
+import a.with
 
 fun f(p1: Outer.Nested.NN, p2: Outer.Nested.NI, p3: Outer.Inner.II) {
     Outer.Nested.NN2()

idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.expected.kt

@@ -1,11 +1,11 @@
 package to
 
-import d.g
-import d.c
 import d.ext
 import d.A
 import d.T
 import d.Outer
+import d.c
+import d.g
 import d.O1
 import d.O2
 import d.E

idea/testData/copyPaste/imports/ImportDependency.expected.kt

@@ -1,11 +1,11 @@
 package to
 
-import d.g
-import d.c
 import d.ext
 import d.A
 import d.T
 import d.Outer
+import d.c
+import d.g
 import d.O1
 import d.O2
 import d.E

idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.expected.kt

@@ -1,7 +1,7 @@
 package to
 
-import a.f
 import a.ext
+import a.f
 
 fun g() {
     f {

idea/testData/refactoring/move/kotlin/moveFile/internalReferences/after/source/some.kt

@@ -1,5 +1,6 @@
 package source
 
 import target.A
+import target.test
 
-fun test1() = target.test(A())
+fun test1() = test(A())

idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/noImports.kt

@@ -1,10 +1,12 @@
 package c
 
 import b.Test
+import b.test
+import b.TEST
 
 fun bar() {
     val t: Test = Test()
-    b.test()
-    println(b.TEST)
-    b.TEST = ""
+    test()
+    println(TEST)
+    TEST = ""
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/_a/noImports.kt

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

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

@@ -1,7 +1,9 @@
 package a
 
+import b.test
+
 class Test {
     fun foo() {
-        b.test()
+        test()
     }
 }

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

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

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.kt

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

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.kt

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

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/_a/noImports.kt

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

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

@@ -1,7 +1,9 @@
 package a
 
+import b.test
+
 class Test {
     fun foo() {
-        b.test()
+        test()
     }
 }

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

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

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.kt

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

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.kt

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

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/_a/noImports.kt

@@ -1,6 +1,8 @@
 package a
 
+import b.test
+
 fun bar() {
-    b.test = ""
-    println(b.test)
+    test = ""
+    println(test)
 }

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

@@ -1,7 +1,9 @@
 package a
 
+import b.test
+
 class Test {
     fun foo() {
-        b.test()
+        test()
     }
 }

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

@@ -1,6 +1,8 @@
 package a
 
+import b.test
+
 fun bar() {
-    b.test = ""
-    println(b.test)
+    test = ""
+    println(test)
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.kt

@@ -1,6 +1,8 @@
 package c
 
+import b.test
+
 fun bar() {
-    b.test = ""
-    println(b.test)
+    test = ""
+    println(test)
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.kt

@@ -1,8 +1,9 @@
 package c
 
 import a.*
+import b.test
 
 fun bar() {
-    b.test = ""
-    println(b.test)
+    test = ""
+    println(test)
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/_a/noImports.kt

@@ -1,6 +1,8 @@
 package a
 
+import b.test
+
 fun bar() {
-    b.test = ""
-    println(b.test)
+    test = ""
+    println(test)
 }

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

@@ -1,7 +1,9 @@
 package a
 
+import b.test
+
 class Test {
     fun foo() {
-        b.test()
+        test()
     }
 }

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

@@ -1,6 +1,8 @@
 package a
 
+import b.test
+
 fun bar() {
-    b.test = ""
-    println(b.test)
+    test = ""
+    println(test)
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.kt

@@ -1,6 +1,8 @@
 package c
 
+import b.test
+
 fun bar() {
-    b.test = ""
-    println(b.test)
+    test = ""
+    println(test)
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.kt

@@ -1,8 +1,9 @@
 package c
 
 import a.*
+import b.test
 
 fun bar() {
-    b.test = ""
-    println(b.test)
+    test = ""
+    println(test)
 }

idea/testData/shortenRefs/imports/importGlobalCallables.dependency.kt

@@ -0,0 +1,4 @@
+package p
+
+fun globalFun(p: Int) {}
+val globalVal: Int = 1

idea/testData/shortenRefs/imports/importGlobalCallables.kt

@@ -0,0 +1,3 @@
+fun foo() {
+    <selection>p.globalFun(p.globalVal)</selection>
+}

idea/testData/shortenRefs/imports/importGlobalCallables.kt.after

@@ -0,0 +1,6 @@
+import p.globalVal
+import p.globalFun
+
+fun foo() {
+    globalFun(globalVal)
+}