Clean up code

src/main/java/com/maddyhome/idea/vim/command/CommandState.kt

@@ -12,12 +12,14 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.state.VimStateMachine
+import org.jetbrains.annotations.ApiStatus
 
 /**
  * COMPATIBILITY-LAYER: Additional class
  * Please see: https://jb.gg/zo8n0r
  */
 @Deprecated("Use `injector.vimState`")
+@ApiStatus.ScheduledForRemoval
 class CommandState(private val machine: VimStateMachine) {
 
   val mode: Mode
@@ -34,11 +36,12 @@ class CommandState(private val machine: VimStateMachine) {
       }
     }
 
-  @Deprecated("Use `KeyHandler.keyHandlerState.commandBuilder", ReplaceWith(
+  @get:Deprecated("Use `KeyHandler.keyHandlerState.commandBuilder", ReplaceWith(
     "KeyHandler.getInstance().keyHandlerState.commandBuilder",
     "com.maddyhome.idea.vim.KeyHandler"
   )
   )
+  @get:ApiStatus.ScheduledForRemoval
   val commandBuilder: CommandBuilder
     get() = KeyHandler.getInstance().keyHandlerState.commandBuilder
 
@@ -65,6 +68,7 @@ class CommandState(private val machine: VimStateMachine) {
   companion object {
     @JvmStatic
     @Deprecated("Use `injector.vimState`")
+    @ApiStatus.ScheduledForRemoval
     fun getInstance(editor: Editor): CommandState {
       return CommandState(injector.vimState)
     }

src/main/java/com/maddyhome/idea/vim/extension/VimExtensionFacade.kt

@@ -186,14 +186,6 @@ object VimExtensionFacade {
     return (injector.commandLine as ExEntryPanelService).inputString(editor.vim, context.vim, prompt, finishOn) ?: ""
   }
 
-  /** Get the current contents of the given register similar to 'getreg()'. */
-  @JvmStatic
-  @Deprecated("Please use com.maddyhome.idea.vim.extension.VimExtensionFacade.getRegister(com.maddyhome.idea.vim.api.VimEditor, char)")
-  fun getRegister(register: Char): List<KeyStroke>? {
-    val reg = VimPlugin.getRegister().getRegister(register) ?: return null
-    return reg.keys
-  }
-
   /** Get the current contents of the given register similar to 'getreg()'. */
   @JvmStatic
   fun getRegister(editor: VimEditor, register: Char): List<KeyStroke>? {
@@ -202,8 +194,8 @@ object VimExtensionFacade {
   }
 
   @JvmStatic
-  fun getRegisterForCaret(register: Char, caret: VimCaret): List<KeyStroke>? {
+  fun getRegisterForCaret(editor: VimEditor, context: ExecutionContext, register: Char, caret: VimCaret): List<KeyStroke>? {
-    val reg = caret.registerStorage.getRegister(register) ?: return null
+    val reg = caret.registerStorage.getRegister(editor, context, register) ?: return null
     return reg.keys
   }
 

src/main/java/com/maddyhome/idea/vim/extension/replacewithregister/ReplaceWithRegister.kt

@@ -144,7 +144,7 @@ internal class ReplaceWithRegister : VimExtension {
 private fun doReplace(editor: Editor, context: DataContext, caret: ImmutableVimCaret, visualSelection: PutData.VisualSelection) {
   val registerGroup = injector.registerGroup
   val lastRegisterChar = if (editor.caretModel.caretCount == 1) registerGroup.currentRegister else registerGroup.getCurrentRegisterForMulticaret()
-  val savedRegister = caret.registerStorage.getRegister(lastRegisterChar) ?: return
+  val savedRegister = caret.registerStorage.getRegister(editor.vim, context.vim, lastRegisterChar) ?: return
 
   var usedType = savedRegister.type
   var usedText = savedRegister.text

src/main/java/com/maddyhome/idea/vim/extension/surround/VimSurroundExtension.kt

@@ -162,7 +162,7 @@ internal class VimSurroundExtension : VimExtension {
         // Save old register values for carets
         val surroundings = editor.sortedCarets()
           .map {
-            val oldValue: List<KeyStroke>? = getRegisterForCaret(REGISTER, it)
+            val oldValue: List<KeyStroke>? = getRegisterForCaret(editor, context, REGISTER, it)
             setRegisterForCaret(REGISTER, it, null)
             SurroundingInfo(it, null, oldValue, false)
           }
@@ -179,7 +179,7 @@ internal class VimSurroundExtension : VimExtension {
             editor.deleteString(currentSurrounding)
           }
 
-          val registerValue = getRegisterForCaret(REGISTER, it.caret)
+          val registerValue = getRegisterForCaret(editor, context, REGISTER, it.caret)
           val innerValue = if (registerValue.isNullOrEmpty()) emptyList() else registerValue
           it.innerText = innerValue
 

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/insert/InsertExitModeAction.kt

@@ -23,7 +23,7 @@ class InsertExitModeAction : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.INSERT
 
   override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    editor.exitInsertMode(context, operatorArguments)
+    editor.exitInsertMode(context)
     return true
   }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimEditor.kt

@@ -8,7 +8,6 @@
 
 package com.maddyhome.idea.vim.api
 
-import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.common.LiveRange
 import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.common.VimEditorReplaceMask
@@ -243,8 +242,6 @@ interface VimEditor {
   // Can be used as a key to store something for specific project
   val projectId: String
 
-  @Deprecated("Use overload without OperatorArguments", replaceWith = ReplaceWith("exitInsertMode(context)"))
-  fun exitInsertMode(context: ExecutionContext, operatorArguments: OperatorArguments) { exitInsertMode(context) }
   fun exitInsertMode(context: ExecutionContext)
   fun exitSelectModeNative(adjustCaret: Boolean)
 

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/register/VimRegisterGroup.kt

@@ -10,20 +10,13 @@ package com.maddyhome.idea.vim.register
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.ImmutableVimCaret
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.common.TextRange
+import com.maddyhome.idea.vim.state.mode.SelectionType
 import org.jetbrains.annotations.TestOnly
 import javax.swing.KeyStroke
 
 interface VimRegisterGroup {
 
-  /**
-   * Get the last register selected by the user
-   *
-   * @return The register, null if no such register
-   */
-  @Deprecated("Please use com.maddyhome.idea.vim.register.VimRegisterGroup#getLastRegister(com.maddyhome.idea.vim.api.VimEditor, com.maddyhome.idea.vim.api.ExecutionContext)")
-  val lastRegister: Register?
   var lastRegisterChar: Char
   val currentRegister: Char
 

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/register/VimRegisterGroupBase.kt

@@ -79,15 +79,6 @@ abstract class VimRegisterGroupBase : VimRegisterGroup {
     return getRegister(editor, context, lastRegisterChar)
   }
 
-  /**
-   * Get the last register selected by the user
-   *
-   * @return The register, null if no such register
-   */
-  @Deprecated("Please use com.maddyhome.idea.vim.register.VimRegisterGroup#getLastRegister(com.maddyhome.idea.vim.api.VimEditor, com.maddyhome.idea.vim.api.ExecutionContext)")
-  override val lastRegister: Register?
-    get() = getRegister(lastRegisterChar)
-
   private val onClipboardChanged: () -> Unit = {
     val clipboardOptionValue = injector.globalOptions().clipboard
     defaultRegisterChar = when {