|
|
@ -1162,10 +1162,6 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
|
|
|
|
let (view, doc) = current_ref!(cx.editor);
|
|
|
|
let (view, doc) = current_ref!(cx.editor);
|
|
|
|
let text = doc.text();
|
|
|
|
let text = doc.text();
|
|
|
|
let selections = doc.selection(view.id);
|
|
|
|
let selections = doc.selection(view.id);
|
|
|
|
let rel_path = doc
|
|
|
|
|
|
|
|
.relative_path()
|
|
|
|
|
|
|
|
.map(|path| path.parent().unwrap().to_path_buf())
|
|
|
|
|
|
|
|
.unwrap_or_default();
|
|
|
|
|
|
|
|
let mut paths: Vec<_> = selections
|
|
|
|
let mut paths: Vec<_> = selections
|
|
|
|
.iter()
|
|
|
|
.iter()
|
|
|
|
.map(|r| text.slice(r.from()..r.to()).to_string())
|
|
|
|
.map(|r| text.slice(r.from()..r.to()).to_string())
|
|
|
@ -1204,14 +1200,24 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
|
|
|
|
return open_url(cx, url, action);
|
|
|
|
return open_url(cx, url, action);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
let path = &rel_path.join(p);
|
|
|
|
let (path, pos) = args::parse_file(p);
|
|
|
|
if path.is_dir() {
|
|
|
|
if path.is_dir() {
|
|
|
|
let picker = ui::file_picker(path.into(), &cx.editor.config());
|
|
|
|
let picker = ui::file_picker(path, &cx.editor.config());
|
|
|
|
cx.push_layer(Box::new(overlaid(picker)));
|
|
|
|
cx.push_layer(Box::new(overlaid(picker)));
|
|
|
|
} else if let Err(e) = cx.editor.open(path, action) {
|
|
|
|
} else {
|
|
|
|
cx.editor.set_error(format!("Open file failed: {:?}", e));
|
|
|
|
match cx.editor.open(path.as_path(), action) {
|
|
|
|
|
|
|
|
Ok(_) => {
|
|
|
|
|
|
|
|
let (view, doc) = current!(cx.editor);
|
|
|
|
|
|
|
|
let pos = Selection::point(pos_at_coords(doc.text().slice(..), pos, true));
|
|
|
|
|
|
|
|
doc.set_selection(view.id, pos);
|
|
|
|
|
|
|
|
align_view(doc, view, Align::Center);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
Err(e) => {
|
|
|
|
|
|
|
|
cx.editor.set_error(format!("Open file failed: {:?}", e));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// Opens the given url. If the URL points to a valid textual file it is open in helix.
|
|
|
|
/// Opens the given url. If the URL points to a valid textual file it is open in helix.
|
|
|
|