Find file add dir as prompt

helix-editor · May 29, 2022 · 6ce60c2 · 6ce60c2
1 parent 7c833c1
commit 6ce60c2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
@@ -91,7 +91,7 @@ impl FindFilePicker {
             Err(_) => Vec::new(),
         };
         let dir1 = dir.clone();
-        let picker = FilePicker::new(
+        let mut picker = FilePicker::new(
             files,
             move |path| {
                 let suffix = if path.is_dir() { "/" } else { "" };
@@ -101,6 +101,17 @@ impl FindFilePicker {
             |_cx, _path, _action| {}, // we use custom callback_fn
             |_editor, path| Some((path.clone(), None)),
         );
+        // TODO: truncate prompt dir if prompt area too small and current dir too long
+        let current_dir = std::env::current_dir().expect("couldn't determine current directory");
+        let dir1 = dir.clone();
+        let prompt = dir1
+            .strip_prefix(current_dir)
+            .unwrap_or(&dir1)
+            .to_string_lossy()
+            .into_owned()
+            + "/";
+        *picker.picker.prompt.prompt_mut() = Cow::Owned(prompt);
+        picker.picker.prompt.prompt_style_fn = Box::new(|theme| Some(theme.get("blue")));
         FindFilePicker { picker, dir }
     }
 }

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
@@ -11,8 +11,8 @@ use helix_core::{
     unicode::segmentation::GraphemeCursor, unicode::width::UnicodeWidthStr, Position,
 };
 use helix_view::{
-    graphics::{CursorKind, Margin, Rect},
-    Editor,
+    graphics::{CursorKind, Margin, Rect, Style},
+    Editor, Theme,
 };
 
 pub type Completion = (RangeFrom<usize>, Cow<'static, str>);
@@ -29,6 +29,7 @@ pub struct Prompt {
     completion_fn: Box<dyn FnMut(&Editor, &str) -> Vec<Completion>>,
     callback_fn: Box<dyn FnMut(&mut Context, &str, PromptEvent)>,
     pub doc_fn: Box<dyn Fn(&str) -> Option<Cow<str>>>,
+    pub prompt_style_fn: Box<dyn Fn(&Theme) -> Option<Style>>,
     next_char_handler: Option<PromptCharHandler>,
 }
 
@@ -80,6 +81,7 @@ impl Prompt {
             completion_fn: Box::new(completion_fn),
             callback_fn: Box::new(callback_fn),
             doc_fn: Box::new(|_| None),
+            prompt_style_fn: Box::new(|_| None),
             next_char_handler: None,
         }
     }
@@ -332,14 +334,19 @@ impl Prompt {
     pub fn exit_selection(&mut self) {
         self.selection = None;
     }
+
+    pub fn prompt_mut(&mut self) -> &mut Cow<'static, str> {
+        &mut self.prompt
+    }
 }
 
 const BASE_WIDTH: u16 = 30;
 
 impl Prompt {
     pub fn render_prompt(&self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         let theme = &cx.editor.theme;
-        let prompt_color = theme.get("ui.text");
+        let prompt_input_color = theme.get("ui.text");
+        let prompt_color = (self.prompt_style_fn)(&theme).unwrap_or(prompt_input_color);
         let completion_color = theme.get("ui.menu");
         let selected_color = theme.get("ui.menu.selected");
         // completion
@@ -446,7 +453,7 @@ impl Prompt {
             area.x + self.prompt.len() as u16,
             area.y + line,
             &self.line,
-            prompt_color,
+            prompt_input_color,
         );
     }
 }