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

EA-92388: Fix of exception in import action creation

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-01-20 13:41:21 +03:00
parent 818773b7e2
commit 1f573bb115
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
+3 -1
View File
@@ -64,9 +64,10 @@ internal fun createSingleImportAction(
val variants = fqNames val variants = fqNames
.map { fqName -> .map { fqName ->
val sameFqNameDescriptors = file.resolveImportReference(fqName) val sameFqNameDescriptors = file.resolveImportReference(fqName)
val priority = sameFqNameDescriptors.map { prioritizer.priority(it) }.min()!! val priority = sameFqNameDescriptors.map { prioritizer.priority(it) }.min() ?: return@map null
Prioritizer.VariantWithPriority(SingleImportVariant(fqName, sameFqNameDescriptors), priority) Prioritizer.VariantWithPriority(SingleImportVariant(fqName, sameFqNameDescriptors), priority)
} }
.filterNotNull()
.sortedBy { it.priority } .sortedBy { it.priority }
.map { it.variant } .map { it.variant }
@@ -150,6 +151,7 @@ class KotlinAddImportAction internal constructor(
override fun execute(): Boolean { override fun execute(): Boolean {
PsiDocumentManager.getInstance(project).commitAllDocuments() PsiDocumentManager.getInstance(project).commitAllDocuments()
if (!element.isValid) return false if (!element.isValid) return false
if (variants.isEmpty()) return false
if (variants.size == 1 || ApplicationManager.getApplication().isUnitTestMode) { if (variants.size == 1 || ApplicationManager.getApplication().isUnitTestMode) {
addImport(variants.first()) addImport(variants.first())