Account for "\ No newline at end of file" in baseline diff parser #2285
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
Byron
reviewed
Dec 7, 2025
Member
Byron
left a comment
Byron
left a comment
There was a problem hiding this comment.
Thanks a lot, happy to merge!
Just one suggestion, but I can also merge without it.
And let's try one more thing 😅, feel free to ignore that.
gix-diff/tests/diff/blob/slider.rs
Outdated
Comment on lines
217
to
224
| if line == "\\ No newline at end of file".as_bytes() { | ||
| // Do nothing. | ||
| } else { | ||
| unreachable!( | ||
| "BUG: expecting unified diff format, found line: `{}`", | ||
| line.to_str_lossy() | ||
| ) | ||
| } |
Member
There was a problem hiding this comment.
I think this should just be an assert! with message.
Contributor
Author
There was a problem hiding this comment.
Makes a lot of sense, thanks for the suggestion!
There was a problem hiding this comment.
Pull request overview
This PR enhances the baseline diff parser in the diff slider tests to handle the \ No newline at end of file marker that appears in unified diff format. Additionally, it includes two grammar corrections in comments.
- Adds handling for
\ No newline at end of filelines in the baseline diff parser - Improves error messages to show the actual problematic line when an unexpected diff format is encountered
- Fixes grammar errors in two comment sections
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| gix-diff/tests/diff/blob/slider.rs | Adds case for handling backslash-prefixed lines in unified diff format, specifically the "\ No newline at end of file" marker, and improves error messages |
| tests/it/src/args.rs | Corrects grammar by removing duplicate verb "are" from comment |
| gix-diff/src/blob/platform.rs | Fixes subject-verb agreement and double negative in comment ("were...cannot" → "was...can") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This is a small PR that fixes an oversight in the baseline diff parser in the diff slider tests. The parser now also parses
\ No newline at end of filelines. This is something I found while using the script to run more tests. Off the top of my head, I don’t know whether there’s more cases the parser doesn’t handle yet.