summaryrefslogtreecommitdiff
path: root/helix-term/src
diff options
context:
space:
mode:
authorNathan Vegdahl2021-07-24 00:23:16 +0000
committerNathan Vegdahl2021-07-24 00:23:16 +0000
commit43594049ddd6b0ec3794807016ab3cd2a6a38834 (patch)
tree56e0bd5b7ac016937612aa650de2f06041a2e258 /helix-term/src
parent427ae6ac6cfdd2a89580692dadd45f1a8dc02d2c (diff)
parentbda4f5c1cdd2f84a06647f7dce45a8f6d06401ae (diff)
Merge branch 'master' into great_line_ending_and_cursor_range_cleanup
Diffstat (limited to 'helix-term/src')
-rw-r--r--helix-term/src/commands.rs14
-rw-r--r--helix-term/src/compositor.rs7
-rw-r--r--helix-term/src/ui/menu.rs16
-rw-r--r--helix-term/src/ui/picker.rs2
-rw-r--r--helix-term/src/ui/prompt.rs2
5 files changed, 28 insertions, 13 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 8bde88a2..57df47a7 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -214,6 +214,7 @@ impl Command {
file_picker,
buffer_picker,
symbol_picker,
+ last_picker,
prepend_to_line,
append_to_line,
open_below,
@@ -2127,6 +2128,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);
@@ -3837,6 +3849,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<CrosstermBackend<std::io::Stdout>>;
pub struct Compositor {
layers: Vec<Box<dyn Component>>,
terminal: Terminal,
+
+ pub(crate) last_picker: Option<Box<dyn Component>>,
}
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<Box<dyn Component>> {
+ self.layers.pop()
}
pub fn handle_event(&mut self, event: Event, cx: &mut Context) -> bool {
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 8681e5b1..5a6f6256 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -90,13 +90,13 @@ impl<T: Item> Menu<T> {
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();
}
@@ -233,16 +233,16 @@ impl<T: Item + 'static> Component for Menu<T> {
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::<usize>()) + n + 1; // +1: reserve some space for scrollbar
+ let len = max_lens.iter().sum::<usize>() + 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<T: Item + 'static> Component for Menu<T> {
.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);
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<T: 'static> Component for Picker<T> {
let close_fn = EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor| {
// remove the layer
- compositor.pop();
+ compositor.last_picker = compositor.pop();
})));
match key_event {
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 {