language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

return ref ranges from gotodef

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-11 14:14:09 +03:00
parent f9ed8d4d23
commit 3aaf20bd6e
4 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_ide_api/src/goto_definition.rs
View file

@ -4,19 +4,21 @@ use ra_syntax::{
algo::find_node_at_offset,
};
use crate::{FilePosition, NavigationTarget, db::RootDatabase};
use crate::{FilePosition, NavigationTarget, db::RootDatabase, RangeInfo};
pub(crate) fn goto_definition(
db: &RootDatabase,
position: FilePosition,
) -> Cancelable<Option<Vec<NavigationTarget>>> {
) -> Cancelable<Option<RangeInfo<Vec<NavigationTarget>>>> {
let file = db.source_file(position.file_id);
let syntax = file.syntax();
if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(syntax, position.offset) {
return Ok(Some(reference_definition(db, position.file_id, name_ref)?));
let navs = reference_definition(db, position.file_id, name_ref)?;
return Ok(Some(RangeInfo::new(name_ref.syntax().range(), navs)));
}
if let Some(name) = find_node_at_offset::<ast::Name>(syntax, position.offset) {
return name_definition(db, position.file_id, name);
let navs = ctry!(name_definition(db, position.file_id, name)?);
return Ok(Some(RangeInfo::new(name.syntax().range(), navs)));
}
Ok(None)
}