From d4ade409834909c6807a337054022cd6de1ef219 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 23 Jan 2025 18:17:37 -0500
Subject: [PATCH] Rename "file browser" => "file explorer"
Connects #11285
---
book/src/generated/static-cmd.md | 6 +++---
helix-term/src/commands.rs | 20 ++++++++++----------
helix-term/src/keymap/default.rs | 4 ++--
helix-term/src/ui/mod.rs | 6 +++---
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/book/src/generated/static-cmd.md b/book/src/generated/static-cmd.md
index 9b2afc02..ed31f0b1 100644
--- a/book/src/generated/static-cmd.md
+++ b/book/src/generated/static-cmd.md
@@ -100,9 +100,9 @@
| `file_picker` | Open file picker | normal: `` <space>f ``, select: `` <space>f `` |
| `file_picker_in_current_buffer_directory` | Open file picker at current buffer's directory | |
| `file_picker_in_current_directory` | Open file picker at current working directory | normal: `` <space>F ``, select: `` <space>F `` |
-| `file_browser` | Open file browser in workspace root | normal: `` <space>e ``, select: `` <space>e `` |
-| `file_browser_in_current_buffer_directory` | Open file browser at current buffer's directory | normal: `` <space>E ``, select: `` <space>E `` |
-| `file_browser_in_current_directory` | Open file browser at current working directory | |
+| `file_explorer` | Open file explorer in workspace root | normal: `` <space>e ``, select: `` <space>e `` |
+| `file_explorer_in_current_buffer_directory` | Open file explorer at current buffer's directory | normal: `` <space>E ``, select: `` <space>E `` |
+| `file_explorer_in_current_directory` | Open file explorer at current working directory | |
| `code_action` | Perform code action | normal: `` <space>a ``, select: `` <space>a `` |
| `buffer_picker` | Open buffer picker | normal: `` <space>b ``, select: `` <space>b `` |
| `jumplist_picker` | Open jumplist picker | normal: `` <space>j ``, select: `` <space>j `` |
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 9064e1cc..e49d752b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -393,9 +393,9 @@ impl MappableCommand {
file_picker, "Open file picker",
file_picker_in_current_buffer_directory, "Open file picker at current buffer's directory",
file_picker_in_current_directory, "Open file picker at current working directory",
- file_browser, "Open file browser in workspace root",
- file_browser_in_current_buffer_directory, "Open file browser at current buffer's directory",
- file_browser_in_current_directory, "Open file browser at current working directory",
+ file_explorer, "Open file explorer in workspace root",
+ file_explorer_in_current_buffer_directory, "Open file explorer at current buffer's directory",
+ file_explorer_in_current_directory, "Open file explorer at current working directory",
code_action, "Perform code action",
buffer_picker, "Open buffer picker",
jumplist_picker, "Open jumplist picker",
@@ -2995,19 +2995,19 @@ fn file_picker_in_current_directory(cx: &mut Context) {
cx.push_layer(Box::new(overlaid(picker)));
}
-fn file_browser(cx: &mut Context) {
+fn file_explorer(cx: &mut Context) {
let root = find_workspace().0;
if !root.exists() {
cx.editor.set_error("Workspace directory does not exist");
return;
}
- if let Ok(picker) = ui::file_browser(root, cx.editor) {
+ if let Ok(picker) = ui::file_explorer(root, cx.editor) {
cx.push_layer(Box::new(overlaid(picker)));
}
}
-fn file_browser_in_current_buffer_directory(cx: &mut Context) {
+fn file_explorer_in_current_buffer_directory(cx: &mut Context) {
let doc_dir = doc!(cx.editor)
.path()
.and_then(|path| path.parent().map(|path| path.to_path_buf()));
@@ -3023,18 +3023,18 @@ fn file_browser_in_current_buffer_directory(cx: &mut Context) {
return;
}
cx.editor.set_error(
- "Current buffer has no parent, opening file browser in current working directory",
+ "Current buffer has no parent, opening file explorer in current working directory",
);
cwd
}
};
- if let Ok(picker) = ui::file_browser(path, cx.editor) {
+ if let Ok(picker) = ui::file_explorer(path, cx.editor) {
cx.push_layer(Box::new(overlaid(picker)));
}
}
-fn file_browser_in_current_directory(cx: &mut Context) {
+fn file_explorer_in_current_directory(cx: &mut Context) {
let cwd = helix_stdx::env::current_working_dir();
if !cwd.exists() {
cx.editor
@@ -3042,7 +3042,7 @@ fn file_browser_in_current_directory(cx: &mut Context) {
return;
}
- if let Ok(picker) = ui::file_browser(cwd, cx.editor) {
+ if let Ok(picker) = ui::file_explorer(cwd, cx.editor) {
cx.push_layer(Box::new(overlaid(picker)));
}
}
diff --git a/helix-term/src/keymap/default.rs b/helix-term/src/keymap/default.rs
index 341d6dbf..e160b224 100644
--- a/helix-term/src/keymap/default.rs
+++ b/helix-term/src/keymap/default.rs
@@ -222,8 +222,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
"space" => { "Space"
"f" => file_picker,
"F" => file_picker_in_current_directory,
- "e" => file_browser,
- "E" => file_browser_in_current_buffer_directory,
+ "e" => file_explorer,
+ "E" => file_explorer_in_current_buffer_directory,
"b" => buffer_picker,
"j" => jumplist_picker,
"s" => symbol_picker,
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 92fa49dd..d5eaaefc 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -279,9 +279,9 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
picker
}
-type FileBrowser = Picker<(PathBuf, bool), (PathBuf, Style)>;
+type FileExplorer = Picker<(PathBuf, bool), (PathBuf, Style)>;
-pub fn file_browser(root: PathBuf, editor: &Editor) -> Result<FileBrowser, std::io::Error> {
+pub fn file_explorer(root: PathBuf, editor: &Editor) -> Result<FileExplorer, std::io::Error> {
let directory_style = editor.theme.get("ui.text.directory");
let directory_content = directory_content(&root)?;
@@ -307,7 +307,7 @@ pub fn file_browser(root: PathBuf, editor: &Editor) -> Result<FileBrowser, std::
let callback = Box::pin(async move {
let call: Callback =
Callback::EditorCompositor(Box::new(move |editor, compositor| {
- if let Ok(picker) = file_browser(new_root, editor) {
+ if let Ok(picker) = file_explorer(new_root, editor) {
compositor.push(Box::new(overlay::overlaid(picker)));
}
}));