Implement D, X, C and s commands

Author: lkollar

Lib/_pyrepl/reader.py

@@ -186,9 +186,13 @@ def make_default_commands() -> dict[CommandName, type[Command]]:
         (r"dd", "vi-delete-line"),
         (r"d0", "vi-delete-to-bol"),
         (r"d$", "vi-delete-to-eol"),
+        (r"D", "vi-delete-to-eol"),
+        (r"X", "vi-delete-char-before"),
 
         # Change commands
         (r"cw", "vi-change-word"),
+        (r"C", "vi-change-to-eol"),
+        (r"s", "vi-substitute-char"),
 
         # Replace commands
         (r"r", "vi-replace-char"),

Lib/_pyrepl/vi_commands.py

@@ -137,12 +137,21 @@ def do(self) -> None:
 
 
 class vi_delete_to_eol(KillCommand):
-    """Delete from cursor to end of line (d$)."""
+    """Delete from cursor to end of line (d$ or D)."""
     def do(self) -> None:
         r = self.reader
         self.kill_range(r.pos, r.eol())
 
 
+class vi_delete_char_before(KillCommand):
+    """Delete character before cursor (X)."""
+    def do(self) -> None:
+        r = self.reader
+        for _ in range(r.get_arg()):
+            if r.pos > 0:
+                self.kill_range(r.pos - 1, r.pos)
+
+
 # ============================================================================
 # Find Commands (f/F/t/T)
 # ============================================================================
@@ -345,6 +354,24 @@ def do(self) -> None:
         r.enter_insert_mode()
 
 
+class vi_change_to_eol(KillCommand):
+    """Change from cursor to end of line (C)."""
+    def do(self) -> None:
+        r = self.reader
+        self.kill_range(r.pos, r.eol())
+        r.enter_insert_mode()
+
+
+class vi_substitute_char(KillCommand):
+    """Delete character under cursor and enter insert mode (s)."""
+    def do(self) -> None:
+        r = self.reader
+        for _ in range(r.get_arg()):
+            if r.pos < len(r.buffer):
+                self.kill_range(r.pos, r.pos + 1)
+        r.enter_insert_mode()
+
+
 # ============================================================================
 # Replace Commands
 # ============================================================================

Lib/test/test_pyrepl/test_reader.py

@@ -1252,6 +1252,60 @@ def test_undo_after_replace(self):
         reader, _ = self._run_vi(events)
         self.assertEqual(reader.get_unicode(), "hello")
 
+    def test_D_delete_to_eol(self):
+        events = itertools.chain(
+            code_to_events("hello world"),
+            [
+                Event(evt="key", data="\x1b", raw=bytearray(b"\x1b")),  # ESC
+                Event(evt="key", data="0", raw=bytearray(b"0")),        # BOL
+                Event(evt="key", data="w", raw=bytearray(b"w")),        # forward word
+                Event(evt="key", data="D", raw=bytearray(b"D")),        # delete to EOL
+            ],
+        )
+        reader, _ = self._run_vi(events)
+        self.assertEqual(reader.get_unicode(), "hello ")
+
+    def test_C_change_to_eol(self):
+        events = itertools.chain(
+            code_to_events("hello world"),
+            [
+                Event(evt="key", data="\x1b", raw=bytearray(b"\x1b")),  # ESC
+                Event(evt="key", data="0", raw=bytearray(b"0")),        # BOL
+                Event(evt="key", data="w", raw=bytearray(b"w")),        # forward word
+                Event(evt="key", data="C", raw=bytearray(b"C")),        # change to EOL
+            ],
+            code_to_events("there"),
+        )
+        reader, _ = self._run_vi(events)
+        self.assertEqual(reader.get_unicode(), "hello there")
+        self.assertEqual(reader.vi_mode, ViMode.INSERT)
+
+    def test_s_substitute_char(self):
+        events = itertools.chain(
+            code_to_events("hello"),
+            [
+                Event(evt="key", data="\x1b", raw=bytearray(b"\x1b")),  # ESC
+                Event(evt="key", data="0", raw=bytearray(b"0")),        # BOL
+                Event(evt="key", data="s", raw=bytearray(b"s")),        # substitute
+            ],
+            code_to_events("j"),
+        )
+        reader, _ = self._run_vi(events)
+        self.assertEqual(reader.get_unicode(), "jello")
+        self.assertEqual(reader.vi_mode, ViMode.INSERT)
+
+    def test_X_delete_char_before(self):
+        events = itertools.chain(
+            code_to_events("hello"),
+            [
+                Event(evt="key", data="\x1b", raw=bytearray(b"\x1b")),  # ESC
+                Event(evt="key", data="X", raw=bytearray(b"X")),        # delete before
+            ],
+        )
+        reader, _ = self._run_vi(events)
+        self.assertEqual(reader.get_unicode(), "helo")
+        self.assertEqual(reader.vi_mode, ViMode.NORMAL)
+
 
 @force_not_colorized_test_class
 class TestHistoricalReaderBindings(TestCase):