Merge branch 'master' of https://github.com/VSCodeVim/Vim into masterRepo

Author: sql-koala

CHANGELOG.md

@@ -1,5 +1,63 @@
 # Change Log
 
+## [v1.21.3](https://github.com/vscodevim/vim/tree/v1.21.3) (2021-06-17)
+
+[Full Changelog](https://github.com/vscodevim/vim/compare/v1.21.2...v1.21.3)
+
+**Fixed Bugs:**
+
+- `i"`/`a"` should match quotes on line when cursor is on quote [\#6761](https://github.com/VSCodeVim/Vim/issues/6761)
+- `a"` should include the space after the closing quote [\#6747](https://github.com/VSCodeVim/Vim/issues/6747)
+- Incorrect cursor position after `vi"c` when cursor on quote [\#6740](https://github.com/VSCodeVim/Vim/issues/6740)
+- `\<BS\>` deletes too much leading whitespace when using hard tabstops with `expandtab` enabled [\#6735](https://github.com/VSCodeVim/Vim/issues/6735)
+- `gd` that causes a file load followed by `h`/`j`/`k`/`l` jumps to random spot [\#6544](https://github.com/VSCodeVim/Vim/issues/6544)
+- The message on the status bar about how many to look for conflicts with "Normal" [\#6039](https://github.com/VSCodeVim/Vim/issues/6039)
+
+## [v1.21.2](https://github.com/vscodevim/vim/tree/v1.21.2) (2021-06-11)
+
+[Full Changelog](https://github.com/vscodevim/vim/compare/v1.21.1...v1.21.2)
+
+**Fixed Bugs:**
+
+- `\<Esc\>` does not cancel multi-cursor [\#6719](https://github.com/VSCodeVim/Vim/issues/6719)
+- incorrect undo of macro execution containing delete after join [\#6645](https://github.com/VSCodeVim/Vim/issues/6645)
+
+## [v1.21.1](https://github.com/vscodevim/vim/tree/v1.21.1) (2021-06-10)
+
+[Full Changelog](https://github.com/vscodevim/vim/compare/v1.21.0...v1.21.1)
+
+**Fixed Bugs:**
+
+- User Settings Getting Overridden [\#6717](https://github.com/VSCodeVim/Vim/issues/6717)
+- incorrect placement of brackets when using macros [\#6692](https://github.com/VSCodeVim/Vim/issues/6692)
+
+## [v1.21.0](https://github.com/vscodevim/vim/tree/v1.21.0) (2021-06-09)
+
+[Full Changelog](https://github.com/vscodevim/vim/compare/v1.20.3...v1.21.0)
+
+**Enhancements:**
+
+- `:s` should report \# of substitutions [\#6698](https://github.com/VSCodeVim/Vim/issues/6698)
+- Support virtual workspaces [\#6596](https://github.com/VSCodeVim/Vim/issues/6596)
+- Support Workspace Trust [\#6587](https://github.com/VSCodeVim/Vim/issues/6587)
+- Python Object Motions [\#6213](https://github.com/VSCodeVim/Vim/issues/6213)
+
+**Fixed Bugs:**
+
+- Bug with tab removal before odd number of characters [\#6327](https://github.com/VSCodeVim/Vim/issues/6327)
+
+**Closed issues:**
+
+- Enable `--noImplicitOverride` [\#6670](https://github.com/VSCodeVim/Vim/issues/6670)
+- Surround emulation gets positions wrong when tabs are involved [\#6564](https://github.com/VSCodeVim/Vim/issues/6564)
+
+**Merged pull requests:**
+
+- Implement :vsc to run VSCode commands [\#6694](https://github.com/VSCodeVim/Vim/pull/6694) ([meluskyc](https://github.com/meluskyc))
+- Surround Rewrite [\#6452](https://github.com/VSCodeVim/Vim/pull/6452) ([sql-koala](https://github.com/sql-koala))
+- Bugfix substitute with backslash\(fixes \#2710\) [\#6409](https://github.com/VSCodeVim/Vim/pull/6409) ([sekai013](https://github.com/sekai013))
+- Add Python specific motions \(fixes \#6213\) [\#6393](https://github.com/VSCodeVim/Vim/pull/6393) ([abid-mujtaba](https://github.com/abid-mujtaba))
+
 ## [v1.20.3](https://github.com/vscodevim/vim/tree/v1.20.3) (2021-05-18)
 
 [Full Changelog](https://github.com/vscodevim/vim/compare/v1.20.2...v1.20.3)
@@ -136,8 +194,6 @@
 - Fix even more dependency cycles [\#6243](https://github.com/VSCodeVim/Vim/pull/6243) ([inspirer](https://github.com/inspirer))
 - Fix several dependency cycles [\#6208](https://github.com/VSCodeVim/Vim/pull/6208) ([inspirer](https://github.com/inspirer))
 - Implement previous context marks \(add to jump list on m' / m`\) [\#6174](https://github.com/VSCodeVim/Vim/pull/6174) ([jose-elias-alvarez](https://github.com/jose-elias-alvarez))
-- Add Erlang style comments [\#5970](https://github.com/VSCodeVim/Vim/pull/5970) ([maxnordlund](https://github.com/maxnordlund))
-- Potential fix for non latin chars issue [\#5951](https://github.com/VSCodeVim/Vim/pull/5951) ([berknam](https://github.com/berknam))
 
 ## [v1.18.9](https://github.com/vscodevim/vim/tree/v1.18.9) (2021-02-05)
 
@@ -160,21 +216,12 @@
 
 [Full Changelog](https://github.com/vscodevim/vim/compare/v1.18.5...v1.18.7)
 
-**Enhancements:**
-
-- Implement `ZZ` and `ZQ` [\#5998](https://github.com/VSCodeVim/Vim/issues/5998)
-
-**Fixed Bugs:**
-
-- Cannot read property 'warn' of undefined [\#5983](https://github.com/VSCodeVim/Vim/issues/5983)
-
 **Merged pull requests:**
 
 - off load vimrc module in web [\#6067](https://github.com/VSCodeVim/Vim/pull/6067) ([rebornix](https://github.com/rebornix))
 - Fix multicursor insert register new [\#6065](https://github.com/VSCodeVim/Vim/pull/6065) ([sql-koala](https://github.com/sql-koala))
 - Fix 'cw' behavior on whitespace [\#6033](https://github.com/VSCodeVim/Vim/pull/6033) ([edemaine](https://github.com/edemaine))
 - Remove stray console.log statements [\#6032](https://github.com/VSCodeVim/Vim/pull/6032) ([edemaine](https://github.com/edemaine))
-- Document build/test process better [\#5946](https://github.com/VSCodeVim/Vim/pull/5946) ([edemaine](https://github.com/edemaine))
 
 ## [v1.18.5](https://github.com/vscodevim/vim/tree/v1.18.5) (2020-12-10)
 

extensionBase.ts

@@ -284,7 +284,7 @@ export async function activate(context: vscode.ExtensionContext, handleLocal: bo
         return;
       }
 
-      const mh = await getAndUpdateModeHandler();
+      const mh = ModeHandlerMap.get(EditorIdentity.fromEditor(vscode.window.activeTextEditor));
       if (mh === undefined) {
         // We don't care if there is no active editor
         return;
@@ -332,15 +332,7 @@ export async function activate(context: vscode.ExtensionContext, handleLocal: bo
         return;
       }
 
-      taskQueue.enqueueTask(
-        () => mh.handleSelectionChange(e),
-        undefined,
-        /**
-         * We don't want these to become backlogged! If they do, we'll update
-         * the selection to an incorrect value and see a jittering cursor.
-         */
-        true
-      );
+      taskQueue.enqueueTask(() => mh.handleSelectionChange(e));
     },
     true,
     false
@@ -350,11 +342,17 @@ export async function activate(context: vscode.ExtensionContext, handleLocal: bo
     context,
     vscode.window.onDidChangeTextEditorVisibleRanges,
     async (e: vscode.TextEditorVisibleRangesChangeEvent) => {
-      const mh = await getAndUpdateModeHandler();
-      if (mh) {
+      taskQueue.enqueueTask(async () => {
         // Scrolling the viewport clears any status bar message, even errors.
-        StatusBar.clear(mh.vimState, true);
-      }
+        const mh = await getAndUpdateModeHandler();
+        if (mh && StatusBar.lastMessageTime) {
+          // TODO: Using the time elapsed works most of the time, but is a bit of a hack
+          const timeElapsed = Number(new Date()) - Number(StatusBar.lastMessageTime);
+          if (timeElapsed > 100) {
+            StatusBar.clear(mh.vimState, true);
+          }
+        }
+      });
     }
   );
 
@@ -493,15 +491,20 @@ export async function activate(context: vscode.ExtensionContext, handleLocal: bo
   for (const boundKey of configuration.boundKeyCombinations) {
     const command = ['<Esc>', '<C-c>'].includes(boundKey.key)
       ? async () => {
-          const didStopRemap = await forceStopRecursiveRemap();
-          if (!didStopRemap) {
-            handleKeyEvent(`${boundKey.key}`);
+          const mh = await getAndUpdateModeHandler();
+          if (mh && !(await forceStopRecursiveRemap(mh))) {
+            await mh.handleKeyEvent(`${boundKey.key}`);
           }
         }
-      : () => {
-          handleKeyEvent(`${boundKey.key}`);
+      : async () => {
+          const mh = await getAndUpdateModeHandler();
+          if (mh) {
+            await mh.handleKeyEvent(`${boundKey.key}`);
+          }
         };
-    registerCommand(context, boundKey.command, command);
+    registerCommand(context, boundKey.command, async () => {
+      taskQueue.enqueueTask(command);
+    });
   }
 
   {
@@ -621,21 +624,11 @@ function registerEventListener<T>(
   context.subscriptions.push(disposable);
 }
 
-async function handleKeyEvent(key: string): Promise<void> {
-  const mh = await getAndUpdateModeHandler();
-  if (mh) {
-    taskQueue.enqueueTask(async () => {
-      await mh.handleKeyEvent(key);
-    });
-  }
-}
-
 /**
  * @returns true if there was a remap being executed to stop
  */
-async function forceStopRecursiveRemap(): Promise<boolean> {
-  const mh = await getAndUpdateModeHandler();
-  if (mh?.remapState.isCurrentlyPerformingRecursiveRemapping) {
+async function forceStopRecursiveRemap(mh: ModeHandler): Promise<boolean> {
+  if (mh.remapState.isCurrentlyPerformingRecursiveRemapping) {
     mh.remapState.forceStopRecursiveRemapping = true;
     return true;
   }

package.json

@@ -3,7 +3,7 @@
   "displayName": "Vim",
   "description": "Vim emulation for Visual Studio Code",
   "icon": "images/icon.png",
-  "version": "1.20.3",
+  "version": "1.21.3",
   "publisher": "vscodevim",
   "galleryBanner": {
     "color": "#e3f4ff",
@@ -43,6 +43,12 @@
   "qna": "https://vscodevim.herokuapp.com/",
   "main": "./out/extension",
   "browser": "./out/extensionWeb",
+  "capabilities": {
+    "untrustedWorkspaces": {
+      "supported": true
+    },
+    "virtualWorkspaces": true
+  },
   "contributes": {
     "commands": [
       {
@@ -1122,6 +1128,7 @@
     "lodash": "^4.17.21",
     "neovim": "4.10.0",
     "path-browserify": "1.0.1",
+    "queue": "^6.0.2",
     "source-map-support": "0.5.19",
     "untildify": "4.0.0",
     "winston": "3.3.3",
@@ -1134,13 +1141,13 @@
     "@types/glob": "7.1.3",
     "@types/lodash": "4.14.170",
     "@types/mocha": "8.2.2",
-    "@types/node": "12.20.14",
+    "@types/node": "12.20.15",
     "@types/sinon": "10.0.2",
     "@types/source-map-support": "0.5.3",
     "@types/vscode": "1.42.0",
     "clean-webpack-plugin": "3.0.0",
     "event-stream": "4.0.1",
-    "fork-ts-checker-webpack-plugin": "6.2.10",
+    "fork-ts-checker-webpack-plugin": "6.2.12",
     "gulp": "4.0.2",
     "gulp-bump": "3.2.0",
     "gulp-git": "2.10.1",
@@ -1149,18 +1156,18 @@
     "gulp-tslint": "8.1.4",
     "gulp-typescript": "5.0.1",
     "minimist": "1.2.5",
-    "mocha": "8.4.0",
+    "mocha": "9.0.1",
     "plugin-error": "1.0.1",
-    "prettier": "2.3.0",
+    "prettier": "2.3.2",
     "sinon": "11.1.1",
-    "ts-loader": "9.2.2",
+    "ts-loader": "9.2.3",
     "tslint": "6.1.3",
-    "typescript": "4.3.2",
-    "vsce": "1.91.0",
+    "typescript": "4.3.4",
+    "vsce": "1.95.0",
     "vscode-test": "1.5.2",
-    "webpack": "5.38.1",
-    "webpack-cli": "4.7.0",
-    "webpack-merge": "5.7.3",
+    "webpack": "5.40.0",
+    "webpack-cli": "4.7.2",
+    "webpack-merge": "5.8.0",
     "webpack-stream": "6.1.2"
   }
 }

src/actions/base.ts

@@ -182,7 +182,7 @@ export abstract class BaseAction {
  * A command is something like <Esc>, :, v, i, etc.
  */
 export abstract class BaseCommand extends BaseAction {
-  isCommand = true;
+  override isCommand = true;
 
   /**
    * If isCompleteAction is true, then triggering this command is a complete action -
@@ -291,22 +291,22 @@ export function getRelevantAction(
   keysPressed: string[],
   vimState: VimState
 ): BaseAction | KeypressState {
-  let isPotentialMatch = false;
+  const possibleActionsForMode = actionMap.get(vimState.currentMode) ?? [];
 
-  const possibleActionsForMode = actionMap.get(vimState.currentMode) || [];
+  let hasPotentialMatch = false;
   for (const actionType of possibleActionsForMode) {
+    // TODO: Constructing up to several hundred Actions every time we hit a key is moronic.
+    //       I think we can make `doesActionApply` and `couldActionApply` static...
     const action = new actionType();
     if (action.doesActionApply(vimState, keysPressed)) {
       action.keysPressed = vimState.recordedState.actionKeys.slice(0);
       return action;
     }
 
-    if (action.couldActionApply(vimState, keysPressed)) {
-      isPotentialMatch = true;
-    }
+    hasPotentialMatch ||= action.couldActionApply(vimState, keysPressed);
   }
 
-  return isPotentialMatch ? KeypressState.WaitingOnKeys : KeypressState.NoPossibleMatch;
+  return hasPotentialMatch ? KeypressState.WaitingOnKeys : KeypressState.NoPossibleMatch;
 }
 
 export function RegisterAction(action: new () => BaseAction): void {

src/actions/baseMotion.ts

@@ -50,7 +50,7 @@ export function failedMovement(vimState: VimState): IMovement {
 export abstract class BaseMovement extends BaseAction {
   modes = [Mode.Normal, Mode.Visual, Mode.VisualLine, Mode.VisualBlock];
 
-  isMotion = true;
+  override isMotion = true;
 
   /**
    * If movement can be repeated with semicolon or comma this will be true when