Fix formatting scanner on JSX text that looks like trivia#39718
Merged
orta merged 2 commits intomicrosoft:masterfrom Jul 30, 2020
Merged
Fix formatting scanner on JSX text that looks like trivia#39718orta merged 2 commits intomicrosoft:masterfrom
orta merged 2 commits intomicrosoft:masterfrom
Conversation
orta
commented
Jul 23, 2020
| Debug.assert(tokenInfo.token.end === child.end, "Token end is child end"); | ||
| consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child); | ||
| return inheritedIndentation; | ||
| } |
Contributor
Author
There was a problem hiding this comment.
Moved down to ensures that the scanner always moves forward
| if (tokenInfo.token.end > childStartPos) { | ||
| if (tokenInfo.token.pos > childStartPos) { | ||
| formattingScanner.skipToStartOf(child); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
if the outer token's start position is ahead of the childs start, then we're basically in a weird state - try reparsing
weswigham
approved these changes
Jul 30, 2020
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
Fixes #38799