niko/oxkerclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: color match

Browse Source 
Correctly escape raw text, and correctly remove ANSI codes.
Color matching white now becomes gray
This commit is contained in:
Jack Wills
2024-07-09 15:37:16 +00:00
parent 197a031b8c
commit 274e5b8c5a
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/color_match.rs
+12 -8
View File
@@ -41,15 +41,19 @@ pub mod log_sanitizer {
/// Remove all ansi formatting from a given string and create ratatui Lines /// Remove all ansi formatting from a given string and create ratatui Lines
pub fn remove_ansi<'a>(input: &str) -> Vec<Line<'a>> { pub fn remove_ansi<'a>(input: &str) -> Vec<Line<'a>> {
raw(&categorise_text(input) vec![Line::from(
.into_iter() categorise_text(input)
.map(|i| i.text) .into_iter()
.collect::<String>()) .map(|i| i.text)
.collect::<String>()
.trim()
.to_owned(),
)]
} }
/// create ratatui Lines that exactly match the given strings /// create ratatui Lines that exactly match the given strings
pub fn raw<'a>(input: &str) -> Vec<Line<'a>> { pub fn raw<'a>(input: &str) -> Vec<Line<'a>> {
vec![Line::from(Span::raw(input.to_owned()))] vec![Line::from(input.escape_debug().collect::<String>())]
} }
/// Change from ansi to tui colors /// Change from ansi to tui colors
@@ -62,7 +66,7 @@ pub mod log_sanitizer {
CansiColor::Blue => Color::Blue, CansiColor::Blue => Color::Blue,
CansiColor::Magenta => Color::Magenta, CansiColor::Magenta => Color::Magenta,
CansiColor::Cyan => Color::Cyan, CansiColor::Cyan => Color::Cyan,
CansiColor::White | CansiColor::BrightWhite => Color::White, CansiColor::White | CansiColor::BrightWhite => Color::Gray,
CansiColor::BrightRed => Color::LightRed, CansiColor::BrightRed => Color::LightRed,
CansiColor::BrightGreen => Color::LightGreen, CansiColor::BrightGreen => Color::LightGreen,
CansiColor::BrightYellow => Color::LightYellow, CansiColor::BrightYellow => Color::LightYellow,
@@ -92,7 +96,7 @@ mod tests {
let expected = vec![Line { let expected = vec![Line {
spans: [Span { spans: [Span {
content: std::borrow::Cow::Borrowed( content: std::borrow::Cow::Borrowed(
"\x1b[31;47mo\x1b[32;40mx\x1b[33;41mk\x1b[34;42me\x1b[35;43mr\x1b[0m", "\\u{1b}[31;47mo\\u{1b}[32;40mx\\u{1b}[33;41mk\\u{1b}[34;42me\\u{1b}[35;43mr\\u{1b}[0m",
), ),
style: Style::default(), style: Style::default(),
}] }]
@@ -111,7 +115,7 @@ mod tests {
spans: vec![ spans: vec![
Span { Span {
content: std::borrow::Cow::Borrowed("o"), content: std::borrow::Cow::Borrowed("o"),
style: Style::default().fg(Color::Red).bg(Color::White), style: Style::default().fg(Color::Red).bg(Color::Gray),
}, },
Span { Span {
content: std::borrow::Cow::Borrowed("x"), content: std::borrow::Cow::Borrowed("x"),