fix(apply-patch) Support nested @@ context lines #7619
+202
−31
Conversation
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
dylan-hurd-oai
changed the title
dylan-hurd-oai
force-pushed
the
dh--apply-patch-context-fix
branch
from
45fdf1f to
7e90c32
Compare
bolinfest
approved these changes
Dec 9, 2025
Collaborator
bolinfest
left a comment
bolinfest
left a comment
There was a problem hiding this comment.
Maybe some small tweaks, but otherwise LGTM!
| @@ -0,0 +1,7 @@ | |||
| *** Begin Patch | |||
| *** Update File: example.py | |||
| @@ class BaseClass: | |||
Collaborator
There was a problem hiding this comment.
Should we use class OtherClass as the target thing since the primary bug that this fixes is the one where the agent wants to update the "second" instance of something in the file (def method() in this case), but inadvertently updates the first due to insufficient context.
| // multiple @@ context headers such as: | ||
| // @@ class BaseClass: | ||
| // @@ def method(): | ||
| for ctx_line in &chunk.change_context { |
Collaborator
There was a problem hiding this comment.
I think we need a test where there are overlapping instances of the context?
For example, if the context were:
@@ A
@@ A
- old
and the file were:
A
A
A
old
I would want to be sure that the failed match for the first two A's doesn't interfere with the match for the second and third A?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Right now, if a patch contains 2
@@context lines in a row, we throw an error. This PR updatesapply-patchto support this as a valid patch where subsequent@@lines increase specificity of the search.Testing