From 6d6daee511af854fd2f48860481221c545a590a1 Mon Sep 17 00:00:00 2001
From: "Paul Gauthier (aider)" <aider@paulg.org>
Date: Wed, 11 Dec 2024 19:59:56 -0800
Subject: [PATCH] fix: Use correct filter for custom enter keybinding

---
 aider/io.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/aider/io.py b/aider/io.py
index d132261fe..24cdb94bb 100644
--- a/aider/io.py
+++ b/aider/io.py
@@ -435,6 +435,11 @@ class InputOutput:
             )
         )
 
+        from prompt_toolkit.application.current import get_app
+        from prompt_toolkit.filters import Condition
+
+        is_searching = Condition(lambda: get_app().is_searching)
+
         def suspend_to_bg(event):
             """Suspend currently running application."""
             event.app.suspend_to_background()
@@ -461,7 +466,7 @@ class InputOutput:
             "Navigate forward through history"
             event.current_buffer.history_forward()
 
-        @kb.add("enter", eager=True, filter=~buffer_has_focus(SEARCH_BUFFER))
+        @kb.add("enter", eager=True, filter=~is_searching)
         def _(event):
             "Handle Enter key press"
             if self.multiline_mode:
@@ -471,7 +476,7 @@ class InputOutput:
                 # In normal mode, Enter submits
                 event.current_buffer.validate_and_handle()
 
-        @kb.add("escape", "enter", eager=True, filter=~buffer_has_focus(SEARCH_BUFFER))  # This is Alt+Enter
+        @kb.add("escape", "enter", eager=True, filter=~is_searching)  # This is Alt+Enter
         def _(event):
             "Handle Alt+Enter key press"
             if self.multiline_mode: