Add file picker dialogue when opening a directory with :o (#2707)
This commit is contained in:
parent
7a1fa0c74f
commit
1b89d3e535
1 changed files with 22 additions and 6 deletions
|
@ -65,12 +65,28 @@ fn open(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
|
|||
ensure!(!args.is_empty(), "wrong argument count");
|
||||
for arg in args {
|
||||
let (path, pos) = args::parse_file(arg);
|
||||
let _ = cx.editor.open(&path, Action::Replace)?;
|
||||
let (view, doc) = current!(cx.editor);
|
||||
let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
|
||||
doc.set_selection(view.id, pos);
|
||||
// does not affect opening a buffer without pos
|
||||
align_view(doc, view, Align::Center);
|
||||
// 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 (view, doc) = current!(cx.editor);
|
||||
let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
|
||||
doc.set_selection(view.id, pos);
|
||||
// does not affect opening a buffer without pos
|
||||
align_view(doc, view, Align::Center);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue