kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Implement opening of folders

Browse source
This commit is contained in:
Denys Rybalka 2024-07-23 17:18:19 +02:00
parent b1dcd96ab5
commit bb1722a528
No known key found for this signature in database
GPG key ID: 1F6284E97DB46ED1
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
helix-term/src/commands.rs
View file

@ -2994,7 +2994,7 @@ fn file_browser(cx: &mut Context) {
.set_error("Current working directory does not exist");
return;
}
let picker = ui::file_browser(cwd, &cx.editor.config());
let picker = ui::file_browser(cwd);
cx.push_layer(Box::new(overlaid(picker)));
}

15
helix-term/src/ui/mod.rs
View file

@ -277,7 +277,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
picker
}
pub fn file_browser(root: PathBuf, _config: &helix_view::editor::Config) -> FilePicker {
pub fn file_browser(root: PathBuf) -> FilePicker {
let directory_content = directory_content(&root);
let columns = [PickerColumn::new(
@ -290,7 +290,18 @@ pub fn file_browser(root: PathBuf, _config: &helix_view::editor::Config) -> File
},
)];
let picker = Picker::new(columns, 0, [], root, move |cx, path: &PathBuf, action| {
if let Err(e) = cx.editor.open(path, action) {
if path.is_dir() {
let owned_path = path.clone();
let callback = Box::pin(async move {
let call: Callback =
Callback::EditorCompositor(Box::new(move |_editor, compositor| {
let picker = file_browser(owned_path);
compositor.push(Box::new(overlay::overlaid(picker)));
}));
Ok(call)
});
cx.jobs.callback(callback);
} else if let Err(e) = cx.editor.open(path, action) {
let err = if let Some(err) = e.source() {
format!("{}", err)
} else {