-
Notifications
You must be signed in to change notification settings - Fork 322
Fix handling of surrogate pairs in length calculation #4462
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.
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
Closed
+82
−2
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
77fbb68
Fix handling of surrogate pairs in length calculation
totkeks 02f3b4c
Add Claude generated unit tests
andyleejordan 69bee70
Merge branch 'master' into pr/totkeks/4462
andyleejordan 744a742
Slight readability cleanup with `char.IsSurrogatePair()`
andyleejordan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't look right. It effectively counts every surrogate pair as 1 cell in terminal display, but that's not the case for almost all surrogate pairs. For example, 😀 and 👉 are both 2-cell width.
I intended to rewrite the length calculation using the lib Wcwidth and rewrite the cursor movement code using
System.Globalization.StringInfo, but just didn't get the time to invest into this area ...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The root cause lies in
LengthInBufferCells, but for the reported issue, it's becauseLengthInBufferCellsreturns a smaller number than the actual buffer cells taken by the '❌' emoji.The '❌' emoji is the Unicode point
U+274C. It's a single 16-byte Unicode character, not a surrogate pair. However, it takes 2 buffer cells (1 char -> 2 cells in this case). So, for a prompt like '❌ ', the buffer length should be 3, butLengthInBufferCellsreturns 2 incorrectly.