Skip to content

Commit

Permalink
Take care of deprecations in VlangImportModuleQuickFix
Browse files Browse the repository at this point in the history
  • Loading branch information
Krotki committed Apr 23, 2024
1 parent d90aaf9 commit 6aa32ea
Showing 1 changed file with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.command.CommandProcessor
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.popup.JBPopupFactory
import com.intellij.openapi.ui.popup.PopupChooserBuilder
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiReference
import com.intellij.ui.SimpleColoredComponent
import com.intellij.ui.SimpleTextAttributes
import com.intellij.ui.components.JBList
import com.intellij.util.IncorrectOperationException
import com.intellij.util.ThreeState
import com.intellij.util.containers.ContainerUtil
import com.intellij.util.ui.JBUI
import io.vlang.ide.ui.VIcons
Expand Down Expand Up @@ -120,7 +121,7 @@ class VlangImportModuleQuickFix : LocalQuickFixAndIntentionActionOnPsiElement, H
// auto import on trying to fix
if (modulesToImport.size == 1) {
if (VlangCodeInsightSettings.getInstance().isAddUnambiguousImportsOnTheFly &&
(ApplicationManager.getApplication().isUnitTestMode || DaemonListeners.canChangeFileSilently(file, true))
(ApplicationManager.getApplication().isUnitTestMode || DaemonListeners.canChangeFileSilently(file, true, ThreeState.UNSURE))
) {
CommandProcessor.getInstance().runUndoTransparentAction { perform(file, firstModuleToImport) }
return true
Expand Down Expand Up @@ -181,16 +182,17 @@ class VlangImportModuleQuickFix : LocalQuickFixAndIntentionActionOnPsiElement, H
}
}

val builder = JBPopupFactory.getInstance().createListPopupBuilder(list).setRequestFocus(true)
val builder = PopupChooserBuilder(list)
.setRequestFocus(true)
.setTitle("Module to Import")
.setItemChoosenCallback {
.setItemChosenCallback(Runnable {
val i = list.selectedIndex
if (i < 0) {
return@setItemChoosenCallback
return@Runnable
}

perform(file, modulesToImport[i])
}
})
.setFilteringEnabled { element: Any -> if (element is String) element else element.toString() }

val popup = builder.createPopup()
Expand Down

0 comments on commit 6aa32ea

Please sign in to comment.