Fixes PowerShell#1674 - BackwardDeleteChar now does not remove charac…

…ter under the cursor.
springcomp · Dec 2, 2020 · 3faaf0a · 3faaf0a
1 parent a7fd34f
commit 3faaf0a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/PSReadLine/ReadLine.vi.cs b/PSReadLine/ReadLine.vi.cs
@@ -299,7 +299,7 @@ private static void DeleteToEndPoint(object arg, int endPoint, Action<ConsoleKey
 
         private static void DeleteBackwardToEndPoint(object arg, int endPoint, Action<ConsoleKeyInfo?, object> instigator)
         {
-            int deleteLength = _singleton._current - endPoint + 1;
+            int deleteLength = _singleton._current - endPoint;
 
             _singleton.SaveToClipboard(endPoint, deleteLength);
             _singleton.SaveEditItem(EditItemDelete.Create(

diff --git a/test/BasicEditingTest.VI.cs b/test/BasicEditingTest.VI.cs
@@ -988,14 +988,14 @@ public void ViChangeChar()
 
             Test("0123456", Keys(
                 "0123456", _.Escape, CheckThat(() => AssertLineIs("0123456")),
-                "cF0abc", _.Escape, CheckThat(() => AssertLineIs("abc")),
+                "cF0abc", _.Escape, CheckThat(() => AssertLineIs("abc6")),
                 'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(6)),
-                "cF1abc", _.Escape, CheckThat(() => AssertLineIs("0abc")),
-                'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(6)),
-                "hcF0abc", _.Escape, CheckThat(() => AssertLineIs("abc6")),
-                'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(6)),
-                "hcF1abc", _.Escape, CheckThat(() => AssertLineIs("0abc6")),
+                "cF1abc", _.Escape, CheckThat(() => AssertLineIs("0abc6")),
                 'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(6)),
+                "hcF0abc", _.Escape, CheckThat(() => AssertLineIs("abc56")),
+                'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(5)),
+                "hcF1abc", _.Escape, CheckThat(() => AssertLineIs("0abc456")),
+                'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(4)),
                 "0cF0abc", _.Escape, CheckThat(() => AssertLineIs("0bc123456")),
                 'u'
                 ));
@@ -1012,10 +1012,10 @@ public void ViChangeChar()
 
             Test("0123456", Keys(
                 "0123456", _.Escape, CheckThat(() => AssertLineIs("0123456")),
-                "cT1abc", _.Escape, CheckThat(() => AssertLineIs("01abc")),
-                'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(6)),
-                "hcT1abc", _.Escape, CheckThat(() => AssertLineIs("01abc6")),
+                "cT1abc", _.Escape, CheckThat(() => AssertLineIs("01abc6")),
                 'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(6)),
+                "hcT1abc", _.Escape, CheckThat(() => AssertLineIs("01abc56")),
+                'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(5)),
                 "0cT0abc", _.Escape, CheckThat(() => AssertLineIs("0bc123456")),
                 'u'
                 ));

diff --git a/test/MovementTest.VI.cs b/test/MovementTest.VI.cs
@@ -621,11 +621,11 @@ public void ViCharDelete()
                 "0dfg"
                 ));
 
-            Test("", Keys(
+            Test("g", Keys(
                 "abcdefg", _.Escape, CheckThat(() => AssertLineIs("abcdefg")),
-                "dFa", _.Escape, CheckThat(() => AssertLineIs("")),
+                "dFa", _.Escape, CheckThat(() => AssertLineIs("g")),
                 'u', CheckThat(() => AssertCursorLeftIs(6)),
-                "dFb", CheckThat(() => AssertLineIs("a")),
+                "dFb", CheckThat(() => AssertLineIs("ag")),
                 'u', CheckThat(() => AssertCursorLeftIs(6)),
                 "dFa"
                 ));
@@ -644,10 +644,10 @@ public void ViCharDelete()
 
             Test("0123456", Keys(
                 "0123456", _.Escape, CheckThat(() => AssertLineIs("0123456")),
-                "dT0", CheckThat(() => AssertLineIs("0")),
-                'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(6)),
-                "hdT0", CheckThat(() => AssertLineIs("06")),
+                "dT0", CheckThat(() => AssertLineIs("06")),
                 'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(6)),
+                "hdT0", CheckThat(() => AssertLineIs("056")),
+                'u', CheckThat(() => AssertLineIs("0123456")), CheckThat(() => AssertCursorLeftIs(5)),
                 "0dT0"
                 ));
         }