From 8b5fc801daa1a91468c929355fea44161f011c64 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Mon, 14 Apr 2025 21:27:05 -0700 Subject: [PATCH] fix: Extract correct filename from unified diff hunk --- aider/coders/udiff_coder.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/aider/coders/udiff_coder.py b/aider/coders/udiff_coder.py index b0955872b..9b5b47c68 100644 --- a/aider/coders/udiff_coder.py +++ b/aider/coders/udiff_coder.py @@ -344,7 +344,11 @@ def process_fenced_block(lines, start_line_num): if block[0].startswith("--- ") and block[1].startswith("+++ "): # Extract the file path, considering that it might contain spaces - fname = block[1][4:].strip() + a_fname = block[1][4:].strip() + b_fname = block[1][4:].strip() + + # if a_fname starts with a/ and b_fname starts with b/, strip b/ ai! + fname = b_fname block = block[2:] else: fname = None