extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-07-01 07:00:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix coloring when string has spaces (#5425)

Browse Source 
* Replace ansi-cut with ansi-str

There's no issues with it we just need to use it later.

Signed-off-by: Maxim Zhiburt <zhiburt@gmail.com>

* Fix color losing in string spliting into Sublines

Signed-off-by: Maxim Zhiburt <zhiburt@gmail.com>
This commit is contained in:
Maxim Zhiburt
2022-05-03 17:48:43 +03:00
committed by GitHub
parent e36649f74b
commit ac48f5a318
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-table/Cargo.toml
View File

@ -17,5 +17,5 @@ nu-protocol = { path = "../nu-protocol", version = "0.61.1" }
regex = "1.4"
unicode-width = "0.1.8"
strip-ansi-escapes = "0.1.1"
ansi-cut = "0.2.0"
ansi-str = "0.1.1"
atty = "0.2.14"

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

@ -1,5 +1,5 @@
use crate::table::TextStyle;
use ansi_cut::AnsiCut;
use ansi_str::AnsiStr;
use nu_ansi_term::Style;
use std::borrow::Cow;
use std::collections::HashMap;
@ -92,9 +92,9 @@ fn strip_ansi(string: &str) -> Cow<str> {
pub fn split_sublines(input: &str) -> Vec<Vec<Subline>> {
input
.split_terminator('\n')
.ansi_split("\n")
.map(|line| {
line.split_terminator(' ')
line.ansi_split(" ")
.map(|x| Subline {
subline: x.to_string(),
width: {
@ -109,7 +109,7 @@ pub fn split_sublines(input: &str) -> Vec<Vec<Subline>> {
// let c = strip_ansi(x).chars().count();
// let u = special_width(x);
// std::cmp::max(c, u)
let stripped = strip_ansi(x);
let stripped = strip_ansi(&x);
let c = stripped.chars().count();
let u = stripped.width();
@ -159,7 +159,7 @@ fn split_word(cell_width: usize, word: &str) -> Vec<Subline> {
end_index = c.0;
if current_width + width > cell_width {
output.push(Subline {
subline: word.cut(start_index..end_index),
subline: word.ansi_cut(start_index..end_index),
width: current_width,
});
@ -173,7 +173,7 @@ fn split_word(cell_width: usize, word: &str) -> Vec<Subline> {
if start_index != word_no_ansi.len() {
output.push(Subline {
subline: word.cut(start_index..),
subline: word.ansi_cut(start_index..),
width: current_width,
});
}