extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 01:45:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add general refactorings (#3996)

Browse Source
This commit is contained in:
Marcin Puc
2021-09-10 00:44:22 +02:00
committed by GitHub
parent ae9f4135c0
commit 51c74eebd0
165 changed files with 540 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-table/src/main.rs
View File

@ -72,7 +72,7 @@ fn make_table_data() -> (Vec<&'static str>, Vec<&'static str>) {
fn vec_of_str_to_vec_of_styledstr(data: &[&str], is_header: bool) -> Vec<StyledString> {
let mut v = vec![];
for x in data.iter() {
for x in data {
if is_header {
v.push(StyledString::new(
String::from(*x),

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

@ -1,6 +1,7 @@
use crate::wrap::{column_width, split_sublines, wrap, Alignment, Subline, WrappedCell};
use nu_ansi_term::{Color, Style};
use std::collections::HashMap;
use std::fmt::Write;
enum SeparatorPosition {
Top,
@ -862,12 +863,12 @@ impl WrappedTable {
);
}
}
if lines_printed == 0 {
break;
} else {
total_output.push_str(output.as_str());
total_output.push('\n');
}
writeln!(&mut total_output, "{}", output).unwrap();
}
total_output
}
@ -885,17 +886,14 @@ impl WrappedTable {
}
if self.theme.print_top_border {
output.push_str(
self.print_separator(SeparatorPosition::Top, color_hm)
.as_str(),
);
output.push_str(&self.print_separator(SeparatorPosition::Top, color_hm));
}
let skip_headers = (self.headers.len() == 2 && self.headers[1].max_width == 0)
|| (self.headers.len() == 1 && self.headers[0].max_width == 0);
if !self.headers.is_empty() && !skip_headers {
output.push_str(self.print_cell_contents(&self.headers, color_hm).as_str());
output.push_str(&self.print_cell_contents(&self.headers, color_hm));
}
let mut first_row = true;
@ -903,31 +901,23 @@ impl WrappedTable {
for row in &self.data {
if !first_row {
if self.theme.separate_rows {
output.push_str(
self.print_separator(SeparatorPosition::Middle, color_hm)
.as_str(),
)
output.push_str(&self.print_separator(SeparatorPosition::Middle, color_hm));
}
} else {
first_row = false;
if self.theme.separate_header && !self.headers.is_empty() && !skip_headers {
output.push_str(
self.print_separator(SeparatorPosition::Middle, color_hm)
.as_str(),
);
output.push_str(&self.print_separator(SeparatorPosition::Middle, color_hm));
}
}
output.push_str(self.print_cell_contents(row, color_hm).as_str());
output.push_str(&self.print_cell_contents(row, color_hm));
}
if self.theme.print_bottom_border {
output.push_str(
self.print_separator(SeparatorPosition::Bottom, color_hm)
.as_str(),
);
output.push_str(&self.print_separator(SeparatorPosition::Bottom, color_hm));
}
output
}
}