Skip to content

Fix flaky inline rename test #1542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
1grzyb1 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −3
Open

Fix flaky inline rename test #1542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/java/com/maddyhome/idea/vim/helper/ModeExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2023 The IdeaVim authors
* Copyright 2003-2026 The IdeaVim authors
*
* Use of this source code is governed by an MIT-style
* license that can be found in the LICENSE.txt file or at
Expand All @@ -17,6 +17,7 @@ import com.maddyhome.idea.vim.api.VimEditor
import com.maddyhome.idea.vim.api.getLineEndForOffset
import com.maddyhome.idea.vim.api.getLineStartForOffset
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.group.visual.VimVisualTimer
import com.maddyhome.idea.vim.listener.SelectionVimListenerSuppressor
import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext
import com.maddyhome.idea.vim.newapi.IjVimCaret
Expand All @@ -28,6 +29,9 @@ import com.maddyhome.idea.vim.state.mode.inSelectMode
internal fun VimEditor.exitSelectMode(adjustCaretPosition: Boolean) {
if (!this.inSelectMode) return

// Cancel any pending visual timer mode change. When the user explicitly exits SELECT mode,
// we don't want a delayed selection change handler to override their intent.
VimVisualTimer.drop()
mode = mode.returnTo
SelectionVimListenerSuppressor.lock().use {
carets().forEach { vimCaret ->
Expand All @@ -47,5 +51,8 @@ internal fun VimEditor.exitSelectMode(adjustCaretPosition: Boolean) {
}

internal fun Editor.exitInsertMode(context: DataContext) {
// Cancel any pending visual timer mode change. When the user explicitly presses Escape to exit INSERT mode,
// we don't want a delayed selection change handler to override their intent and switch back to INSERT.
VimVisualTimer.drop()
VimPlugin.getChange().processEscape(IjVimEditor(this), IjEditorExecutionContext(context))
}
3 changes: 1 addition & 2 deletions tests/java-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/group/visual/TemplateTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2024 The IdeaVim authors
* Copyright 2003-2026 The IdeaVim authors
*
* Use of this source code is governed by an MIT-style
* license that can be found in the LICENSE.txt file or at
Expand Down Expand Up @@ -809,7 +809,6 @@ class TemplateTest : VimJavaTestCase() {
waitAndAssertMode(fixture, Mode.SELECT(SelectionType.CHARACTER_WISE))
typeText("myNewVar", "<CR>") // Typing first char switches to Insert

// Insert ends after the symbol, then switching to Normal moves back a char
assertState(
"""
|class Hello {
Expand Down
Loading