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

Move select toggle implementation

Browse Source
This commit is contained in:
Matt Ellis 2025-01-01 12:08:27 +00:00 committed by Alex Pláte
parent eb19d9fb11
commit 0b308769b1
4 changed files with 81 additions and 42 deletions
src/main/java/com/maddyhome/idea/vim/listener
AppCodeTemplates.kt
vim-engine/src/main/kotlin/com/maddyhome/idea/vim
action/motion/select
SelectToggleVisualMode.kt
api
VimVisualMotionGroup.ktVimVisualMotionGroupBase.kt

4
src/main/java/com/maddyhome/idea/vim/listener/AppCodeTemplates.kt
View File

@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.Key
import com.maddyhome.idea.vim.KeyHandler
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.action.motion.select.SelectToggleVisualMode
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.group.visual.VimVisualTimer
import com.maddyhome.idea.vim.helper.fileSize
import com.maddyhome.idea.vim.helper.inVisualMode
@ -56,7 +56,7 @@ internal object AppCodeTemplates {
if (myEditor != null) {
VimVisualTimer.doNow()
if (myEditor.inVisualMode) {
SelectToggleVisualMode.toggleMode(myEditor.vim)
injector.visualMotionGroup.toggleSelectVisual(myEditor.vim)
KeyHandler.getInstance().partialReset(myEditor.vim)
}
}

28
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/motion/select/SelectToggleVisualMode.kt
View File

@ -16,7 +16,6 @@ import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.handler.VimActionHandler
import com.maddyhome.idea.vim.state.mode.SelectionType
/**
* @author Alex Plate
@ -33,32 +32,7 @@ class SelectToggleVisualMode : VimActionHandler.SingleExecution() {
cmd: Command,
operatorArguments: OperatorArguments,
): Boolean {
toggleMode(editor)
injector.visualMotionGroup.toggleSelectVisual(editor)
return true
}
companion object {
fun toggleMode(editor: VimEditor) {
val myMode = editor.mode
if (myMode is com.maddyhome.idea.vim.state.mode.Mode.VISUAL) {
injector.visualMotionGroup.enterSelectMode(editor, myMode.selectionType)
if (myMode.selectionType != SelectionType.LINE_WISE) {
editor.nativeCarets().forEach {
if (it.offset + injector.visualMotionGroup.selectionAdj == it.selectionEnd) {
it.moveToInlayAwareOffset(it.offset + injector.visualMotionGroup.selectionAdj)
}
}
}
} else if (myMode is com.maddyhome.idea.vim.state.mode.Mode.SELECT) {
injector.visualMotionGroup.enterVisualMode(editor, myMode.selectionType)
if (myMode.selectionType != SelectionType.LINE_WISE) {
editor.nativeCarets().forEach {
if (it.offset == it.selectionEnd && it.visualLineStart <= it.offset - injector.visualMotionGroup.selectionAdj) {
it.moveToInlayAwareOffset(it.offset - injector.visualMotionGroup.selectionAdj)
}
}
}
}
}
}
}

11
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimVisualMotionGroup.kt
View File

@ -58,6 +58,17 @@ interface VimVisualMotionGroup {
*/
fun toggleVisual(editor: VimEditor, count: Int, rawCount: Int, selectionType: SelectionType, returnTo: Mode? = null): Boolean
/**
* Toggles between Select and Visual modes
*
* IdeaVim treats Select mode as always exclusive, regardless of the value in `'selection'`. As such, when toggling
* between Visual and Select, the caret is adjusted to be more natural for exclusive selection. Specifically, when
* toggling from Visual with inclusive selection to Select (always exclusive), the caret is adjusted one character to
* the right, to put it as exclusive to the current selection. When toggling from Select (exclusive) to Visual with
* inclusive selection, the caret is adjusted one character to the left from exclusive position to inclusive.
*/
fun toggleSelectVisual(editor: VimEditor)
/**
* When in Select mode, enter Visual mode for a single command
*

80
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimVisualMotionGroupBase.kt
View File

@ -8,7 +8,6 @@
package com.maddyhome.idea.vim.api
import com.maddyhome.idea.vim.action.motion.select.SelectToggleVisualMode
import com.maddyhome.idea.vim.group.visual.VisualChange
import com.maddyhome.idea.vim.group.visual.VisualOperation
import com.maddyhome.idea.vim.group.visual.vimLeadSelectionOffset
@ -119,6 +118,66 @@ abstract class VimVisualMotionGroupBase : VimVisualMotionGroup {
return true
}
override fun toggleSelectVisual(editor: VimEditor) {
val mode = editor.mode
if (mode is Mode.VISUAL) {
val previouslyExclusive = exclusiveSelection
enterSelectMode(editor, mode.selectionType)
adjustCaretsForSelectionPolicy(editor, previouslyExclusive)
}
else if (mode is Mode.SELECT) {
val previouslyExclusive = true // IdeaVim treats Select as always exclusive
enterVisualMode(editor, mode.selectionType)
adjustCaretsForSelectionPolicy(editor, previouslyExclusive)
}
}
/**
* Move the caret after toggling Visual/Select mode, if this also toggles selection policy (inclusive/exclusive)
*
* Toggling Visual/Select mode does not update the caret position in Vim. This is because the inclusive/exclusive
* state of the selection does not change. It is the value of the `'selection'` option, and the same for Visual and
* Select.
*
* IdeaVim can have a different selection policy for Visual and Select; it is more intuitive for Select mode to use
* "exclusive", but more familiar for Visual to be inclusive (see [VimEditor.isSelectionExclusive] for more
* background). IdeaVim will therefore try to update the caret position to match what the selection would be if it
* has just been created with the new selection policy, rather than toggled after the selection was made.
*
* In other words, Vim places the caret at the end of the selection when creating an inclusive selection, and
* _after_ the end of selection when creating an exclusive selection, and IdeaVim updates to match this.
*
* Specifically, when switching from inclusive to exclusive, and the caret is at the end of the selection, the caret
* is moved to be after the selection. And when switching from exclusive to inclusive and the caret is after the end
* of the selection, it is moved to be at the end of selection.
*/
private fun adjustCaretsForSelectionPolicy(editor: VimEditor, previouslyExclusive: Boolean) {
val mode = editor.mode
// TODO: Improve handling of this.exclusiveSelection
val isSelectionExclusive = this.exclusiveSelection || mode is Mode.SELECT
if (mode.selectionType != SelectionType.LINE_WISE) {
// Remember that VimCaret.selectionEnd is exclusive!
if (isSelectionExclusive && !previouslyExclusive) {
// Inclusive -> exclusive
editor.nativeCarets().forEach {
if (it.offset == it.selectionEnd - 1) {
it.moveToInlayAwareOffset(it.selectionEnd) // Caret is on the selection end, move to after
}
}
}
else if (!isSelectionExclusive && previouslyExclusive) {
// Exclusive -> inclusive
editor.nativeCarets().forEach {
// If caret offset matches the exclusive selection end offset, then it's positioned after the selection, so
// move it to the actual end of the selection. Make sure there's enough room on this line to do so
if (it.offset == it.selectionEnd && it.visualLineStart < it.offset) {
it.moveToInlayAwareOffset(it.selectionEnd - 1)
}
}
}
}
}
/**
* When in Select mode, enter Visual mode for a single command
*
@ -132,21 +191,16 @@ abstract class VimVisualMotionGroupBase : VimVisualMotionGroup {
override fun processSingleVisualCommand(editor: VimEditor) {
val mode = editor.mode
if (mode is Mode.SELECT) {
// We can't use toggleSelectVisual because when toggling between Select and Visual, we replace the current mode,
// but here we want to "push" Visual, so we return to Select.
val previouslyExclusive = true // Select is always exclusive
editor.mode = Mode.VISUAL(mode.selectionType, returnTo = mode)
// TODO: This is a copy of code from SelectToggleVisualMode.toggleMode. It should be moved to VimVisualMotionGroup
// IdeaVim always treats Select mode as exclusive. This will adjust the caret from exclusive to (potentially)
// inclusive, depending on the value of 'selection'
if (mode.selectionType != SelectionType.LINE_WISE) {
editor.nativeCarets().forEach {
if (it.offset == it.selectionEnd && it.visualLineStart <= it.offset - injector.visualMotionGroup.selectionAdj) {
it.moveToInlayAwareOffset(it.offset - injector.visualMotionGroup.selectionAdj)
}
}
}
adjustCaretsForSelectionPolicy(editor, previouslyExclusive)
}
else if (mode is Mode.VISUAL && mode.isSelectPending) {
// TODO: It would be better to move this to VimVisualMotionGroup
SelectToggleVisualMode.toggleMode(editor)
// We can use toggleSelectVisual because we're replacing the "pushed" Visual mode with a simple Select, which is
// the same as when we toggle from Visual to Select
toggleSelectVisual(editor)
}
}