Handle CRLF line breaks in the patch parser #91
Merged
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
NMinhNguyen
changed the title
This fixes an issue where file creation wasn't occurring on Windows due to `startPath !== "/dev/null"` because `startPath` had a trailing `\r`.
NMinhNguyen
commented
Oct 20, 2018
| it("is OK when blank lines are accidentally created", () => { | ||
| expect(parsePatch(accidentalBlankLine)).toEqual(parsePatch(patch)) | ||
| }) | ||
| it(`can handle files with CRLF line breaks`, () => { |
There was a problem hiding this comment.
Strictly speaking, I could've written a more focused test that does
expect(parsePatch(crlfLineBreaks)[0].type).toBe("file creation")Let me know if you'd prefer that instead of a snapshot test
NMinhNguyen
commented
Oct 24, 2018
|
|
||
| private parseFileModification() { | ||
| const startPath = this.currentLine.slice("--- ".length) | ||
| const startPath = this.currentLine.trim().slice("--- ".length) |
There was a problem hiding this comment.
Not sure if there's any implications from using .trim() as opposed to trimming from the end e.g.
const trimEnd = str => str.replace(/\s+$/, '')
|
This looks great, thanks! Sorry it took me a while to get around to it. |
|
published in patch-package@6.0.0-11 Thanks again! 🎉 |
|
No problem, thank you for reviewing and releasing! 🙂 |
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.
I noticed that if a patch file was checked out on Windows and it contained CRLF linebreaks, then
patch-packagewould fail on file creation because this condition would be false due tostartPathcontaining a trailing\r(carriage return) character: https://github.com/ds300/patch-package/blob/54a168b/src/patch/parse.ts#L297After some investigation, it turned out that this was happening because https://github.com/ds300/patch-package/blob/54a168b/src/patch/parse.ts#L387 was splitting patch file contents on
\nand so every line contained a trailing\rInterestingly, I couldn't getThanks to CI, I've now managed to ensure all tests pass.yarn test --runInBandto pass locally even on a fresh checkout (without my changes) 🙁