fix(text): make overflow UTF-8 aware #963
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
bryphe
reviewed
Jul 20, 2020
| @@ -10,7 10,7 @@ let removeLineBreaks = text => { | |||
| }; | |||
|
|
|||
| let rec handleOverflow = (~maxWidth, ~text, ~measure, ~character="…", ()) => { | |||
| let clippedText = String.length(text) - 1 |> Str.string_before(text); | |||
| let clippedText = Zed_utf8.rchop(text); | |||
There was a problem hiding this comment.
Nice find! I didn't know about this method - I'm glad there was already an efficient way to handle this.
bryphe
reviewed
Jul 20, 2020
| width; | ||
|
|
||
| let abcSize = measure("ABC"); | ||
| let overflown = |
bryphe
reviewed
Jul 20, 2020
test/Core/TextTests.re
Outdated
Comment on lines
8
to
14
| |> ( | ||
| result => | ||
| switch (result) { | ||
| | Ok(font) => font | ||
| | Error(e) => failwith(e) | ||
| } | ||
| ); |
There was a problem hiding this comment.
Since this is a test case - would be fine to use Result.get_ok here (would simplify these lines)
bryphe
approved these changes
Jul 20, 2020
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.
This is a pretty simple fix, since Zed already gives us a function to do exactly what we were doing before but with UTF-8.
I will also add some tests for this, just to make sure it's robust!