holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a small regex optimization (#2937)

Browse Source 
* a small regex optimization

* removed comments
This commit is contained in:
Darren Schroeder 2021-01-15 01:20:28 -06:00 committed by GitHub
parent d8ed01400f
commit c5485c6501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1009,8 +1009,18 @@ pub fn draw_table(table: &Table, termwidth: usize, color_hm: &HashMap<String, St
// This should give us the final max column width // This should give us the final max column width
let max_column_width = column_space.max_width(termwidth); let max_column_width = column_space.max_width(termwidth);
let re_leading =
regex::Regex::new(r"(?P<beginsp>^\s+)").expect("error with leading space regex");
let re_trailing =
regex::Regex::new(r"(?P<endsp>\s+$)").expect("error with trailing space regex");
let wrapped_table = wrap_cells(processed_table, max_column_width, &color_hm); let wrapped_table = wrap_cells(
processed_table,
max_column_width,
&color_hm,
&re_leading,
&re_trailing,
);
wrapped_table.print_table(&color_hm); wrapped_table.print_table(&color_hm);
} }
@ -1019,6 +1029,8 @@ fn wrap_cells(
processed_table: ProcessedTable, processed_table: ProcessedTable,
max_column_width: usize, max_column_width: usize,
color_hm: &HashMap<String, Style>, color_hm: &HashMap<String, Style>,
re_leading: &regex::Regex,
re_trailing: &regex::Regex,
) -> WrappedTable { ) -> WrappedTable {
let mut column_widths = vec![ let mut column_widths = vec![
0; 0;
@ -1040,8 +1052,13 @@ fn wrap_cells(
}; };
for contents in header.1.contents.into_iter() { for contents in header.1.contents.into_iter() {
let (mut lines, inner_max_width) = let (mut lines, inner_max_width) = wrap(
wrap(max_column_width, contents.into_iter(), &color_hm); max_column_width,
contents.into_iter(),
&color_hm,
&re_leading,
&re_trailing,
);
wrapped.lines.append(&mut lines); wrapped.lines.append(&mut lines);
if inner_max_width > wrapped.max_width { if inner_max_width > wrapped.max_width {
wrapped.max_width = inner_max_width; wrapped.max_width = inner_max_width;
@ -1063,8 +1080,13 @@ fn wrap_cells(
style: column.1.style, style: column.1.style,
}; };
for contents in column.1.contents.into_iter() { for contents in column.1.contents.into_iter() {
let (mut lines, inner_max_width) = let (mut lines, inner_max_width) = wrap(
wrap(max_column_width, contents.into_iter(), &color_hm); max_column_width,
contents.into_iter(),
&color_hm,
&re_leading,
&re_trailing,
);
wrapped.lines.append(&mut lines); wrapped.lines.append(&mut lines);
if inner_max_width > wrapped.max_width { if inner_max_width > wrapped.max_width {
wrapped.max_width = inner_max_width; wrapped.max_width = inner_max_width;

6
crates/nu-table/src/wrap.rs
View File

@ -139,6 +139,8 @@ pub fn wrap<'a>(
cell_width: usize, cell_width: usize,
mut input: impl Iterator<Item = Subline<'a>>, mut input: impl Iterator<Item = Subline<'a>>,
color_hm: &HashMap<String, Style>, color_hm: &HashMap<String, Style>,
re_leading: &regex::Regex,
re_trailing: &regex::Regex,
) -> (Vec<WrappedLine>, usize) { ) -> (Vec<WrappedLine>, usize) {
let mut lines = vec![]; let mut lines = vec![];
let mut current_line: Vec<Subline> = vec![]; let mut current_line: Vec<Subline> = vec![];
@ -249,15 +251,11 @@ pub fn wrap<'a>(
bg_color_string = Style::default().on(bg).prefix().to_string() bg_color_string = Style::default().on(bg).prefix().to_string()
}; };
let re_leading =
regex::Regex::new(r"(?P<beginsp>^\s+)").expect("error with leading space regex");
if let Some(leading_match) = re_leading.find(&current_line.clone()) { if let Some(leading_match) = re_leading.find(&current_line.clone()) {
String::insert_str(&mut current_line, leading_match.end(), "\x1b[0m"); String::insert_str(&mut current_line, leading_match.end(), "\x1b[0m");
String::insert_str(&mut current_line, leading_match.start(), &bg_color_string); String::insert_str(&mut current_line, leading_match.start(), &bg_color_string);
} }
let re_trailing =
regex::Regex::new(r"(?P<endsp>\s+$)").expect("error with trailing space regex");
if let Some(trailing_match) = re_trailing.find(&current_line.clone()) { if let Some(trailing_match) = re_trailing.find(&current_line.clone()) {
String::insert_str(&mut current_line, trailing_match.start(), &bg_color_string); String::insert_str(&mut current_line, trailing_match.start(), &bg_color_string);
current_line += "\x1b[0m"; current_line += "\x1b[0m";