Skip to content

Fix CRLF behavior mismatch during error recovery#189

Merged
maxbrunsfeld merged 3 commits intotree-sitter:masterfrom
ahelwer:heredocs-crlf
Sep 28, 2021
Merged

Fix CRLF behavior mismatch during error recovery#189
maxbrunsfeld merged 3 commits intotree-sitter:masterfrom
ahelwer:heredocs-crlf

Conversation

@ahelwer
Copy link
Contributor

@ahelwer ahelwer commented Sep 27, 2021

This is a bit more subtle than the previous fixes in #188
The ruby error_corpus test was failing in the main repo on Windows, generating a slightly different error-corrected parse tree. I suspect this is because of the additional \r characters consumed by the external scanner which led the parser to prefer one GLR branch over another. I changed the external scanner so its behavior matches as closely as possible in both cases by doing a line-by-line diff of the debug parse output. If I had to summarize the changes, they would be "treat a standalone \r as a newline, unless it's directly followed by a \n, in which case consume \r\n one right after the other". The same error-corrected parse tree is now output on all platforms. I've also added the test itself to this repo since it seems a bit fragile.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants