extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-28 11:24:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix padding issue with header_on_border (#13808)

Browse Source 
close #13803 

For your @amtoine  example we get

```
#┬c-a┬c-b┬c-c┬c-d─┬─c-e─
0│  1│ 12│123│1234│12345
─┴───┴───┴───┴────┴─────
```
This commit is contained in:
Maxim Zhiburt 2024-09-11 14:12:53 +03:00 committed by GitHub
parent c4bac90b35
commit 0c139c7411
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,6 +272,8 @@ fn set_indent(table: &mut Table, left: usize, right: usize) {
}
fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl) {
let pad = wctrl.pad;
if with_footer {
let count_rows = table.count_rows();
let last_row_index = count_rows - 1;
@ -298,12 +300,14 @@ fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl)
first_row.1,
head_settings.1,
head_settings.2.clone(),
pad,
))
.with(SetLineHeaders::new(
last_row_index - 1,
last_row.1,
head_settings.1,
head_settings.2,
pad,
)),
);
} else {
@ -318,7 +322,7 @@ fn set_border_head(table: &mut Table, with_footer: bool, wctrl: TableWidthCtrl)
.with(wctrl)
.with(StripColorFromRow(0))
.with(MoveRowNext::new(0, 0))
.with(SetLineHeaders::new(0, row.1, row_opts.1, row_opts.2)),
.with(SetLineHeaders::new(0, row.1, row_opts.1, row_opts.2, pad)),
);
}
}
@ -983,6 +987,7 @@ struct SetLineHeaders {
columns: Vec<String>,
alignment: AlignmentHorizontal,
color: Option<Color>,
pad: usize,
}
impl SetLineHeaders {
@ -991,12 +996,14 @@ impl SetLineHeaders {
columns: Vec<String>,
alignment: AlignmentHorizontal,
color: Option<Color>,
pad: usize,
) -> Self {
Self {
line,
columns,
alignment,
color,
pad,
}
}
}
@ -1013,7 +1020,7 @@ impl TableOption<NuRecords, ColoredConfig, CompleteDimensionVecRecords<'_>> for
Some(widths) => {
columns = columns
.into_iter()
.zip(widths.iter().map(|w| w.checked_sub(2).unwrap_or(*w))) // exclude padding; which is generally 2
.zip(widths.iter().map(|w| w - self.pad)) // it must be always safe to do
.map(|(s, width)| Truncate::truncate(&s, width).into_owned())
.collect();
}