Fixed "Import member" intention shown in the wrong place

This commit is contained in:
Valentin Kipyatkov
2015-11-16 18:35:35 +03:00
parent bf99f91d83
commit fdc7c75f5b
3 changed files with 17 additions and 3 deletions
@@ -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? {
@@ -0,0 +1,9 @@
// IS_APPLICABLE: false
// WITH_RUNTIME
import javax.swing.SwingUtilities
fun foo() {
<caret>SwingUtilities.invokeLater {
}
}
@@ -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");