Merge pull request #95 from BreitbandModem/feature/vim-keybinds

Add more basic VIM bindings for query editor: I, C, D

Author: Maxteabag

sqlit/core/keymap.py

@@ -331,6 +331,7 @@ def _build_action_keys(self) -> list[ActionKeyDef]:
             ActionKeyDef("question_mark", "show_help", "global"),
             # Query (normal mode)
             ActionKeyDef("i", "enter_insert_mode", "query_normal"),
+            ActionKeyDef("I", "prepend_insert_mode", "query_normal"),
             ActionKeyDef("o", "open_line_below", "query_normal"),
             ActionKeyDef("O", "open_line_above", "query_normal"),
             ActionKeyDef("enter", "execute_query", "query_normal"),
@@ -341,6 +342,8 @@ def _build_action_keys(self) -> list[ActionKeyDef]:
             ActionKeyDef("backspace", "show_history", "query_normal"),
             ActionKeyDef("N", "new_query", "query_normal"),
             ActionKeyDef("d", "delete_leader_key", "query_normal"),
+            ActionKeyDef("C", "change_line_end_motion", "query_normal"),
+            ActionKeyDef("D", "delete_line_end", "query_normal"),
             ActionKeyDef("u", "undo", "query_normal"),
             ActionKeyDef("ctrl+r", "redo", "query_normal"),
             # Vim cursor movement (normal mode)

sqlit/domains/query/state/query_normal.py

@@ -39,11 +39,15 @@ def _setup_actions(self) -> None:
         self.allows("cursor_find_char_back", help="Find char backward")
         self.allows("cursor_till_char", help="Move till char forward")
         self.allows("cursor_till_char_back", help="Move till char backward")
+        self.allows("prepend_insert_mode", help="Insert at line start")
         self.allows("append_insert_mode", help="Append after cursor")
         self.allows("append_line_end", help="Append at line end")
         # Vim open line
         self.allows("open_line_below", help="Open line below")
         self.allows("open_line_above", help="Open line above")
+        # Vim delete or change
+        self.allows("change_line_end_motion", help="Change to line end")
+        self.allows("delete_line_end", help="Delete to line end")
         # Clipboard actions
         self.allows("select_all", help="Select all text")
         self.allows("copy_selection", help="Copy selection")

sqlit/domains/query/ui/mixins/query_editing_cursor.py

@@ -131,6 +131,12 @@ def action_cursor_till_char_back(self: QueryMixinHost) -> None:
         """Move till after previous char (T{c})."""
         self._show_motion_char_pending_menu("T")
 
+    def action_prepend_insert_mode(self: QueryMixinHost) -> None:
+        """Enter insert mode at start of line (I)."""
+        row, _ = self.query_input.cursor_location
+        self.query_input.cursor_location = (row, 0)
+        self.action_enter_insert_mode()
+
     def action_append_insert_mode(self: QueryMixinHost) -> None:
         """Enter insert mode after cursor (a)."""
         lines = self.query_input.text.split("\n")

sqlit/domains/shell/state/machine.py

@@ -185,8 +185,10 @@ def binding(key: str, desc: str, indent: int = 4) -> str:
         # ═══════════════════════════════════════════════════════════════════
         lines.append(section("QUERY EDITOR"))
         lines.append(subsection("Normal Mode:"))
-        lines.append(binding("i", "Enter INSERT mode"))
+        lines.append(binding("i/I", "Enter INSERT mode"))
         lines.append(binding("o/O", "Open line below/above"))
+        lines.append(binding("C", "Change to line end"))
+        lines.append(binding("D", "Delete to line end"))
         lines.append(binding("<enter>/gr", "Execute query"))
         lines.append(binding("gt", "Execute as transaction"))
         lines.append(binding("<backspace>", "Query history"))