From 26ec1c4f825dc557657678d54d7ce8289ee4f35f Mon Sep 17 00:00:00 2001 From: "Amar Sood (tekacs)" Date: Sat, 12 Apr 2025 12:25:02 -0400 Subject: [PATCH] Fix ReplaceAll, using new git diff helper --- aider/tools/replace_all.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aider/tools/replace_all.py b/aider/tools/replace_all.py index 1764a23ee..279854578 100644 --- a/aider/tools/replace_all.py +++ b/aider/tools/replace_all.py @@ -4,6 +4,7 @@ from .tool_utils import ( validate_file_for_edit, apply_change, handle_tool_error, + generate_unified_diff_snippet, format_tool_result, ) @@ -33,8 +34,7 @@ def _execute_replace_all(coder, file_path, find_text, replace_text, change_id=No return f"Warning: No changes made (replacement identical to original)" # 4. Generate diff for feedback - # Note: _generate_diff_chunks is currently on the Coder class - diff_examples = coder._generate_diff_chunks(original_content, find_text, replace_text) + diff_examples = generate_unified_diff_snippet(original_content, new_content, rel_path) # 5. Handle dry run if dry_run: @@ -62,4 +62,4 @@ def _execute_replace_all(coder, file_path, find_text, replace_text, change_id=No return handle_tool_error(coder, tool_name, e, add_traceback=False) except Exception as e: # Handle unexpected errors - return handle_tool_error(coder, tool_name, e) + return handle_tool_error(coder, tool_name, e) \ No newline at end of file