Merge pull request #5 from VSCodeVim/master

update master

Author: sql-koala

package-lock.json

@@ -1058,20 +1058,20 @@
     "gulp-tag-version": "1.3.1",
     "gulp-tslint": "8.1.4",
     "gulp-typescript": "5.0.1",
-    "husky": "4.2.5",
+    "husky": "4.3.0",
     "minimist": "1.2.5",
     "mocha": "8.1.3",
     "plugin-error": "1.0.1",
     "prettier": "2.1.1",
-    "pretty-quick": "3.0.0",
+    "pretty-quick": "3.0.1",
     "sinon": "9.0.3",
     "ts-loader": "8.0.3",
     "tslint": "6.1.3",
     "typescript": "4.0.2",
     "vscode-test": "1.4.0",
     "webpack": "4.44.1",
     "webpack-cli": "3.3.12",
-    "webpack-merge": "5.1.3",
+    "webpack-merge": "5.1.4",
     "webpack-stream": "6.1.0"
   }
 }

package.json

@@ -1171,9 +1171,11 @@ class CommandRepeatSubstitution extends BaseCommand {
   }
 }
 
+type FoldDirection = 'up' | 'down' | undefined;
 abstract class CommandFold extends BaseCommand {
   modes = [Mode.Normal, Mode.Visual, Mode.VisualLine];
   commandName: string;
+  direction: FoldDirection;
 
   public doesActionApply(vimState: VimState, keysPressed: string[]): boolean {
     // Don't run if there's an operator because the Sneak plugin uses <operator>z
@@ -1183,7 +1185,13 @@ abstract class CommandFold extends BaseCommand {
   }
 
   public async exec(position: Position, vimState: VimState): Promise<void> {
-    await vscode.commands.executeCommand(this.commandName);
+    const timesToRepeat = vimState.recordedState.count || 1;
+    const args =
+      this.direction !== undefined
+        ? { levels: timesToRepeat, direction: this.direction }
+        : undefined;
+    await vscode.commands.executeCommand(this.commandName, args);
+    vimState.cursors = getCursorsAfterSync();
     await vimState.setCurrentMode(Mode.Normal);
   }
 }
@@ -1192,24 +1200,13 @@ abstract class CommandFold extends BaseCommand {
 class CommandToggleFold extends CommandFold {
   keys = ['z', 'a'];
   commandName = 'editor.toggleFold';
-  public async exec(position: Position, vimState: VimState): Promise<void> {
-    await vscode.commands.executeCommand(this.commandName);
-    vimState.cursors = getCursorsAfterSync();
-    await vimState.setCurrentMode(Mode.Normal);
-  }
 }
 
 @RegisterAction
 class CommandCloseFold extends CommandFold {
   keys = ['z', 'c'];
   commandName = 'editor.fold';
-  runsOnceForEachCountPrefix = true;
-
-  public async exec(position: Position, vimState: VimState): Promise<void> {
-    let timesToRepeat = vimState.recordedState.count || 1;
-    await vscode.commands.executeCommand('editor.fold', { levels: timesToRepeat, direction: 'up' });
-    vimState.cursors = getCursorsAfterSync();
-  }
+  direction: FoldDirection = 'up';
 }
 
 @RegisterAction
@@ -1222,15 +1219,7 @@ class CommandCloseAllFolds extends CommandFold {
 class CommandOpenFold extends CommandFold {
   keys = ['z', 'o'];
   commandName = 'editor.unfold';
-  runsOnceForEachCountPrefix = true;
-
-  public async exec(position: Position, vimState: VimState): Promise<void> {
-    let timesToRepeat = vimState.recordedState.count || 1;
-    await vscode.commands.executeCommand('editor.unfold', {
-      levels: timesToRepeat,
-      direction: 'down',
-    });
-  }
+  direction: FoldDirection = 'down';
 }
 
 @RegisterAction

src/actions/commands/actions.ts

@@ -6,27 +6,39 @@
   "patterns": [
     {
       "name": "comment.line",
-      "match": "\".*$"
+      "match": "(^| |\t)\".*$"
     },
     {
       "name": "entity.name.function",
-      "match": "^(map|nmap|vmap|smap|xmap|omap|map!|imap|lmap|cmap)"
+      "match": "^( |\t)*(map|nmap|vmap|smap|xmap|omap|map!|imap|lmap|cmap)"
     },
     {
       "name": "entity.name.function",
-      "match": "^(noremap|nnoremap|vnoremap|snoremap|xnoremap|onoremap|noremap!|inoremap|lnoremap|cnoremap)"
+      "match": "^( |\t)*(noremap|nnoremap|vnoremap|snoremap|xnoremap|onoremap|noremap!|inoremap|lnoremap|cnoremap)"
     },
     {
       "name": "entity.name.function",
-      "match": "^(unmap|nunmap|vunmap|sunmap|xunmap|ounmap|unmap!|iunmap|lunmap|cunmap)"
+      "match": "^( |\t)*(unmap|nunmap|vunmap|sunmap|xunmap|ounmap|unmap!|iunmap|lunmap|cunmap)"
     },
     {
       "name": "entity.name.function",
-      "match": "^set"
+      "match": "^( |\t)*set"
+    },
+    {
+      "name": "constant",
+      "match": "<([Ll][Ee][Aa][Dd][Ee][Rr])>"
+    },
+    {
+      "name": "constant",
+      "match": "<([Cc][Rr])>"
+    },
+    {
+      "name": "constant",
+      "match": "<[CcDd]-.>"
     },
     {
       "name": "string.unquoted",
-      "match": ".*$"
+      "match": "[A-Za-z]+(\\.[A-Za-z]+)+"
     }
   ]
 }