Skip to content

fix: use utf8.DecodeLastRuneInString to correctly handle multi-byte runes in setLastNonTriviaPosition #3712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gabriela Araujo Britto (gabritto) merged 1 commit into from
May 5, 2026
Merged

fix: use utf8.DecodeLastRuneInString to correctly handle multi-byte runes in setLastNonTriviaPosition #3712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions internal/printer/changetrackerwriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package printer

import (
"unicode/utf8"

"github.com/microsoft/typescript-go/internal/ast"
"github.com/microsoft/typescript-go/internal/core"
"github.com/microsoft/typescript-go/internal/scanner"
Expand Down Expand Up @@ -89,10 +91,16 @@ func (ct *ChangeTrackerWriter) setLastNonTriviaPosition(s string, force bool) {
if force || scanner.SkipTrivia(s, 0) != len(s) {
ct.lastNonTriviaPosition = ct.textWriter.GetTextPos()
// trim trailing whitespaces
pos := len(s) - 1
for ; pos >= 0 && stringutil.IsWhiteSpaceLike(rune(s[pos])); pos-- {
pos := len(s)
for pos > 0 {
r, size := utf8.DecodeLastRuneInString(s[:pos])
if stringutil.IsWhiteSpaceLike(r) {
pos -= size
Comment thread
gabritto marked this conversation as resolved.
} else {
break
}
}
ct.lastNonTriviaPosition -= len(s) - 1 - pos
ct.lastNonTriviaPosition -= len(s) - pos
}
}

Expand Down
Loading