Format completion snippet text before escaping #48793
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
typescript-bot
added
Author: Team
For Milestone Bug
gabritto
reviewed
Apr 21, 2022
| return textChanges.applyChanges(syntheticFile.text, changes); | ||
|
|
||
| const allChanges = escapes | ||
| ? stableSort(concatenate(changes, escapes), (a, b) => compareTextSpans(a.span, b.span)) |
There was a problem hiding this comment.
this might be a dumb question, but is there a chance that we have overlapping text changes, and if so, will this sorting make sure everything works correctly?
There was a problem hiding this comment.
Overlapping edits can defeat the sorting, but since the formatter deals only in whitespace and semicolons, and the characters we need to escape are only part of tokens, I don’t think it can ever be a problem in practice.
gabritto
approved these changes
Apr 21, 2022
jakebailey
approved these changes
Apr 21, 2022
Jack-Works
pushed a commit
to Jack-Works/TypeScript
that referenced
this pull request
Apr 22, 2022
* Format snippet text before escaping * Reset `escapes` before printing so printer can be reused
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.
Fixes #48139
Fixes #48215
I briefly tried to make the formatting scanner and/or actual scanner tolerant of
\$and\\, but it quickly became apparent that this approach would be easier.