mirror of
https://github.com/nushell/nushell.git
synced 2024-10-16 23:33:49 +02:00
774769a7ad
# Description Closes #6909. You can now add closures to your `color_config` themes. Whenever a value would be printed with `table`, the closure is run with the value piped-in. The closure must return either a {fg,bg,attr} record or a color name (`'light_red'` etc.). This returned style is used to colour the value. This is entirely backwards-compatible with existing config.nu files. Example code excerpt: ``` let my_theme = { header: green_bold bool: { if $in { 'light_cyan' } else { 'light_red' } } int: purple_bold filesize: { |e| if $e == 0b { 'gray' } else if $e < 1mb { 'purple_bold' } else { 'cyan_bold' } } duration: purple_bold date: { (date now) - $in | if $in > 1wk { 'cyan_bold' } else if $in > 1day { 'green_bold' } else { 'yellow_bold' } } range: yellow_bold string: { if $in =~ '^#\w{6}$' { $in } else { 'white' } } nothing: white ``` Example output with this in effect:    Slightly important notes: * Some color_config names, namely "separator", "empty" and "hints", pipe in `null` instead of a value. * Currently, doing anything non-trivial inside a closure has an understandably big perf hit. I currently do not actually recommend something like `string: { if $in =~ '^#\w{6}$' { $in } else { 'white' } }` for serious work, mainly because of the abundance of string-type data in the world. Nevertheless, lesser-used types like "date" and "duration" work well with this. * I had to do some reorganisation in order to make it possible to call `eval_block()` that late in table rendering. I invented a new struct called "StyleComputer" which holds the engine_state and stack of the initial `table` command (implicit or explicit). * StyleComputer has a `compute()` method which takes a color_config name and a nu value, and always returns the correct Style, so you don't have to worry about A) the color_config value was set at all, B) whether it was set to a closure or not, or C) which default style to use in those cases. * Currently, errors encountered during execution of the closures are thrown in the garbage. Any other ideas are welcome. (Nonetheless, errors result in a huge perf hit when they are encountered. I think what should be done is to assume something terrible happened to the user's config and invalidate the StyleComputer for that `table` run, thus causing subsequent output to just be Style::default().) * More thorough tests are forthcoming - ran into some difficulty using `nu!` to take an alternative config, and for some reason `let-env config =` statements don't seem to work inside `nu!` pipelines(???) * The default config.nu has not been updated to make use of this yet. Do tell if you think I should incorporate that into this. # User-Facing Changes See above. # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace --features=extra -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace --features=extra` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
106 lines
2.5 KiB
Rust
106 lines
2.5 KiB
Rust
use nu_color_config::TextStyle;
|
|
use nu_table::{Table, TableConfig, TableTheme};
|
|
use tabled::papergrid::records::{cell_info::CellInfo, tcell::TCell};
|
|
|
|
fn main() {
|
|
let args: Vec<_> = std::env::args().collect();
|
|
let mut width = 0;
|
|
|
|
if args.len() > 1 {
|
|
// Width in terminal characters
|
|
width = args[1].parse::<usize>().expect("Need a width in columns");
|
|
}
|
|
|
|
if width < 4 {
|
|
println!("Width must be greater than or equal to 4, setting width to 80");
|
|
width = 80;
|
|
}
|
|
|
|
// The mocked up table data
|
|
let (table_headers, row_data) = make_table_data();
|
|
|
|
// The table headers
|
|
let headers = vec_of_str_to_vec_of_styledstr(&table_headers, true);
|
|
|
|
// The table rows
|
|
let rows = vec_of_str_to_vec_of_styledstr(&row_data, false);
|
|
|
|
// The table itself
|
|
let count_cols = std::cmp::max(rows.len(), headers.len());
|
|
let mut rows = vec![rows; 3];
|
|
rows.insert(0, headers);
|
|
|
|
let theme = TableTheme::rounded();
|
|
let table_cfg = TableConfig::new(theme, true, false, false);
|
|
|
|
let table = Table::new(rows, (3, count_cols));
|
|
|
|
// Capture the table as a string
|
|
let output_table = table
|
|
.draw(table_cfg, width)
|
|
.unwrap_or_else(|| format!("Couldn't fit table into {} columns!", width));
|
|
|
|
// Draw the table
|
|
println!("{}", output_table)
|
|
}
|
|
|
|
fn make_table_data() -> (Vec<&'static str>, Vec<&'static str>) {
|
|
let table_headers = vec![
|
|
"category",
|
|
"description",
|
|
"emoji",
|
|
"ios_version",
|
|
"unicode_version",
|
|
"aliases",
|
|
"tags",
|
|
"category2",
|
|
"description2",
|
|
"emoji2",
|
|
"ios_version2",
|
|
"unicode_version2",
|
|
"aliases2",
|
|
"tags2",
|
|
];
|
|
|
|
let row_data = vec![
|
|
"Smileys & Emotion",
|
|
"grinning face",
|
|
"😀",
|
|
"6",
|
|
"6.1",
|
|
"grinning",
|
|
"smile",
|
|
"Smileys & Emotion",
|
|
"grinning face",
|
|
"😀",
|
|
"6",
|
|
"6.1",
|
|
"grinning",
|
|
"smile",
|
|
];
|
|
|
|
(table_headers, row_data)
|
|
}
|
|
|
|
fn vec_of_str_to_vec_of_styledstr(
|
|
data: &[&str],
|
|
is_header: bool,
|
|
) -> Vec<TCell<CellInfo<'static>, TextStyle>> {
|
|
let mut v = vec![];
|
|
|
|
for x in data {
|
|
if is_header {
|
|
v.push(Table::create_cell(
|
|
String::from(*x),
|
|
TextStyle::default_header(),
|
|
))
|
|
} else {
|
|
v.push(Table::create_cell(
|
|
String::from(*x),
|
|
TextStyle::basic_left(),
|
|
))
|
|
}
|
|
}
|
|
v
|
|
}
|