From 9f0ef156d6dbe33e81b95267427324fad376c671 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Fri, 28 Jun 2024 16:55:07 -0400 Subject: [PATCH 1/2] Improve preview pane appearance --- src/components/preview.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/preview.rs b/src/components/preview.rs index 3c65524..e53f3a8 100644 --- a/src/components/preview.rs +++ b/src/components/preview.rs @@ -189,9 +189,14 @@ impl Component for Preview { ReplaceTextKind::Simple => replace_text.to_string(), }; - spans - .push(Span::styled(matched_text, Style::default().fg(Color::LightRed).add_modifier(Modifier::CROSSED_OUT))); - spans.push(Span::styled(replaced_text, Style::default().fg(Color::White).bg(Color::Green))); + if replaced_text.len() > 0 { + spans + .push(Span::styled(matched_text, Style::default().bg(Color::LightRed).add_modifier(Modifier::CROSSED_OUT))); + spans.push(Span::styled(replaced_text, Style::default().fg(Color::White).bg(Color::Green))); + } else { + spans.push(Span::styled(matched_text, Style::default().bg(Color::Blue).add_modifier(Modifier::BOLD))); + } + last_end = mat.end; } @@ -212,7 +217,6 @@ impl Component for Preview { if let Some(last) = last_match { if line_number > last + 1 { let divider_line = Line::from("-".repeat(area.width as usize)).fg(Color::DarkGray); - lines.push(divider_line.clone()); lines.push(divider_line); } } @@ -234,7 +238,7 @@ impl Component for Preview { let text = Text::from(lines); let preview_widget = - List::new(text).highlight_style(Style::default().bg(Color::Blue)).block(block).scroll_padding(4); + List::new(text).highlight_style(Style::default().add_modifier(Modifier::BOLD)).block(block).scroll_padding(4); f.render_stateful_widget(preview_widget, layout.preview, &mut self.lines_state); From 26ce5789e181b094b20ff74651bef80e5c89bf1b Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Fri, 28 Jun 2024 18:04:55 -0400 Subject: [PATCH 2/2] Fix clippy warning --- src/components/preview.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/preview.rs b/src/components/preview.rs index e53f3a8..4339fc4 100644 --- a/src/components/preview.rs +++ b/src/components/preview.rs @@ -189,12 +189,12 @@ impl Component for Preview { ReplaceTextKind::Simple => replace_text.to_string(), }; - if replaced_text.len() > 0 { + if replaced_text.is_empty() { + spans.push(Span::styled(matched_text, Style::default().bg(Color::Blue).add_modifier(Modifier::BOLD))); + } else { spans .push(Span::styled(matched_text, Style::default().bg(Color::LightRed).add_modifier(Modifier::CROSSED_OUT))); spans.push(Span::styled(replaced_text, Style::default().fg(Color::White).bg(Color::Green))); - } else { - spans.push(Span::styled(matched_text, Style::default().bg(Color::Blue).add_modifier(Modifier::BOLD))); } last_end = mat.end;