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

[terminal] IJPL-214752 Fix losing focus when resizing nano

Browse Source 
`nano` is crazy - it emits alternate buffer switch events on resize. So, we receive alternate buffer disabling event and then enabling in a row.
When we receive alternate buffer switch event - we add the current editor to the UI hierarchy and request focus to the new editor if terminal was focused previously.
For some reason when we received alternate buffer enabled event (after disabling), the focus switch from the disabling event was not yet performed, so `terminalPanel.isFocusAncestor()` was false. This way focus was lost.
Fixed it by refactoring the StateFlow listening, though, don't really understand why it works correctly now. Previous and new implementations should work the same.

GitOrigin-RevId: 983d1eff70e1c4012238a8dc314ddd9164c62734
This commit is contained in:
Konstantin Hudyakov
2025-11-21 10:03:34 +00:00
committed by intellij-monorepo-bot
parent 6b6e89b816
commit c50cb61de5
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalViewImpl.kt
+12 -10
View File
@@ -406,19 +406,21 @@ class TerminalViewImpl(
}
private fun listenAlternateBufferSwitch() {
coroutineScope.launch(Dispatchers.EDT + ModalityState.any().asContextElement() + CoroutineName("Alternate buffer switch listener")) {
coroutineScope.launch(CoroutineName("Alternate buffer switch listener")) {
sessionModel.terminalState.collect { state ->
if (state.isAlternateScreenBuffer != isAlternateScreenBuffer) {
isAlternateScreenBuffer = state.isAlternateScreenBuffer
withContext(Dispatchers.EDT + ModalityState.any().asContextElement()) {
if (state.isAlternateScreenBuffer != isAlternateScreenBuffer) {
isAlternateScreenBuffer = state.isAlternateScreenBuffer
val terminalWasFocused = terminalPanel.isFocusAncestor()
val editor = if (state.isAlternateScreenBuffer) alternateBufferEditor else outputEditor
terminalPanel.setTerminalContent(editor)
terminalSearchController.finishSearchSession()
mutableOutputModels.setActiveModel(state.isAlternateScreenBuffer)
val terminalWasFocused = terminalPanel.isFocusAncestor()
val editor = if (state.isAlternateScreenBuffer) alternateBufferEditor else outputEditor
terminalPanel.setTerminalContent(editor)
terminalSearchController.finishSearchSession()
mutableOutputModels.setActiveModel(state.isAlternateScreenBuffer)
if (terminalWasFocused) {
IdeFocusManager.getInstance(project).requestFocus(terminalPanel.preferredFocusableComponent, true)
if (terminalWasFocused) {
IdeFocusManager.getInstance(project).requestFocus(terminalPanel.preferredFocusableComponent, true)
}
}
}
}