Merge pull request #234 from Maxteabag/feat/keybinding-editor

feat(keybindings): in-app keybinding editor (leader+k)

Author: Maxteabag

sqlit/core/keymap.py

@@ -204,6 +204,7 @@ def _build_leader_commands(self) -> list[LeaderCommandDef]:
                 "Actions",
             ),
             LeaderCommandDef("h", "show_help", "Help", "Actions"),
+            LeaderCommandDef("k", "show_keybinding_editor", "Edit Keybindings", "Actions"),
             LeaderCommandDef("space", "telescope", "Telescope", "Actions"),
             LeaderCommandDef("slash", "telescope_filter", "Telescope Search", "Actions"),
             # Delete menu (vim-style)

sqlit/core/state_base.py

@@ -97,6 +97,15 @@ class State(ABC):
     """Base class for hierarchical states."""
 
     help_category: str | None = None
+    # Name this state uses in keymap defaults / user config (e.g. the
+    # ``context`` field of :class:`~sqlit.core.keymap.ActionKeyDef`). Used
+    # by the keymap-manager's conflict detector to derive ancestor chains
+    # from this state's :attr:`parent` link — so binding the same key in
+    # a descendant context to a *different* action than an ancestor's
+    # binding is caught before it lands on disk. ``None`` means the
+    # state has no corresponding keymap context (intermediate/composite
+    # states like ``QueryFocusedState`` and the modal-only screens).
+    keymap_context: str | None = None
 
     def __init__(self, parent: State | None = None):
         self.parent = parent

sqlit/domains/explorer/state/tree_filter_active.py

@@ -10,6 +10,7 @@ class TreeFilterActiveState(BlockingState):
     """State when tree filter is active."""
 
     help_category = "Explorer"
+    keymap_context = "tree_filter"
 
     def _setup_actions(self) -> None:
         self.allows("tree_filter_close", help="Close filter")

sqlit/domains/explorer/state/tree_focused.py

@@ -10,6 +10,7 @@ class TreeFocusedState(State):
     """Base state when tree has focus."""
 
     help_category = "Explorer"
+    keymap_context = "tree"
 
     def _setup_actions(self) -> None:
         self.allows("new_connection", label="New", help="New connection")

sqlit/domains/explorer/state/tree_visual_mode.py

@@ -10,6 +10,7 @@ class TreeVisualModeState(State):
     """Tree focused in visual selection mode (vim-style range selection)."""
 
     help_category = "Explorer"
+    keymap_context = "tree_visual"
 
     def _setup_actions(self) -> None:
         self.allows(

sqlit/domains/query/state/autocomplete_active.py

@@ -11,6 +11,7 @@ class AutocompleteActiveState(State):
     """Query editor with autocomplete dropdown visible."""
 
     help_category = "Query Editor (Insert)"
+    keymap_context = "autocomplete"
 
     def _setup_actions(self) -> None:
         self.allows("autocomplete_next", help="Next suggestion", help_key="^j")

sqlit/domains/query/state/query_insert.py

@@ -11,6 +11,7 @@ class QueryInsertModeState(State):
     """Query editor in INSERT mode."""
 
     help_category = "Query Editor (Insert)"
+    keymap_context = "query_insert"
 
     def _setup_actions(self) -> None:
         self.allows("exit_insert_mode", label="Normal Mode", help="Exit to NORMAL mode")

sqlit/domains/query/state/query_normal.py

@@ -11,6 +11,7 @@ class QueryNormalModeState(State):
     """Query editor in NORMAL mode."""
 
     help_category = "Query Editor (Normal)"
+    keymap_context = "query_normal"
 
     def _setup_actions(self) -> None:
         self.allows("enter_insert_mode", label="Insert Mode", help="Enter INSERT mode")

sqlit/domains/query/state/query_visual.py

@@ -11,6 +11,7 @@ class QueryVisualModeState(State):
     """Query editor in VISUAL mode (v)."""
 
     help_category = "Query Editor (Visual)"
+    keymap_context = "query_visual"
 
     def _setup_actions(self) -> None:
         self.allows(

sqlit/domains/query/state/query_visual_line.py

@@ -11,6 +11,7 @@ class QueryVisualLineModeState(State):
     """Query editor in VISUAL LINE mode (V)."""
 
     help_category = "Query Editor (Visual Line)"
+    keymap_context = "query_visual_line"
 
     def _setup_actions(self) -> None:
         self.allows(