dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-09 06:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix some LLM-generated mixups

Browse source
This commit is contained in:
Amar Sood (tekacs) 2025-04-12 12:59:13 -04:00
parent 9b56e1f099
commit e9c0774f1f
2 changed files with 46 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

22
aider/coders/navigator_coder.py
View file

@ -1500,27 +1500,6 @@ Just reply with fixed versions of the {blocks} above that failed to match.
# ------------------- Helper for finding occurrences ------------------- # ------------------- Helper for finding occurrences -------------------
def _find_occurrences(self, content, pattern, near_context=None):
"""Find all occurrences of pattern, optionally filtered by near_context."""
occurrences = []
start = 0
while True:
index = content.find(pattern, start)
if index == -1:
break
if near_context:
# Check if near_context is within a window around the match
window_start = max(0, index - 200)
window_end = min(len(content), index + len(pattern) + 200)
window = content[window_start:window_end]
if near_context in window:
occurrences.append(index)
else:
occurrences.append(index)
start = index + 1 # Move past this occurrence's start
return occurrences
# ------------------- Granular Editing Tools ------------------- # ------------------- Granular Editing Tools -------------------
@ -1533,4 +1512,3 @@ Just reply with fixed versions of the {blocks} above that failed to match.

91
aider/repomap.py
View file

@ -247,51 +247,6 @@ class RepoMap:
self.io.tool_warning(f"File not found error: {fname}") self.io.tool_warning(f"File not found error: {fname}")
def get_tags(self, fname, rel_fname): def get_tags(self, fname, rel_fname):
def get_symbol_definition_location(self, file_path, symbol_name):
"""
Finds the unique definition location (start/end line) for a symbol in a file.
Args:
file_path (str): The relative path to the file.
symbol_name (str): The name of the symbol to find.
Returns:
tuple: (start_line, end_line) (0-based) if a unique definition is found.
Raises:
ToolError: If the symbol is not found, not unique, or not a definition.
"""
abs_path = self.io.root_abs_path(file_path) # Assuming io has this helper or similar
rel_path = self.get_rel_fname(abs_path) # Ensure we use consistent relative path
tags = self.get_tags(abs_path, rel_path)
if not tags:
raise ToolError(f"Symbol '{symbol_name}' not found in '{file_path}' (no tags).")
definitions = []
for tag in tags:
# Check if it's a definition and the name matches
if tag.kind == "def" and tag.name == symbol_name:
# Ensure we have valid location info
if tag.start_line is not None and tag.end_line is not None and tag.start_line >= 0:
definitions.append(tag)
if not definitions:
# Check if it exists as a non-definition tag
non_defs = [tag for tag in tags if tag.name == symbol_name and tag.kind != "def"]
if non_defs:
raise ToolError(f"Symbol '{symbol_name}' found in '{file_path}', but not as a unique definition (found as {non_defs[0].kind}).")
else:
raise ToolError(f"Symbol '{symbol_name}' definition not found in '{file_path}'.")
if len(definitions) > 1:
# Provide more context about ambiguity if possible
lines = sorted([d.start_line + 1 for d in definitions]) # 1-based for user message
raise ToolError(f"Symbol '{symbol_name}' is ambiguous in '{file_path}'. Found definitions on lines: {', '.join(map(str, lines))}.")
# Unique definition found
definition_tag = definitions[0]
return definition_tag.start_line, definition_tag.end_line
# Check if the file is in the cache and if the modification time has not changed # Check if the file is in the cache and if the modification time has not changed
file_mtime = self.get_mtime(fname) file_mtime = self.get_mtime(fname)
if file_mtime is None: if file_mtime is None:
@ -336,6 +291,52 @@ class RepoMap:
self.TAGS_CACHE[cache_key] = {"mtime": file_mtime, "data": data} self.TAGS_CACHE[cache_key] = {"mtime": file_mtime, "data": data}
return data return data
def get_symbol_definition_location(self, file_path, symbol_name):
"""
Finds the unique definition location (start/end line) for a symbol in a file.
Args:
file_path (str): The relative path to the file.
symbol_name (str): The name of the symbol to find.
Returns:
tuple: (start_line, end_line) (0-based) if a unique definition is found.
Raises:
ToolError: If the symbol is not found, not unique, or not a definition.
"""
abs_path = self.io.root_abs_path(file_path) # Assuming io has this helper or similar
rel_path = self.get_rel_fname(abs_path) # Ensure we use consistent relative path
tags = self.get_tags(abs_path, rel_path)
if not tags:
raise ToolError(f"Symbol '{symbol_name}' not found in '{file_path}' (no tags).")
definitions = []
for tag in tags:
# Check if it's a definition and the name matches
if tag.kind == "def" and tag.name == symbol_name:
# Ensure we have valid location info
if tag.start_line is not None and tag.end_line is not None and tag.start_line >= 0:
definitions.append(tag)
if not definitions:
# Check if it exists as a non-definition tag
non_defs = [tag for tag in tags if tag.name == symbol_name and tag.kind != "def"]
if non_defs:
raise ToolError(f"Symbol '{symbol_name}' found in '{file_path}', but not as a unique definition (found as {non_defs[0].kind}).")
else:
raise ToolError(f"Symbol '{symbol_name}' definition not found in '{file_path}'.")
if len(definitions) > 1:
# Provide more context about ambiguity if possible
lines = sorted([d.start_line + 1 for d in definitions]) # 1-based for user message
raise ToolError(f"Symbol '{symbol_name}' is ambiguous in '{file_path}'. Found definitions on lines: {', '.join(map(str, lines))}.")
# Unique definition found
definition_tag = definitions[0]
return definition_tag.start_line, definition_tag.end_line
# Check if the file is in the cache and if the modification time has not changed
def get_tags_raw(self, fname, rel_fname): def get_tags_raw(self, fname, rel_fname):
lang = filename_to_lang(fname) lang = filename_to_lang(fname)