From fdc7c75f5b21744f7a2cd4c8fc72e554542d5a73 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 16 Nov 2015 18:35:35 +0300
Subject: [PATCH] Fixed "Import member" intention shown in the wrong place

---
 .../kotlin/idea/intentions/ImportMemberIntention.kt      | 5 ++---
 idea/testData/intentions/importMember/NotForQualifier.kt | 9 +++++++++
 .../kotlin/idea/intentions/IntentionTestGenerated.java   | 6 ++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 idea/testData/intentions/importMember/NotForQualifier.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt
index efe6ee0a4e3..9e06193354a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt
@@ -25,10 +25,10 @@ import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.idea.util.ShortenReferences
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
 import org.jetbrains.kotlin.psi.KtNameReferenceExpression
 import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
+import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement
 import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
@@ -65,8 +65,7 @@ class ImportMemberIntention : SelfTargetingOffsetIndependentIntention<KtNameRefe
     }
 
     private fun qualifiedExpression(element: KtNameReferenceExpression): KtDotQualifiedExpression? {
-        val parent = element.parent
-        return (if (parent is KtCallExpression) parent.parent else parent) as? KtDotQualifiedExpression
+        return element.getQualifiedElement() as? KtDotQualifiedExpression
     }
 
     private fun targetFqName(qualifiedExpression: KtDotQualifiedExpression): FqName? {
diff --git a/idea/testData/intentions/importMember/NotForQualifier.kt b/idea/testData/intentions/importMember/NotForQualifier.kt
new file mode 100644
index 00000000000..f9989e1153c
--- /dev/null
+++ b/idea/testData/intentions/importMember/NotForQualifier.kt
@@ -0,0 +1,9 @@
+// IS_APPLICABLE: false
+// WITH_RUNTIME
+
+import javax.swing.SwingUtilities
+
+fun foo() {
+    <caret>SwingUtilities.invokeLater {
+    }
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 2c486976ba2..a4efd9dcb9a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -5211,6 +5211,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("NotForQualifier.kt")
+        public void testNotForQualifier() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/importMember/NotForQualifier.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("ObjectMethod.kt")
         public void testObjectMethod() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/importMember/ObjectMethod.kt");