Remove test hack

src/mode/modeHandler.ts

@@ -625,16 +625,8 @@ export class ModeHandler implements vscode.Disposable {
   }
 
   async handleKeyEvent(key: string): Promise<Boolean> {
-    if (key === "<c-r>") { key = "ctrl+r"; } // TODO - temporary hack for tests only!
-    if (key === "<c-a>") { key = "ctrl+a"; } // TODO - temporary hack for tests only!
-    if (key === "<c-x>") { key = "ctrl+x"; } // TODO - temporary hack for tests only!
-
     if (key === "<esc>") { key = "<escape>"; }
 
-    // Due to a limitation in Electron, en-US QWERTY char codes are used in international keyboards.
-    // We'll try to mitigate this problem until it's fixed upstream.
-    // https://github.com/Microsoft/vscode/issues/713
-
     this._vimState.cursorPositionJustBeforeAnythingHappened = this._vimState.cursorPosition;
 
     try {

test/testSimplifier.ts

@@ -168,6 +168,16 @@ function tokenizeKeySequence(sequence: string): string[] {
       continue;
     }
 
+    const bracketedKeyTranslations = {
+      '<c-r>' : 'ctrl+r',
+      '<c-a>' : 'ctrl+a',
+      '<c-x>' : 'ctrl+x',
+    };
+
+    if (key in bracketedKeyTranslations) {
+      key = bracketedKeyTranslations[key];
+    }
+
     result.push(key);
     key = "";
   }