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

Updated comment and defaults for word end action

Browse Source 
The `ge` motion incorrectly had `stopAtEmptyLine` set to false, but `ge` always stops at empty lines. This option is only applicable for forward motion, so is ignored by the implementation of `findPreviousWordEndOne`.
This commit is contained in:
Matt Ellis 2025-02-20 17:37:29 +00:00 committed by Alex Pláte
parent 43a2bd98db
commit 24c0d31f14
1 changed files with 6 additions and 5 deletions

11
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/text/MotionWordEndAction.kt
View File

@ -21,16 +21,17 @@ import com.maddyhome.idea.vim.handler.Motion
import com.maddyhome.idea.vim.handler.Motion.AbsoluteOffset import com.maddyhome.idea.vim.handler.Motion.AbsoluteOffset
import com.maddyhome.idea.vim.handler.MotionActionHandler import com.maddyhome.idea.vim.handler.MotionActionHandler
// Vim considers an empty line as a word/WORD, but for vi compatibility, `e` and `E` do not stop at empty lines (`ge`, // Vim considers an empty line as a word/WORD, but for vi compatibility, `e` and `E` do not stop at empty lines.
// `gE` and `w`/`W` and `b`/`B` do) // This is only applicable for forwards motion (the "right" actions). The backwards ("left") actions `ge` and `gE`
// always stop at empty lines (as do word forward/backward motions `w`/`W` and `b`/`B`).
@CommandOrMotion(keys = ["gE"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING]) @CommandOrMotion(keys = ["gE"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING])
class MotionBigWordEndLeftAction : WordEndAction(Direction.BACKWARDS, bigWord = true, stopAtEmptyLine = true) class MotionBigWordEndLeftAction : WordEndAction(Direction.BACKWARDS, bigWord = true)
@CommandOrMotion(keys = ["E"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING]) @CommandOrMotion(keys = ["E"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING])
class MotionBigWordEndRightAction : WordEndAction(Direction.FORWARDS, bigWord = true, stopAtEmptyLine = false) class MotionBigWordEndRightAction : WordEndAction(Direction.FORWARDS, bigWord = true, stopAtEmptyLine = false)
@CommandOrMotion(keys = ["ge"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING]) @CommandOrMotion(keys = ["ge"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING])
class MotionWordEndLeftAction : WordEndAction(Direction.BACKWARDS, bigWord = false, stopAtEmptyLine = false) class MotionWordEndLeftAction : WordEndAction(Direction.BACKWARDS, bigWord = false)
@CommandOrMotion(keys = ["e"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING]) @CommandOrMotion(keys = ["e"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING])
class MotionWordEndRightAction : WordEndAction(Direction.FORWARDS, bigWord = false, stopAtEmptyLine = false) class MotionWordEndRightAction : WordEndAction(Direction.FORWARDS, bigWord = false, stopAtEmptyLine = false)
@ -38,7 +39,7 @@ class MotionWordEndRightAction : WordEndAction(Direction.FORWARDS, bigWord = fal
sealed class WordEndAction( sealed class WordEndAction(
private val direction: Direction, private val direction: Direction,
private val bigWord: Boolean, private val bigWord: Boolean,
private val stopAtEmptyLine: Boolean, private val stopAtEmptyLine: Boolean = true,
) : MotionActionHandler.ForEachCaret() { ) : MotionActionHandler.ForEachCaret() {
override fun getOffset( override fun getOffset(
editor: VimEditor, editor: VimEditor,