Backport "Fix(#16459) xml parse regression" to LTS #20877
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. [Cherry-picked 1fc27df]
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 ``` [Cherry-picked c8d7ca1]
I need to come up with good solution for pattern match with `if` guard. [Cherry-picked 0423862]
Confusing LARROW just after XML pattern breaks the parser. [Cherry-picked 4b0fff5]
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. [Cherry-picked 3d156b6]
|
No regressions detected in the community build up to lts-19605. |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Backports #19531 to the LTS branch.
PR submitted by the release tooling.
[skip ci]