From 836d116786c3d435b0686d9fd84b59886594821d Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Thu, 1 Oct 2015 21:34:47 +0300
Subject: [PATCH] Checked that import popup now works for callable references

---
 .../autoImports/callableReferenceExtension.after.kt  |  5 +++++
 .../callableReferenceExtension.before.Dependency.kt  |  3 +++
 .../callableReferenceExtension.before.Main.kt        |  3 +++
 .../autoImports/callableReferenceTopLevel.after.kt   |  5 +++++
 .../callableReferenceTopLevel.before.Dependency.kt   |  3 +++
 .../callableReferenceTopLevel.before.Main.kt         |  3 +++
 .../quickfix/QuickFixMultiFileTestGenerated.java     | 12 ++++++++++++
 7 files changed, 34 insertions(+)
 create mode 100644 idea/testData/quickfix/autoImports/callableReferenceExtension.after.kt
 create mode 100644 idea/testData/quickfix/autoImports/callableReferenceExtension.before.Dependency.kt
 create mode 100644 idea/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt
 create mode 100644 idea/testData/quickfix/autoImports/callableReferenceTopLevel.after.kt
 create mode 100644 idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Dependency.kt
 create mode 100644 idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt

diff --git a/idea/testData/quickfix/autoImports/callableReferenceExtension.after.kt b/idea/testData/quickfix/autoImports/callableReferenceExtension.after.kt
new file mode 100644
index 00000000000..d88b2250511
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/callableReferenceExtension.after.kt
@@ -0,0 +1,5 @@
+import dependency.extensionFun
+
+// "Import" "true"
+// ERROR: Unresolved reference: extensionFun
+val v = String::extensionFun<caret>
diff --git a/idea/testData/quickfix/autoImports/callableReferenceExtension.before.Dependency.kt b/idea/testData/quickfix/autoImports/callableReferenceExtension.before.Dependency.kt
new file mode 100644
index 00000000000..b7e1cc74a49
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/callableReferenceExtension.before.Dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+fun String.extensionFun(){}
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt b/idea/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt
new file mode 100644
index 00000000000..ce7d8bc5443
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt
@@ -0,0 +1,3 @@
+// "Import" "true"
+// ERROR: Unresolved reference: extensionFun
+val v = String::extensionFun<caret>
diff --git a/idea/testData/quickfix/autoImports/callableReferenceTopLevel.after.kt b/idea/testData/quickfix/autoImports/callableReferenceTopLevel.after.kt
new file mode 100644
index 00000000000..b0fe30716d0
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/callableReferenceTopLevel.after.kt
@@ -0,0 +1,5 @@
+import dependency.topLevelFun
+
+// "Import" "true"
+// ERROR: Unresolved reference: topLevelFun
+val v = ::topLevelFun<caret>
diff --git a/idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Dependency.kt b/idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Dependency.kt
new file mode 100644
index 00000000000..a1af0543c79
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+fun topLevelFun(){}
\ No newline at end of file
diff --git a/idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt b/idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt
new file mode 100644
index 00000000000..0d2b6c371c4
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt
@@ -0,0 +1,3 @@
+// "Import" "true"
+// ERROR: Unresolved reference: topLevelFun
+val v = ::topLevelFun<caret>
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
index 02b86a53466..7d969251c8d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
@@ -65,6 +65,18 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
             doTestWithExtraFile(fileName);
         }
 
+        @TestMetadata("callableReferenceExtension.before.Main.kt")
+        public void testCallableReferenceExtension() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt");
+            doTestWithExtraFile(fileName);
+        }
+
+        @TestMetadata("callableReferenceTopLevel.before.Main.kt")
+        public void testCallableReferenceTopLevel() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt");
+            doTestWithExtraFile(fileName);
+        }
+
         @TestMetadata("classImport.before.Main.kt")
         public void testClassImport() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/classImport.before.Main.kt");