Conversation
is_hunk_end() only treated `@@`, `---`, and `+++` as hunk terminators. parse_hunk_line then classified anything else as a context line. As a result, the `diff --git` and `index` lines git places between files were silently absorbed into the previous hunk as two extra context lines — inflating both old and new counts by two and producing spurious hunk-line-count-mismatch diagnostics on otherwise valid patches. Make is_hunk_end strict: a unified body line must start with ' ', '+', '-', '\\', or '\n'. Anything else ends the hunk. The looser @@/---/+++ check moves to is_hunk_boundary, still used by the invalid-header recovery loop which needs to skip past arbitrary garbage.
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.
is_hunk_end() only treated
@@,---, and+++as hunk terminators. parse_hunk_line then classified anything else as a context line. As a result, thediff --gitandindexlines git places between files were silently absorbed into the previous hunk as two extra context lines — inflating both old and new counts by two and producing spurious hunk-line-count-mismatch diagnostics on otherwise valid patches.Make is_hunk_end strict: a unified body line must start with ' ', '+', '-', '\', or '\n'. Anything else ends the hunk. The looser @@/---/+++ check moves to is_hunk_boundary, still used by the invalid-header recovery loop which needs to skip past arbitrary garbage.