From f35079055aa989c63c7693d7f742d5848b5bfe73 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 18 Apr 2017 18:42:38 +0200 Subject: [PATCH] Don't try to import elements that don't belong to any module (EA-91890) --- .../idea/conversion/copy/PlainTextPasteImportResolver.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt index cc345cd6f3d..a0edce8e6f2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt @@ -20,10 +20,7 @@ import com.intellij.psi.* import com.intellij.psi.search.PsiShortNamesCache import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully -import org.jetbrains.kotlin.idea.caches.resolve.getJavaMemberDescriptor -import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade -import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor +import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.core.isVisible import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport import org.jetbrains.kotlin.idea.references.mainReference @@ -144,6 +141,7 @@ class PlainTextPasteImportResolver(val dataForConversion: DataForConversion, val val members = (shortNameCache.getMethodsByName(referenceName, scope).asList() + shortNameCache.getFieldsByName(referenceName, scope).asList()) .map { it as PsiMember } + .filter { it.getNullableModuleInfo() != null } .map { it to it.getJavaMemberDescriptor(resolutionFacade) as? DeclarationDescriptorWithVisibility } .filter { canBeImported(it.second) }