Find file (space .)

book/src/keymap.md

@@ -258,6 +258,7 @@ This layer is a kludge of mappings, mostly pickers.
 | -----   | -----------                                                             | -------                             |
 | `f`     | Open file picker                                                        | `file_picker`                       |
 | `F`     | Open file picker at current working directory                           | `file_picker_in_current_directory`  |
+| `.`     | Open find file picker                                                   | `find_file_picker`                  |
 | `b`     | Open buffer picker                                                      | `buffer_picker`                     |
 | `j`     | Open jumplist picker                                                    | `jumplist_picker`                   |
 | `k`     | Show documentation for item under cursor in a [popup](#popup) (**LSP**) | `hover`                             |

helix-term/Cargo.toml

@@ -66,6 +66,8 @@ serde = { version = "1.0", features = ["derive"] }
 # ripgrep for global search
 grep-regex = "0.1.10"
 grep-searcher = "0.1.10"
+libc = "0.2.133"
+number_prefix = "0.4.0"
 
 [target.'cfg(not(windows))'.dependencies]  # https://github.com/vorner/signal-hook/issues/100
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }

helix-term/src/commands.rs

@@ -264,6 +264,7 @@ impl MappableCommand {
         command_mode, "Enter command mode",
         file_picker, "Open file picker",
         file_picker_in_current_directory, "Open file picker at current working directory",
+        find_file_picker, "Open find file picker",
         code_action, "Perform code action",
         buffer_picker, "Open buffer picker",
         jumplist_picker, "Open jumplist picker",
@@ -2238,6 +2239,16 @@ fn file_picker_in_current_directory(cx: &mut Context) {
     cx.push_layer(Box::new(overlayed(picker)));
 }
 
+fn find_file_picker(cx: &mut Context) {
+    let doc = doc!(cx.editor);
+    let doc_parent = doc.path().and_then(|p| p.parent()).map(|p| p.to_owned());
+    let cwd = doc_parent
+        .or_else(|| std::env::current_dir().ok())
+        .unwrap_or_else(|| PathBuf::from("./"));
+    let picker = ui::find_file_picker(cwd);
+    cx.push_layer(Box::new(overlayed(picker)));
+}
+
 fn buffer_picker(cx: &mut Context) {
     let current = view!(cx.editor).doc;
 

helix-term/src/keymap/default.rs

@@ -204,6 +204,7 @@ pub fn default() -> HashMap<Mode, Keymap> {
         "space" => { "Space"
             "f" => file_picker,
             "F" => file_picker_in_current_directory,
+            "." => find_file_picker,
             "b" => buffer_picker,
             "j" => jumplist_picker,
             "s" => symbol_picker,

helix-term/src/ui/mod.rs

@@ -16,7 +16,7 @@ pub use completion::Completion;
 pub use editor::EditorView;
 pub use markdown::Markdown;
 pub use menu::Menu;
-pub use picker::{FileLocation, FilePicker, Picker};
+pub use picker::{FileLocation, FilePicker, FindFilePicker, Picker};
 pub use popup::Popup;
 pub use prompt::{Prompt, PromptEvent};
 pub use spinner::{ProgressSpinners, Spinner};
@@ -200,6 +200,11 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
     )
 }
 
+/// Based on find-file on doom emacs (SPC . or SPC f f).
+pub fn find_file_picker(dir: PathBuf) -> FindFilePicker {
+    FindFilePicker::new(dir)
+}
+
 pub mod completers {
     use crate::ui::prompt::Completion;
     use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;

helix-term/src/ui/prompt.rs

@@ -10,8 +10,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>);
@@ -28,6 +28,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>,
 }
 
@@ -79,6 +80,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,
         }
     }
@@ -343,14 +345,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
@@ -464,8 +471,8 @@ impl Prompt {
         surface.set_string(
             area.x + self.prompt.len() as u16,
             area.y + line,
-            &input,
-            prompt_color,
+            input,
+            prompt_input_color,
         );
     }
 }