Merge branch 'master' into a

VSCodeVim · Dec 29, 2018 · 85bd93c · 85bd93c
2 parents 07a306b + 43fd090
commit 85bd93c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/cmd_line/subparser.ts b/src/cmd_line/subparser.ts
@@ -88,6 +88,7 @@ export const commandParsers = {
   vne: fileCmd.parseEditNewFileInNewVerticalWindowCommandArgs,
   vnew: fileCmd.parseEditNewFileInNewVerticalWindowCommandArgs,
 
+  on: parseOnlyCommandArgs,
   only: parseOnlyCommandArgs,
 
   set: parseOptionsCommandArgs,

diff --git a/src/util/vscode-context.ts b/src/util/vscode-context.ts
@@ -1,6 +1,11 @@
 import * as vscode from 'vscode';
 
-export class VsCodeContextImpl {
+/**
+ * Wrapper around VS Code's `setContext`.
+ * The API call takes several milliseconds to seconds to complete,
+ * so let's cache the values and only call the API when necessary.
+ */
+class VsCodeContextImpl {
   contextMap: { [key: string]: any } = {};
 
   public async Set(key: string, value: any): Promise<void> {