Feat/close buffer from picker

helix-term/src/commands.rs

@@ -51,12 +51,12 @@ use movement::Movement;
 use crate::{
     args,
     compositor::{self, Component, Compositor},
-    filter_picker_entry,
+    ctrl, filter_picker_entry,
     job::Callback,
     keymap::ReverseKeymap,
     ui::{
         self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, CompletionItem, Picker,
-        Popup, Prompt, PromptEvent,
+        PickerAction, Popup, Prompt, PromptEvent,
     },
 };
 
@@ -2559,7 +2559,7 @@ fn buffer_picker(cx: &mut Context) {
         }
     }
 
-    let new_meta = |doc: &Document| BufferMeta {
+    let new_meta = move |doc: &Document| BufferMeta {
         id: doc.id(),
         path: doc.path().cloned(),
         is_modified: doc.is_modified(),
@@ -2588,6 +2588,37 @@ fn buffer_picker(cx: &mut Context) {
             .primary()
             .cursor_line(doc.text().slice(..));
         Some((meta.id.into(), Some((line, line))))
+    })
+    .on_key_event(move |cx, meta, key_event| match key_event {
+        ctrl!('x') => {
+            if cx.editor.close_document(meta.id, false).is_err() {
+                cx.editor.set_error("Cannot close buffer");
+                None
+            } else {
+                let updated_options = cx
+                    .editor
+                    .documents
+                    .iter()
+                    .map(|(_, doc)| new_meta(doc))
+                    .collect();
+                Some(PickerAction::UpdateOptions(updated_options))
+            }
+        }
+        ctrl!('X') => {
+            if cx.editor.close_document(meta.id, true).is_err() {
+                cx.editor.set_error("Cannot force close buffer");
+                None
+            } else {
+                let updated_options = cx
+                    .editor
+                    .documents
+                    .iter()
+                    .map(|(_, doc)| new_meta(doc))
+                    .collect();
+                Some(PickerAction::UpdateOptions(updated_options))
+            }
+        }
+        _ => None,
     });
     cx.push_layer(Box::new(overlaid(picker)));
 }

helix-term/src/ui/mod.rs

@@ -21,7 +21,7 @@ pub use completion::{Completion, CompletionItem};
 pub use editor::EditorView;
 pub use markdown::Markdown;
 pub use menu::Menu;
-pub use picker::{DynamicPicker, FileLocation, Picker};
+pub use picker::{DynamicPicker, FileLocation, Picker, PickerAction};
 pub use popup::Popup;
 pub use prompt::{Prompt, PromptEvent};
 pub use spinner::{ProgressSpinners, Spinner};

helix-term/src/ui/picker.rs

@@ -33,6 +33,7 @@ use helix_core::{
 use helix_view::{
     editor::Action,
     graphics::{CursorKind, Margin, Modifier, Rect},
+    input::KeyEvent,
     theme::Style,
     view::ViewPosition,
     Document, DocumentId, Editor,
@@ -74,6 +75,12 @@ impl From<DocumentId> for PathOrId {
 
 type FileCallback<T> = Box<dyn Fn(&Editor, &T) -> Option<FileLocation>>;
 
+pub enum PickerAction<T: Item> {
+    UpdateOptions(Vec<T>),
+}
+
+type KeyEventCallback<T> = Box<dyn Fn(&mut Context, &T, &KeyEvent) -> Option<PickerAction<T>>>;
+
 /// File path and range of lines (used to align and highlight lines)
 pub type FileLocation = (PathOrId, Option<(usize, usize)>);
 
@@ -132,7 +139,6 @@ pub struct Picker<T: Item> {
     show_preview: bool,
     /// Constraints for tabular formatting
     widths: Vec<Constraint>,
-
     callback_fn: PickerCallback<T>,
 
     pub truncate_start: bool,
@@ -141,6 +147,7 @@ pub struct Picker<T: Item> {
     read_buffer: Vec<u8>,
     /// Given an item in the picker, return the file path and line number to display.
     file_fn: Option<FileCallback<T>>,
+    key_event_callback: Option<KeyEventCallback<T>>,
 }
 
 impl<T: Item + 'static> Picker<T> {
@@ -172,6 +179,7 @@ impl<T: Item + 'static> Picker<T> {
             preview_cache: HashMap::new(),
             read_buffer: Vec::with_capacity(1024),
             file_fn: None,
+            key_event_callback: None,
         };
 
         picker.calculate_column_widths();
@@ -205,6 +213,14 @@ impl<T: Item + 'static> Picker<T> {
         self
     }
 
+    pub fn on_key_event(
+        mut self,
+        callback: impl Fn(&mut Context, &T, &KeyEvent) -> Option<PickerAction<T>> + 'static,
+    ) -> Self {
+        self.key_event_callback = Some(Box::new(callback));
+        self
+    }
+
     pub fn set_options(&mut self, new_options: Vec<T>) {
         self.options = new_options;
         self.cursor = 0;
@@ -849,7 +865,16 @@ impl<T: Item + 'static> Component for Picker<T> {
                 self.toggle_preview();
             }
             _ => {
-                self.prompt_handle_event(event, ctx);
+                match self.selection().and_then(|option| {
+                    self.key_event_callback
+                        .as_ref()
+                        .and_then(|cb| cb(ctx, option, &key_event))
+                }) {
+                    Some(PickerAction::UpdateOptions(options)) => self.set_options(options),
+                    None => {
+                        self.prompt_handle_event(event, ctx);
+                    }
+                };
             }
         }