Fix: make lockfile parser tolerant to CRLF #4495
Merged
Conversation
This file contains 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
**Summary** Lockfile parser fails when the lockfile had Windows-style line endings with an "Invalid token" error. This is default on Windows and, say when editing the file using vim, it is not obvious or trivial that the file endings are in Windows-style. This patch makes the parser tolareate potential "\r" chars before "\n" while keeping the existing parsing logic the same. **Test plan** Added two new unit tests.
bestander
reviewed
Sep 18, 2017
src/lockfile/parse.js
Outdated
| @@ -155,7 +159,7 @@ function* tokenise(input: string): Iterator<Token> { | |||
| } | |||
|
|
|||
| col += chop; | |||
| lastNewline = input[0] === '\n'; | |||
| lastNewline = input[0] === '\n' || input[1] === '\n'; | |||
There was a problem hiding this comment.
does input[0] matter when input[1] === '\n'?
There was a problem hiding this comment.
I guess I can change this to input[0] === '\n' || (input[0] === '\r' && input[1] === '\n') to be precise?
|
This change will increase the build size from 9.69 MB to 9.7 MB, an increase of 2.09 KB (0%)
|
joaolucasl
pushed a commit
to joaolucasl/yarn
that referenced
this pull request
Oct 27, 2017
**Summary** Lockfile parser fails when the lockfile had Windows-style line endings with an "Invalid token" error. This is default on Windows and, say when editing the file using vim, it is not obvious or trivial that the file endings are in Windows-style. This patch makes the parser tolareate potential "\r" chars before "\n" while keeping the existing parsing logic the same. **Test plan** Added three new unit tests.
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
Lockfile parser fails when the lockfile had Windows-style line
endings with an "Invalid token" error. This is default on Windows
and, say when editing the file using vim, it is not obvious or
trivial that the file endings are in Windows-style. This patch
makes the parser tolareate potential "\r" chars before "\n" while
keeping the existing parsing logic the same.
Test plan
Added three new unit tests.