holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a little better table alignment (#720)

Browse Source
This commit is contained in:
Darren Schroeder 2022-01-11 08:49:15 -06:00 committed by GitHub
parent 74fd78e02c
commit ffb086d56f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/nu-table/src/wrap.rs
View File

@ -73,6 +73,22 @@ fn unicode_width_strip_ansi(astring: &str) -> usize {
UnicodeWidthStr::width(&stripped_string[..]) UnicodeWidthStr::width(&stripped_string[..])
} }
// fn special_width(astring: &str) -> usize {
// // remove the zwj's '\u{200d}'
// // remove the fe0f's
// let stripped_string: String = {
// if let Ok(bytes) = strip_ansi_escapes::strip(astring) {
// String::from_utf8_lossy(&bytes).to_string()
// } else {
// astring.to_string()
// }
// };
// let no_zwj = stripped_string.replace('\u{200d}', "");
// let no_fe0f = no_zwj.replace('\u{fe0f}', "");
// UnicodeWidthStr::width(&no_fe0f[..])
// }
pub fn split_sublines(input: &str) -> Vec<Vec<Subline>> { pub fn split_sublines(input: &str) -> Vec<Vec<Subline>> {
input input
.split_terminator('\n') .split_terminator('\n')
@ -88,7 +104,14 @@ pub fn split_sublines(input: &str) -> Vec<Vec<Subline>> {
// let c = x.chars().count(); // let c = x.chars().count();
// let u = UnicodeWidthStr::width(x); // let u = UnicodeWidthStr::width(x);
// std::cmp::min(c, u) // std::cmp::min(c, u)
unicode_width_strip_ansi(x)
// let c = strip_ansi(x).chars().count();
// let u = special_width(x);
// std::cmp::max(c, u)
let c = strip_ansi(x).chars().count();
let u = unicode_width_strip_ansi(x);
std::cmp::max(c, u)
}, },
}) })
.collect::<Vec<_>>() .collect::<Vec<_>>()