andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

Pass directory content into picker directly

Browse Source
This commit is contained in:
Denys Rybalka 2024-08-09 20:58:46 +02:00
parent 084d1811ea
commit 8f5e4dff29
No known key found for this signature in database
GPG Key ID: 1F6284E97DB46ED1
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helix-term/src/commands.rs
View File

@ -375,7 +375,7 @@ pub fn doc(&self) -> &str {
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 at current buffer's directory",
file_browser, "Open file browser at current working directory",
code_action, "Perform code action",
buffer_picker, "Open buffer picker",
jumplist_picker, "Open jumplist picker",
@ -2956,8 +2956,9 @@ fn file_browser(cx: &mut Context) {
.set_error("Current working directory does not exist");
return;
}
let picker = ui::file_browser(cwd);
cx.push_layer(Box::new(overlaid(picker)));
if let Ok(picker) = ui::file_browser(cwd) {
cx.push_layer(Box::new(overlaid(picker)));
}
}
fn buffer_picker(cx: &mut Context) {

65
helix-term/src/ui/mod.rs
View File

@ -266,8 +266,8 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
picker
}
pub fn file_browser(root: PathBuf) -> FilePicker {
let directory_content = directory_content(&root);
pub fn file_browser(root: PathBuf) -> Result<FilePicker, std::io::Error> {
let directory_content = directory_content(&root)?;
let columns = [PickerColumn::new(
"path",
@ -278,38 +278,37 @@ pub fn file_browser(root: PathBuf) -> FilePicker {
.into()
},
)];
let picker = Picker::new(columns, 0, [], root, move |cx, path: &PathBuf, 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 {
format!("unable to open \"{}\"", path.display())
};
cx.editor.set_error(err);
}
})
.with_preview(|_editor, path| Some((path.as_path().into(), None)));
let injector = picker.injector();
if let Ok(files) = directory_content {
for file in files {
if injector.push(file).is_err() {
break;
let picker = Picker::new(
columns,
0,
directory_content,
root,
move |cx, path: &PathBuf, 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| {
if let Ok(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 {
format!("unable to open \"{}\"", path.display())
};
cx.editor.set_error(err);
}
}
}
picker
},
)
.with_preview(|_editor, path| Some((path.as_path().into(), None)));
Ok(picker)
}
fn directory_content(path: &Path) -> Result<Vec<PathBuf>, std::io::Error> {