Make 'ViForwardChar' able to accept suggestions (#1528)

Author: daxian-dbw

PSReadLine/Movement.cs

@@ -91,7 +91,14 @@ private static void ViForwardChar(ConsoleKeyInfo? key = null, object arg = null)
         {
             if (TryGetArgAsInt(arg, out var numericArg, 1))
             {
-                ViOffsetCursorPosition(+ numericArg);
+                if (InViInsertMode() && _singleton._current == _singleton._buffer.Length && numericArg > 0)
+                {
+                    AcceptSuggestion(key, arg);
+                }
+                else
+                {
+                    ViOffsetCursorPosition(+ numericArg);
+                }
             }
         }
 

PSReadLine/UndoRedo.cs

@@ -92,9 +92,10 @@ public static void Undo(ConsoleKeyInfo? key = null, object arg = null)
                 }
                 _singleton._edits[_singleton._undoEditIndex - 1].Undo();
                 _singleton._undoEditIndex--;
+
                 if (_singleton._options.EditMode == EditMode.Vi && _singleton._current >= _singleton._buffer.Length)
                 {
-                    _singleton._current = Math.Max(0, _singleton._buffer.Length - 1);
+                    _singleton._current = Math.Max(0, _singleton._buffer.Length + ViEndOfLineFactor);
                 }
                 _singleton.Render();
             }

test/SuggestionTest.cs

@@ -289,5 +289,40 @@ public void HistoryEditsCanUndoProperly()
                     TokenClassification.None, " checkout ")),
                 _.Escape));
         }
+
+        [SkippableFact]
+        public void AcceptSuggestionInVIMode()
+        {
+            TestSetup(KeyMode.Vi);
+
+            SetHistory("echo -bar", "eca -zoo");
+            Test("ech", Keys(
+                'e', CheckThat(() => AssertScreenIs(1,
+                        TokenClassification.Command, 'e',
+                        TokenClassification.Prediction, "ca -zoo")),
+                'c', CheckThat(() => AssertScreenIs(1,
+                        TokenClassification.Command, "ec",
+                        TokenClassification.Prediction, "a -zoo")),
+                'h', CheckThat(() => AssertScreenIs(1,
+                        TokenClassification.Command, "ech",
+                        TokenClassification.Prediction, "o -bar")),
+                CheckThat(() => AssertCursorLeftIs(3)),
+                _.RightArrow, CheckThat(() => AssertScreenIs(1,
+                        TokenClassification.Command, "echo",
+                        TokenClassification.None, ' ',
+                        TokenClassification.Parameter, "-bar")),
+                CheckThat(() => AssertCursorLeftIs(9)),
+                _.Ctrl_z, CheckThat(() => AssertScreenIs(1,
+                        TokenClassification.Command, "ech",
+                        TokenClassification.Prediction, "o -bar")),
+                CheckThat(() => AssertCursorLeftIs(3)),
+
+                _.RightArrow, _.Escape,
+                CheckThat(() => AssertCursorLeftIs(8)),
+                _.Ctrl_z, CheckThat(() => AssertScreenIs(1,
+                        TokenClassification.Command, "ech")),
+                CheckThat(() => AssertCursorLeftIs(2))
+            ));
+        }
     }
 }