From fef1b59b4224dd1be352da8336b28daec375e774 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Wed, 13 Nov 2024 12:50:17 -0800
Subject: [PATCH] refactor: Restructure file mention check and interrupt
 handling in base coder

---
 aider/coders/base_coder.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index e55b798dd..05af92fe8 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -1242,10 +1242,19 @@ class Coder:
         else:
             content = ""
 
-        try:
-            self.reply_completed()
-        except KeyboardInterrupt:
-            interrupted = True
+        if not interrupted:
+            add_rel_files_message = self.check_for_file_mentions(content)
+            if add_rel_files_message:
+                if self.reflected_message:
+                    self.reflected_message += "\n\n" + add_rel_files_message
+                else:
+                    self.reflected_message = add_rel_files_message
+                return
+
+            try:
+                self.reply_completed()
+            except KeyboardInterrupt:
+                interrupted = True
 
         if interrupted:
             content += "\n^C KeyboardInterrupt"
@@ -1296,13 +1305,6 @@ class Coder:
                     self.update_cur_messages()
                     return
 
-        add_rel_files_message = self.check_for_file_mentions(content)
-        if add_rel_files_message:
-            if self.reflected_message:
-                self.reflected_message += "\n\n" + add_rel_files_message
-            else:
-                self.reflected_message = add_rel_files_message
-
     def reply_completed(self):
         pass