extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-23 00:43:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

add hex color parsing to ansi (#5209)

Browse Source
This commit is contained in:
Darren Schroeder 2022-04-16 10:44:04 -05:00 committed by GitHub
parent 1bad40726d
commit 4d31139a44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
crates/nu-command/src/platform/ansi/ansi_.rs
View File

@ -375,15 +375,32 @@ Format: #
// OCS's need to end with a bell '\x07' char // OCS's need to end with a bell '\x07' char
format!("\x1b]{};", code_string) format!("\x1b]{};", code_string)
} else if param_is_valid_string { } else if param_is_valid_string {
match str_to_ansi(&code_string) { // parse hex colors like #00FF00
Some(c) => c, if code_string.starts_with('#') {
None => { match nu_color_config::color_from_hex(&code_string) {
return Err(ShellError::UnsupportedInput( Ok(color) => match color {
String::from("Unknown ansi code"), Some(c) => c.prefix().to_string(),
call.positional_nth(0) None => Color::White.prefix().to_string(),
.expect("Unexpected missing argument") },
.span, Err(err) => {
)) return Err(ShellError::SpannedLabeledError(
"error parsing hex color".to_string(),
format!("{}", err),
code.span()?,
));
}
}
} else {
match str_to_ansi(&code_string) {
Some(c) => c,
None => {
return Err(ShellError::UnsupportedInput(
String::from("Unknown ansi code"),
call.positional_nth(0)
.expect("Unexpected missing argument")
.span,
))
}
} }
} }
} else { } else {