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

Author: sql-koala

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 
-## [v1.20.2](https://github.com/vscodevim/vim/tree/v1.20.2) (2021-04-28)
+## [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)
+
+**Fixed Bugs:**
+
+- . \(dot\) repeat last command mangles edit when used with completion [\#6610](https://github.com/VSCodeVim/Vim/issues/6610)
+- Scrolling commands `zb` and `zt` not working in visual mode [\#6578](https://github.com/VSCodeVim/Vim/issues/6578)
+- `\<` followed by `\<CR\>` in remap parsed incorrectly [\#6153](https://github.com/VSCodeVim/Vim/issues/6153)
+
+## [v1.20.2](https://github.com/vscodevim/vim/tree/v1.20.2) (2021-04-30)
 
 [Full Changelog](https://github.com/vscodevim/vim/compare/v1.20.1...v1.20.2)
 
@@ -38,10 +48,6 @@
 - `:y` yank command moves cursor [\#6519](https://github.com/VSCodeVim/Vim/issues/6519)
 - Failed to handle key=L. Cannot read property 'active' of undefined [\#6454](https://github.com/VSCodeVim/Vim/issues/6454)
 
-**Merged pull requests:**
-
-- Support 'set joinspaces' in join and reformat paragraph \(fix \#2505\) [\#5895](https://github.com/VSCodeVim/Vim/pull/5895) ([edemaine](https://github.com/edemaine))
-
 ## [v1.20.0](https://github.com/vscodevim/vim/tree/v1.20.0) (2021-04-17)
 
 [Full Changelog](https://github.com/vscodevim/vim/compare/v1.19.3...v1.20.0)
@@ -96,7 +102,6 @@
 - Illegal value for `line` [\#6273](https://github.com/VSCodeVim/Vim/issues/6273)
 - Failed to handle key=d. Illegal value for `line` [\#6258](https://github.com/VSCodeVim/Vim/issues/6258)
 - Failed to handle key==. Illegal value for `line` [\#6178](https://github.com/VSCodeVim/Vim/issues/6178)
-- Failed to handle key=i. Illegal value for `line` [\#5909](https://github.com/VSCodeVim/Vim/issues/5909)
 
 ## [v1.19.1](https://github.com/vscodevim/vim/tree/v1.19.1) (2021-03-21)
 
@@ -113,15 +118,13 @@
 **Enhancements:**
 
 - goto command not implemented [\#6025](https://github.com/VSCodeVim/Vim/issues/6025)
-- Use source maps to get intelligible stack traces [\#5887](https://github.com/VSCodeVim/Vim/issues/5887)
 
 **Fixed Bugs:**
 
 - Tests fail silently on module loading problems. [\#6244](https://github.com/VSCodeVim/Vim/issues/6244)
 - `gi` should put cursor at start of file if there was no prior insertion [\#6189](https://github.com/VSCodeVim/Vim/issues/6189)
 - Issue while search text in Russian [\#6140](https://github.com/VSCodeVim/Vim/issues/6140)
 - `nnoremap`'ing `\<S-J\>` and `\<S-K\>` from .vimrc doesn't work [\#6110](https://github.com/VSCodeVim/Vim/issues/6110)
-- When Korean keyboard layout \(Hangul\) is active, Entering a space does not work properly. [\#5900](https://github.com/VSCodeVim/Vim/issues/5900)
 
 **Closed issues:**
 
@@ -160,17 +163,10 @@
 **Enhancements:**
 
 - Implement `ZZ` and `ZQ` [\#5998](https://github.com/VSCodeVim/Vim/issues/5998)
-- Show Marks in Gutter [\#5924](https://github.com/VSCodeVim/Vim/pull/5924) ([zstix](https://github.com/zstix))
 
 **Fixed Bugs:**
 
 - Cannot read property 'warn' of undefined [\#5983](https://github.com/VSCodeVim/Vim/issues/5983)
-- H/M/L key not working in visual block mode [\#5890](https://github.com/VSCodeVim/Vim/issues/5890)
-
-**Closed issues:**
-
-- Unable to install vscode.vim extension is not compatible with current version vscode 1.51.1 [\#5883](https://github.com/VSCodeVim/Vim/issues/5883)
-- Failed to handle key=d. Cannot read property 'canBeRepeatedWithDot' of undefined [\#5879](https://github.com/VSCodeVim/Vim/issues/5879)
 
 **Merged pull requests:**
 
@@ -179,7 +175,6 @@
 - 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))
-- Fix gq to preserve blank lines like Vim does \(fix \#2393\) [\#5892](https://github.com/VSCodeVim/Vim/pull/5892) ([edemaine](https://github.com/edemaine))
 
 ## [v1.18.5](https://github.com/vscodevim/vim/tree/v1.18.5) (2020-12-10)
 

gulpfile.js

@@ -1,21 +1,21 @@
-var gulp = require('gulp'),
-  bump = require('gulp-bump'),
-  git = require('gulp-git'),
-  sourcemaps = require('gulp-sourcemaps'),
-  tag_version = require('gulp-tag-version'),
-  tslint = require('gulp-tslint'),
-  ts = require('gulp-typescript'),
-  PluginError = require('plugin-error'),
-  minimist = require('minimist'),
-  path = require('path'),
-  webpack = require('webpack'),
-  webpack_stream = require('webpack-stream'),
-  webpack_config = require('./webpack.config.js'),
-  es = require('event-stream');
-webpack_dev_config = require('./webpack.dev.js');
-
-const exec = require('child_process').exec;
-const spawn = require('child_process').spawn;
+const gulp = require('gulp');
+const bump = require('gulp-bump');
+const git = require('gulp-git');
+const sourcemaps = require('gulp-sourcemaps');
+const tag_version = require('gulp-tag-version');
+const tslint = require('gulp-tslint');
+const ts = require('gulp-typescript');
+const PluginError = require('plugin-error');
+const minimist = require('minimist');
+const path = require('path');
+const webpack = require('webpack');
+const webpack_stream = require('webpack-stream');
+const es = require('event-stream');
+
+const webpack_config = require('./webpack.config.js');
+const webpack_dev_config = require('./webpack.dev.js');
+
+const { exec, spawn } = require('child_process');
 
 const releaseOptions = {
   semver: '',
@@ -200,7 +200,7 @@ gulp.task('webpack-dev', function () {
   return webpack_stream(
     {
       config: webpack_dev_config,
-      entry: ['./extension.ts', './extensionWeb.ts'],
+      entry: ['./extension.ts'],
     },
     webpack
   ).pipe(gulp.dest('out'));

package.json

@@ -3,7 +3,7 @@
   "displayName": "Vim",
   "description": "Vim emulation for Visual Studio Code",
   "icon": "images/icon.png",
-  "version": "1.20.2",
+  "version": "1.20.3",
   "publisher": "vscodevim",
   "galleryBanner": {
     "color": "#e3f4ff",
@@ -1132,15 +1132,15 @@
     "@types/diff": "5.0.0",
     "@types/diff-match-patch": "1.0.32",
     "@types/glob": "7.1.3",
-    "@types/lodash": "4.14.169",
+    "@types/lodash": "4.14.170",
     "@types/mocha": "8.2.2",
-    "@types/node": "12.20.13",
-    "@types/sinon": "10.0.0",
+    "@types/node": "12.20.14",
+    "@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.8",
+    "fork-ts-checker-webpack-plugin": "6.2.10",
     "gulp": "4.0.2",
     "gulp-bump": "3.2.0",
     "gulp-git": "2.10.1",
@@ -1152,13 +1152,13 @@
     "mocha": "8.4.0",
     "plugin-error": "1.0.1",
     "prettier": "2.3.0",
-    "sinon": "10.0.0",
-    "ts-loader": "9.1.2",
+    "sinon": "11.1.1",
+    "ts-loader": "9.2.2",
     "tslint": "6.1.3",
-    "typescript": "4.2.4",
-    "vsce": "1.88.0",
+    "typescript": "4.3.2",
+    "vsce": "1.91.0",
     "vscode-test": "1.5.2",
-    "webpack": "5.37.0",
+    "webpack": "5.38.1",
     "webpack-cli": "4.7.0",
     "webpack-merge": "5.7.3",
     "webpack-stream": "6.1.2"

src/actions/base.ts

@@ -1,5 +1,5 @@
 import { Position } from 'vscode';
-import { Range } from '../common/motion/range';
+import { Cursor } from '../common/motion/cursor';
 import { Notation } from '../configuration/notation';
 import { isTextTransformation } from '../transformations/transformations';
 import { configuration } from './../configuration/configuration';
@@ -21,6 +21,10 @@ export abstract class BaseAction {
    */
   public isJump = false;
 
+  /**
+   * TODO: This property is a lie - it pertains to whether an action creates an undo point...
+   *       See #5058 and rationalize ASAP.
+   */
   public canBeRepeatedWithDot = false;
 
   /**
@@ -39,12 +43,12 @@ export abstract class BaseAction {
   /**
    * Modes that this action can be run in.
    */
-  public abstract modes: Mode[];
+  public abstract readonly modes: readonly Mode[];
 
   /**
    * The sequence of keys you use to trigger the action, or a list of such sequences.
    */
-  public keys: string[] | string[][];
+  public abstract readonly keys: readonly string[] | readonly string[][];
 
   public mustBeFirstKey = false;
 
@@ -99,7 +103,10 @@ export abstract class BaseAction {
     return true;
   }
 
-  public static CompareKeypressSequence(one: string[] | string[][], two: string[]): boolean {
+  public static CompareKeypressSequence(
+    one: readonly string[] | readonly string[][],
+    two: readonly string[]
+  ): boolean {
     if (BaseAction.is2DArray(one)) {
       for (const sequence of one) {
         if (BaseAction.CompareKeypressSequence(sequence, two)) {
@@ -166,7 +173,7 @@ export abstract class BaseAction {
     return this.keys.join('');
   }
 
-  private static is2DArray<T>(x: T[] | T[][]): x is T[][] {
+  private static is2DArray<T>(x: readonly T[] | readonly T[][]): x is readonly T[][] {
     return Array.isArray(x[0]);
   }
 }
@@ -198,8 +205,6 @@ export abstract class BaseCommand extends BaseAction {
    */
   runsOnceForEachCountPrefix = false;
 
-  canBeRepeatedWithDot = false;
-
   /**
    * Run the command a single time.
    */
@@ -227,10 +232,10 @@ export abstract class BaseCommand extends BaseAction {
       return;
     }
 
-    const resultingCursors: Range[] = [];
+    const resultingCursors: Cursor[] = [];
 
     const cursorsToIterateOver = vimState.cursors
-      .map((x) => new Range(x.start, x.stop))
+      .map((x) => new Cursor(x.start, x.stop))
       .sort((a, b) =>
         a.start.line > b.start.line ||
         (a.start.line === b.start.line && a.start.character > b.start.character)
@@ -249,7 +254,7 @@ export abstract class BaseCommand extends BaseAction {
         await this.exec(stop, vimState);
       }
 
-      resultingCursors.push(new Range(vimState.cursorStartPosition, vimState.cursorStopPosition));
+      resultingCursors.push(new Cursor(vimState.cursorStartPosition, vimState.cursorStopPosition));
 
       for (const transformation of vimState.recordedState.transformer.transformations) {
         if (isTextTransformation(transformation) && transformation.cursorIndex === undefined) {