Fixed trimming comments on the remaining range #45807
Conversation
typescript-bot
added
the
For Milestone Bug
| @@ -432,13 432,12 @@ namespace ts.formatting { | |||
| if (leadingTrivia) { | |||
| indentTriviaItems(leadingTrivia, indentation, /*indentNextTokenOrTrivia*/ false, | |||
There was a problem hiding this comment.
how does indentTriviaItems already get rid of trailing whitespace for trivia?
There was a problem hiding this comment.
If there's leading trivia on the node, we first parse those in indentTriviaItems. This method pretty much apply rules for trivia only (i.e. indenting multiline/single line). The later trimTrailingWhitespacesForRemainingRange, used to ignore this trivia and cause some changes to conflict between them.
| @@ -432,13 432,12 @@ namespace ts.formatting { | |||
| if (leadingTrivia) { | |||
| indentTriviaItems(leadingTrivia, indentation, /*indentNextTokenOrTrivia*/ false, | |||
| item => processRange(item, sourceFile.getLineAndCharacterOfPosition(item.pos), enclosingNode, enclosingNode, /*dynamicIndentation*/ undefined!)); | |||
| if (options.trimTrailingWhitespace !== false) { | |||
| trimTrailingWhitespacesForRemainingRange(leadingTrivia); | |||
There was a problem hiding this comment.
why don't we need to call trimTrailingWhitespacesForRemainingRange in the above case when isOnToken() is true?
There was a problem hiding this comment.
trimTrailingWhitespacesForRemainingRange() should only be use for leading trivia I believe. By the time isOnToken() is false that means we're at the end of the file or at trivia after processing the previous nodes or outside the original range; otherwise we'll require to process the node like we're doing in on the previous lines.
Hope this clarifies it.
Fixes #45526
The bug above happens because the "remaining range" contains all comments that are last in the range. This have already been trimmed in
indentTriviaItemscreating duplicate edits.This PR fixes that by excluding from the remaining range the comment trivia.