azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-01-29 00:05:02 +03:00
parent a3f546c6f9
commit 78be48ace8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+9 -2
View File
@@ -53,6 +53,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.idea.util.ImportInsertHelper
import org.jetbrains.kotlin.idea.util.ImportInsertHelper.ImportDescriptorResult import org.jetbrains.kotlin.idea.util.ImportInsertHelper.ImportDescriptorResult
import org.jetbrains.kotlin.descriptors.CallableDescriptor
public class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper() { public class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper() {
/** /**
@@ -190,8 +191,14 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
else -> return ImportDescriptorResult.FAIL else -> return ImportDescriptorResult.FAIL
} }
// do not insert imports for non-top level declarations if (!mayImportByCodeStyle(descriptor)) {
if (target !is PackageViewDescriptor && target.getContainingDeclaration() !is PackageFragmentDescriptor) return ImportDescriptorResult.FAIL 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() val imports = file.getImportDirectives()