Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Maxim Zhiburt 2024-07-03 18:20:46 +03:00
parent 1ba01691b8
commit e4b03a018d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu-table/src/table.rs
View File

@ -295,7 +295,7 @@ fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl)
head_settings.2.clone(), head_settings.2.clone(),
)) ))
.with(SetLineHeaders::new( .with(SetLineHeaders::new(
last_row_index, last_row_index - 1,
last_row.1, last_row.1,
head_settings.1, head_settings.1,
head_settings.2, head_settings.2,
@ -360,6 +360,8 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
} else if self.cfg.expand && self.max > total_width { } else if self.cfg.expand && self.max > total_width {
Settings::new(SetDimensions(self.width), Width::increase(self.max)) Settings::new(SetDimensions(self.width), Width::increase(self.max))
.change(rec, cfg, dim) .change(rec, cfg, dim)
} else {
SetDimensions(self.width).change(rec, cfg, dim);
} }
} }
} }
@ -830,13 +832,15 @@ impl TableOption<NuRecords, CompleteDimensionVecRecords<'_>, ColoredConfig> for
Some(widths) => { Some(widths) => {
columns = columns columns = columns
.into_iter() .into_iter()
.zip(widths) .zip(widths.iter().map(|w| w.checked_sub(2).unwrap_or(*w))) // exclude padding; which is generally 2
.map(|(s, width)| Truncate::truncate_text(&s, *width).into_owned()) .map(|(s, width)| Truncate::truncate_text(&s, width).into_owned())
.collect(); .collect();
} }
None => { None => {
// we don't have widths cached; which means that NO widtds adjustmens were done // we don't have widths cached; which means that NO widtds adjustmens were done
// which means we are OK to leave columns as they are. // which means we are OK to leave columns as they are.
//
// but we are actually always got to have widths at this point
} }
}; };