Repository navigation
refactor(mcp): count UTF-16 units with unicode/utf16.RuneLen in the toolkit - #1488
Merged
Merged
Conversation
…oolkit Co-Authored-By: jason.han <hanhuijun@gmail.com>
Contributor
Author
|
I'll fix CI failures and address comments from users with write access. I'll skip comments containing "(aside)".
|
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 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.
What and why
internal/frontend/mcp/toolkitcarried its ownutf16Len(r rune) uint32(2 for a rune at or above U+10000, otherwise 1), which isunicode/utf16.RuneLen— the functioninternal/syntax/semtok/encode.goalready uses for the same count.Position.ToProtocolandFromProtocolnow callutf16.RuneLendirectly and the local helper is gone.Behaviour is identical. Both callers range over the runes of a Go string, which decodes invalid bytes to U+FFFD and never yields a surrogate, so
RuneLenis always 1 or 2 here and never its −1 sentinel. The twouint32(...)conversions carry a#nosec G115line for that reason, aslineNumberin the same file already does.How it was verified
TestPositionRoundTripsThroughUTF16andTestColumnsCountCharactersNotBytesininternal/frontend/mcp/toolkit/toolkit_test.gopin the emoji (two-unit) case and the round trip through both functions; they pass unchanged.Checklist
make testandmake lintpass locally (see above; lint run on the touched package)changes/unreleased/toolkit-utf16-runelen.changed.md, not as an edit toCHANGELOG.mdmake docs-countsrun if a gate count moved (none moved)F4,K5) in the body, docs, or changelogLink to Devin session: https://nasa-jpl-demo.devinenterprise.com/sessions/dd67c09df22146688969e4a7459a5eed
Open in Devin Desktop: https://nasa-jpl-demo.devinenterprise.com/desktop/session/dd67c09df22146688969e4a7459a5eed?variant=devin
Requested by: @HuiJun