From ddbe2853ea571718d5b08b34e5000d71ed68c3bd Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Sun, 1 Dec 2024 09:50:49 -0800
Subject: [PATCH] refactor: improve AI comment processing in FileWatcher

---
 aider/watch.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/aider/watch.py b/aider/watch.py
index 6959e634b..e9fe55d76 100644
--- a/aider/watch.py
+++ b/aider/watch.py
@@ -6,6 +6,8 @@ from typing import Optional
 from pathspec import PathSpec
 from pathspec.patterns import GitWildMatchPattern
 from watchfiles import watch
+from grep_ast import TreeContext
+
 
 from aider.dump import dump  # noqa
 
@@ -64,6 +66,7 @@ class FileWatcher:
     """Watches source files for changes and AI comments"""
 
     # Compiled regex pattern for AI comments
+    # make this pattern match at the end of a line ai!
     ai_comment_pattern = re.compile(r"(?:#|//) *(ai\b.*|ai|.*\bai!)", re.IGNORECASE)
 
     def __init__(self, coder, gitignores=None, verbose=False):
@@ -165,15 +168,6 @@ class FileWatcher:
 
         self.io.tool_output("Processing your request...")
 
-        # Refresh all AI comments from tracked files
-        ai_comments = {}
-        for fname in self.coder.abs_fnames:
-            line_nums, comments, _has_bang = self.get_ai_comments(fname)
-            if line_nums:
-                ai_comments[fname] = comments
-
-        from grep_ast import TreeContext
-
         res = """The "ai" comments below can be found in the code files I've shared with you.
 They contain your instructions.
 Make the requested changes.
@@ -181,8 +175,10 @@ Be sure to remove all these "ai" comments from the code!
 
     """
 
-        for fname, comments in ai_comments.items():
-            if not comments:
+        # Refresh all AI comments from tracked files
+        for fname in self.coder.abs_fnames:
+            line_nums, comments, _has_bang = self.get_ai_comments(fname)
+            if not line_nums:
                 continue
 
             code = self.io.read_text(fname)