Fixed cursor placement issues with 'o' & 'O'.

Author: srdubya

PSReadLine/ReadLine.vi.cs

@@ -981,7 +981,7 @@ public static void ViInsertLine(ConsoleKeyInfo? key = null, object arg = null)
             _singleton._groupUndoHelper.StartGroup(ViInsertLine, arg);
             _singleton.MoveToBeginningOfPhrase();
             _singleton._buffer.Insert(_singleton._current, '\n');
-            _singleton._current = Math.Max(0, _singleton._current - 1);
+            //_singleton._current = Math.Max(0, _singleton._current - 1);
             _singleton.SaveEditItem(EditItemInsertChar.Create( '\n', _singleton._current));
             _singleton.Render();
             ViInsertMode();
@@ -1016,16 +1016,19 @@ public static void ViAppendLine(ConsoleKeyInfo? key = null, object arg = null)
         {
             _singleton._groupUndoHelper.StartGroup(ViInsertLine, arg);
             _singleton.MoveToEndOfPhrase();
+            int insertPoint = 0;
             if (_singleton.IsAtEndOfLine(_singleton._current))
             {
+                insertPoint = _singleton._buffer.Length;
                 _singleton._buffer.Append('\n');
+                _singleton._current = insertPoint;
             }
             else
             {
-                _singleton._buffer.Insert(++_singleton._current, '\n');
+                insertPoint = _singleton._current + 1;
+                _singleton._buffer.Insert(insertPoint, '\n');
             }
-            _singleton._current++;
-            _singleton.SaveEditItem(EditItemInsertChar.Create('\n', _singleton._current));
+            _singleton.SaveEditItem(EditItemInsertChar.Create('\n', insertPoint));
             _singleton.Render();
             ViInsertWithAppend();
         }

UnitTestPSReadLine/BasicEditingTest.VI.cs

@@ -673,20 +673,21 @@ public void ViTestChange()
         [TestMethod]
         public void ViTestInsertLine()
         {
+            int adder = PSConsoleReadlineOptions.DefaultContinuationPrompt.Length;
             TestSetup(KeyMode.Vi);
 
             Test("line1\n", Keys(
                 _.Escape, "Oline1", CheckThat(() => AssertCursorLeftIs(5))
                 ));
 
             Test("\nline1", Keys(
-                _.Escape, "oline1", CheckThat(() => AssertCursorLeftIs(8)), CheckThat(() => AssertLineIs("\nline1")),
-                _.Escape, CheckThat(() => AssertCursorLeftIs(7))
+                _.Escape, "oline1", CheckThat(() => AssertCursorLeftIs(5 + adder)), CheckThat(() => AssertLineIs("\nline1")),
+                _.Escape, CheckThat(() => AssertCursorLeftIs(4 + adder))
                 ));
 
             Test("", Keys(
                 "line2", _.Escape, CheckThat(() => AssertLineIs("line2")),
-                "Oline1", _.Escape, CheckThat(() => AssertLineIs("line1\nline2")),
+                "Oline1", _.Escape, CheckThat(() => AssertLineIs("line1\nline2")), CheckThat(() => AssertCursorLeftIs(4)),
                 "joline3", _.Escape, CheckThat(() => AssertLineIs("line1\nline2\nline3")),
                 'u', CheckThat(() => AssertLineIs("line1\nline2")),
                 'u', CheckThat(() => AssertLineIs("line2")),
@@ -703,6 +704,16 @@ public void ViTestInsertLine()
                 'u', CheckThat(() => AssertLineIs("line")),
                 "uuuu"
                 ));
+
+            Test("", Keys(
+                _.Escape, "oline4", CheckThat(() => AssertLineIs("\nline4")), CheckThat(() => AssertCursorLeftIs(5 + adder)),
+                _.Escape, "Oline2", CheckThat(() => AssertLineIs("\nline2\nline4")), CheckThat(() => AssertCursorLeftIs(5 + adder)),
+                _.Escape, "oline3", CheckThat(() => AssertLineIs("\nline2\nline3\nline4")),
+                _.Escape, CheckThat(() => AssertLineIs("\nline2\nline3\nline4")), CheckThat(() => AssertCursorLeftIs(4 + adder)),
+                'u', CheckThat(() => AssertLineIs("\nline2\nline4")),
+                'u', CheckThat(() => AssertLineIs("\nline4")),
+                'u'
+                ));
         }
 
         [TestMethod]