From eba0bbda2ee10e9ba53f01f1d324d2c4c82229d2 Mon Sep 17 00:00:00 2001 From: Ivan Tham Date: Sun, 18 Jul 2021 12:24:07 +0800 Subject: Resume last picker Inspired by space ' in doom emacs. --- helix-term/src/commands.rs | 14 ++++++++++++++ helix-term/src/compositor.rs | 7 +++++-- helix-term/src/ui/picker.rs | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) (limited to 'helix-term/src') diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 5fc96cd9..9b72a8e9 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -217,6 +217,7 @@ impl Command { file_picker, buffer_picker, symbol_picker, + last_picker, prepend_to_line, append_to_line, open_below, @@ -2091,6 +2092,17 @@ fn symbol_picker(cx: &mut Context) { ) } +fn last_picker(cx: &mut Context) { + // TODO: last picker does not seemed to work well with buffer_picker + cx.callback = Some(Box::new(|compositor: &mut Compositor| { + if let Some(picker) = compositor.last_picker.take() { + compositor.push(picker); + } + // XXX: figure out how to show error when no last picker lifetime + // cx.editor.set_error("no last picker".to_owned()) + })); +} + // I inserts at the first nonwhitespace character of each line with a selection fn prepend_to_line(cx: &mut Context) { goto_first_nonwhitespace(cx); @@ -3749,6 +3761,8 @@ macro_rules! mode_info { mode_info! { /// space mode space_mode, SPACE_MODE, + /// resume last picker + "'" => last_picker, /// file picker "f" => file_picker, /// buffer picker diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs index 5fcb552a..c2cfa3a7 100644 --- a/helix-term/src/compositor.rs +++ b/helix-term/src/compositor.rs @@ -74,6 +74,8 @@ type Terminal = tui::terminal::Terminal>; pub struct Compositor { layers: Vec>, terminal: Terminal, + + pub(crate) last_picker: Option>, } impl Compositor { @@ -83,6 +85,7 @@ impl Compositor { Ok(Self { layers: Vec::new(), terminal, + last_picker: None, }) } @@ -103,8 +106,8 @@ impl Compositor { self.layers.push(layer); } - pub fn pop(&mut self) { - self.layers.pop(); + pub fn pop(&mut self) -> Option> { + self.layers.pop() } pub fn handle_event(&mut self, event: Event, cx: &mut Context) -> bool { diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs index d7fc9d86..733be2fc 100644 --- a/helix-term/src/ui/picker.rs +++ b/helix-term/src/ui/picker.rs @@ -159,7 +159,7 @@ impl Component for Picker { let close_fn = EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor| { // remove the layer - compositor.pop(); + compositor.last_picker = compositor.pop(); }))); match key_event { -- cgit v1.2.3-70-g09d2 From 58d08d36ae6a2c6efbf175247bb096fae6629eb1 Mon Sep 17 00:00:00 2001 From: Blaž Hrastnik Date: Fri, 23 Jul 2021 18:10:17 +0900 Subject: Simplify ui/menu.rs --- helix-term/src/ui/menu.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'helix-term/src') diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs index 8681e5b1..dc3bbf7f 100644 --- a/helix-term/src/ui/menu.rs +++ b/helix-term/src/ui/menu.rs @@ -233,16 +233,16 @@ impl Component for Menu { let max_lens = self.options.iter().fold(vec![0; n], |mut acc, option| { let row = option.row(); // maintain max for each column - for (i, cell) in row.cells.iter().enumerate() { + for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) { let width = cell.content.width(); - if width > acc[i] { - acc[i] = width; + if width > *acc { + *acc = width; } } acc }); - let len = (max_lens.iter().sum::()) + n + 1; // +1: reserve some space for scrollbar + let len = max_lens.iter().sum::() + n + 1; // +1: reserve some space for scrollbar let width = len.min(viewport.0 as usize); self.widths = max_lens @@ -250,9 +250,7 @@ impl Component for Menu { .map(|len| Constraint::Length(len as u16)) .collect(); - const MAX: usize = 10; - let height = std::cmp::min(self.options.len(), MAX); - let height = std::cmp::min(height, viewport.1 as usize); + let height = self.options.len().min(10).min(viewport.1 as usize); self.size = (width as u16, height as u16); -- cgit v1.2.3-70-g09d2 From 817a7e0bd68c2430e5dcb7b6c612043329a62231 Mon Sep 17 00:00:00 2001 From: Blaž Hrastnik Date: Fri, 23 Jul 2021 18:10:30 +0900 Subject: fix: Only try expanding directory completion if it makes sense Fixes #487 --- helix-term/src/ui/prompt.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'helix-term/src') diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs index a4cb26f7..2df1e281 100644 --- a/helix-term/src/ui/prompt.rs +++ b/helix-term/src/ui/prompt.rs @@ -463,7 +463,7 @@ impl Component for Prompt { code: KeyCode::Enter, .. } => { - if self.line.ends_with('/') { + if self.selection.is_some() && self.line.ends_with('/') { self.completion = (self.completion_fn)(&self.line); self.exit_selection(); } else { -- cgit v1.2.3-70-g09d2 From 1789dfabfe68c00dda3b861b828ea7a50860f6e7 Mon Sep 17 00:00:00 2001 From: Blaž Hrastnik Date: Fri, 23 Jul 2021 18:12:33 +0900 Subject: fix: ui/menu: Don't allow scrolling past the end of completion Fixes #472 --- helix-term/src/ui/menu.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'helix-term/src') diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs index dc3bbf7f..5a6f6256 100644 --- a/helix-term/src/ui/menu.rs +++ b/helix-term/src/ui/menu.rs @@ -90,13 +90,13 @@ impl Menu { pub fn move_up(&mut self) { // TODO: wrap around to end - let pos = self.cursor.map_or(0, |i| i.saturating_sub(1)) % self.options.len(); + let pos = self.cursor.map_or(0, |i| i.saturating_sub(1)) % self.matches.len(); self.cursor = Some(pos); self.adjust_scroll(); } pub fn move_down(&mut self) { - let pos = self.cursor.map_or(0, |i| i + 1) % self.options.len(); + let pos = self.cursor.map_or(0, |i| i + 1) % self.matches.len(); self.cursor = Some(pos); self.adjust_scroll(); } -- cgit v1.2.3-70-g09d2