fix(editblock): allow find_filename to look past indented fenced block markers - #5663
Open
lx3133584 wants to merge 1 commit into
Open
fix(editblock): allow find_filename to look past indented fenced block markers#5663lx3133584 wants to merge 1 commit into
lx3133584 wants to merge 1 commit into
Conversation
…k markers Fixes Aider-AI#5662 Signed-off-by: Liang Xu <lx3133584@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
When fenced code block markers contain leading whitespace (e.g.
" ```python"),find_filenameineditblock_coder.pybreaks early on the continuation check and returnsNone, failing to recover valid filenames in SEARCH/REPLACE blocks.Root Cause
In
aider/coders/editblock_coder.py,find_filenamecheckedif not line.startswith(fence[0]) and not line.startswith(triple_backticks):using the unstrippedline. When preceding fence lines have leading spaces, the condition evaluated to true and broke the lookback loop before inspecting the filename line.Fix
Strip whitespace before checking whether the line starts with a fence or triple backticks (
stripped = line.strip()), allowing the lookback search to proceed through indented fence lines.Testing
Added test case in
tests/basic/test_editblock.py::TestUtils::test_find_filenameverifying filename recovery with indented fenced markers.