Fix(#16459) xml parse regression #19531
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
The parser could not parse `if expr` that contains single-quoted text(s) inside XML literal with newline(s) because `followedByToken`, which is used to detect `do` or `then` token after `if`, unintentionally consumed XMLSTART symbol, which prevented the parser from delegating parse to XML parser.
|
🤔 |
xml literal may appear in LHS of for comprehension. The previous fix caused a syntax error for the following code. ```scala val actual: List[Node] = for (case t @ <book><title>Blabla</title></book> <- NodeSeq.fromSeq(books.child).toList) yield t ```
i10416
commented
Jan 25, 2024
I need to come up with good solution for pattern match with `if` guard.
i10416
force-pushed
the
fix/16459-xml-parse-regression
branch
from
3e83bde to
0423862
Compare
Confusing LARROW just after XML pattern breaks the parser.
i10416
force-pushed
the
fix/16459-xml-parse-regression
branch
from
5d1f0b4 to
4b0fff5
Compare
i10416
commented
Jan 25, 2024
Comment on lines
+52
to
+53
| val auxiliary6 = for (case _ @ <div>empty</div><- Seq(xml)) yield () | ||
| val auxiliary7 = for (case _ @ <div>empty</div><-Seq(xml)) yield () |
There was a problem hiding this comment.
The left arrow just after xml closing tag broke the parser.
i10416
commented
Jan 25, 2024
Add a patch to cover the cornercase where xml pattern in parens confuse the parser. Before this commit, the following code compiles, ```scala for (case _ @ <div>empty</div> <- Seq(xml)) yield () ``` but the following resulted in syntax error. ```scala for (case _ @ <div>empty</div><-Seq(xml)) yield () ``` Because `followingIsEnclosedGenerators` always comes after `for` and `(`, I beleive it would not break the parser to early-exit when `XMLSTART` is found.
i10416
force-pushed
the
fix/16459-xml-parse-regression
branch
from
53bbb78 to
3d156b6
Compare
i10416
changed the title
odersky
approved these changes
Feb 1, 2024
WojciechMazur
added a commit
that referenced
this pull request
Jul 1, 2024
Backports #19531 to the LTS branch. PR submitted by the release tooling. [skip ci]
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.
close #16459
The parser could not parse
if exprthat contains single-quoted text(s) inside XML literal with newline(s) becausefollowedByToken, which is used to detectdoorthentoken afterif, unintentionally consumed XMLSTART symbol, which prevented the parser from delegating parse to XML parser.