From 73e6949287281c2aa4e839378b3ea481edbc5492 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Tue, 14 May 2024 11:12:36 -0700
Subject: [PATCH] refac

---
 aider/coders/base_coder.py | 16 ++++++++++++----
 aider/repomap.py           | 18 +-----------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index de8e11b49..45de743d6 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -762,7 +762,7 @@ class Coder:
                 )
             ]
 
-    def check_for_file_mentions(self, content):
+    def get_file_mentions(self, content):
         words = set(word for word in content.split())
 
         # drop sentence punctuation from the end
@@ -781,14 +781,22 @@ class Coder:
                 mentioned_rel_fnames.add(str(rel_fname))
 
             fname = os.path.basename(rel_fname)
-            if fname not in fname_to_rel_fnames:
-                fname_to_rel_fnames[fname] = []
-            fname_to_rel_fnames[fname].append(rel_fname)
+
+            # Don't add basenames that could be plain words like "run" or "make"
+            if "/" in fname or "." in fname:
+                if fname not in fname_to_rel_fnames:
+                    fname_to_rel_fnames[fname] = []
+                fname_to_rel_fnames[fname].append(rel_fname)
 
         for fname, rel_fnames in fname_to_rel_fnames.items():
             if len(rel_fnames) == 1 and fname in words:
                 mentioned_rel_fnames.add(rel_fnames[0])
 
+        return mentioned_rel_fnames
+
+    def check_for_file_mentions(self, content):
+        mentioned_rel_fnames = self.get_file_mentions(content)
+
         if not mentioned_rel_fnames:
             return
 
diff --git a/aider/repomap.py b/aider/repomap.py
index 64007bf07..ec76755e0 100644
--- a/aider/repomap.py
+++ b/aider/repomap.py
@@ -225,7 +225,7 @@ class RepoMap:
 
         fnames = sorted(fnames)
 
-        if self.cache_missing:
+        if self.cache_missing or True:
             fnames = tqdm(fnames)
         self.cache_missing = False
 
@@ -338,25 +338,16 @@ class RepoMap:
         if not max_map_tokens:
             max_map_tokens = self.max_map_tokens
 
-        dump(max_map_tokens, self.max_map_tokens)
-
         ranked_tags = self.get_ranked_tags(chat_fnames, other_fnames)
-        # dump(ranked_tags)
 
         num_tags = len(ranked_tags)
-
-        dump(num_tags, max_map_tokens)
-
         lower_bound = 0
         upper_bound = num_tags
-
         best_tree = None
         best_tree_tokens = 0
 
         chat_rel_fnames = [self.get_rel_fname(fname) for fname in chat_fnames]
 
-        print("#" * 80)
-
         # Guess a small starting number to help with giant repos
         middle = min(max_map_tokens // 25, num_tags)
 
@@ -366,14 +357,7 @@ class RepoMap:
             tree = self.to_tree(ranked_tags[:middle], chat_rel_fnames)
             num_tokens = self.token_count(tree)
 
-            dump(lower_bound, middle, upper_bound)
-            dump(num_tokens)
-            dump(num_tokens / middle)
-
-            # dump(len(tree))
-
             if num_tokens < max_map_tokens and num_tokens > best_tree_tokens:
-                print(f"best_tree: {num_tokens} tokens, {middle} middle")
                 best_tree = tree
                 best_tree_tokens = num_tokens