Broken

build.gradle.kts

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

src/main/kotlin/org/acejump/action/AceVimAction.kt

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