Avoid polluting base classes with vi undo logic

Author: lkollar

Lib/_pyrepl/commands.py

@@ -61,8 +61,6 @@ def do(self) -> None:
 
 
 class KillCommand(Command):
-    modifies_buffer = True
-
     def kill_range(self, start: int, end: int) -> None:
         if start == end:
             return
@@ -424,8 +422,6 @@ def do(self) -> None:
 
 
 class backspace(EditCommand):
-    modifies_buffer = True
-
     def do(self) -> None:
         r = self.reader
         b = r.buffer
@@ -439,8 +435,6 @@ def do(self) -> None:
 
 
 class delete(EditCommand):
-    modifies_buffer = True
-
     def do(self) -> None:
         r = self.reader
         b = r.buffer

Lib/_pyrepl/reader.py

@@ -173,7 +173,7 @@ def make_default_commands() -> dict[CommandName, type[Command]]:
         (r",", "vi-repeat-find-opposite"),
 
         # Edit commands
-        (r"x", "delete"),
+        (r"x", "vi-delete"),
         (r"i", "vi-insert-mode"),
         (r"a", "vi-append-mode"),
         (r"A", "vi-append-eol"),
@@ -207,12 +207,12 @@ def make_default_commands() -> dict[CommandName, type[Command]]:
         (r"\<down>", "down"),
         (r"\<home>", "beginning-of-line"),
         (r"\<end>", "end-of-line"),
-        (r"\<delete>", "delete"),
+        (r"\<delete>", "vi-delete"),
         (r"\<backspace>", "left"),
 
         # Control keys (important ones that work in both modes)
         (r"\C-c", "interrupt"),
-        (r"\C-d", "delete"),
+        (r"\C-d", "vi-delete"),
         (r"\C-l", "clear-screen"),
         (r"\C-r", "reverse-history-isearch"),
 

Lib/_pyrepl/vi_commands.py

@@ -2,12 +2,17 @@
 Vi-specific commands for pyrepl.
 """
 
-from .commands import Command, MotionCommand, KillCommand
+from .commands import Command, MotionCommand, KillCommand, delete
 from . import input as _input
 from .types import ViFindDirection
 from .trace import trace
 
 
+class ViKillCommand(KillCommand):
+    """Base class for Vi kill commands that modify the buffer."""
+    modifies_buffer = True
+
+
 # ============================================================================
 # Vi-specific Motion Commands
 # ============================================================================
@@ -112,7 +117,12 @@ def do(self) -> None:
 # Delete Commands
 # ============================================================================
 
-class vi_delete_word(KillCommand):
+class vi_delete(delete):
+    """Delete character under cursor (x)."""
+    modifies_buffer = True
+
+
+class vi_delete_word(ViKillCommand):
     """Delete from cursor to start of next word (dw)."""
     def do(self) -> None:
         r = self.reader
@@ -122,28 +132,28 @@ def do(self) -> None:
                 self.kill_range(r.pos, end)
 
 
-class vi_delete_line(KillCommand):
+class vi_delete_line(ViKillCommand):
     """Delete entire line content (dd)."""
     def do(self) -> None:
         r = self.reader
         self.kill_range(r.bol(), r.eol())
 
 
-class vi_delete_to_bol(KillCommand):
+class vi_delete_to_bol(ViKillCommand):
     """Delete from cursor to beginning of line (d0)."""
     def do(self) -> None:
         r = self.reader
         self.kill_range(r.bol(), r.pos)
 
 
-class vi_delete_to_eol(KillCommand):
+class vi_delete_to_eol(ViKillCommand):
     """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):
+class vi_delete_char_before(ViKillCommand):
     """Delete character before cursor (X)."""
     def do(self) -> None:
         r = self.reader
@@ -343,7 +353,7 @@ def do(self) -> None:
 # Change Commands
 # ============================================================================
 
-class vi_change_word(KillCommand):
+class vi_change_word(ViKillCommand):
     """Change from cursor to end of word (cw)."""
     def do(self) -> None:
         r = self.reader
@@ -354,15 +364,15 @@ def do(self) -> None:
         r.enter_insert_mode()
 
 
-class vi_change_to_eol(KillCommand):
+class vi_change_to_eol(ViKillCommand):
     """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):
+class vi_substitute_char(ViKillCommand):
     """Delete character under cursor and enter insert mode (s)."""
     def do(self) -> None:
         r = self.reader