Merge 0b4f33c761 into 76f8e6438b

Cargo.lock

@@ -449,13 +449,13 @@ dependencies = [
  "portable-pty",
  "rand",
  "ratatui",
+ "regex",
  "temp-dir",
  "textwrap",
  "time",
  "tree-sitter-bash",
  "tree-sitter-highlight",
  "tui-term",
- "unicode-width 0.2.0",
  "zips",
 ]
 

tui/Cargo.toml

@@ -21,7 +21,6 @@ ratatui = "0.29.0"
 tui-term = "0.2.0"
 temp-dir = "0.1.14"
 time = { version = "0.3.36", features = ["local-offset", "macros", "formatting"] }
-unicode-width = "0.2.0"
 rand = { version = "0.8.5", optional = true }
 linutil_core = { path = "../core", version = "24.9.28" }
 tree-sitter-highlight = "0.24.3"
@@ -30,6 +29,7 @@ textwrap = "0.16.1"
 anstyle = "1.0.8"
 ansi-to-tui = "7.0.0"
 zips = "0.1.7"
+regex = { version = "1.3", default-features = false, features = ["std"] }
 
 [[bin]]
 name = "linutil"

tui/src/confirmation.rs

@@ -1,13 +1,11 @@
-use std::borrow::Cow;
-
-use crate::{float::FloatContent, hint::Shortcut};
-
+use crate::{float::FloatContent, hint::Shortcut, theme};
 use ratatui::{
     crossterm::event::{KeyCode, KeyEvent},
     layout::Alignment,
     prelude::*,
     widgets::{Block, Borders, Clear, List},
 };
