Fix/issue 2224 via pr 5842

package.json

@@ -68,7 +68,7 @@
     ],
     "keybindings": [
       {
-        "key": "Escape",
+        "key": "escape",
         "command": "extension.vim_escape",
         "when": "editorTextFocus && vim.active && !inDebugRepl"
       },
@@ -82,33 +82,33 @@
         "command": "extension.vim_home",
         "when": "editorTextFocus && vim.active && !inDebugRepl && vim.mode != 'Insert'"
       },
-      {
-        "key": "ctrl+home",
-        "command": "extension.vim_ctrl+home",
-        "when": "editorTextFocus && vim.active && !inDebugRepl && vim.mode != 'Insert'"
-      },
       {
         "key": "End",
         "command": "extension.vim_end",
         "when": "editorTextFocus && vim.active && !inDebugRepl && vim.mode != 'Insert'"
       },
       {
-        "key": "ctrl+end",
-        "command": "extension.vim_ctrl+end",
-        "when": "editorTextFocus && vim.active && !inDebugRepl && vim.mode != 'Insert'"
+        "key": "PageUp",
+        "command": "extension.vim_pageup",
+        "when": "editorTextFocus && vim.active && !inDebugRepl && !suggestWidgetVisible && !parameterHintsVisible"
+      },
+      {
+        "key": "PageDown",
+        "command": "extension.vim_pagedown",
+        "when": "editorTextFocus && vim.active && !inDebugRepl && !suggestWidgetVisible && !parameterHintsVisible"
       },
       {
         "key": "Insert",
         "command": "extension.vim_insert",
         "when": "editorTextFocus && vim.active && !inDebugRepl"
       },
       {
-        "key": "Backspace",
+        "key": "backspace",
         "command": "extension.vim_backspace",
         "when": "editorTextFocus && vim.active && !inDebugRepl"
       },
       {
-        "key": "Delete",
+        "key": "delete",
         "command": "extension.vim_delete",
         "when": "editorTextFocus && vim.active && !inDebugRepl"
       },
@@ -142,6 +142,100 @@
         "command": "extension.vim_down",
         "when": "editorTextFocus && vim.active && !inDebugRepl && !suggestWidgetVisible && !parameterHintsVisible"
       },
+      {
+        "key": "shift+left",
+        "command": "extension.vim_shift+left",
+        "when": "editorTextFocus && vim.active && !inDebugRepl"
+      },
+      {
+        "key": "shift+right",
+        "command": "extension.vim_shift+right",
+        "when": "editorTextFocus && vim.active && !inDebugRepl"
+      },
+      {
+        "key": "shift+up",
+        "command": "extension.vim_shift+up",
+        "when": "editorTextFocus && vim.active && !inDebugRepl && !suggestWidgetVisible && !parameterHintsVisible"
+      },
+      {
+        "key": "shift+down",
+        "command": "extension.vim_shift+down",
+        "when": "editorTextFocus && vim.active && !inDebugRepl && !suggestWidgetVisible && !parameterHintsVisible"
+      },
+      {
+        "key": "shift+home",
+        "command": "extension.vim_shift+home",
+        "when": "editorTextFocus && vim.active && !inDebugRepl"
+      },
+      {
+        "key": "shift+end",
+        "command": "extension.vim_shift+end",
+        "when": "editorTextFocus && vim.active && !inDebugRepl"
+      },
+      {
+        "key": "shift+pageup",
+        "command": "extension.vim_shift+pageup",
+        "when": "editorTextFocus && vim.active && !inDebugRepl && !suggestWidgetVisible && !parameterHintsVisible"
+      },
+      {
+        "key": "shift+pagedown",
+        "command": "extension.vim_shift+pagedown",
+        "when": "editorTextFocus && vim.active && !inDebugRepl && !suggestWidgetVisible && !parameterHintsVisible"
+      },
+      {
+        "key": "ctrl+left",
+        "mac": "alt+left",
+        "command": "extension.vim_ctrl+left",
+        "when": "editorTextFocus && vim.active && vim.mode != 'Insert' && !inDebugRepl"
+      },
+      {
+        "key": "ctrl+right",
+        "mac": "alt+right",
+        "command": "extension.vim_ctrl+right",
+        "when": "editorTextFocus && vim.active && vim.mode != 'Insert' && !inDebugRepl"
+      },
+      {
+        "key": "ctrl+shift+left",
+        "mac": "alt+shift+left",
+        "command": "extension.vim_ctrl+shift+left",
+        "when": "editorTextFocus && vim.active && !inDebugRepl"
+      },
+      {
+        "key": "ctrl+shift+right",
+        "mac": "alt+shift+right",
+        "command": "extension.vim_ctrl+shift+right",
+        "when": "editorTextFocus && vim.active && !inDebugRepl"
+      },
+      {
+        "key": "ctrl+shift+up",
+        "command": "extension.vim_ctrl+shift+up",
+        "when": "editorTextFocus && vim.active && !inDebugRepl && !suggestWidgetVisible && !parameterHintsVisible"
+      },
+      {
+        "key": "ctrl+shift+down",
+        "command": "extension.vim_ctrl+shift+down",
+        "when": "editorTextFocus && vim.active && !inDebugRepl && !suggestWidgetVisible && !parameterHintsVisible"
+      },
+      {
+        "key": "ctrl+home",
+        "command": "extension.vim_ctrl+home",
+        "when": "editorTextFocus && vim.active && vim.mode != 'Insert' && !inDebugRepl"
+      },
+      {
+        "key": "ctrl+end",
+        "command": "extension.vim_ctrl+end",
+        "when": "editorTextFocus && vim.active && vim.mode != 'Insert' && !inDebugRepl"
+      },
+      {
+        "key": "ctrl+shift+home",
+        "command": "extension.vim_ctrl+shift+home",
+        "when": "editorTextFocus && vim.active && !inDebugRepl"
+      },
+      {
+        "key": "ctrl+shift+end",
+        "command": "extension.vim_ctrl+shift+end",
+        "when": "editorTextFocus && vim.active && !inDebugRepl"
+      },
       {
         "key": "g g",
         "command": "list.focusFirst",
@@ -352,16 +446,6 @@
         "command": "extension.vim_ctrl+down",
         "when": "editorTextFocus && vim.active && vim.mode != 'Insert' && !inDebugRepl"
       },
