From dfe95d3ae6e8f370a80987e0aef35c555349bd2e Mon Sep 17 00:00:00 2001 From: Darren Schroeder <343840+fdncred@users.noreply.github.com> Date: Wed, 24 Feb 2021 15:36:22 -0600 Subject: [PATCH] enabled the easy access use of nu-ansi-term's "Light" colors (#3100) --- .../nu-command/src/commands/ansi/command.rs | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/crates/nu-command/src/commands/ansi/command.rs b/crates/nu-command/src/commands/ansi/command.rs index 1b55d1a3d8..9f91df2c42 100644 --- a/crates/nu-command/src/commands/ansi/command.rs +++ b/crates/nu-command/src/commands/ansi/command.rs @@ -179,48 +179,116 @@ pub fn str_to_ansi(s: String) -> Option { "gi" | "green_italic" => Some(Color::Green.italic().prefix().to_string()), "gd" | "green_dimmed" => Some(Color::Green.dimmed().prefix().to_string()), "gr" | "green_reverse" => Some(Color::Green.reverse().prefix().to_string()), + + "lg" | "light_green" => Some(Color::LightGreen.prefix().to_string()), + "lgb" | "light_green_bold" => Some(Color::LightGreen.bold().prefix().to_string()), + "lgu" | "light_green_underline" => Some(Color::LightGreen.underline().prefix().to_string()), + "lgi" | "light_green_italic" => Some(Color::LightGreen.italic().prefix().to_string()), + "lgd" | "light_green_dimmed" => Some(Color::LightGreen.dimmed().prefix().to_string()), + "lgr" | "light_green_reverse" => Some(Color::LightGreen.reverse().prefix().to_string()), + "r" | "red" => Some(Color::Red.prefix().to_string()), "rb" | "red_bold" => Some(Color::Red.bold().prefix().to_string()), "ru" | "red_underline" => Some(Color::Red.underline().prefix().to_string()), "ri" | "red_italic" => Some(Color::Red.italic().prefix().to_string()), "rd" | "red_dimmed" => Some(Color::Red.dimmed().prefix().to_string()), "rr" | "red_reverse" => Some(Color::Red.reverse().prefix().to_string()), + + "lr" | "light_red" => Some(Color::LightRed.prefix().to_string()), + "lrb" | "light_red_bold" => Some(Color::LightRed.bold().prefix().to_string()), + "lru" | "light_red_underline" => Some(Color::LightRed.underline().prefix().to_string()), + "lri" | "light_red_italic" => Some(Color::LightRed.italic().prefix().to_string()), + "lrd" | "light_red_dimmed" => Some(Color::LightRed.dimmed().prefix().to_string()), + "lrr" | "light_red_reverse" => Some(Color::LightRed.reverse().prefix().to_string()), + "u" | "blue" => Some(Color::Blue.prefix().to_string()), "ub" | "blue_bold" => Some(Color::Blue.bold().prefix().to_string()), "uu" | "blue_underline" => Some(Color::Blue.underline().prefix().to_string()), "ui" | "blue_italic" => Some(Color::Blue.italic().prefix().to_string()), "ud" | "blue_dimmed" => Some(Color::Blue.dimmed().prefix().to_string()), "ur" | "blue_reverse" => Some(Color::Blue.reverse().prefix().to_string()), + + "lu" | "light_blue" => Some(Color::LightBlue.prefix().to_string()), + "lub" | "light_blue_bold" => Some(Color::LightBlue.bold().prefix().to_string()), + "luu" | "light_blue_underline" => Some(Color::LightBlue.underline().prefix().to_string()), + "lui" | "light_blue_italic" => Some(Color::LightBlue.italic().prefix().to_string()), + "lud" | "light_blue_dimmed" => Some(Color::LightBlue.dimmed().prefix().to_string()), + "lur" | "light_blue_reverse" => Some(Color::LightBlue.reverse().prefix().to_string()), + "b" | "black" => Some(Color::Black.prefix().to_string()), "bb" | "black_bold" => Some(Color::Black.bold().prefix().to_string()), "bu" | "black_underline" => Some(Color::Black.underline().prefix().to_string()), "bi" | "black_italic" => Some(Color::Black.italic().prefix().to_string()), "bd" | "black_dimmed" => Some(Color::Black.dimmed().prefix().to_string()), "br" | "black_reverse" => Some(Color::Black.reverse().prefix().to_string()), + + "ligr" | "light_gray" => Some(Color::LightGray.prefix().to_string()), + "ligrb" | "light_gray_bold" => Some(Color::LightGray.bold().prefix().to_string()), + "ligru" | "light_gray_underline" => Some(Color::LightGray.underline().prefix().to_string()), + "ligri" | "light_gray_italic" => Some(Color::LightGray.italic().prefix().to_string()), + "ligrd" | "light_gray_dimmed" => Some(Color::LightGray.dimmed().prefix().to_string()), + "ligrr" | "light_gray_reverse" => Some(Color::LightGray.reverse().prefix().to_string()), + "y" | "yellow" => Some(Color::Yellow.prefix().to_string()), "yb" | "yellow_bold" => Some(Color::Yellow.bold().prefix().to_string()), "yu" | "yellow_underline" => Some(Color::Yellow.underline().prefix().to_string()), "yi" | "yellow_italic" => Some(Color::Yellow.italic().prefix().to_string()), "yd" | "yellow_dimmed" => Some(Color::Yellow.dimmed().prefix().to_string()), "yr" | "yellow_reverse" => Some(Color::Yellow.reverse().prefix().to_string()), + + "ly" | "light_yellow" => Some(Color::LightYellow.prefix().to_string()), + "lyb" | "light_yellow_bold" => Some(Color::LightYellow.bold().prefix().to_string()), + "lyu" | "light_yellow_underline" => { + Some(Color::LightYellow.underline().prefix().to_string()) + } + "lyi" | "light_yellow_italic" => Some(Color::LightYellow.italic().prefix().to_string()), + "lyd" | "light_yellow_dimmed" => Some(Color::LightYellow.dimmed().prefix().to_string()), + "lyr" | "light_yellow_reverse" => Some(Color::LightYellow.reverse().prefix().to_string()), + "p" | "purple" => Some(Color::Purple.prefix().to_string()), "pb" | "purple_bold" => Some(Color::Purple.bold().prefix().to_string()), "pu" | "purple_underline" => Some(Color::Purple.underline().prefix().to_string()), "pi" | "purple_italic" => Some(Color::Purple.italic().prefix().to_string()), "pd" | "purple_dimmed" => Some(Color::Purple.dimmed().prefix().to_string()), "pr" | "purple_reverse" => Some(Color::Purple.reverse().prefix().to_string()), + + "lp" | "light_purple" => Some(Color::LightPurple.prefix().to_string()), + "lpb" | "light_purple_bold" => Some(Color::LightPurple.bold().prefix().to_string()), + "lpu" | "light_purple_underline" => { + Some(Color::LightPurple.underline().prefix().to_string()) + } + "lpi" | "light_purple_italic" => Some(Color::LightPurple.italic().prefix().to_string()), + "lpd" | "light_purple_dimmed" => Some(Color::LightPurple.dimmed().prefix().to_string()), + "lpr" | "light_purple_reverse" => Some(Color::LightPurple.reverse().prefix().to_string()), + "c" | "cyan" => Some(Color::Cyan.prefix().to_string()), "cb" | "cyan_bold" => Some(Color::Cyan.bold().prefix().to_string()), "cu" | "cyan_underline" => Some(Color::Cyan.underline().prefix().to_string()), "ci" | "cyan_italic" => Some(Color::Cyan.italic().prefix().to_string()), "cd" | "cyan_dimmed" => Some(Color::Cyan.dimmed().prefix().to_string()), "cr" | "cyan_reverse" => Some(Color::Cyan.reverse().prefix().to_string()), + + "lc" | "light_cyan" => Some(Color::LightCyan.prefix().to_string()), + "lcb" | "light_cyan_bold" => Some(Color::LightCyan.bold().prefix().to_string()), + "lcu" | "light_cyan_underline" => Some(Color::LightCyan.underline().prefix().to_string()), + "lci" | "light_cyan_italic" => Some(Color::LightCyan.italic().prefix().to_string()), + "lcd" | "light_cyan_dimmed" => Some(Color::LightCyan.dimmed().prefix().to_string()), + "lcr" | "light_cyan_reverse" => Some(Color::LightCyan.reverse().prefix().to_string()), + "w" | "white" => Some(Color::White.prefix().to_string()), "wb" | "white_bold" => Some(Color::White.bold().prefix().to_string()), "wu" | "white_underline" => Some(Color::White.underline().prefix().to_string()), "wi" | "white_italic" => Some(Color::White.italic().prefix().to_string()), "wd" | "white_dimmed" => Some(Color::White.dimmed().prefix().to_string()), "wr" | "white_reverse" => Some(Color::White.reverse().prefix().to_string()), + + "dgr" | "dark_gray" => Some(Color::DarkGray.prefix().to_string()), + "dgrb" | "dark_gray_bold" => Some(Color::DarkGray.bold().prefix().to_string()), + "dgru" | "dark_gray_underline" => Some(Color::DarkGray.underline().prefix().to_string()), + "dgri" | "dark_gray_italic" => Some(Color::DarkGray.italic().prefix().to_string()), + "dgrd" | "dark_gray_dimmed" => Some(Color::DarkGray.dimmed().prefix().to_string()), + "dgrr" | "dark_gray_reverse" => Some(Color::DarkGray.reverse().prefix().to_string()), + "reset" => Some("\x1b[0m".to_owned()), // Reference for ansi codes https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797