MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Align popup tooltip with quick fix and autocompletion suggestion

Browse Source 
#KTIJ-20617

GitOrigin-RevId: 01e2ded7dd3439f732c76e3047469a0ca8700b46
This commit is contained in:
Vladimir Dolzhenko
2022-11-14 22:38:14 +00:00
committed by intellij-monorepo-bot
parent 92a1c3cc46
commit c5142d33cb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
+6 -4
View File
@@ -50,6 +50,7 @@ import org.jetbrains.kotlin.psi.psiUtil.endOffset
import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.resolve.ImportPath
import java.awt.BorderLayout
import java.util.*
import javax.swing.Icon
import javax.swing.JPanel
import javax.swing.ListCellRenderer
@@ -62,16 +63,17 @@ internal fun createSingleImportAction(
): KotlinAddImportAction {
val file = element.containingKtFile
val prioritizer = Prioritizer(file)
val variants = fqNames.asSequence().mapNotNull { fqName ->
val variants = TreeSet<VariantWithPriority>(compareBy({ it.priority }, { it.variant.hint }))
for (fqName in fqNames) {
val sameFqNameDescriptors = file.resolveImportReference(fqName)
val priority = sameFqNameDescriptors.minOfOrNull {
prioritizer.priority(it, file.languageVersionSettings)
} ?: return@mapNotNull null
} ?: continue
VariantWithPriority(SingleImportVariant(fqName, sameFqNameDescriptors, project), priority)
variants += VariantWithPriority(SingleImportVariant(fqName, sameFqNameDescriptors, project), priority)
}
return KotlinAddImportAction(project, editor, element, variants)
return KotlinAddImportAction(project, editor, element, variants.asSequence())
}
internal fun createSingleImportActionForConstructor(