holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nu-table/ Add table.indent configuration (#9983)

Browse Source 
Hi there.

Am I got it right?

ref: https://github.com/zhiburt/tabled/issues/358
cc: @fdncred

---------

Signed-off-by: Maxim Zhiburt <zhiburt@gmail.com>
This commit is contained in:
Maxim Zhiburt
2023-08-11 16:37:16 +03:00
committed by GitHub
parent a0cecf7658
commit aa37572ddc
11 changed files with 226 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
crates/nu-protocol/src/config.rs
View File

@ -75,6 +75,7 @@ pub struct Config {
pub table_mode: String,
pub table_move_header: bool,
pub table_show_empty: bool,
pub table_indent: TableIndent,
pub use_ls_colors: bool,
pub color_config: HashMap<String, Value>,
pub use_grid_icons: bool,
@ -131,6 +132,7 @@ impl Default for Config {
table_show_empty: true,
trim_strategy: TRIM_STRATEGY_DEFAULT,
table_move_header: false,
table_indent: TableIndent { left: 1, right: 1 },
datetime_normal_format: None,
datetime_table_format: None,
@ -243,6 +245,12 @@ impl TrimStrategy {
}
}
#[derive(Serialize, Deserialize, Clone, Debug)]
pub struct TableIndent {
pub left: usize,
pub right: usize,
}
impl Value {
pub fn into_config(&mut self, config: &Config) -> (Config, Option<ShellError>) {
// Clone the passed-in config rather than mutating it.
@ -934,6 +942,55 @@ impl Value {
"header_on_separator" => {
try_bool!(cols, vals, index, span, table_move_header)
}
"padding" => match value {
Value::Int { val, .. } => {
if *val < 0 {
invalid!(Some(span), "unexpected $env.config.{key}.{key2} '{val}'; expected a unsigned integer");
}
config.table_indent.left = *val as usize;
config.table_indent.right = *val as usize;
}
Value::Record { vals, cols, .. } => {
let left = cols.iter().position(|e| e == "left");
let right = cols.iter().position(|e| e == "right");
if let Some(i) = left {
let value = vals[i].as_int();
match value {
Ok(val) => {
if val < 0 {
invalid!(Some(span), "unexpected $env.config.{key}.{key2} '{val}'; expected a unsigned integer");
}
config.table_indent.left = val as usize;
}
Err(_) => {
invalid!(Some(span), "unexpected $env.config.{key}.{key2} value; expected a unsigned integer or a record");
}
}
}
if let Some(i) = right {
let value = vals[i].as_int();
match value {
Ok(val) => {
if val < 0 {
invalid!(Some(span), "unexpected $env.config.{key}.{key2} '{val}'; expected a unsigned integer");
}
config.table_indent.right = val as usize;
}
Err(_) => {
invalid!(Some(span), "unexpected $env.config.{key}.{key2} value; expected a unsigned integer or a record");
}
}
}
}
_ => {
invalid!(Some(span), "unexpected $env.config.{key}.{key2} value; expected a unsigned integer or a record");
}
},
"index_mode" => {
if let Ok(b) = value.as_string() {
let val_str = b.to_lowercase();