fix(apply-patch): skip initial new-file hunk header emitted by some AI models #695
+100
−1
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
|
All contributors have signed the CLA ✍️ ✅ |
|
I have read the CLA Document and I hereby sign the CLA |
Gemini 2.0 Flash emits hunk headers in Add File directives (e.g. "@@ -0,0 +1 @@" or "@@ -0,0 +1,5 @@"). Use "/^@@\s+-0,0\s+\+1(?:,[1-9]\d*)?\s+@@/" to detect and skip these headers. Signed-off-by: Masami HIRATA <[email protected]>
msmhrt
force-pushed
the
fix/apply-patch-skip-gemini-hunk
branch
from
77bdda0 to
389d877
Compare
…I models and add unit
tests
- TypeScript parser: introduce NEW_FILE_HUNK regex + isFirst flag
- Rust parser: same regex+first logic in parse_one_hunk
- Tests (TS & Rust) covering skip-header behavior and regex self-test
Signed-off-by: Masami HIRATA <[email protected]>
…codex into fix/apply-patch-skip-gemini-hunk
msmhrt
changed the title
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.
What & Why
Some AI-generated patches (e.g. from Gemini 2.0 Flash) prepend a full diff hunk header like:
@@ -0,0 +1,2 @@ SectionNamebefore any
+lines. Our parser treats that as invalid, causing parse failures or stray blank lines when adding new files.This PR makes both the TypeScript and Rust parsers ignore only the first such "new-file" hunk header, then proceed normally.
How
TypeScript
NEW_FILE_HUNKregex +isFirstflag inparse_add_file()Rust
regex::Regexnew_file_re+ "first" logic inparse_one_hunk()Tests
TS
process_patch– add file skips full hunk headersRust
test_add_file_skip_full_hunk_header_with_sectiontest_new_file_hunk_regex