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

rename flatshape_* to shape_* (#4589)

Browse Source
This commit is contained in:
Darren Schroeder 2022-02-21 12:27:21 -06:00 committed by GitHub
parent 24fc9c657e
commit 88fa40d698
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 333 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
crates/nu-color-config/src/shape_color.rs
View File

@ -9,29 +9,29 @@ pub fn get_shape_color(shape: String, conf: &Config) -> Style {
Err(_) => Style::default(),
},
None => match shape.as_ref() {
"flatshape_garbage" => Style::new().fg(Color::White).on(Color::Red).bold(),
"flatshape_bool" => Style::new().fg(Color::LightCyan),
"flatshape_int" => Style::new().fg(Color::Purple).bold(),
"flatshape_float" => Style::new().fg(Color::Purple).bold(),
"flatshape_range" => Style::new().fg(Color::Yellow).bold(),
"flatshape_internalcall" => Style::new().fg(Color::Cyan).bold(),
"flatshape_external" => Style::new().fg(Color::Cyan),
"flatshape_externalarg" => Style::new().fg(Color::Green).bold(),
"flatshape_literal" => Style::new().fg(Color::Blue),
"flatshape_operator" => Style::new().fg(Color::Yellow),
"flatshape_signature" => Style::new().fg(Color::Green).bold(),
"flatshape_string" => Style::new().fg(Color::Green),
"flatshape_string_interpolation" => Style::new().fg(Color::Cyan).bold(),
"flatshape_list" => Style::new().fg(Color::Cyan).bold(),
"flatshape_table" => Style::new().fg(Color::Blue).bold(),
"flatshape_record" => Style::new().fg(Color::Cyan).bold(),
"flatshape_block" => Style::new().fg(Color::Blue).bold(),
"flatshape_filepath" => Style::new().fg(Color::Cyan),
"flatshape_globpattern" => Style::new().fg(Color::Cyan).bold(),
"flatshape_variable" => Style::new().fg(Color::Purple),
"flatshape_flag" => Style::new().fg(Color::Blue).bold(),
"flatshape_custom" => Style::new().fg(Color::Green),
"flatshape_nothing" => Style::new().fg(Color::LightCyan),
"shape_garbage" => Style::new().fg(Color::White).on(Color::Red).bold(),
"shape_bool" => Style::new().fg(Color::LightCyan),
"shape_int" => Style::new().fg(Color::Purple).bold(),
"shape_float" => Style::new().fg(Color::Purple).bold(),
"shape_range" => Style::new().fg(Color::Yellow).bold(),
"shape_internalcall" => Style::new().fg(Color::Cyan).bold(),
"shape_external" => Style::new().fg(Color::Cyan),
"shape_externalarg" => Style::new().fg(Color::Green).bold(),
"shape_literal" => Style::new().fg(Color::Blue),
"shape_operator" => Style::new().fg(Color::Yellow),
"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_list" => Style::new().fg(Color::Cyan).bold(),
"shape_table" => Style::new().fg(Color::Blue).bold(),
"shape_record" => Style::new().fg(Color::Cyan).bold(),
"shape_block" => Style::new().fg(Color::Blue).bold(),
"shape_filepath" => Style::new().fg(Color::Cyan),
"shape_globpattern" => Style::new().fg(Color::Cyan).bold(),
"shape_variable" => Style::new().fg(Color::Purple),
"shape_flag" => Style::new().fg(Color::Blue).bold(),
"shape_custom" => Style::new().fg(Color::Green),
"shape_nothing" => Style::new().fg(Color::LightCyan),
_ => Style::default(),
},
}

46
crates/nu-parser/src/flatten.rs
View File

