language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

introduce navigation target

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-02 16:53:40 +03:00
parent a4b4fd7dc5
commit d25c89f760
3 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_lsp_server/src/main_loop/handlers.rs
View file

@ -213,9 +213,9 @@ pub fn handle_goto_definition(
Some(it) => it,
};
let mut res = Vec::new();
for (file_id, symbol) in rr.resolves_to {
let line_index = world.analysis().file_line_index(file_id);
let location = to_location(file_id, symbol.node_range, &world, &line_index)?;
for nav in rr.resolves_to {
let line_index = world.analysis().file_line_index(nav.file_id());
let location = to_location(nav.file_id(), nav.range(), &world, &line_index)?;
res.push(location)
}
Ok(Some(req::GotoDefinitionResponse::Array(res)))
@ -517,8 +517,8 @@ pub fn handle_hover(
Some(it) => it,
};
let mut result = Vec::new();
for (file_id, symbol) in rr.resolves_to {
if let Some(docs) = world.analysis().doc_text_for(file_id, symbol)? {
for nav in rr.resolves_to {
if let Some(docs) = world.analysis().doc_text_for(nav)? {
result.push(docs);
}
}