Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Improve trimming and alignment with multi-byte characters #647

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

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

Improve trimming and alignment with multi-byte characters #647

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
59 changes: 59 additions & 0 deletions src/style.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,57 @@ enum Alignment {
Right,
}

impl Alignment {
fn trim(self, s: &str, width: usize) -> &str {
dbg!(s);
let cur = measure_text_width(s);
if dbg!(cur) <= width {
return s;
}

let mut iter = s.char_indices();
let (mut i, mut start, mut end, mut reduced) = (0, 0, s.len(), 0);
let mut buf = [0; 4];
while cur - reduced > width {
dbg!(i, start, end, reduced);
match self {
Alignment::Left => {
if let Some((idx, c)) = dbg!(iter.next_back()) {
let encoded = c.encode_utf8(&mut buf);
reduced += measure_text_width(encoded);
end = idx;
}
}
Alignment::Right => {
if let Some((_, c)) = dbg!(iter.next()) {
let encoded = c.encode_utf8(&mut buf);
reduced += measure_text_width(encoded);
start += c.len_utf8();
}
}
Alignment::Center => {
if i % 2 == 0 {
if let Some((idx, c)) = dbg!(iter.next_back()) {
let encoded = c.encode_utf8(&mut buf);
reduced += measure_text_width(encoded);
end = idx;
}
} else {
if let Some((_, c)) = dbg!(iter.next()) {
let encoded = c.encode_utf8(&mut buf);
reduced += measure_text_width(encoded);
start += c.len_utf8();
}
}
}
}
i += 1;
}

&s[start..end]
}
}

/// Trait for defining stateful or stateless formatters
pub trait ProgressTracker: Send + Sync {
/// Creates a new instance of the progress tracker
Expand Down Expand Up @@ -993,4 +1044,12 @@ mod tests {
assert_eq!(&buf[2], "bar");
assert_eq!(&buf[3], "baz");
}

#[test]
fn multi_byte_char_width() {
dbg!("left");
assert_eq!(Alignment::Left.trim("🦀🦀🦀", 3), "🦀");
dbg!("right");
assert_eq!(Alignment::Right.trim("❤️✅✨", 3), "❤️");
}
}