fix(handle affirmation of handlekeys config): closes #2162. handlekey…

…s config trumps usectrlkeys config
VSCodeVim · Jan 5, 2018 · 7726ad8 · 7726ad8
1 parent 5d011ef
commit 7726ad8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/configuration/configuration.ts b/src/configuration/configuration.ts
@@ -74,9 +74,10 @@ class ConfigurationClass {
       // By default, all key combinations are used
       let useKey = true;
 
-      if (this.handleKeys[bracketedKey] === false) {
-        // disabled through `vim.handleKeys`
-        useKey = false;
+      let handleKey = this.handleKeys[bracketedKey];
+      if (handleKey !== undefined) {
+        // enabled/disabled through `vim.handleKeys`
+        useKey = handleKey;
       } else if (!this.useCtrlKeys && bracketedKey.slice(1, 3) === 'C-') {
         // user has disabled CtrlKeys and the current key is a CtrlKey
         // <C-c>, still needs to be captured to overrideCopy
@@ -87,7 +88,7 @@ class ConfigurationClass {
         }
       }
 
-      vscode.commands.executeCommand('setContext', 'vim.use' + bracketedKey, useKey);
+      vscode.commands.executeCommand('setContext', `vim.use${bracketedKey}`, useKey);
     }
   }
 

diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -1361,11 +1361,6 @@ export class ModeHandler implements vscode.Disposable {
     }
     this._renderStatusBar();
 
-    await vscode.commands.executeCommand(
-      'setContext',
-      'vim.useCtrlKeys',
-      Configuration.useCtrlKeys
-    );
     await vscode.commands.executeCommand(
       'setContext',
       'vim.overrideCopy',