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

update

Browse Source
This commit is contained in:
Maxim Zhiburt 2024-07-04 00:31:40 +03:00
parent e4b03a018d
commit 4d105b3a97
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,12 +211,15 @@ fn build_table(
termwidth: usize, termwidth: usize,
indent: (usize, usize), indent: (usize, usize),
) -> Option<String> { ) -> Option<String> {
const TERMWIDTH_THRESHOLD: usize = 120;
if data.count_columns() == 0 || data.count_rows() == 0 { if data.count_columns() == 0 || data.count_rows() == 0 {
return Some(String::new()); return Some(String::new());
} }
let pad = indent.0 + indent.1; let pad = indent.0 + indent.1;
let widths = maybe_truncate_columns(&mut data, &cfg.theme, termwidth, pad); let is_content_first = termwidth > TERMWIDTH_THRESHOLD || cfg.header_on_border; // we use content first approach in case header is used on border in order to it not being cut.
let widths = maybe_truncate_columns(&mut data, &cfg.theme, termwidth, pad, is_content_first);
if widths.is_empty() { if widths.is_empty() {
return None; return None;
} }
@ -496,10 +499,9 @@ fn maybe_truncate_columns(
theme: &TableTheme, theme: &TableTheme,
termwidth: usize, termwidth: usize,
pad: usize, pad: usize,
preserve_content: bool,
) -> Vec<usize> { ) -> Vec<usize> {
const TERMWIDTH_THRESHOLD: usize = 120; let truncate = if preserve_content {
let truncate = if termwidth > TERMWIDTH_THRESHOLD {
truncate_columns_by_columns truncate_columns_by_columns
} else { } else {
truncate_columns_by_content truncate_columns_by_content
@ -747,6 +749,7 @@ impl<R> TableOption<R, CompleteDimensionVecRecords<'_>, ColoredConfig> for SetDi
} }
// it assumes no spans is used. // it assumes no spans is used.
// todo: Could be replaced by Dimension impl usage
fn build_width(records: &NuRecords, pad: usize) -> Vec<usize> { fn build_width(records: &NuRecords, pad: usize) -> Vec<usize> {
use tabled::grid::records::vec_records::Cell; use tabled::grid::records::vec_records::Cell;