chylex/IntelliJ-AceJump
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-AceJump.git synced 2024-11-25 08:42:45 +01:00
Code

Compare commits

base: chylex:59fbd4e19c8071dd15e6a8e93b6aac8e1e1d5593
Branches Tags
chylex:master
chylex:vim
chylex:pr-optimize-search
chylex:broken-idea-2
chylex:broken-idea
chylex:experimental-rework
chylex:experimental-rework-progsel
chylex:experimental-interactive-modes
chylex:customized
chylex:experimental
..
compare: chylex:9a14fb87e357f065f9d4d9ec3b00614b425ebef7
Branches Tags
chylex:vim
chylex:pr-optimize-search
chylex:broken-idea-2
chylex:broken-idea
chylex:master
chylex:experimental-rework
chylex:experimental-rework-progsel
chylex:experimental-interactive-modes
chylex:customized
chylex:experimental

No commits in common. "59fbd4e19c8071dd15e6a8e93b6aac8e1e1d5593" and "9a14fb87e357f065f9d4d9ec3b00614b425ebef7" have entirely different histories.
59fbd4e19c ... 9a14fb87e3

2 changed files with 11 additions and 10 deletions
Show Stats Expand all files Collapse all files

10
build.gradle.kts
View File

@ -4,20 +4,20 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
kotlin("jvm") version "1.9.10" kotlin("jvm") version "1.9.10"
id("org.jetbrains.intellij") version "1.17.3" id("org.jetbrains.intellij") version "1.16.1"
} }
group = "org.acejump" group = "org.acejump"
version = "chylex-21" version = "chylex-20"
repositories { repositories {
mavenCentral() mavenCentral()
} }
intellij { intellij {
version.set("2024.1.4") version.set("2023.3.3")
updateSinceUntilBuild.set(false) updateSinceUntilBuild.set(false)
plugins.add("IdeaVIM:chylex-37") plugins.add("IdeaVIM:chylex-31")
pluginsRepositories { pluginsRepositories {
custom("https://intellij.chylex.com") custom("https://intellij.chylex.com")
@ -33,7 +33,7 @@ dependencies {
} }
tasks.patchPluginXml { tasks.patchPluginXml {
sinceBuild.set("241") sinceBuild.set("233")
} }
tasks.buildSearchableOptions { tasks.buildSearchableOptions {

11
src/main/kotlin/org/acejump/action/AceVimAction.kt
View File

@ -14,6 +14,7 @@ import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.group.visual.vimSetSelection import com.maddyhome.idea.vim.group.visual.vimSetSelection
import com.maddyhome.idea.vim.helper.inVisualMode import com.maddyhome.idea.vim.helper.inVisualMode
import com.maddyhome.idea.vim.helper.vimSelectionStart import com.maddyhome.idea.vim.helper.vimSelectionStart
import com.maddyhome.idea.vim.helper.vimStateMachine
import com.maddyhome.idea.vim.newapi.vim import com.maddyhome.idea.vim.newapi.vim
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
@ -52,7 +53,8 @@ sealed class AceVimAction : DumbAwareAction() {
else { else {
val vim = editor.vim val vim = editor.vim
val keyHandler = KeyHandler.getInstance() val keyHandler = KeyHandler.getInstance()
if (keyHandler.isOperatorPending(vim.mode, keyHandler.keyHandlerState)) { val commandState = vim.vimStateMachine
if (commandState.isOperatorPending(vim.mode)) {
val key = keyHandler.keyHandlerState.commandBuilder.keys.singleOrNull()?.keyChar val key = keyHandler.keyHandlerState.commandBuilder.keys.singleOrNull()?.keyChar
keyHandler.fullReset(vim) keyHandler.fullReset(vim)
@ -73,13 +75,12 @@ sealed class AceVimAction : DumbAwareAction() {
keyHandler.keyHandlerState.commandBuilder.pushCommandPart(action) keyHandler.keyHandlerState.commandBuilder.pushCommandPart(action)
val cmd = keyHandler.keyHandlerState.commandBuilder.buildCommand() val cmd = keyHandler.keyHandlerState.commandBuilder.buildCommand()
val operatorArguments = OperatorArguments(vim.mode is Mode.OP_PENDING, cmd.rawCount, injector.vimState.mode) val operatorArguments = OperatorArguments(vim.mode is Mode.OP_PENDING, cmd.rawCount, commandState.mode)
injector.vimState.executingCommand = cmd commandState.executingCommand = cmd
injector.actionExecutor.executeVimAction(vim, action, context, operatorArguments) injector.actionExecutor.executeVimAction(vim, action, context, operatorArguments)
// TODO does not update status
} }
keyHandler.reset(vim)
} }
} }
} }