Update tui key bindings to have a specified completion key, move through completions with left and right arrows since that makes way more sense

Author: dwash96

aider/tui/app.py

@@ -69,40 +69,57 @@ def __init__(self, coder_worker, output_queue, input_queue, args):
         )
 
         self.bind(
-            self.tui_config["key_bindings"]["newline"], "noop", description="New Line", show=True
+            self._encode_keys(self.get_keys_for("newline")),
+            "noop",
+            description="New Line",
+            show=True,
         )
         self.bind(
-            self.tui_config["key_bindings"]["submit"], "noop", description="Submit", show=True
+            self._encode_keys(self.get_keys_for("submit")), "noop", description="Submit", show=True
         )
         self.bind(
-            self.tui_config["key_bindings"]["cycle_forward"],
+            self._encode_keys(self.get_keys_for("completion")),
+            "noop",
+            description="Accept Completion",
+            show=True,
+        )
+        self.bind(
+            self._encode_keys(self.get_keys_for("cycle_forward")),
             "noop",
             description="Cycle Forward",
             show=True,
         )
         self.bind(
-            self.tui_config["key_bindings"]["cycle_backward"],
+            self._encode_keys(self.get_keys_for("cycle_backward")),
             "noop",
             description="Cycle Backward",
             show=True,
         )
         self.bind(
-            self.tui_config["key_bindings"]["cancel"], "noop", description="Cancel", show=True
+            self._encode_keys(self.get_keys_for("cancel")), "noop", description="Cancel", show=True
         )
 
         self.bind(
-            self.tui_config["key_bindings"]["focus"],
+            self._encode_keys(self.get_keys_for("focus")),
             "focus_input",
             description="Focus Input",
             show=True,
         )
         self.bind(
-            self.tui_config["key_bindings"]["stop"], "interrupt", description="Interrupt", show=True
+            self._encode_keys(self.get_keys_for("stop")),
+            "interrupt",
+            description="Interrupt",
+            show=True,
         )
         self.bind(
-            self.tui_config["key_bindings"]["clear"], "clear_output", description="Clear", show=True
+            self._encode_keys(self.get_keys_for("clear")),
+            "clear_output",
+            description="Clear",
+            show=True,
+        )
+        self.bind(
+            self._encode_keys(self.get_keys_for("focus")), "quit", description="Quit", show=True
         )
-        self.bind(self.tui_config["key_bindings"]["focus"], "quit", description="Quit", show=True)
 
         self.register_theme(BASE_THEME)
         self.theme = "aider"
@@ -166,9 +183,10 @@ def _get_config(self):
         default_key_bindings = {
             "newline": "enter" if is_multiline else "shift+enter",
             "submit": "shift+enter" if is_multiline else "enter",
+            "completion": "tab",
             "stop": "escape",
-            "cycle_forward": "tab",
-            "cycle_backward": "shift+tab",
+            "cycle_forward": "right",
+            "cycle_backward": "left",
             "focus": "ctrl+f",
             "cancel": "ctrl+c",
             "clear": "ctrl+l",
@@ -267,10 +285,10 @@ def update_key_hints(self, generating=False):
         try:
             hints = self.query_one(KeyHints)
             if generating:
-                stop = self.app._decode_keys(self.app.tui_config["key_bindings"]["stop"])
+                stop = self.app.get_keys_for("stop")
                 hints.update(f"{stop} to cancel")
             else:
-                submit = self.app._decode_keys(self.app.tui_config["key_bindings"]["submit"])
+                submit = self.app.get_keys_for("submit")
                 hints.update(f"{submit} to submit")
         except Exception:
             pass
@@ -486,17 +504,26 @@ def action_noop(self):
         pass
 
     def _encode_keys(self, key):
-        if key == "shift+enter":
-            return "ctrl+j"
+        key = key.replace("shift+enter", "ctrl+j")
 
         return key
 
     def _decode_keys(self, key):
-        if key == "ctrl+j":
-            return "shift+enter"
+        key = key.replace("ctrl+j", "shift+enter")
 
         return key
 
+    def is_key_for(self, type, key):
+        allowed_keys = self.tui_config["key_bindings"][type].split(",")
+        if key in allowed_keys:
+            return True
+
+        return False
+
+    def get_keys_for(self, type):
+        allowed_keys = self.tui_config["key_bindings"][type]
+        return self._decode_keys(allowed_keys)
+
     def _do_quit(self):
         """Perform the actual quit after UI updates."""
         self.worker.stop()

aider/tui/widgets/input_area.py

@@ -59,8 +59,8 @@ def __init__(self, history_file: str = None, **kwargs):
         # Let's assume kwargs might handle it or we set it.
         # Actually, let's just set the default if it's empty.
         if not self.placeholder:
-            submit = self.app._decode_keys(self.app.tui_config["key_bindings"]["submit"])
-            newline = self.app._decode_keys(self.app.tui_config["key_bindings"]["newline"])
+            submit = self.app.get_keys_for("submit")
+            newline = self.app.get_keys_for("newline")
 
             self.placeholder = (
                 f"> Type your message... ({submit} to submit, {newline} for new line)"
@@ -208,38 +208,38 @@ def on_key(self, event) -> None:
         if self.disabled:
             return
 
-        if event.key == self.app.tui_config["key_bindings"]["cancel"]:
+        if self.app.is_key_for("cancel", event.key):
             event.stop()
             event.prevent_default()
             if self.text.strip():
                 self.save_to_history(self.text)
             self.text = ""
             return
 
-        if event.key == self.app.tui_config["key_bindings"]["submit"]:
+        if self.completion_active and self.app.is_key_for("completion", event.key):
+            # Accept completion
+            self.post_message(self.CompletionAccept())
+            event.stop()
+            event.prevent_default()
+            return
+
+        if self.app.is_key_for("submit", event.key):
             # Submit message
             event.stop()
             event.prevent_default()
             self.post_message(self.Submit(self.text))
             return
 
-        if event.key == self.app.tui_config["key_bindings"]["newline"]:
-            if self.completion_active:
-                # Accept completion
-                self.post_message(self.CompletionAccept())
-                event.stop()
-                event.prevent_default()
-                return
-            else:
-                if self.app.tui_config["key_bindings"]["newline"] != "enter":
-                    self.insert("\n")
+        if self.app.is_key_for("newline", event.key):
+            if self.app.get_keys_for("newline") != "enter":
+                self.insert("\n")
 
-                    current_row, current_col = self.cursor_location
-                    self.cursor_location = (current_row + 1, 0)
+                current_row, current_col = self.cursor_location
+                self.cursor_location = (current_row + 1, 0)
 
-                return
+            return
 
-        if event.key == self.app.tui_config["key_bindings"]["cycle_forward"]:
+        if self.app.is_key_for("cycle_forward", event.key):
             event.stop()
             event.prevent_default()
             if self.completion_active:
@@ -248,7 +248,7 @@ def on_key(self, event) -> None:
             else:
                 # Request completions
                 self.post_message(self.CompletionRequested(self.text))
-        elif event.key == self.app.tui_config["key_bindings"]["cycle_backward"]:
+        elif self.app.is_key_for("cycle_backward", event.key):
             event.stop()
             event.prevent_default()
             if self.completion_active:
@@ -257,7 +257,7 @@ def on_key(self, event) -> None:
             else:
                 # Request completions
                 self.post_message(self.CompletionRequested(self.text))
-        elif event.key == self.app.tui_config["key_bindings"]["stop"] and self.completion_active:
+        elif self.app.is_key_for("stop", event.key) and self.completion_active:
             event.stop()
             event.prevent_default()
             self.post_message(self.CompletionDismiss())