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

Remove unnecessary pushVisualMode helper function

Browse Source
This commit is contained in:
Matt Ellis 2024-12-31 02:09:37 +00:00 committed by Alex Pláte
parent a28416dd9f
commit 9306d93cbf
2 changed files with 1 additions and 7 deletions
vim-engine/src/main/kotlin/com/maddyhome/idea/vim
api
VimVisualMotionGroupBase.kt
helper
EngineHelper.kt

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

@ -15,7 +15,6 @@ import com.maddyhome.idea.vim.group.visual.vimLeadSelectionOffset
import com.maddyhome.idea.vim.group.visual.vimSetSelection import com.maddyhome.idea.vim.group.visual.vimSetSelection
import com.maddyhome.idea.vim.group.visual.vimUpdateEditorSelection import com.maddyhome.idea.vim.group.visual.vimUpdateEditorSelection
import com.maddyhome.idea.vim.helper.exitVisualMode import com.maddyhome.idea.vim.helper.exitVisualMode
import com.maddyhome.idea.vim.helper.pushVisualMode
import com.maddyhome.idea.vim.state.mode.Mode import com.maddyhome.idea.vim.state.mode.Mode
import com.maddyhome.idea.vim.state.mode.SelectionType import com.maddyhome.idea.vim.state.mode.SelectionType
import com.maddyhome.idea.vim.state.mode.inVisualMode import com.maddyhome.idea.vim.state.mode.inVisualMode
@ -60,7 +59,7 @@ abstract class VimVisualMotionGroupBase : VimVisualMotionGroup {
if (!editor.inVisualMode) { if (!editor.inVisualMode) {
if (rawCount > 0) { if (rawCount > 0) {
val primarySelectionType = editor.primaryCaret().vimLastVisualOperatorRange?.type ?: selectionType val primarySelectionType = editor.primaryCaret().vimLastVisualOperatorRange?.type ?: selectionType
editor.pushVisualMode(primarySelectionType) editor.mode = Mode.VISUAL(primarySelectionType, editor.mode.returnTo)
editor.forEachCaret { editor.forEachCaret {
val range = it.vimLastVisualOperatorRange ?: VisualChange.default(selectionType) val range = it.vimLastVisualOperatorRange ?: VisualChange.default(selectionType)

5
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/helper/EngineHelper.kt
View File

@ -14,7 +14,6 @@ import com.maddyhome.idea.vim.api.options
import com.maddyhome.idea.vim.common.TextRange import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.options.OptionConstants import com.maddyhome.idea.vim.options.OptionConstants
import com.maddyhome.idea.vim.state.mode.Mode import com.maddyhome.idea.vim.state.mode.Mode
import com.maddyhome.idea.vim.state.mode.SelectionType
import java.util.* import java.util.*
inline fun <reified T : Enum<T>> noneOfEnum(): EnumSet<T> = EnumSet.noneOf(T::class.java) inline fun <reified T : Enum<T>> noneOfEnum(): EnumSet<T> = EnumSet.noneOf(T::class.java)
@ -60,7 +59,3 @@ inline fun <reified T : Enum<T>> enumSetOf(vararg value: T): EnumSet<T> = when (
1 -> EnumSet.of(value[0]) 1 -> EnumSet.of(value[0])
else -> EnumSet.of(value[0], *value.slice(1..value.lastIndex).toTypedArray()) else -> EnumSet.of(value[0], *value.slice(1..value.lastIndex).toTypedArray())
} }
fun VimEditor.pushVisualMode(selectionType: SelectionType) {
mode = Mode.VISUAL(selectionType, mode.returnTo)
}