MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-197188 Fix Switcher hint popup update

Browse Source 
PSI_ELEMENT.getData returns an outdated PSI element
if called in-place in the same EDT event the selection changes.
Fix by postponing the update using a state flow.


(cherry picked from commit e8568cdadbb2ee1332a2aedfd60a20c072840537)

IJ-CR-169482

GitOrigin-RevId: 1d4ddecba8c44dee25bcfe31b24518eedde2f7fd
This commit is contained in:
Sergei Tachenov
2025-07-16 11:42:04 +03:00
committed by intellij-monorepo-bot
parent fd075ea309
commit 7f3d737867
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platform/recentFiles/frontend/src/com/intellij/platform/recentFiles/frontend/Switcher.kt
View File

@@ -14,6 +14,10 @@ import com.intellij.openapi.actionSystem.ex.ActionUtil
import com.intellij.openapi.actionSystem.remoting.ActionRemoteBehaviorSpecification
import com.intellij.openapi.application.EDT
import com.intellij.openapi.application.ModalityState
import com.intellij.openapi.application.UiDispatcherKind
import com.intellij.openapi.application.WriteIntentReadAction
import com.intellij.openapi.application.ui
import com.intellij.openapi.application.writeIntentReadAction
import com.intellij.openapi.components.service
import com.intellij.openapi.diagnostic.fileLogger
import com.intellij.openapi.fileEditor.FileEditorManager
@@ -59,6 +63,8 @@ import com.intellij.util.ui.SwingTextTrimmer
import com.intellij.util.ui.accessibility.ScreenReader
import com.intellij.util.ui.components.BorderLayoutPanel
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.collectLatest
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.Nls
import org.jetbrains.annotations.NonNls
@@ -317,6 +323,7 @@ object Switcher : BaseSwitcherAction(null), ActionRemoteBehaviorSpecification.Fr
files = JBListWithOpenInRightSplit.createListWithOpenInRightSplitter<SwitcherVirtualFile>(maybeSearchableModel, null)
files.visibleRowCount = files.itemsCount
val selectedValueFlow = MutableStateFlow<SwitcherListItem?>(null)
val filesSelectionListener = object : ListSelectionListener {
override fun valueChanged(e: ListSelectionEvent) {
LOG.debug("Switcher value changed: $e")
@@ -326,9 +333,20 @@ object Switcher : BaseSwitcherAction(null), ActionRemoteBehaviorSpecification.Fr
}
updatePathLabel()
val hint = hint
val popupUpdater = if (hint == null || !hint.isVisible) null else hint.getUserData(PopupUpdateProcessorBase::class.java)
popupUpdater?.updatePopup(CommonDataKeys.PSI_ELEMENT.getData(DataManager.getInstance().getDataContext(this@SwitcherPanel)))
selectedValueFlow.value = selectedList?.selectedValue
}
}
uiUpdateScope.launch(CoroutineName("Switcher hint popup updater")) {
selectedValueFlow.collectLatest { selectedValue ->
withContext(Dispatchers.ui(UiDispatcherKind.RELAX)) { // can't use STRICT because updatePopup needs a WIRA
val hint = hint
val popupUpdater = if (hint == null || !hint.isVisible) null else hint.getUserData(PopupUpdateProcessorBase::class.java)
if (selectedValue != null && popupUpdater != null) {
writeIntentReadAction {
popupUpdater.updatePopup(CommonDataKeys.PSI_ELEMENT.getData(DataManager.getInstance().getDataContext(this@SwitcherPanel)))
}
}
}
}
}
toolWindows.selectionModel.addListSelectionListener(filesSelectionListener)