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

Fix unicode word wrapping with ansi-cut (#767)

Browse Source 
Ansi-cut expects ranges of character numbers (of the non-ansi control
sequence characters) instead of byte indices.
This fixes the panics when wrapping of non-unicode lines (which exceed
the demanded number of characters as byte indices).
Also rectifies some wrong wrapping of unicdoe containing lines that
don't panic
This commit is contained in:
Stefan Holderbach 2022-01-17 21:31:21 +01:00 committed by GitHub
parent ac36f32647
commit 01e691c5ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,7 +152,7 @@ fn split_word(cell_width: usize, word: &str) -> Vec<Subline> {
let mut end_index;
let word_no_ansi = strip_ansi(word);
for c in word_no_ansi.char_indices() {
for c in word_no_ansi.chars().enumerate() {
if let Some(width) = c.1.width() {
end_index = c.0;
if current_width + width > cell_width {
@ -169,7 +169,7 @@ fn split_word(cell_width: usize, word: &str) -> Vec<Subline> {
}
}
if start_index != word.len() {
if start_index != word_no_ansi.chars().count() {
output.push(Subline {
subline: word.cut(start_index..),
width: current_width,