forked from nushell/nushell
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Closes nushell#7551
- Loading branch information
1 parent
d8a2e0e
commit 74656bf
Showing
1 changed file
with
50 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,56 @@ | ||
| use crate::color_config::lookup_ansi_color_style; | ||
| use crate::{color_config::lookup_ansi_color_style, color_record_to_nustyle}; | ||
| use nu_ansi_term::{Color, Style}; | ||
| use nu_protocol::Config; | ||
| use nu_protocol::{Config, Value}; | ||
|
|
||
| // The default colors for shapes, used when there is no config for them. | ||
| pub fn default_shape_color(shape: String) -> Style { | ||
| match shape.as_ref() { | ||
| "shape_and" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_binary" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_block" => Style::new().fg(Color::Blue).bold(), | ||
| "shape_bool" => Style::new().fg(Color::LightCyan), | ||
| "shape_custom" => Style::new().fg(Color::Green), | ||
| "shape_datetime" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_directory" => Style::new().fg(Color::Cyan), | ||
| "shape_external" => Style::new().fg(Color::Cyan), | ||
| "shape_externalarg" => Style::new().fg(Color::Green).bold(), | ||
| "shape_filepath" => Style::new().fg(Color::Cyan), | ||
| "shape_flag" => Style::new().fg(Color::Blue).bold(), | ||
| "shape_float" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_garbage" => Style::new().fg(Color::White).on(Color::Red).bold(), | ||
| "shape_globpattern" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_int" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_internalcall" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_list" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_literal" => Style::new().fg(Color::Blue), | ||
| "shape_nothing" => Style::new().fg(Color::LightCyan), | ||
| "shape_operator" => Style::new().fg(Color::Yellow), | ||
| "shape_or" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_pipe" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_range" => Style::new().fg(Color::Yellow).bold(), | ||
| "shape_record" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_redirection" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_signature" => Style::new().fg(Color::Green).bold(), | ||
| "shape_string" => Style::new().fg(Color::Green), | ||
| "shape_string_interpolation" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_table" => Style::new().fg(Color::Blue).bold(), | ||
| "shape_variable" => Style::new().fg(Color::Purple), | ||
| _ => Style::default(), | ||
| } | ||
| } | ||
|
|
||
| pub fn get_shape_color(shape: String, conf: &Config) -> Style { | ||
| match conf.color_config.get(shape.as_str()) { | ||
| Some(int_color) => match int_color.as_string() { | ||
| Ok(int_color) => lookup_ansi_color_style(&int_color), | ||
| Err(_) => Style::default(), | ||
| }, | ||
| None => match shape.as_ref() { | ||
| "shape_and" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_binary" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_block" => Style::new().fg(Color::Blue).bold(), | ||
| "shape_bool" => Style::new().fg(Color::LightCyan), | ||
| "shape_custom" => Style::new().fg(Color::Green), | ||
| "shape_datetime" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_directory" => Style::new().fg(Color::Cyan), | ||
| "shape_external" => Style::new().fg(Color::Cyan), | ||
| "shape_externalarg" => Style::new().fg(Color::Green).bold(), | ||
| "shape_filepath" => Style::new().fg(Color::Cyan), | ||
| "shape_flag" => Style::new().fg(Color::Blue).bold(), | ||
| "shape_float" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_garbage" => Style::new().fg(Color::White).on(Color::Red).bold(), | ||
| "shape_globpattern" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_int" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_internalcall" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_list" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_literal" => Style::new().fg(Color::Blue), | ||
| "shape_nothing" => Style::new().fg(Color::LightCyan), | ||
| "shape_operator" => Style::new().fg(Color::Yellow), | ||
| "shape_or" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_pipe" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_range" => Style::new().fg(Color::Yellow).bold(), | ||
| "shape_record" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_redirection" => Style::new().fg(Color::Purple).bold(), | ||
| "shape_signature" => Style::new().fg(Color::Green).bold(), | ||
| "shape_string" => Style::new().fg(Color::Green), | ||
| "shape_string_interpolation" => Style::new().fg(Color::Cyan).bold(), | ||
| "shape_table" => Style::new().fg(Color::Blue).bold(), | ||
| "shape_variable" => Style::new().fg(Color::Purple), | ||
| _ => Style::default(), | ||
| }, | ||
| Some(int_color) => { | ||
| // Shapes do not use color_config closures, currently. | ||
| match int_color { | ||
| Value::Record { .. } => color_record_to_nustyle(int_color), | ||
| Value::String { val, .. } => lookup_ansi_color_style(val), | ||
| // Defer to the default in the event of incorrect types being given | ||
| // (i.e. treat null, etc. as the value being unset) | ||
| _ => default_shape_color(shape), | ||
| } | ||
| } | ||
| None => default_shape_color(shape), | ||
| } | ||
| } |