cybercyst/nushell
1
0
Fork 0
mirror of https://github.com/nushell/nushell.git synced 2025-05-16 20:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #15653 regression with not counting padding properly (#15704)

Browse Source 
ref #15653

Thanks for reproducible.

So @Bahex indeed padding was not properly handled.
I am not sure whether there's more issues related to your examples
@fdncred but I seems like don't get them.

Also added a test for future regressions (well to be honest didn't
tested that it's failing on main but at least at may catch something)

PS: Also got some panic related to #15138 (which PR fixed) :(
There's nothing on my end stopping me releasing a WASM issue fix; I just
sort of always worrying with releasing a `patch` (`0.0.x`)......and
there's 1 quite big thing I wanna do before a minor release.......
This commit is contained in:
Maxim Zhiburt 2025-05-09 01:18:50 +03:00 committed by GitHub
parent d4357ad981
commit 52fa9a978b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 752 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -101,23 +101,24 @@ impl CellOutput {
type CellResult = Result<Option<CellOutput>, ShellError>;
fn expand_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
const PADDING_SPACE: usize = 2;
const SPLIT_LINE_SPACE: usize = 1;
const ADDITIONAL_CELL_SPACE: usize = PADDING_SPACE + SPLIT_LINE_SPACE;
const MIN_CELL_CONTENT_WIDTH: usize = 3;
const MIN_CELL_WIDTH: usize = 3;
const TRUNCATE_CONTENT_WIDTH: usize = 3;
const TRUNCATE_CELL_WIDTH: usize = TRUNCATE_CONTENT_WIDTH + PADDING_SPACE;
if input.is_empty() {
return Ok(None);
}
let pad_width = cfg.opts.config.table.padding.left + cfg.opts.config.table.padding.right;
let extra_width = pad_width + SPLIT_LINE_SPACE;
let truncate_column_width = TRUNCATE_CONTENT_WIDTH + pad_width;
// 2 - split lines
let mut available_width = cfg
.opts
.width
.saturating_sub(SPLIT_LINE_SPACE + SPLIT_LINE_SPACE);
if available_width < MIN_CELL_CONTENT_WIDTH {
if available_width < MIN_CELL_WIDTH {
return Ok(None);
}
@ -136,14 +137,14 @@ fn expand_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
let mut total_rows = 0usize;
if !with_index && !with_header {
if available_width <= ADDITIONAL_CELL_SPACE {
if available_width <= extra_width {
// it means we have no space left for actual content;
// which means there's no point in index itself if it was even used.
// so we do not print it.
return Ok(None);
}
available_width -= PADDING_SPACE;
available_width -= pad_width;
let mut table = NuTable::new(input.len(), 1);
table.set_index_style(get_index_style(&cfg.opts.style_computer));
@ -186,7 +187,7 @@ fn expand_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
.map(|value| value.to_expanded_string("", cfg.opts.config))
.unwrap_or_else(|| index.to_string());
let index_width = string_width(&index_value);
if available_width <= index_width + ADDITIONAL_CELL_SPACE + PADDING_SPACE {
if available_width <= index_width + extra_width + pad_width {
// NOTE: we don't wanna wrap index; so we return
return Ok(None);
}
@ -196,7 +197,7 @@ fn expand_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
index_column_width = max(index_column_width, index_width);
}
available_width -= index_column_width + ADDITIONAL_CELL_SPACE + PADDING_SPACE;
available_width -= index_column_width + extra_width + pad_width;
for (row, item) in input.iter().enumerate() {
cfg.opts.signals.check(cfg.opts.span)?;
@ -246,12 +247,12 @@ fn expand_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
index_column_width = max(index_column_width, index_width);
}
if available_width <= index_column_width + ADDITIONAL_CELL_SPACE {
if available_width <= index_column_width + extra_width {
// NOTE: we don't wanna wrap index; so we return
return Ok(None);
}
available_width -= index_column_width + ADDITIONAL_CELL_SPACE;
available_width -= index_column_width + extra_width;
widths.push(index_column_width);
}
@ -260,22 +261,28 @@ fn expand_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
let mut rendered_column = 0;
for (col, header) in headers.into_iter().enumerate() {
let column = col + with_index as usize;
let extra_space = PADDING_SPACE + SPLIT_LINE_SPACE;
if available_width <= extra_space {
if available_width <= extra_width {
table.pop_column(table.count_columns() - column);
widths.pop();
truncate = true;
break;
}
let mut available = available_width - extra_space;
let mut available = available_width - extra_width;
// We want to reserver some space for next column
// If we can't fit it in it will be popped anyhow.
let is_prelast_column = col + 2 == count_columns;
let is_last_column = col + 1 == count_columns;
if !is_last_column && available > TRUNCATE_CELL_WIDTH {
available -= TRUNCATE_CELL_WIDTH;
if is_prelast_column {
let need_width = MIN_CELL_WIDTH + SPLIT_LINE_SPACE;
if available > need_width {
available -= need_width;
}
} else if !is_last_column {
let need_width: usize = truncate_column_width + SPLIT_LINE_SPACE;
if available > need_width {
available -= need_width;
}
}
let mut total_column_rows = 0usize;
@ -311,7 +318,7 @@ fn expand_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
widths.push(column_width);
available_width -= column_width + extra_space;
available_width -= column_width + extra_width;
rendered_column += 1;
total_rows = std::cmp::max(total_rows, total_column_rows);
@ -330,18 +337,18 @@ fn expand_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
return Ok(None);
}
if available_width < TRUNCATE_CELL_WIDTH {
if available_width < truncate_column_width {
// back up by removing last column.
// it's LIKELY that removing only 1 column will leave us enough space for a shift column.
while let Some(width) = widths.pop() {
table.pop_column(1);
available_width += width + PADDING_SPACE;
available_width += width + pad_width;
if !widths.is_empty() {
available_width += SPLIT_LINE_SPACE;
}
if available_width > TRUNCATE_CELL_WIDTH {
if available_width > truncate_column_width {
break;
}
}
@ -349,7 +356,7 @@ fn expand_list(input: &[Value], cfg: Cfg<'_>) -> TableResult {
// this must be a RARE case or even NEVER happen,
// but we do check it just in case.
if available_width < TRUNCATE_CELL_WIDTH {
if available_width < truncate_column_width {
return Ok(None);
}
@ -374,12 +381,12 @@ fn expanded_table_kv(record: &Record, cfg: Cfg<'_>) -> CellResult {
let count_borders = theme.borders_has_vertical() as usize
+ theme.borders_has_right() as usize
+ theme.borders_has_left() as usize;
let padding = 2;
if key_width + count_borders + padding + padding > cfg.opts.width {
let pad = cfg.opts.config.table.padding.left + cfg.opts.config.table.padding.right;
if key_width + count_borders + pad + pad > cfg.opts.width {
return Ok(None);
}
let value_width = cfg.opts.width - key_width - count_borders - padding - padding;
let value_width = cfg.opts.width - key_width - count_borders - pad - pad;
let mut total_rows = 0usize;