chylex/IntelliJ-IdeaVim
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-08-08 18:40:37 +02:00
Code

Move argument capturing to vim engine

Browse Source
This commit is contained in:
Alex Plate 2022-03-22 19:09:09 +03:00
parent ca19d2bfd5
commit 2d84e2d788
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
5 changed files with 9 additions and 5 deletions
src/main/java/com/maddyhome/idea/vim
KeyHandler.kt
action/change
OperatorAction.ktRepeatChangeAction.kt
key
MappingInfo.kt
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/common
ArgumentCapturer.kt

2
src/main/java/com/maddyhome/idea/vim/KeyHandler.kt
View File

@ -17,7 +17,6 @@
*/
package com.maddyhome.idea.vim
import com.maddyhome.idea.vim.action.change.VimRepeater.Extension.argumentCaptured
import com.maddyhome.idea.vim.api.ExecutionContext
import com.maddyhome.idea.vim.api.VimActionsInitiator
import com.maddyhome.idea.vim.api.VimEditor
@ -36,6 +35,7 @@ import com.maddyhome.idea.vim.common.CurrentCommandState
import com.maddyhome.idea.vim.common.DigraphResult
import com.maddyhome.idea.vim.common.MappingMode
import com.maddyhome.idea.vim.common.Node
import com.maddyhome.idea.vim.common.argumentCaptured
import com.maddyhome.idea.vim.diagnostic.VimLogger
import com.maddyhome.idea.vim.diagnostic.debug
import com.maddyhome.idea.vim.diagnostic.trace

3
src/main/java/com/maddyhome/idea/vim/action/change/OperatorAction.kt
View File

@ -25,6 +25,7 @@ import com.maddyhome.idea.vim.command.Argument
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.command.SelectionType
import com.maddyhome.idea.vim.common.argumentCaptured
import com.maddyhome.idea.vim.group.MotionGroup
import com.maddyhome.idea.vim.handler.VimActionHandler
import com.maddyhome.idea.vim.helper.MessageHelper
@ -45,7 +46,7 @@ class OperatorAction : VimActionHandler.SingleExecution() {
val argument = cmd.argument
if (argument != null) {
if (!editor.vim.commandState.isDotRepeatInProgress) {
VimRepeater.Extension.argumentCaptured = argument
argumentCaptured = argument
}
val saveRepeatHandler = VimRepeater.repeatHandler
val motion = argument.motion

2
src/main/java/com/maddyhome/idea/vim/action/change/RepeatChangeAction.kt
View File

@ -22,7 +22,6 @@ import com.intellij.openapi.command.CommandProcessor
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.Argument
import com.maddyhome.idea.vim.command.Command
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.extension.VimExtensionHandler
@ -107,7 +106,6 @@ object VimRepeater {
object Extension {
var lastExtensionHandler: VimExtensionHandler? = null
var argumentCaptured: Argument? = null
private val keyStrokes = mutableListOf<KeyStroke>()
private val strings = mutableListOf<String>()

2
src/main/java/com/maddyhome/idea/vim/key/MappingInfo.kt
View File

@ -21,7 +21,6 @@ import com.intellij.openapi.application.invokeLater
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.editor.actionSystem.CaretSpecificDataContext
import com.maddyhome.idea.vim.KeyHandler
import com.maddyhome.idea.vim.action.change.VimRepeater.Extension.argumentCaptured
import com.maddyhome.idea.vim.action.change.VimRepeater.Extension.clean
import com.maddyhome.idea.vim.action.change.VimRepeater.Extension.lastExtensionHandler
import com.maddyhome.idea.vim.action.change.VimRepeater.repeatHandler
@ -34,6 +33,7 @@ import com.maddyhome.idea.vim.command.CommandState
import com.maddyhome.idea.vim.command.SelectionType
import com.maddyhome.idea.vim.command.SelectionType.Companion.fromSubMode
import com.maddyhome.idea.vim.common.Offset
import com.maddyhome.idea.vim.common.argumentCaptured
import com.maddyhome.idea.vim.common.offset
import com.maddyhome.idea.vim.extension.VimExtensionHandler
import com.maddyhome.idea.vim.group.visual.VimSelection

5
vim-engine/src/main/kotlin/com/maddyhome/idea/vim/common/ArgumentCapturer.kt Normal file
View File

@ -0,0 +1,5 @@
package com.maddyhome.idea.vim.common
import com.maddyhome.idea.vim.command.Argument
var argumentCaptured: Argument? = null