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

Fix #11047 (#11054)

Browse Source 
close #11047
This commit is contained in:
Maxim Zhiburt 2023-11-16 14:28:54 +03:00 committed by GitHub
parent 5886a74ccc
commit a1dfc35968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/nu-command/tests/commands/table.rs
View File

File diff suppressed because one or more lines are too long

19
crates/nu-table/src/types/expanded.rs
View File

@ -154,8 +154,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
return Err(*error.clone()); return Err(*error.clone());
} }
let mut inner_cfg = cfg.clone(); let inner_cfg = update_config(cfg.clone(), available_width);
inner_cfg.opts.width = available_width;
let (mut text, style) = expanded_table_entry2(item, inner_cfg); let (mut text, style) = expanded_table_entry2(item, inner_cfg);
let value_width = string_width(&text); let value_width = string_width(&text);
@ -242,8 +241,7 @@ fn expanded_table_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
return Err(*error.clone()); return Err(*error.clone());
} }
let mut inner_cfg = cfg.clone(); let inner_cfg = update_config(cfg.clone(), available);
inner_cfg.opts.width = available;
let (mut text, style) = expanded_table_entry(item, header.as_str(), inner_cfg); let (mut text, style) = expanded_table_entry(item, header.as_str(), inner_cfg);
let mut value_width = string_width(&text); let mut value_width = string_width(&text);
@ -405,8 +403,7 @@ fn expand_table_value(
let span = value.span(); let span = value.span();
match value { match value {
Value::List { vals, .. } => { Value::List { vals, .. } => {
let mut inner_cfg = dive_options(cfg, span); let inner_cfg = update_config(dive_options(cfg, span), value_width);
inner_cfg.opts.width = value_width;
let table = expanded_table_list(vals, inner_cfg)?; let table = expanded_table_list(vals, inner_cfg)?;
match table { match table {
@ -436,8 +433,7 @@ fn expand_table_value(
))); )));
} }
let mut inner_cfg = dive_options(cfg, span); let inner_cfg = update_config(dive_options(cfg, span), value_width);
inner_cfg.opts.width = value_width;
let result = expanded_table_kv(record, inner_cfg)?; let result = expanded_table_kv(record, inner_cfg)?;
match result { match result {
Some(result) => Ok(Some((result, true))), Some(result) => Ok(Some((result, true))),
@ -601,3 +597,10 @@ fn value_to_wrapped_string_clean(value: &Value, cfg: &Cfg<'_>, value_width: usiz
let text = nu_value_to_string_colored(value, cfg.opts.config, cfg.opts.style_computer); let text = nu_value_to_string_colored(value, cfg.opts.config, cfg.opts.style_computer);
wrap_text(&text, value_width, cfg.opts.config) wrap_text(&text, value_width, cfg.opts.config)
} }
fn update_config(cfg: Cfg<'_>, width: usize) -> Cfg<'_> {
let mut inner_cfg = cfg.clone();
inner_cfg.opts.width = width;
inner_cfg.opts.index_offset = 0;
inner_cfg
}