+use std::borrow::Cow;
 
 pub enum ConfirmStatus {
     Confirm,
@@ -16,35 +14,30 @@ pub enum ConfirmStatus {
 }
 
 pub struct ConfirmPrompt {
-    pub names: Box<[String]>,
-    pub status: ConfirmStatus,
+    inner_area_height: usize,
+    names: Box<[String]>,
     scroll: usize,
+    pub status: ConfirmStatus,
 }
 
 impl ConfirmPrompt {
-    pub fn new(names: &[&str]) -> Self {
-        let max_count_str = format!("{}", names.len());
+    pub fn new(names: Vec<&str>) -> Self {
         let names = names
             .iter()
             .zip(1..)
-            .map(|(name, n)| {
-                let count_str = format!("{n}");
-                let space_str = (0..(max_count_str.len() - count_str.len()))
-                    .map(|_| ' ')
-                    .collect::<String>();
-                format!("{space_str}{n}. {name}")
-            })
+            .map(|(name, n)| format!(" {n}. {name}"))
             .collect();
 
         Self {
+            inner_area_height: 0,
             names,
-            status: ConfirmStatus::None,
             scroll: 0,
+            status: ConfirmStatus::None,
         }
     }
 
     pub fn scroll_down(&mut self) {
-        if self.scroll < self.names.len() - 1 {
+        if self.scroll + self.inner_area_height < self.names.len() - 1 {
             self.scroll += 1;
         }
     }
@@ -57,19 +50,28 @@ impl ConfirmPrompt {
 }
 
 impl FloatContent for ConfirmPrompt {
-    fn draw(&mut self, frame: &mut Frame, area: Rect) {
+    fn draw(&mut self, frame: &mut Frame, area: Rect, theme: &theme::Theme) {
         let block = Block::default()
             .borders(Borders::ALL)
             .border_set(ratatui::symbols::border::ROUNDED)
             .title(" Confirm selections ")
-            .title_bottom(" [y] to continue, [n] to abort ")
+            .title_bottom(Line::from(vec![
+                Span::styled(" [", Style::default()),
+                Span::styled("y", Style::default().fg(theme.success_color())),
+                Span::styled("] to continue ", Style::default()),
+                Span::styled("[", Style::default()),
+                Span::styled("n", Style::default().fg(theme.fail_color())),
+                Span::styled("] to abort ", Style::default()),
+            ]))
             .title_alignment(Alignment::Center)
             .title_style(Style::default().bold())
             .style(Style::default());
 
-        frame.render_widget(block.clone(), area);
-
         let inner_area = block.inner(area);
+        self.inner_area_height = inner_area.height as usize;
+
+        frame.render_widget(Clear, area);
+        frame.render_widget(block, area);
 
         let paths_text = self
             .names
@@ -81,26 +83,25 @@ impl FloatContent for ConfirmPrompt {
             })
             .collect::<Text>();
 
-        frame.render_widget(Clear, inner_area);
         frame.render_widget(List::new(paths_text), inner_area);
     }
 
     fn handle_key_event(&mut self, key: &KeyEvent) -> bool {
-        use KeyCode::*;
+        use ConfirmStatus::*;
+        use KeyCode::{Char, Down, Esc, Up};
         self.status = match key.code {
-            Char('y') | Char('Y') => ConfirmStatus::Confirm,
-            Char('n') | Char('N') | Esc | Char('q') => ConfirmStatus::Abort,
-            Char('j') => {
+            Char('y') | Char('Y') => Confirm,
+            Char('n') | Char('N') | Esc | Char('q') => Abort,
+            Char('j') | Char('J') | Down => {
                 self.scroll_down();
-                ConfirmStatus::None
+                None
             }
-            Char('k') => {
+            Char('k') | Char('K') | Up => {
                 self.scroll_up();
-                ConfirmStatus::None
+                None
             }
-            _ => ConfirmStatus::None,
+            _ => None,
         };
-
         false
     }
 
@@ -118,8 +119,8 @@ impl FloatContent for ConfirmPrompt {
             Box::new([
                 Shortcut::new("Continue", ["Y", "y"]),
                 Shortcut::new("Abort", ["N", "n", "q", "Esc"]),
-                Shortcut::new("Scroll up", ["k"]),
-                Shortcut::new("Scroll down", ["j"]),
+                Shortcut::new("Scroll up", ["k", "Up"]),
+                Shortcut::new("Scroll down", ["j", "Down"]),
                 Shortcut::new("Close linutil", ["CTRL-c"]),
             ]),
         )

tui/src/filter.rs

@@ -3,12 +3,12 @@ use linutil_core::{ego_tree::NodeId, Tab};
 use ratatui::{
     crossterm::event::{KeyCode, KeyEvent, KeyModifiers},
     layout::{Position, Rect},
-    style::{Color, Style},
+    style::Style,
     text::Span,
     widgets::{Block, Borders, Paragraph},
     Frame,
 };
-use unicode_width::UnicodeWidthChar;
+use regex::RegexBuilder;
 
 pub enum SearchAction {
     None,
@@ -17,7 +17,7 @@ pub enum SearchAction {
 }
 
 pub struct Filter {
-    search_input: Vec<char>,
+    search_input: String,
     in_search_mode: bool,
     input_position: usize,
     items: Vec<ListEntry>,
@@ -27,7 +27,7 @@ pub struct Filter {
 impl Filter {
     pub fn new() -> Self {
         Self {
-            search_input: vec![],
+            search_input: String::new(),
             in_search_mode: false,
             input_position: 0,
             items: vec![],
@@ -62,47 +62,45 @@ impl Filter {
                 .collect();
         } else {
             self.items.clear();
-
-            let query_lower = self.search_input.iter().collect::<String>().to_lowercase();
-            for tab in tabs.iter() {
-                let mut stack = vec![tab.tree.root().id()];
-                while let Some(node_id) = stack.pop() {
-                    let node = tab.tree.get(node_id).unwrap();
-
-                    if node.value().name.to_lowercase().contains(&query_lower)
-                        && !node.has_children()
-                    {
-                        self.items.push(ListEntry {
-                            node: node.value().clone(),
-                            id: node.id(),
-                            has_children: false,
-                        });
+            if let Ok(regex) = self.regex_builder(&regex::escape(&self.search_input)) {
+                for tab in tabs {
+                    let mut stack = vec![tab.tree.root().id()];
+                    while let Some(node_id) = stack.pop() {
+                        let node = tab.tree.get(node_id).unwrap();
+                        if regex.is_match(&node.value().name) && !node.has_children() {
+                            self.items.push(ListEntry {
+                                node: node.value().clone(),
+                                id: node.id(),
+                                has_children: false,
+                            });
+                        }
+                        stack.extend(node.children().map(|child| child.id()));
                     }
-
-                    stack.extend(node.children().map(|child| child.id()));
                 }
+                self.items
+                    .sort_unstable_by(|a, b| a.node.name.cmp(&b.node.name));
+            } else {
+                self.search_input.clear();
             }
-            self.items.sort_by(|a, b| a.node.name.cmp(&b.node.name));
         }
-
         self.update_completion_preview();
     }
 
     fn update_completion_preview(&mut self) {
-        if self.search_input.is_empty() {
-            self.completion_preview = None;
-            return;
-        }
-
-        let input = self.search_input.iter().collect::<String>().to_lowercase();
-        self.completion_preview = self.items.iter().find_map(|item| {
-            let item_name_lower = item.node.name.to_lowercase();
-            if item_name_lower.starts_with(&input) {
-                Some(item_name_lower[input.len()..].to_string())
+        self.completion_preview = if self.items.is_empty() || self.search_input.is_empty() {
+            None
+        } else {
+            let pattern = format!("(?i)^{}", regex::escape(&self.search_input));
+            if let Ok(regex) = self.regex_builder(&pattern) {
+                self.items.iter().find_map(|item| {
+                    regex
+                        .find(&item.node.name)
+                        .map(|mat| item.node.name[mat.end()..].to_string())
+                })
             } else {
                 None
             }
-        });
+        }
     }
 
     pub fn draw_searchbar(&self, frame: &mut Frame, area: Rect, theme: &Theme) {
@@ -110,8 +108,10 @@ impl Filter {
         let display_text = if !self.in_search_mode && self.search_input.is_empty() {
             Span::raw("Press / to search")
         } else {
-            let input_text = self.search_input.iter().collect::<String>();
-            Span::styled(input_text, Style::default().fg(theme.focused_color()))
+            Span::styled(
+                &self.search_input,
+                Style::default().fg(theme.focused_color()),
+            )
         };
 
         let search_color = if self.in_search_mode {
@@ -135,24 +135,16 @@ impl Filter {
 
         // Render cursor in search bar
         if self.in_search_mode {
-            let cursor_position: usize = self.search_input[..self.input_position]
-                .iter()
-                .map(|c| c.width().unwrap_or(1))
-                .sum();
-            let x = area.x + cursor_position as u16 + 1;
+            let x = area.x + self.input_position as u16 + 1;
             let y = area.y + 1;
             frame.set_cursor_position(Position::new(x, y));
 
             if let Some(preview) = &self.completion_preview {
-                let preview_span = Span::styled(preview, Style::default().fg(Color::DarkGray));
-                let preview_paragraph = Paragraph::new(preview_span).style(Style::default());
-                let preview_area = Rect::new(
-                    x,
-                    y,
-                    (preview.len() as u16).min(area.width - cursor_position as u16 - 1),
-                    1,
-                );
-                frame.render_widget(preview_paragraph, preview_area);
+                let preview_x = area.x + self.search_input.len() as u16 + 1;
+                let preview_span =
+                    Span::styled(preview, Style::default().fg(theme.search_preview_color()));
+                let preview_area = Rect::new(preview_x, y, preview.len() as u16, 1);
+                frame.render_widget(Paragraph::new(preview_span), preview_area);
             }
         }
     }
@@ -219,14 +211,35 @@ impl Filter {
         }
     }
 
+    fn regex_builder(&self, pattern: &str) -> Result<regex::Regex, regex::Error> {
+        RegexBuilder::new(pattern).case_insensitive(true).build()
+    }
+
     fn complete_search(&mut self) -> SearchAction {
-        if let Some(completion) = self.completion_preview.take() {
-            self.search_input.extend(completion.chars());
-            self.input_position = self.search_input.len();
-            self.update_completion_preview();
-            SearchAction::Update
-        } else {
+        if self.completion_preview.is_none() {
             SearchAction::None
+        } else {
+            let pattern = format!("(?i)^{}", self.search_input);
+            if let Ok(regex) = self.regex_builder(&pattern) {
+                self.search_input = self
+                    .items
+                    .iter()
+                    .find_map(|item| {
+                        if regex.is_match(&item.node.name) {
+                            Some(item.node.name.clone())
+                        } else {
+                            None
+                        }
+                    })
+                    .unwrap_or_default();
+
+                self.completion_preview = None;
+                self.input_position = self.search_input.len();
+
+                SearchAction::Update
+            } else {
+                SearchAction::None
+            }
         }
     }
 

tui/src/float.rs

@@ -1,13 +1,12 @@
+use crate::{hint::Shortcut, theme::Theme};
 use ratatui::{
     crossterm::event::{KeyCode, KeyEvent},
     layout::{Constraint, Direction, Layout, Rect},
     Frame,
 };
 
-use crate::hint::Shortcut;
-
 pub trait FloatContent {
-    fn draw(&mut self, frame: &mut Frame, area: Rect);
+    fn draw(&mut self, frame: &mut Frame, area: Rect, theme: &Theme);
     fn handle_key_event(&mut self, key: &KeyEvent) -> bool;
     fn is_finished(&self) -> bool;
     fn get_shortcut_list(&self) -> (&str, Box<[Shortcut]>);
@@ -48,9 +47,9 @@ impl<Content: FloatContent + ?Sized> Float<Content> {
             .split(hor_float)[1]
     }
 
-    pub fn draw(&mut self, frame: &mut Frame, parent_area: Rect) {
+    pub fn draw(&mut self, frame: &mut Frame, parent_area: Rect, theme: &Theme) {
         let popup_area = self.floating_window(parent_area);
-        self.content.draw(frame, popup_area);
+        self.content.draw(frame, popup_area, theme);
     }
 
     // Returns true if the floating window is finished.

tui/src/floating_text.rs

@@ -1,13 +1,6 @@
-use std::{
-    borrow::Cow,
-    collections::VecDeque,
-    io::{Cursor, Read as _, Seek, SeekFrom, Write as _},
-};
-
-use crate::{float::FloatContent, hint::Shortcut};
-
+use crate::{float::FloatContent, hint::Shortcut, theme::Theme};
+use ansi_to_tui::IntoText;
 use linutil_core::Command;
-
 use ratatui::{
     crossterm::event::{KeyCode, KeyEvent},
     layout::Rect,
@@ -16,9 +9,11 @@ use ratatui::{
     widgets::{Block, Borders, Clear, List},
     Frame,
 };
-
-use ansi_to_tui::IntoText;
-
+use std::{
+    borrow::Cow,
+    collections::VecDeque,
+    io::{Cursor, Read as _, Seek, SeekFrom, Write as _},
+};
 use textwrap::wrap;
 use tree_sitter_bash as hl_bash;
 use tree_sitter_highlight::{self as hl, HighlightEvent};
@@ -209,7 +204,7 @@ impl FloatingText {
 }
 
 impl FloatContent for FloatingText {
-    fn draw(&mut self, frame: &mut Frame, area: Rect) {
+    fn draw(&mut self, frame: &mut Frame, area: Rect, _theme: &Theme) {
         self.frame_height = area.height as usize;
 
         // Define the Block with a border and background color

tui/src/hint.rs

@@ -1,9 +1,8 @@
-use std::borrow::Cow;
-
 use ratatui::{
     style::{Style, Stylize},
     text::{Line, Span},
 };
+use std::borrow::Cow;
 
 pub struct Shortcut {
     pub key_sequences: Vec<Span<'static>>,

tui/src/main.rs

@@ -7,15 +7,8 @@ mod running_command;
 pub mod state;
 mod theme;
 
-use std::{
-    io::{self, stdout},
-    path::PathBuf,
-    time::Duration,
-};
-
 use crate::theme::Theme;
 use clap::Parser;
-
 use ratatui::{
     backend::CrosstermBackend,
     crossterm::{
@@ -27,6 +20,11 @@ use ratatui::{
     Terminal,
 };
 use state::AppState;
+use std::{
+    io::{self, stdout},
+    path::PathBuf,
+    time::Duration,
+};
 
 // Linux utility toolbox
 #[derive(Debug, Parser)]

tui/src/running_command.rs

@@ -1,4 +1,4 @@
-use crate::{float::FloatContent, hint::Shortcut};
+use crate::{float::FloatContent, hint::Shortcut, theme::Theme};
 use linutil_core::Command;
 use oneshot::{channel, Receiver};
 use portable_pty::{
@@ -7,7 +7,7 @@ use portable_pty::{
 use ratatui::{
     crossterm::event::{KeyCode, KeyEvent, KeyModifiers},
     layout::{Rect, Size},
-    style::{Color, Style, Stylize},
+    style::{Style, Stylize},
     text::{Line, Span},
     widgets::{Block, Borders},
     Frame,
@@ -22,6 +22,7 @@ use tui_term::{
     vt100::{self, Screen},
     widget::PseudoTerminal,
 };
+
 pub struct RunningCommand {
     /// A buffer to save all the command output (accumulates, until the command exits)
     buffer: Arc<Mutex<Vec<u8>>>,
@@ -42,7 +43,7 @@ pub struct RunningCommand {
 }
 
 impl FloatContent for RunningCommand {
-    fn draw(&mut self, frame: &mut Frame, area: Rect) {
+    fn draw(&mut self, frame: &mut Frame, area: Rect, theme: &Theme) {
         // Calculate the inner size of the terminal area, considering borders
         let inner_size = Size {
             width: area.width - 2, // Adjust for border width
@@ -64,13 +65,13 @@ impl FloatContent for RunningCommand {
                 Line::from(
                     Span::default()
                         .content("SUCCESS!")
-                        .style(Style::default().fg(Color::Green).reversed()),
+                        .style(Style::default().fg(theme.success_color()).reversed()),
                 )
             } else {
                 Line::from(
                     Span::default()
                         .content("FAILED!")
-                        .style(Style::default().fg(Color::Red).reversed()),
+                        .style(Style::default().fg(theme.fail_color()).reversed()),
                 )
             };
 

tui/src/state.rs

@@ -137,7 +137,7 @@ impl AppState {
                 .map(|node| node.name.as_str())
                 .collect();
 
-            let prompt = ConfirmPrompt::new(&cmd_names);
+            let prompt = ConfirmPrompt::new(cmd_names);
             self.focus = Focus::ConfirmationPrompt(Float::new(Box::new(prompt), 40, 40));
         }
     }
@@ -229,7 +229,7 @@ impl AppState {
                 MIN_HEIGHT,
             ))
                 .alignment(Alignment::Center)
-                .style(Style::default().fg(ratatui::style::Color::Red).bold())
+                .style(Style::default().fg(self.theme.fail_color()).bold())
                 .wrap(ratatui::widgets::Wrap { trim: true });
 
             let centered_layout = Layout::default()
@@ -461,8 +461,8 @@ impl AppState {
         frame.render_stateful_widget(disclaimer_list, list_chunks[1], &mut self.selection);
 
         match &mut self.focus {
-            Focus::FloatingWindow(float) => float.draw(frame, chunks[1]),
-            Focus::ConfirmationPrompt(prompt) => prompt.draw(frame, chunks[1]),
+            Focus::FloatingWindow(float) => float.draw(frame, chunks[1], &self.theme),
+            Focus::ConfirmationPrompt(prompt) => prompt.draw(frame, chunks[1], &self.theme),
             _ => {}
         }
 
@@ -798,7 +798,7 @@ impl AppState {
                         .map(|node| node.name.as_str())
                         .collect::<Vec<_>>();
 
-                    let prompt = ConfirmPrompt::new(&cmd_names[..]);
+                    let prompt = ConfirmPrompt::new(cmd_names);
                     self.focus = Focus::ConfirmationPrompt(Float::new(Box::new(prompt), 40, 40));
                 }
             }

tui/src/theme.rs

@@ -14,88 +14,70 @@ pub enum Theme {
 }
 
 impl Theme {
-    pub fn dir_color(&self) -> Color {
+    fn get_color_variant(&self, default: Color, compatible: Color) -> Color {
         match self {
-            Theme::Default => Color::Blue,
-            Theme::Compatible => Color::Blue,
+            Theme::Default => default,
+            Theme::Compatible => compatible,
         }
     }
 
+    fn get_icon_variant(&self, default: &'static str, compatible: &'static str) -> &'static str {
+        match self {
+            Theme::Default => default,
+            Theme::Compatible => compatible,
+        }
+    }
+
+    pub fn dir_color(&self) -> Color {
+        self.get_color_variant(Color::Blue, Color::Blue)
+    }
+
     pub fn cmd_color(&self) -> Color {
-        match self {
-            Theme::Default => Color::Rgb(204, 224, 208),
-            Theme::Compatible => Color::LightGreen,
-        }
+        self.get_color_variant(Color::Rgb(204, 224, 208), Color::LightGreen)
     }
 
     pub fn multi_select_disabled_color(&self) -> Color {
-        match self {
-            Theme::Default => Color::DarkGray,
-            Theme::Compatible => Color::DarkGray,
-        }
+        self.get_color_variant(Color::DarkGray, Color::DarkGray)
     }
 
     pub fn tab_color(&self) -> Color {
-        match self {
-            Theme::Default => Color::Rgb(255, 255, 85),
-            Theme::Compatible => Color::Yellow,
-        }
+        self.get_color_variant(Color::Rgb(255, 255, 85), Color::Yellow)
     }
 
     pub fn dir_icon(&self) -> &'static str {
-        match self {
-            Theme::Default => "  ",
-            Theme::Compatible => "[DIR]",
-        }
+        self.get_icon_variant("  ", "[DIR]")
     }
 
     pub fn cmd_icon(&self) -> &'static str {
-        match self {
-            Theme::Default => "  ",
-            Theme::Compatible => "[CMD]",
-        }
+        self.get_icon_variant("  ", "[CMD]")
     }
 
     pub fn tab_icon(&self) -> &'static str {
-        match self {
-            Theme::Default => "  ",
-            Theme::Compatible => ">> ",
-        }
+        self.get_icon_variant("  ", ">> ")
     }
 
     pub fn multi_select_icon(&self) -> &'static str {
-        match self {
-            Theme::Default => "",
-            Theme::Compatible => "*",
-        }
+        self.get_icon_variant("", "*")
     }
 
     pub fn success_color(&self) -> Color {
-        match self {
-            Theme::Default => Color::Rgb(199, 55, 44),
-            Theme::Compatible => Color::Green,
-        }
+        self.get_color_variant(Color::Rgb(5, 255, 55), Color::Green)
     }
 
     pub fn fail_color(&self) -> Color {
-        match self {
-            Theme::Default => Color::Rgb(5, 255, 55),
-            Theme::Compatible => Color::Red,
-        }
+        self.get_color_variant(Color::Rgb(199, 55, 44), Color::Red)
     }
 
     pub fn focused_color(&self) -> Color {
-        match self {
-            Theme::Default => Color::LightBlue,
-            Theme::Compatible => Color::LightBlue,
-        }
+        self.get_color_variant(Color::LightBlue, Color::LightBlue)
+    }
+
+    pub fn search_preview_color(&self) -> Color {
+        self.get_color_variant(Color::DarkGray, Color::DarkGray)
     }
 
     pub fn unfocused_color(&self) -> Color {
-        match self {
-            Theme::Default => Color::Gray,
-            Theme::Compatible => Color::Gray,
-        }
+        self.get_color_variant(Color::Gray, Color::Gray)
     }
 }