Fix UpHat (^) in vi-mode to move the cursor while yanking (#1656)

PowerShell · Jul 13, 2020 · 6cacbeb · 6cacbeb
1 parent a88c22f
commit 6cacbeb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/PSReadLine/YankPaste.vi.cs b/PSReadLine/YankPaste.vi.cs
@@ -265,20 +265,12 @@ public static void ViYankBeginningOfLine(ConsoleKeyInfo? key = null, object arg
         /// </summary>
         public static void ViYankToFirstChar(ConsoleKeyInfo? key = null, object arg = null)
         {
-            int start = 0;
-            while (_singleton.IsWhiteSpace(start))
-            {
-                start++;
-            }
-            if (start == _singleton._current)
-            {
-                return;
-            }
-
-            int length = _singleton._current - start;
+            var start = GetFirstNonBlankOfLogicalLinePos(_singleton._current);
+            var length = _singleton._current - start;
             if (length > 0)
             {
-                _singleton.SaveToClipboard(start, length);
+                _clipboard.Record(_singleton._buffer, start, length);
+                _singleton.MoveCursor(start);
             }
         }
 

diff --git a/test/YankPasteTest.VI.cs b/test/YankPasteTest.VI.cs
@@ -379,13 +379,13 @@ public void ViPasteAfterYankFirstNoneBlank()
 
             Test("012", Keys(
                 "012", _.Escape,
-                "y", _.Uphat, "P", CheckThat(() => AssertLineIs("01012")), CheckThat(() => AssertCursorLeftIs(3)),
+                "y", _.Uphat, "P", CheckThat(() => AssertLineIs("01012")), CheckThat(() => AssertCursorLeftIs(1)),
                 "u"
                 ));
 
             Test(" 123  ", Keys(
                 " 123  ", _.Escape,
-                "y", _.Uphat, "P", CheckThat(() => AssertLineIs(" 123 123  ")), CheckThat(() => AssertCursorLeftIs(8)),
+                "y", _.Uphat, "P", CheckThat(() => AssertLineIs(" 123 123  ")), CheckThat(() => AssertCursorLeftIs(4)),
                 "u"
                 ));
         }