From 78be48ace805302a35266d946880d78fb9b96cbd Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 29 Jan 2015 00:05:02 +0300 Subject: [PATCH] Minor refactoring --- .../kotlin/idea/util/ImportInsertHelperImpl.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt index d83f15f4bc3..e3ed0eea3b3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt @@ -53,6 +53,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor import com.intellij.openapi.project.Project import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.idea.util.ImportInsertHelper.ImportDescriptorResult +import org.jetbrains.kotlin.descriptors.CallableDescriptor public class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper() { /** @@ -190,8 +191,14 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert else -> return ImportDescriptorResult.FAIL } - // do not insert imports for non-top level declarations - if (target !is PackageViewDescriptor && target.getContainingDeclaration() !is PackageFragmentDescriptor) return ImportDescriptorResult.FAIL + if (!mayImportByCodeStyle(descriptor)) { + return ImportDescriptorResult.FAIL + } + + // cannot import for non-top level function or property + if (target is CallableDescriptor && target.getContainingDeclaration() !is PackageFragmentDescriptor) { + return ImportDescriptorResult.FAIL + } val imports = file.getImportDirectives()