Add integration test to cover #2114

Author: bryphe

integration_test/InputRemapMotionTest.re

@@ -0,0 +1,98 @@
+open Oni_Model;
+open Oni_IntegrationTestLib;
+open EditorCoreTypes;
+
+runTest(~name="InputRemapMotionTest (#2114)", (dispatch, wait, runEffects) => {
+  wait(~name="Initial mode is normal", (state: State.t) =>
+    Selectors.mode(state) |> Vim.Mode.isNormal
+  );
+
+  let testFile = getAssetPath("some-test-file.txt");
+  // Open an erroneous CSS file - verify we get some diagnostics
+  dispatch(Actions.OpenFileByPath(testFile, None, None));
+
+  wait(~name="buffer load", (state: State.t) => {
+    switch (Selectors.getActiveBuffer(state)) {
+    | Some(buffer) => Oni_Core.Buffer.getNumberOfLines(buffer) > 2
+    | None => false
+    }
+  });
+
+  // #2114 - remap hjkl -> jklm
+  dispatch(
+    VimExecuteCommand({allowAnimation: true, command: "nnoremap j h "}),
+  );
+  runEffects();
+
+  dispatch(
+    VimExecuteCommand({allowAnimation: true, command: "nnoremap l k "}),
+  );
+  runEffects();
+
+  dispatch(
+    VimExecuteCommand({allowAnimation: true, command: "nnoremap m l "}),
+  );
+  runEffects();
+
+  dispatch(
+    VimExecuteCommand({allowAnimation: true, command: "nnoremap k j "}),
+  );
+  runEffects();
+
+  let input = key => {
+    let modifiers = EditorInput.Modifiers.none;
+
+    let keyPress: EditorInput.KeyPress.t =
+      EditorInput.KeyPress.physicalKey(
+        ~key=EditorInput.Key.Character(key),
+        ~modifiers,
+      );
+    let time = Revery.Time.now();
+
+    dispatch(Model.Actions.KeyDown({key: keyPress, scancode: 1, time}));
+    dispatch(Model.Actions.KeyUp({key: keyPress, scancode: 1, time}));
+    runEffects();
+  };
+
+  let waitForCursorPosition = bytePosition => {
+    wait(
+      ~name="Verify cursor is at:" ++ BytePosition.show(bytePosition),
+      (state: State.t) => {
+        let cursorPosition =
+          state.layout
+          |> Feature_Layout.activeEditor
+          |> Feature_Editor.Editor.getPrimaryCursorByte;
+
+        cursorPosition == bytePosition;
+      },
+    );
+  };
+
+  waitForCursorPosition(
+    BytePosition.{line: LineNumber.zero, byte: ByteIndex.zero},
+  );
+
+  // Move down, jklm style
+  input('k');
+  waitForCursorPosition(
+    BytePosition.{line: LineNumber.(zero + 1), byte: ByteIndex.zero},
+  );
+
+  // Move right, jklm style
+  input('m');
+  waitForCursorPosition(
+    BytePosition.{line: LineNumber.(zero + 1), byte: ByteIndex.(zero + 1)},
+  );
+
+  // Move up, jklm style
+  input('l');
+  waitForCursorPosition(
+    BytePosition.{line: LineNumber.(zero), byte: ByteIndex.(zero + 1)},
+  );
+
+  // Move left, jklm style
+  input('j');
+  waitForCursorPosition(
+    BytePosition.{line: LineNumber.(zero), byte: ByteIndex.(zero)},
+  );
+});

integration_test/dune

@@ -8,12 +8,13 @@
    ExCommandKeybindingNormTest ExtConfigurationChangedTest
    ExtHostBufferOpenTest ExtHostBufferUpdatesTest ExtHostCompletionTest
    ExtHostDefinitionTest FileWatcherTest KeybindingsInvalidJsonTest
-   KeySequenceJJTest InputIgnoreTest InputContextKeysTest LanguageCssTest
-   LanguageTypeScriptTest LineEndingsLFTest LineEndingsCRLFTest
-   QuickOpenEventuallyCompletesTest SearchShowClearHighlightsTest
-   SyntaxServer SyntaxServerCloseTest SyntaxServerMessageExceptionTest
-   SyntaxServerParentPidTest SyntaxServerParentPidCorrectTest
-   SyntaxServerReadExceptionTest Regression1671Test Regression2349EnewTest
+   KeySequenceJJTest InputIgnoreTest InputContextKeysTest
+   InputRemapMotionTest LanguageCssTest LanguageTypeScriptTest
+   LineEndingsLFTest LineEndingsCRLFTest QuickOpenEventuallyCompletesTest
+   SearchShowClearHighlightsTest SyntaxServer SyntaxServerCloseTest
+   SyntaxServerMessageExceptionTest SyntaxServerParentPidTest
+   SyntaxServerParentPidCorrectTest SyntaxServerReadExceptionTest
+   Regression1671Test Regression2349EnewTest
    RegressionCommandLineNoCompletionTest RegressionFontFallbackTest
    RegressionFileModifiedIndicationTest RegressionNonExistentDirectory
    RegressionVspEmptyInitialBufferTest RegressionVspEmptyExistingBufferTest
@@ -40,8 +41,8 @@
    ExtHostBufferUpdatesTest.exe ExtHostCompletionTest.exe
    ExtHostDefinitionTest.exe FileWatcherTest.exe
    KeybindingsInvalidJsonTest.exe KeySequenceJJTest.exe InputIgnoreTest.exe
-   InputContextKeysTest.exe LanguageCssTest.exe LanguageTypeScriptTest.exe
-   LineEndingsCRLFTest.exe LineEndingsLFTest.exe
+   InputContextKeysTest.exe InputRemapMotionTest.exe LanguageCssTest.exe
+   LanguageTypeScriptTest.exe LineEndingsCRLFTest.exe LineEndingsLFTest.exe
    QuickOpenEventuallyCompletesTest.exe Regression1671Test.exe
    Regression2349EnewTest.exe RegressionCommandLineNoCompletionTest.exe
    RegressionFileModifiedIndicationTest.exe RegressionFontFallbackTest.exe