Add file picker dialogue when opening a directory with :o (#2707)

This commit is contained in:
Jack Allison 2022-12-22 21:23:34 -05:00 committed by GitHub
parent 7a1fa0c74f
commit 1b89d3e535
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -65,6 +65,21 @@ fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
ensure!(!args.is_empty(), "wrong argument count"); ensure!(!args.is_empty(), "wrong argument count");
for arg in args { for arg in args {
let (path, pos) = args::parse_file(arg); let (path, pos) = args::parse_file(arg);
// If the path is a directory, open a file picker on that directory and update the status
// message
if std::fs::canonicalize(&path)?.is_dir() {
let callback = async move {
let call: job::Callback = job::Callback::EditorCompositor(Box::new(
move |editor: &mut Editor, compositor: &mut Compositor| {
let picker = ui::file_picker(path, &editor.config());
compositor.push(Box::new(overlayed(picker)));
},
));
Ok(call)
};
cx.jobs.callback(callback);
} else {
// Otherwise, just open the file
let _ = cx.editor.open(&path, Action::Replace)?; let _ = cx.editor.open(&path, Action::Replace)?;
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true)); let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
@ -72,6 +87,7 @@ fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
// does not affect opening a buffer without pos // does not affect opening a buffer without pos
align_view(doc, view, Align::Center); align_view(doc, view, Align::Center);
} }
}
Ok(()) Ok(())
} }