fix: add configuration tests

src/configuration/remapper.ts

@@ -82,9 +82,9 @@ export class Remapper implements IRemapper {
     const userDefinedRemappings = configuration[this._configKey] as Map<string, IKeyRemapping>;
 
     this._logger.debug(
-      `find matching remap. keys=${keys}. mode=${ModeName[vimState.currentMode]}. keybindings=${
-        this._configKey
-      }.`
+      `trying to find matching remap. keys=${keys}. mode=${
+        ModeName[vimState.currentMode]
+      }. keybindings=${this._configKey}.`
     );
     let remapping: IKeyRemapping | undefined = Remapper.findMatchingRemap(
       userDefinedRemappings,
@@ -113,7 +113,7 @@ export class Remapper implements IRemapper {
     }
 
     // Check to see if a remapping could potentially be applied when more keys are received
-    for (let remap of Object.keys(userDefinedRemappings)) {
+    for (let remap of userDefinedRemappings.keys()) {
       if (keys.join('') === remap.slice(0, keys.length)) {
         this._isPotentialRemap = true;
         break;

src/mode/modeHandler.ts

@@ -313,20 +313,19 @@ export class ModeHandler implements vscode.Disposable {
   }
 
   private async handleKeyEventHelper(key: string, vimState: VimState): Promise<VimState> {
-    // Just nope right out of here.
     if (vscode.window.activeTextEditor !== this.vimState.editor) {
+      this._logger.warn('Current window is not active');
       return this.vimState;
     }
 
     // Catch any text change not triggered by us (example: tab completion).
     vimState.historyTracker.addChange(this.vimState.cursorPositionJustBeforeAnythingHappened);
 
-    let recordedState = vimState.recordedState;
+    vimState.keyHistory.push(key);
 
+    let recordedState = vimState.recordedState;
     recordedState.actionKeys.push(key);
 
-    vimState.keyHistory.push(key);
-
     let result = Actions.getRelevantAction(recordedState.actionKeys, vimState);
     switch (result) {
       case KeypressState.NoPossibleMatch:

test/cmd_line/substitute.test.ts

@@ -220,9 +220,9 @@ suite('Basic substitute', () => {
   });
 
   suite('Effects of substituteGlobalFlag=true', () => {
-    setup(() => {
+    setup(async () => {
       Globals.mockConfiguration.substituteGlobalFlag = true;
-      reloadConfiguration();
+      await reloadConfiguration();
     });
 
     test('Replace all matches in the line', async () => {

test/configuration/configuration.test.ts

@@ -1,5 +1,4 @@
 import * as assert from 'assert';
-
 import * as srcConfiguration from '../../src/configuration/configuration';
 import * as testConfiguration from '../testConfiguration';
 import { cleanUpWorkspace, setupWorkspace } from './../testUtils';
@@ -20,6 +19,23 @@ suite('Configuration', () => {
       after: ['v'],
     },
   ];
+  (configuration.visualModeKeyBindingsNonRecursive = [
+    // duplicate keybindings
+    {
+      before: ['c', 'o', 'p', 'y'],
+      after: ['c', 'o', 'p', 'y'],
+    },
+    {
+      before: ['c', 'o', 'p', 'y'],
+      after: ['c', 'o', 'p', 'y'],
+    },
+  ]),
+    (configuration.insertModeKeyBindingsNonRecursive = [
+      {
+        // missing after and command
+        before: ['a'],
+      },
+    ]);
   configuration.whichwrap = 'h,l';
 
   setup(async () => {
@@ -30,19 +46,24 @@ suite('Configuration', () => {
 
   test('remappings are normalized', async () => {
     const normalizedKeybinds = srcConfiguration.configuration.normalModeKeyBindingsNonRecursive;
+    const normalizedKeybindsMap =
+      srcConfiguration.configuration.normalModeKeyBindingsNonRecursiveMap;
     const testingKeybinds = configuration.normalModeKeyBindingsNonRecursive;
 
     assert.equal(normalizedKeybinds.length, testingKeybinds.length);
+    assert.equal(normalizedKeybinds.length, normalizedKeybindsMap.size);
     assert.deepEqual(normalizedKeybinds[0].before, [' ', 'o']);
     assert.deepEqual(normalizedKeybinds[0].after, ['o', '<Esc>', 'k']);
   });
 
-  newTest({
-    title: 'Can handle long key chords',
-    start: ['|'],
-    keysPressed: ' fes',
-    end: ['|'],
-    endMode: ModeName.Visual,
+  test('remappings are de-duped', async () => {
+    const keybindings = srcConfiguration.configuration.visualModeKeyBindingsNonRecursiveMap;
+    assert.equal(keybindings.size, 1);
+  });
+
+  test('invalid remappings are ignored', async () => {
+    const keybindings = srcConfiguration.configuration.insertModeKeyBindingsNonRecursiveMap;
+    assert.equal(keybindings.size, 0);
   });
 
   test('whichwrap is parsed into wrapKeys', async () => {
@@ -54,4 +75,13 @@ suite('Configuration', () => {
     assert.equal(wrapKeys[h], true);
     assert.equal(wrapKeys[j], undefined);
   });
+
+  newTest({
+    title: 'Can handle long key chords',
+    start: ['|'],
+    // <leader>fes
+    keysPressed: ' fes',
+    end: ['|'],
+    endMode: ModeName.Visual,
+  });
 });

test/mode/modeVisual.test.ts

@@ -827,9 +827,9 @@ suite('Mode Visual', () => {
   });
 
   suite('visualstar', () => {
-    setup(() => {
+    setup(async () => {
       Globals.mockConfiguration.visualstar = true;
-      reloadConfiguration();
+      await reloadConfiguration();
     });
 
     newTest({

test/plugins/sneak.test.ts

@@ -8,7 +8,7 @@ suite('sneak plugin', () => {
   setup(async () => {
     await setupWorkspace();
     Globals.mockConfiguration.sneak = true;
-    reloadConfiguration();
+    await reloadConfiguration();
   });
 
   teardown(cleanUpWorkspace);

test/testUtils.ts

@@ -85,7 +85,7 @@ export async function setupWorkspace(
   await vscode.window.showTextDocument(doc);
 
   Globals.mockConfiguration = config;
-  reloadConfiguration();
+  await reloadConfiguration();
 
   let activeTextEditor = vscode.window.activeTextEditor;
   assert.ok(activeTextEditor);
@@ -134,8 +134,8 @@ export async function cleanUpWorkspace(): Promise<any> {
   });
 }
 
-export function reloadConfiguration() {
-  require('../src/configuration/configuration').configuration.load();
+export async function reloadConfiguration() {
+  await require('../src/configuration/configuration').configuration.load();
 }
 
 /**