-      {
-        "key": "ctrl+left",
-        "command": "extension.vim_ctrl+left",
-        "when": "editorTextFocus && vim.active && vim.mode != 'Insert' && !inDebugRepl"
-      },
-      {
-        "key": "ctrl+right",
-        "command": "extension.vim_ctrl+right",
-        "when": "editorTextFocus && vim.active && vim.mode != 'Insert' && !inDebugRepl"
-      },
       {
         "key": "ctrl+pagedown",
         "command": "extension.vim_ctrl+pagedown",
@@ -385,12 +469,12 @@
       {
         "key": "ctrl+backspace",
         "command": "extension.vim_ctrl+backspace",
-        "when": "editorTextFocus && vim.active && vim.use<C-BS> && vim.mode != 'Insert' && !inDebugRepl"
+        "when": "editorTextFocus && vim.active && vim.use<C-BS> && !inDebugRepl"
       },
       {
         "key": "shift+backspace",
         "command": "extension.vim_shift+backspace",
-        "when": "editorTextFocus && vim.active && vim.use<S-BS> && vim.mode != 'Insert' && !inDebugRepl"
+        "when": "editorTextFocus && vim.active && vim.use<S-BS> && !inDebugRepl"
       },
       {
         "key": "cmd+left",
@@ -975,9 +1059,20 @@
         },
         "vim.mouseSelectionGoesIntoVisualMode": {
           "type": "boolean",
-          "description": "If enabled, dragging with the mouse activates Visual mode.",
+          "markdownDescription": "If enabled, dragging with the mouse activates Visual mode. If disabled, mouse drag stays in the current mode (Normal/Insert/Replace) without selection.",
           "default": true
         },
+        "vim.keymodel": {
+          "type": "string",
+          "markdownDescription": "Defines the behavior of shifted arrow keys (and `<Home>`/`<End>`/`<PageUp>`/`<PageDown>`). Comma-separated tokens:\n- `startsel` -> using a shifted special key starts/extends a Visual selection.\n- `stopsel` -> using an unshifted special key stops a Visual selection (returns to Normal, or to Insert/Replace if Visual was entered from there via `<S-arrow>` or `<C-o>`).",
+          "enum": [
+            "",
+            "startsel",
+            "stopsel",
+            "startsel,stopsel"
+          ],
+          "default": "startsel,stopsel"
+        },
         "vim.disableExtension": {
           "type": "boolean",
           "description": "Disables the VSCodeVim extension. The extension will continue to be loaded and activated, but Vim functionality will be disabled.",

src/actions/base.ts

@@ -156,7 +156,8 @@ export abstract class BaseCommand extends BaseAction {
 
   /**
    * If isCompleteAction is true, then triggering this command is a complete action -
-   * that means that we'll go and try to run it.
+   * that means that after the command is run we can clear recordedState.count because
+   * it will have been handled already.
    */
   public isCompleteAction = true;
 

src/actions/commands/insert.ts

@@ -220,7 +220,7 @@ export class ExitInsertMode extends BaseCommand {
     void vscode.commands.executeCommand('editor.action.inlineSuggest.hide');
 
     vimState.cursors = vimState.cursors.map((x) => x.withNewStop(x.stop.getLeft()));
-    if (vimState.returnToInsertAfterCommand && position.character !== 0) {
+    if (vimState.modeToReturnToAfterNormalCommand != null && position.character !== 0) {
       vimState.cursors = vimState.cursors.map((x) => x.withNewStop(x.stop.getRight()));
     }
 
@@ -408,7 +408,7 @@ class DecreaseIndent extends IndentCommand {
 @RegisterAction
 export class BackspaceInInsertMode extends BaseCommand {
   modes = [Mode.Insert];
-  keys = [['<BS>'], ['<C-h>']];
+  keys = [['<BS>'], ['<C-h>'], ['<S-BS>']];
 
   override runsOnceForEveryCursor() {
     return false;
@@ -419,6 +419,20 @@ export class BackspaceInInsertMode extends BaseCommand {
   }
 }
 
+@RegisterAction
+class CtrlBackspaceInInsertMode extends BaseCommand {
+  modes = [Mode.Insert];
+  keys = ['<C-BS>'];
+
+  override runsOnceForEveryCursor() {
+    return false;
+  }
+
+  public override async exec(position: Position, vimState: VimState): Promise<void> {
+    vimState.recordedState.transformer.vscodeCommand('deleteWordLeft');
+  }
+}
+
 @RegisterAction
 class DeleteInInsertMode extends BaseCommand {
   modes = [Mode.Insert];
@@ -572,13 +586,18 @@ class InsertRegisterContent extends BaseCommand {
 
 @RegisterAction
 class ExecuteOneNormalCommandInInsertMode extends BaseCommand {
-  modes = [Mode.Insert];
+  modes = [Mode.Insert, Mode.Replace];
   keys = ['<C-o>'];
 
   public override async exec(position: Position, vimState: VimState): Promise<void> {
-    vimState.returnToInsertAfterCommand = true;
+    const sourceMode = vimState.currentMode === Mode.Replace ? Mode.Replace : Mode.Insert;
+    vimState.modeToReturnToAfterNormalCommand = sourceMode;
     vimState.actionCount = 0;
-    await new ExitInsertMode().exec(position, vimState);
+    if (sourceMode === Mode.Insert) {
+      await new ExitInsertMode().exec(position, vimState);
+    } else {
+      await vimState.setCurrentMode(Mode.Normal);
+    }
   }
 }
 

src/actions/commands/put.ts

@@ -73,7 +73,7 @@ abstract class BasePutCommand extends BaseCommand {
 
     const newCursorPosition = this.getCursorPosition({
       document: vimState.document,
-      returnToInsertAfterCommand: vimState.returnToInsertAfterCommand,
+      returnToInsertAfterCommand: vimState.modeToReturnToAfterNormalCommand != null,
       mode,
       replaceRange,
       registerMode,

src/actions/commands/replace.ts

@@ -248,6 +248,9 @@ class ReplaceModeToInsertMode extends BaseCommand {
 @RegisterAction
 class BackspaceInReplaceMode extends BaseCommand {
   modes = [Mode.Replace];
+  // `<C-BS>` aliases `<BS>` here (one char restore), unlike Insert where it
+  // word-deletes. Replace's invariant requires every char be tracked and
+  // restored — skipping past chars via word-back would lose the originals.
   keys = [['<BS>'], ['<S-BS>'], ['<C-BS>'], ['<C-h>']];
 
   public override async exec(position: Position, vimState: VimState): Promise<void> {