From 6ab4f09a3a4bdc7874a7ef8037e367515a57d5e7 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Thu, 13 Jul 2023 10:06:46 -0700
Subject: [PATCH] cleanup --show-repo-map

---
 aider/coders/base_coder.py | 20 +++++++++++++-------
 aider/main.py              |  7 +++----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 6548acd87..a2bcfce1f 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -344,6 +344,14 @@ class Coder:
 
         return prompt
 
+    def get_repo_map(self):
+        if not self.repo_map:
+            return
+
+        other_files = set(self.get_all_abs_files()) - set(self.abs_fnames)
+        repo_content = self.repo_map.get_repo_map(self.abs_fnames, other_files)
+        return repo_content
+
     def get_files_messages(self):
         all_content = ""
         if self.abs_fnames:
@@ -354,13 +362,11 @@ class Coder:
 
         all_content += files_content
 
-        other_files = set(self.get_all_abs_files()) - set(self.abs_fnames)
-        if self.repo_map:
-            repo_content = self.repo_map.get_repo_map(self.abs_fnames, other_files)
-            if repo_content:
-                if all_content:
-                    all_content += "\n"
-                all_content += repo_content
+        repo_content = self.get_repo_map()
+        if repo_content:
+            if all_content:
+                all_content += "\n"
+            all_content += repo_content
 
         files_messages = [
             dict(role="user", content=all_content),
diff --git a/aider/main.py b/aider/main.py
index 2371e48c2..21e8505b5 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -389,10 +389,9 @@ def main(args=None, input=None, output=None):
     )
 
     if args.show_repo_map:
-        other_files = set(coder.get_all_abs_files()) - set(coder.abs_fnames)
-        if coder.repo_map:
-            repo_content = coder.repo_map.get_repo_map(coder.abs_fnames, other_files)
-            print(repo_content)
+        repo_map = coder.get_repo_map()
+        if repo_map:
+            io.tool_output(repo_map)
         return
 
     if args.dirty_commits: