dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-24 22:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

16x

Browse source
This commit is contained in:
Paul Gauthier 2024-05-14 14:04:45 -07:00
parent dea93bbfd9
commit ecc46bd3e3
2 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

38
aider/coders/base_coder.py
View file

@ -3,6 +3,7 @@
import hashlib import hashlib
import json import json
import os import os
import re
import sys import sys
import threading import threading
import time import time
@ -416,16 +417,49 @@ class Coder:
return prompt return prompt
def get_cur_message_text(self):
text = ""
for msg in self.cur_messages:
text += msg["content"] + "\n"
return text
def get_ident_mentions(self, text):
# Split the string on any character that is not alphanumeric
# \W+ matches one or more non-word characters (equivalent to [^a-zA-Z0-9_]+)
words = set(re.split(r"\W+", text))
return words
def get_repo_map(self): def get_repo_map(self):
if not self.repo_map: if not self.repo_map:
return return
cur_msg_text = self.get_cur_message_text()
mentioned_fnames = self.get_file_mentions(cur_msg_text)
mentioned_idents = self.get_ident_mentions(cur_msg_text)
other_files = set(self.get_all_abs_files()) - set(self.abs_fnames) 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) repo_content = self.repo_map.get_repo_map(
self.abs_fnames,
other_files,
mentioned_fnames=mentioned_fnames,
mentioned_idents=mentioned_idents,
)
# fall back to global repo map if files in chat are disjoint from rest of repo # fall back to global repo map if files in chat are disjoint from rest of repo
if not repo_content: if not repo_content:
repo_content = self.repo_map.get_repo_map(set(), set(self.get_all_abs_files())) repo_content = self.repo_map.get_repo_map(
set(),
set(self.get_all_abs_files()),
mentioned_fnames=mentioned_fnames,
mentioned_idents=mentioned_idents,
)
# fall back to completely unhinted repo
if not repo_content:
repo_content = self.repo_map.get_repo_map(
set(),
set(self.get_all_abs_files()),
)
return repo_content return repo_content

4
aider/repomap.py
View file

@ -68,7 +68,9 @@ class RepoMap:
max_map_tokens = self.max_map_tokens max_map_tokens = self.max_map_tokens
if not chat_files: if not chat_files:
# with no code in the chat, give a bigger view of the entire repo # with no code in the chat, give a bigger view of the entire repo
max_map_tokens *= 8 max_map_tokens *= 16
dump(max_map_tokens)
try: try:
files_listing = self.get_ranked_tags_map( files_listing = self.get_ranked_tags_map(