Fix truncation/padding for non-ASCII sender names (#182)

This commit is contained in:
Benjamin Lee 2024-02-27 21:09:37 -08:00 committed by GitHub
parent 5be886301b
commit 1cb280df8b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 16 deletions

View file

@ -26,19 +26,19 @@ pub fn split_cow(cow: Cow<'_, str>, idx: usize) -> (Cow<'_, str>, Cow<'_, str>)
pub fn take_width(s: Cow<'_, str>, width: usize) -> ((Cow<'_, str>, usize), Cow<'_, str>) {
// Find where to split the line.
let mut idx = 0;
let mut w = 0;
for (i, g) in UnicodeSegmentation::grapheme_indices(s.as_ref(), true) {
let gw = UnicodeWidthStr::width(g);
idx = i;
if w + gw > width {
break;
}
w += gw;
}
let idx = UnicodeSegmentation::grapheme_indices(s.as_ref(), true)
.find_map(|(i, g)| {
let gw = UnicodeWidthStr::width(g);
if w + gw > width {
Some(i)
} else {
w += gw;
None
}
})
.unwrap_or(s.len());
let (s0, s1) = split_cow(s, idx);