Skip to content

Don't wrap messages without formatted_body in middle of word #486

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

Open
VAWVAW wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't wrap messages without formatted_body in middle of word #486

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
34 changes: 25 additions & 9 deletions src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,38 @@ 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 w = 0;
let mut cur_width = 0;

let idx = UnicodeSegmentation::grapheme_indices(s.as_ref(), true)
.find_map(|(i, g)| {
let gw = UnicodeWidthStr::width(g);
if w + gw > width {
let mut idx = UnicodeSegmentation::split_word_bound_indices(s.as_ref())
.find_map(|(i, word)| {
let word_width = UnicodeWidthStr::width(word);
if cur_width + word_width > width {
Some(i)
} else {
w += gw;
cur_width += word_width;
None
}
})
.unwrap_or(s.len());

if idx == 0 {
// first word is wider than available; fall back to splitting by width
idx = UnicodeSegmentation::grapheme_indices(s.as_ref(), true)
.find_map(|(i, graph)| {
let graph_width = UnicodeWidthStr::width(graph);
if cur_width + graph_width > width {
Some(i)
} else {
cur_width += graph_width;
None
}
})
.unwrap_or(s.len());
}

let (s0, s1) = split_cow(s, idx);

((s0, w), s1)
((s0, cur_width), s1)
}

pub struct WrappedLinesIterator<'a> {
Expand Down Expand Up @@ -183,8 +198,9 @@ pub mod tests {

let mut iter = wrap(s, 5);
assert_eq!(iter.next(), Some((Cow::Borrowed("hello"), 5)));
assert_eq!(iter.next(), Some((Cow::Borrowed(" worl"), 5)));
assert_eq!(iter.next(), Some((Cow::Borrowed("d!"), 2)));
assert_eq!(iter.next(), Some((Cow::Borrowed(" "), 1)));
assert_eq!(iter.next(), Some((Cow::Borrowed("world"), 5)));
assert_eq!(iter.next(), Some((Cow::Borrowed("!"), 1)));
assert_eq!(iter.next(), Some((Cow::Borrowed("abcde"), 5)));
assert_eq!(iter.next(), Some((Cow::Borrowed("fghij"), 5)));
assert_eq!(iter.next(), Some((Cow::Borrowed("klmno"), 5)));
Expand Down
Loading