@ -32,29 +32,29 @@ pub enum FlatShape {
impl Display for FlatShape {
fn fmt(&self, f: &mut Formatter) -> Result {
match self {
FlatShape::Garbage => write!(f, "flatshape_garbage"),
FlatShape::Nothing => write!(f, "flatshape_nothing"),
FlatShape::Bool => write!(f, "flatshape_bool"),
FlatShape::Int => write!(f, "flatshape_int"),
FlatShape::Float => write!(f, "flatshape_float"),
FlatShape::Range => write!(f, "flatshape_range"),
FlatShape::InternalCall => write!(f, "flatshape_internalcall"),
FlatShape::External => write!(f, "flatshape_external"),
FlatShape::ExternalArg => write!(f, "flatshape_externalarg"),
FlatShape::Literal => write!(f, "flatshape_literal"),
FlatShape::Operator => write!(f, "flatshape_operator"),
FlatShape::Signature => write!(f, "flatshape_signature"),
FlatShape::String => write!(f, "flatshape_string"),
FlatShape::StringInterpolation => write!(f, "flatshape_string_interpolation"),
FlatShape::List => write!(f, "flatshape_list"),
FlatShape::Table => write!(f, "flatshape_table"),
FlatShape::Record => write!(f, "flatshape_record"),
FlatShape::Block => write!(f, "flatshape_block"),
FlatShape::Filepath => write!(f, "flatshape_filepath"),
FlatShape::GlobPattern => write!(f, "flatshape_globpattern"),
FlatShape::Variable => write!(f, "flatshape_variable"),
FlatShape::Flag => write!(f, "flatshape_flag"),
FlatShape::Custom(_) => write!(f, "flatshape_custom"),
FlatShape::Garbage => write!(f, "shape_garbage"),
FlatShape::Nothing => write!(f, "shape_nothing"),
FlatShape::Bool => write!(f, "shape_bool"),
FlatShape::Int => write!(f, "shape_int"),
FlatShape::Float => write!(f, "shape_float"),
FlatShape::Range => write!(f, "shape_range"),
FlatShape::InternalCall => write!(f, "shape_internalcall"),
FlatShape::External => write!(f, "shape_external"),
FlatShape::ExternalArg => write!(f, "shape_externalarg"),
FlatShape::Literal => write!(f, "shape_literal"),
FlatShape::Operator => write!(f, "shape_operator"),
FlatShape::Signature => write!(f, "shape_signature"),
FlatShape::String => write!(f, "shape_string"),
FlatShape::StringInterpolation => write!(f, "shape_string_interpolation"),
FlatShape::List => write!(f, "shape_list"),
FlatShape::Table => write!(f, "shape_table"),
FlatShape::Record => write!(f, "shape_record"),
FlatShape::Block => write!(f, "shape_block"),
FlatShape::Filepath => write!(f, "shape_filepath"),
FlatShape::GlobPattern => write!(f, "shape_globpattern"),
FlatShape::Variable => write!(f, "shape_variable"),
FlatShape::Flag => write!(f, "shape_flag"),
FlatShape::Custom(_) => write!(f, "shape_custom"),
}
}
}

199
docs/How_To_Coloring_and_Theming.md
View File

@ -4,14 +4,16 @@ There are a few main parts that nushell allows you to change the color. All of t
1. table borders
2. primitive values
3. flatshapes (this is the command line syntax)
3. shapes (this is the command line syntax)
4. prompt
5. LS_COLORS
## `Table borders`
___
---
Table borders are controlled by the `table_mode` setting in the `config.nu`. Here is an example:
```
let $config = {
table_mode: rounded
@ -19,6 +21,7 @@ let $config = {
```
Here are the current options for `table_mode`:
1. `rounded` # of course, this is the best one :)
2. `basic`
3. `compact`
@ -33,20 +36,22 @@ Here are the current options for `table_mode`:
12. `other`
### `Color symbologies`
---
* `r` - normal color red's abbreviation
* `rb` - normal color red's abbreviation with bold attribute
* `red` - normal color red
* `red_bold` - normal color red with bold attribute
* `"#ff0000"` - "#hex" format foreground color red (quotes are required)
* `{ fg: "#ff0000" bg: "#0000ff" attr: b }` - "full #hex" format foreground red in "#hex" format with a background of blue in "#hex" format with an attribute of bold abbreviated.
- `r` - normal color red's abbreviation
- `rb` - normal color red's abbreviation with bold attribute
- `red` - normal color red
- `red_bold` - normal color red with bold attribute
- `"#ff0000"` - "#hex" format foreground color red (quotes are required)
- `{ fg: "#ff0000" bg: "#0000ff" attr: b }` - "full #hex" format foreground red in "#hex" format with a background of blue in "#hex" format with an attribute of bold abbreviated.
### `attributes`
---
| code | meaning |
|-|-|
| ---- | ------------------- |
| l | blink |
| b | bold |
| d | dimmed |
@ -61,7 +66,7 @@ Here are the current options for `table_mode`:
### `normal colors` and `abbreviations`
| code | name |
|-|-|
| ------ | ---------------------- |
| g | green |
| gb | green_bold |
| gu | green_underline |
@ -192,6 +197,7 @@ Here are the current options for `table_mode`:
| dgrst | dark_gray_strike |
### `"#hex"` format
---
The "#hex" format is one way you typically see colors represented. It's simply the `#` character followed by 6 characters. The first two are for `red`, the second two are for `green`, and the third two are for `blue`. It's important that this string be surrounded in quotes, otherwise nushell thinks it's a commented out string.
@ -201,48 +207,51 @@ Example: The primary `red` color is `"#ff0000"` or `"#FF0000"`. Upper and lower
This `"#hex"` format allows us to specify 24-bit truecolor tones to different parts of nushell.
## `full "#hex"` format
---
The `full "#hex"` format is a take on the `"#hex"` format but allows one to specify the foreground, background, and attributes in one line.
Example: `{ fg: "#ff0000" bg: "#0000ff" attr: b }`
* foreground of red in "#hex" format
* background of blue in "#hex" format
* attribute of bold abbreviated
- foreground of red in "#hex" format
- background of blue in "#hex" format
- attribute of bold abbreviated
## `Primitive values`
___
Primitive values are things like `int` and `string`. Primitive values and flatshapes can be set with a variety of color symbologies seen above.
---
This is the current list of primitives. Not all of these are configurable. The configurable ones are marked with *.
Primitive values are things like `int` and `string`. Primitive values and shapes can be set with a variety of color symbologies seen above.
This is the current list of primitives. Not all of these are configurable. The configurable ones are marked with \*.
| primitive | default color | configurable |
| - | - | - |
| ------------ | --------------------- | ------------ |
| `any` | | |
| `binary`|Color::White.normal()| * |
| `block`|Color::White.normal()| * |
| `bool`|Color::White.normal()| * |
| `cellpath`|Color::White.normal()| * |
| `binary` | Color::White.normal() | \* |
| `block` | Color::White.normal() | \* |
| `bool` | Color::White.normal() | \* |
| `cellpath` | Color::White.normal() | \* |
| `condition` | | |
| `custom` | | |
| `date`|Color::White.normal()| * |
| `duration`|Color::White.normal()| * |
| `date` | Color::White.normal() | \* |
| `duration` | Color::White.normal() | \* |
| `expression` | | |
| `filesize`|Color::White.normal()| * |
| `float`|Color::White.normal()| * |
| `filesize` | Color::White.normal() | \* |
| `float` | Color::White.normal() | \* |
| `glob` | | |
| `import` | | |
| `int`|Color::White.normal()| * |
| `list`|Color::White.normal()| * |
| `nothing`|Color::White.normal()| * |
| `int` | Color::White.normal() | \* |
| `list` | Color::White.normal() | \* |
| `nothing` | Color::White.normal() | \* |
| `number` | | |
| `operator` | | |
| `path` | | |
| `range`|Color::White.normal()| * |
| `record`|Color::White.normal()| * |
| `range` | Color::White.normal() | \* |
| `record` | Color::White.normal() | \* |
| `signature` | | |
| `string`|Color::White.normal()| * |
| `string` | Color::White.normal() | \* |
| `table` | | |
| `var` | | |
| `vardecl` | | |
@ -251,14 +260,15 @@ This is the current list of primitives. Not all of these are configurable. The c
#### special "primitives" (not really primitives but they exist solely for coloring)
| primitive | default color | configurable |
| - | - | - |
| `leading_trailing_space_bg`|Color::Rgb(128, 128, 128))| *|
| `header`|Color::Green.bold()| *|
| `empty`|Color::Blue.normal()| *|
| `row_index`|Color::Green.bold()| *|
| `hints`|Color::DarkGray.normal()| *|
| --------------------------- | -------------------------- | ------------ |
| `leading_trailing_space_bg` | Color::Rgb(128, 128, 128)) | \* |
| `header` | Color::Green.bold() | \* |
| `empty` | Color::Blue.normal() | \* |
| `row_index` | Color::Green.bold() | \* |
| `hints` | Color::DarkGray.normal() | \* |
Here's a small example of changing some of these values.
```
let config = {
color_config: {
@ -281,7 +291,9 @@ let config = {
}
}
```
Here's another small example using multiple color syntaxes with some comments.
```
let config = {
color_config: {
@ -300,46 +312,46 @@ let config = {
}
```
## `FlatShape` values
## `Shape` values
As mentioned above, `flatshape` is a term used to indicate the sytax coloring.
As mentioned above, `shape` is a term used to indicate the sytax coloring.
Here's the current list of flat shapes.
| flatshape | default style | configurable |
| - | - | - |
| `flatshape_block`| fg(Color::Blue).bold()| * |
| `flatshape_bool`| fg(Color::LightCyan)| * |
| `flatshape_custom`| bold()| * |
| `flatshape_external`| fg(Color::Cyan)| * |
| `flatshape_externalarg`| fg(Color::Green).bold()| * |
| `flatshape_filepath`| fg(Color::Cyan)| * |
| `flatshape_flag`| fg(Color::Blue).bold()| * |
| `flatshape_float`|fg(Color::Purple).bold() | * |
| `flatshape_garbage`| fg(Color::White).on(Color::Red).bold()| * |
| `flatshape_globpattern`| fg(Color::Cyan).bold()| * |
| `flatshape_int`|fg(Color::Purple).bold() | * |
| `flatshape_internalcall`| fg(Color::Cyan).bold()| * |
| `flatshape_list`| fg(Color::Cyan).bold()| * |
| `flatshape_literal`| fg(Color::Blue)| * |
| `flatshape_nothing`| fg(Color::LightCyan)| * |
| `flatshape_operator`| fg(Color::Yellow)| * |
| `flatshape_range`| fg(Color::Yellow).bold()| * |
| `flatshape_record`| fg(Color::Cyan).bold()| * |
| `flatshape_signature`| fg(Color::Green).bold()| * |
| `flatshape_string`| fg(Color::Green)| * |
| `flatshape_string_interpolation`| fg(Color::Cyan).bold()| * |
| `flatshape_table`| fg(Color::Blue).bold()| * |
| `flatshape_variable`| fg(Color::Purple)| * |
| shape | default style | configurable |
| ---------------------------- | -------------------------------------- | ------------ |
| `shape_block` | fg(Color::Blue).bold() | \* |
| `shape_bool` | fg(Color::LightCyan) | \* |
| `shape_custom` | bold() | \* |
| `shape_external` | fg(Color::Cyan) | \* |
| `shape_externalarg` | fg(Color::Green).bold() | \* |
| `shape_filepath` | fg(Color::Cyan) | \* |
| `shape_flag` | fg(Color::Blue).bold() | \* |
| `shape_float` | fg(Color::Purple).bold() | \* |
| `shape_garbage` | fg(Color::White).on(Color::Red).bold() | \* |
| `shape_globpattern` | fg(Color::Cyan).bold() | \* |
| `shape_int` | fg(Color::Purple).bold() | \* |
| `shape_internalcall` | fg(Color::Cyan).bold() | \* |
| `shape_list` | fg(Color::Cyan).bold() | \* |
| `shape_literal` | fg(Color::Blue) | \* |
| `shape_nothing` | fg(Color::LightCyan) | \* |
| `shape_operator` | fg(Color::Yellow) | \* |
| `shape_range` | fg(Color::Yellow).bold() | \* |
| `shape_record` | fg(Color::Cyan).bold() | \* |
| `shape_signature` | fg(Color::Green).bold() | \* |
| `shape_string` | fg(Color::Green) | \* |
| `shape_string_interpolation` | fg(Color::Cyan).bold() | \* |
| `shape_table` | fg(Color::Blue).bold() | \* |
| `shape_variable` | fg(Color::Purple) | \* |
Here's a small example of how to apply color to these items. Anything not specified will receive the default color.
```
let $config = {
color_config: {
flatshape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: b}
flatshape_bool: green
flatshape_int: { fg: "#0000ff" attr: b}
shape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: b}
shape_bool: green
shape_int: { fg: "#0000ff" attr: b}
}
}
```
@ -348,12 +360,12 @@ let $config = {
The nushell prompt is configurable through these environment variables settings.
* `PROMPT_COMMAND`: Code to execute for setting up the prompt (block)
* `PROMPT_COMMAND_RIGHT`: Code to execute for setting up the *RIGHT* prompt (block) (see oh-my.nu in nu_scripts)
* `PROMPT_INDICATOR` = "〉": The indicator printed after the prompt (by default ">"-like Unicode symbol)
* `PROMPT_INDICATOR_VI_INSERT` = ": "
* `PROMPT_INDICATOR_VI_NORMAL` = "v "
* `PROMPT_MULTILINE_INDICATOR` = "::: "
- `PROMPT_COMMAND`: Code to execute for setting up the prompt (block)
- `PROMPT_COMMAND_RIGHT`: Code to execute for setting up the _RIGHT_ prompt (block) (see oh-my.nu in nu_scripts)
- `PROMPT_INDICATOR` = "〉": The indicator printed after the prompt (by default ">"-like Unicode symbol)
- `PROMPT_INDICATOR_VI_INSERT` = ": "
- `PROMPT_INDICATOR_VI_NORMAL` = "v "
- `PROMPT_MULTILINE_INDICATOR` = "::: "
Example: For a simple prompt one could do this. Note that `PROMPT_COMMAND` requires a `block` whereas the others require a `string`.
@ -367,7 +379,7 @@ Coloring of the prompt is controlled by the `block` in `PROMPT_COMMAND` where yo
## `LS_COLORS` colors for the `ls` command
Nushell will respect and use the `LS_COLORS` environment variable setting on Mac, Linux, and Windows. This setting allows you to define the color of file types when you do a `ls`. For instance, you can make directories one color, *.md markdown files another color, *.toml files yet another color, etc. There are a variety of ways to color your file types.
Nushell will respect and use the `LS_COLORS` environment variable setting on Mac, Linux, and Windows. This setting allows you to define the color of file types when you do a `ls`. For instance, you can make directories one color, _.md markdown files another color, _.toml files yet another color, etc. There are a variety of ways to color your file types.
There's an exhaustive list [here](https://github.com/trapd00r/LS_COLORS), which is overkill, but gives you an rudimentary understanding of how to create a ls_colors file that `dircolors` can turn into a `LS_COLORS` environment variable.
@ -381,7 +393,7 @@ I like the `vivid` application and currently have it configured in my `config.nu
Theming combines all the coloring above. Here's a quick example of one we put together quickly to demonstrate the ability to theme. This is a spin on the `base16` themes that we see so widespread on the web.
The key to making theming work is to make sure you specify all themes and colors you're going to use in the `config.nu` file *before* you declare the `let config = ` line.
The key to making theming work is to make sure you specify all themes and colors you're going to use in the `config.nu` file _before_ you declare the `let config = ` line.
```
# lets define some colors
@ -423,25 +435,25 @@ let base16_theme = {
cellpath: $base08
hints: dark_gray
# flatshape_garbage: { fg: $base07 bg: $base08 attr: b} # base16 white on red
# shape_garbage: { fg: $base07 bg: $base08 attr: b} # base16 white on red
# but i like the regular white on red for parse errors
flatshape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: b}
flatshape_bool: $base0d
flatshape_int: { fg: $base0e attr: b}
flatshape_float: { fg: $base0e attr: b}
flatshape_range: { fg: $base0a attr: b}
flatshape_internalcall: { fg: $base0c attr: b}
flatshape_external: $base0c
flatshape_externalarg: { fg: $base0b attr: b}
flatshape_literal: $base0d
flatshape_operator: $base0a
flatshape_signature: { fg: $base0b attr: b}
flatshape_string: $base0b
flatshape_filepath: $base0d
flatshape_globpattern: { fg: $base0d attr: b}
flatshape_variable: $base0e
flatshape_flag: { fg: $base0d attr: b}
flatshape_custom: {attr: b}
shape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: b}
shape_bool: $base0d
shape_int: { fg: $base0e attr: b}
shape_float: { fg: $base0e attr: b}
shape_range: { fg: $base0a attr: b}
shape_internalcall: { fg: $base0c attr: b}
shape_external: $base0c
shape_externalarg: { fg: $base0b attr: b}
shape_literal: $base0d
shape_operator: $base0a
shape_signature: { fg: $base0b attr: b}
shape_string: $base0b
shape_filepath: $base0d
shape_globpattern: { fg: $base0d attr: b}
shape_variable: $base0e
shape_flag: { fg: $base0d attr: b}
shape_custom: {attr: b}
}
# now let's apply our regular config settings but also apply the "color_config:" theme that we specified above.
@ -462,4 +474,5 @@ let config = {
log_level: error
}
```
if you want to go full-tilt on theming, you'll want to theme all the items I mentioned at the very beginning, including LS_COLORS, and the prompt. Good luck!

48
src/default_config.nu
View File

@ -132,30 +132,30 @@ let default_theme = {
block: white
hints: dark_gray
# flatshapes are used to change the cli syntax highlighting
flatshape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: b}
flatshape_bool: light_cyan
flatshape_int: purple_bold
flatshape_float: purple_bold
flatshape_range: yellow_bold
flatshape_internalcall: cyna_bold
flatshape_external: cyan
flatshape_externalarg: green_bold
flatshape_literal: blue
flatshape_operator: yellow
flatshape_signature: green_bold
flatshape_string: green
flatshape_string_interpolation: cyan_bold
flatshape_list: cyan_bold
flatshape_table: blue_bold
flatshape_record: cyan_bold
flatshape_block: blue_bold
flatshape_filepath: cyan
flatshape_globpattern: cyan_bold
flatshape_variable: purple
flatshape_flag: blue_bold
flatshape_custom: green
flatshape_nothing: light_cyan
# shapes are used to change the cli syntax highlighting
shape_garbage: { fg: "#FFFFFF" bg: "#FF0000" attr: b}
shape_bool: light_cyan
shape_int: purple_bold
shape_float: purple_bold
shape_range: yellow_bold
shape_internalcall: cyna_bold
shape_external: cyan
shape_externalarg: green_bold
shape_literal: blue
shape_operator: yellow
shape_signature: green_bold
shape_string: green
shape_string_interpolation: cyan_bold
shape_list: cyan_bold
shape_table: blue_bold
shape_record: cyan_bold
shape_block: blue_bold
shape_filepath: cyan
shape_globpattern: cyan_bold
shape_variable: purple
shape_flag: blue_bold
shape_custom: green
shape_nothing: light_cyan
}
# The default config record. This is where much of your global configuration is setup.