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

Remove mode restoring after unexpected selection

Browse Source
This commit is contained in:
Alex Plate 2019-07-08 13:13:44 +03:00
parent 4d07171aaa
commit e23f5cb159
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
2 changed files with 1 additions and 12 deletions
src/com/maddyhome/idea/vim
group/visual
VisualMotionGroup.kt
listener
ListenerManager.kt

11
src/com/maddyhome/idea/vim/group/visual/VisualMotionGroup.kt
View File

@ -20,8 +20,6 @@ package com.maddyhome.idea.vim.group.visual
import com.intellij.codeInsight.template.TemplateManager
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.diagnostic.debug
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.editor.Caret
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.editor.LogicalPosition
@ -33,7 +31,6 @@ import com.maddyhome.idea.vim.command.MappingMode
import com.maddyhome.idea.vim.command.SelectionType
import com.maddyhome.idea.vim.common.TextRange
import com.maddyhome.idea.vim.group.MotionGroup
import com.maddyhome.idea.vim.helper.EditorDataContext
import com.maddyhome.idea.vim.helper.EditorHelper
import com.maddyhome.idea.vim.helper.inBlockSubMode
import com.maddyhome.idea.vim.helper.inSelectMode
@ -57,8 +54,7 @@ import com.maddyhome.idea.vim.option.SelectModeOptionData
*/
class VisualMotionGroup {
companion object {
var modeBeforeEnteringNonVimVisual: CommandState.Mode? = null
val logger = Logger.getInstance(VisualMotionGroup.javaClass)
val logger = Logger.getInstance(VisualMotionGroup::class.java)
}
fun selectPreviousVisualMode(editor: Editor): Boolean {
@ -126,7 +122,6 @@ class VisualMotionGroup {
if (editor.caretModel.allCarets.any(Caret::hasSelection)) {
logger.debug("Some of carets have selection")
val commandState = CommandState.getInstance(editor)
modeBeforeEnteringNonVimVisual = commandState.mode
while (commandState.mode != CommandState.Mode.COMMAND) {
commandState.popState()
}
@ -146,10 +141,6 @@ class VisualMotionGroup {
exitVisual(editor)
exitSelectModeAndResetKeyHandler(editor, true)
val project = editor.project
if ((project != null && TemplateManager.getInstance(project).getActiveTemplate(editor) != null || modeBeforeEnteringNonVimVisual == CommandState.Mode.INSERT) && editor.mode == CommandState.Mode.COMMAND) {
VimPlugin.getChange().insertBeforeCursor(editor, EditorDataContext(editor))
}
updateCaretState(editor)
KeyHandler.getInstance().reset(editor)
}

2
src/com/maddyhome/idea/vim/listener/ListenerManager.kt
View File

@ -49,7 +49,6 @@ import com.maddyhome.idea.vim.group.FileGroup
import com.maddyhome.idea.vim.group.MarkGroup
import com.maddyhome.idea.vim.group.MotionGroup
import com.maddyhome.idea.vim.group.SearchGroup
import com.maddyhome.idea.vim.group.visual.VisualMotionGroup
import com.maddyhome.idea.vim.group.visual.moveCaretOneCharLeftFromSelectionEnd
import com.maddyhome.idea.vim.group.visual.vimSetSystemSelectionSilently
import com.maddyhome.idea.vim.helper.EditorHelper
@ -313,7 +312,6 @@ object VimListenerManager {
}
override fun mouseReleased(event: EditorMouseEvent) {
VisualMotionGroup.modeBeforeEnteringNonVimVisual = null
if (mouseDragging) {
logger.debug("Release mouse after dragging")
val editor = event.editor