ilyakooo0/helix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/helix.git synced 2024-12-02 06:45:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

picker wip

Browse Source
This commit is contained in:
Jan Hrastnik 2021-03-14 22:24:46 +01:00 committed by Blaž Hrastnik
parent 15f142bc4b
commit 0828d1fdea
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -852,27 +852,21 @@ pub fn exit_select_mode(cx: &mut Context) {
cx.doc().mode = Mode::Normal; cx.doc().mode = Mode::Normal;
} }
fn goto(cx: &mut Context, locations: Vec<lsp::Location>) { fn goto(cx: &'static mut Context<'static>, locations: Vec<lsp::Location>) {
let doc = cx.doc(); let doc = cx.doc();
doc.mode = Mode::Normal; doc.mode = Mode::Normal;
log::info!("{:?}", locations); log::info!("{:?}", locations);
let filepath = doc.path().unwrap();
log::info!("{:?}", filepath);
match locations.as_slice() { match locations.as_slice() {
[location] => { [location] => {
if filepath.to_str().unwrap() == location.uri.path() { cx.editor
.open(PathBuf::from(location.uri.path()), cx.executor);
let doc = cx.doc();
let definition_pos = location.range.start; let definition_pos = location.range.start;
let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos); let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
doc.set_selection(Selection::point(new_pos)); doc.set_selection(Selection::point(new_pos));
} else {
// open new file
cx.editor
.open(PathBuf::from(location.uri.path()), cx.executor);
// TODO: go to position
}
} }
[] => (), // maybe show user message that no definition was found? [] => (), // maybe show user message that no definition was found?
_locations => { _locations => {
@ -884,14 +878,20 @@ fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
format!("{}:{}", file, line).into() format!("{}:{}", file, line).into()
}, },
move |editor: &mut Editor, item| { move |editor: &mut Editor, item| {
let doc = &mut editor.view_mut().doc; cx.editor.open(PathBuf::from(item.uri.path()), cx.executor);
let doc = cx.doc();
let definition_pos = item.range.start;
let new_pos =
helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
doc.set_selection(Selection::point(new_pos));
}, },
); );
cx.push_layer(Box::new(picker));
} }
} }
} }
pub fn goto_definition(cx: &mut Context) { pub fn goto_definition(cx: &'static mut Context<'static>) {
let doc = cx.doc(); let doc = cx.doc();
let language_server = match doc.language_server.as_ref() { let language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server, Some(language_server) => language_server,
@ -907,7 +907,7 @@ pub fn goto_definition(cx: &mut Context) {
goto(cx, res); goto(cx, res);
} }
pub fn goto_type_definition(cx: &mut Context) { pub fn goto_type_definition(cx: &'static mut Context<'static>) {
let doc = cx.doc(); let doc = cx.doc();
let language_server = match doc.language_server.as_ref() { let language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server, Some(language_server) => language_server,
@ -923,7 +923,7 @@ pub fn goto_type_definition(cx: &mut Context) {
goto(cx, res); goto(cx, res);
} }
pub fn goto_implementation(cx: &mut Context) { pub fn goto_implementation(cx: &'static mut Context<'static>) {
let doc = cx.doc(); let doc = cx.doc();
let language_server = match doc.language_server.as_ref() { let language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server, Some(language_server) => language_server,
@ -939,7 +939,7 @@ pub fn goto_implementation(cx: &mut Context) {
goto(cx, res); goto(cx, res);
} }
pub fn goto_reference(cx: &mut Context) { pub fn goto_reference(cx: &'static mut Context<'static>) {
let doc = cx.doc(); let doc = cx.doc();
let language_server = match doc.language_server.as_ref() { let language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server, Some(language_server) => language_server,