Orange-OpenSource/hurl
1
1
Fork 0
mirror of https://github.com/Orange-OpenSource/hurl.git synced 2024-11-26 00:22:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add more colors to RichText

Browse Source
This commit is contained in:
Jean-Christophe Amiel 2024-05-31 13:03:01 +02:00
parent 492ea25fee
commit 085e67b7e9
No known key found for this signature in database
GPG Key ID: 07FF11CFD55356CC
1 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
packages/hurl_core/src/richtext/mod.rs
View File

@ -40,11 +40,12 @@ struct Token<'a> {
}
#[allow(unused)]
#[derive(Clone, Debug, PartialEq, Eq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Color {
Red,
Green,
Blue,
Green,
Red,
Yellow,
}
#[allow(unused)]
@ -72,6 +73,27 @@ impl<'a> RichText<'a> {
self
}
pub fn green(mut self) -> RichText<'a> {
if let Some(token) = self.tokens.last_mut() {
token.fg = Some(Color::Green);
};
self
}
pub fn blue(mut self) -> RichText<'a> {
if let Some(token) = self.tokens.last_mut() {
token.fg = Some(Color::Blue);
};
self
}
pub fn yellow(mut self) -> RichText<'a> {
if let Some(token) = self.tokens.last_mut() {
token.fg = Some(Color::Yellow);
};
self
}
pub fn bold(mut self) -> RichText<'a> {
if let Some(token) = self.tokens.last_mut() {
token.bold = true;
@ -108,11 +130,11 @@ impl<'a> Token<'a> {
let mut s = self.content.to_string();
if let Some(color) = &self.fg {
s = match color {
Color::Red => {
Color::Blue => {
if self.bold {
s.red().bold().to_string()
s.blue().bold().to_string()
} else {
s.red().to_string()
s.blue().to_string()
}
}
Color::Green => {
@ -122,11 +144,18 @@ impl<'a> Token<'a> {
s.green().to_string()
}
}
Color::Blue => {
Color::Red => {
if self.bold {
s.blue().bold().to_string()
s.red().bold().to_string()
} else {
s.blue().to_string()
s.red().to_string()
}
}
Color::Yellow => {
if self.bold {
s.yellow().bold().to_string()
} else {
s.yellow().to_string()
}
}
};
@ -153,7 +182,9 @@ mod tests {
}
#[test]
fn compare_with_colored() {
fn compare_with_crate_colored() {
// These tests are used to check regression against the [colored crate](https://crates.io/crates/colored).
// A short-term objective is to remove the colored crates to manage ansi colors.
assert_eq!(
"foo".red().bold().to_string(),
RichText::new()
@ -162,14 +193,12 @@ mod tests {
.bold()
.to_string(Format::Ansi),
);
assert_eq!(
"foo".red().bold().to_string(),
RichText::new()
.rich("foo", Some(Color::Red), true)
.to_string(Format::Ansi),
);
assert_eq!(
"bar".bold().to_string(),
RichText::new().text("bar").bold().to_string(Format::Ansi),