chylex/IntelliJ-IdeaVim
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-05-07 05:34:02 +02:00
Code

Remove the use of write action in macros

Browse Source
This commit is contained in:
Alex Plate 2025-02-24 14:31:14 +02:00
parent a925676d64
commit 4ca25eed70
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
2 changed files with 18 additions and 8 deletions
src/test/java/org/jetbrains/plugins/ideavim/action
MacroActionTest.kt
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/macro
PlaybackRegisterAction.kt

15
src/test/java/org/jetbrains/plugins/ideavim/action/MacroActionTest.kt
View File

@ -55,6 +55,21 @@ class MacroActionTest : VimTestCase() {
assertRegister('a', "ipp^[")
}
@Test
fun testMacroWithIdeAction() {
configureByText("""One
|Two
|Three
|Four""".trimMargin())
enterCommand("map j <Action>(EditorDown)")
typeText(injector.parser.parseKeys("qa" + "j" + "q"))
typeText(injector.parser.parseKeys("@a"))
assertState("""One
|Two
|${c}Three
|Four""".trimMargin())
}
@Test
fun testRecordMacroWithDigraph() {
typeTextInFile(injector.parser.parseKeys("qa" + "i" + "<C-K>OK<Esc>" + "q"), "")

11
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/macro/PlaybackRegisterAction.kt
View File

@ -33,10 +33,9 @@ class PlaybackRegisterAction : VimActionHandler.SingleExecution() {
): Boolean {
val argument = cmd.argument as? Argument.Character ?: return false
val reg = argument.character
val application = injector.application
val res = arrayOf(false)
when {
reg == LAST_COMMAND_REGISTER || (reg == '@' && injector.macro.lastRegister == LAST_COMMAND_REGISTER) -> { // No write action
reg == LAST_COMMAND_REGISTER || (reg == '@' && injector.macro.lastRegister == LAST_COMMAND_REGISTER) -> {
try {
var i = 0
while (i < cmd.count) {
@ -55,15 +54,11 @@ class PlaybackRegisterAction : VimActionHandler.SingleExecution() {
}
reg == '@' -> {
application.runWriteAction {
res[0] = injector.macro.playbackLastRegister(editor, context, cmd.count)
}
res[0] = injector.macro.playbackLastRegister(editor, context, cmd.count)
}
else -> {
application.runWriteAction {
res[0] = injector.macro.playbackRegister(editor, context, reg, cmd.count)
}
res[0] = injector.macro.playbackRegister(editor, context, reg, cmd.count)
}
}
return res[0]