Basic resolution for ADT

This commit is contained in:
kjeremy 2019-04-23 14:11:27 -04:00
parent a094d5c621
commit 7125192c1e
5 changed files with 99 additions and 2 deletions

View file

@ -0,0 +1,68 @@
use ra_db::SourceDatabase;
use ra_syntax::{
AstNode, ast,
algo::find_token_at_offset
};
use crate::{FilePosition, NavigationTarget, db::RootDatabase, RangeInfo};
pub(crate) fn goto_type_definition(
db: &RootDatabase,
position: FilePosition,
) -> Option<RangeInfo<Vec<NavigationTarget>>> {
let file = db.parse(position.file_id);
let node = find_token_at_offset(file.syntax(), position.offset).find_map(|token| {
token
.parent()
.ancestors()
.find(|n| ast::Expr::cast(*n).is_some() || ast::Pat::cast(*n).is_some())
})?;
let analyzer = hir::SourceAnalyzer::new(db, position.file_id, node, None);
let ty: hir::Ty = if let Some(ty) = ast::Expr::cast(node).and_then(|e| analyzer.type_of(db, e))
{
ty
} else if let Some(ty) = ast::Pat::cast(node).and_then(|p| analyzer.type_of_pat(db, p)) {
ty
} else {
return None;
};
if let Some((adt_def, _)) = ty.as_adt() {
let nav = NavigationTarget::from_adt_def(db, adt_def);
return Some(RangeInfo::new(node.range(), vec![nav]));
};
None
}
#[cfg(test)]
mod tests {
use crate::mock_analysis::analysis_and_position;
fn check_goto(fixture: &str, expected: &str) {
let (analysis, pos) = analysis_and_position(fixture);
let mut navs = analysis.goto_type_definition(pos).unwrap().unwrap().info;
assert_eq!(navs.len(), 1);
let nav = navs.pop().unwrap();
nav.assert_match(expected);
}
#[test]
fn goto_type_definition_works_simple() {
check_goto(
"
//- /lib.rs
struct Foo;
fn foo() {
let f: Foo;
f<|>
}
",
"Foo STRUCT_DEF FileId(1) [0; 11) [7; 10)",
);
}
}

View file

@ -19,6 +19,7 @@ mod status;
mod completion;
mod runnables;
mod goto_definition;
mod goto_type_definition;
mod extend_selection;
mod hover;
mod call_info;
@ -416,6 +417,13 @@ impl Analysis {
self.with_db(|db| impls::goto_implementation(db, position))
}
pub fn goto_type_definition(
&self,
position: FilePosition,
) -> Cancelable<Option<RangeInfo<Vec<NavigationTarget>>>> {
self.with_db(|db| goto_type_definition::goto_type_definition(db, position))
}
/// Finds all usages of the reference at point.
pub fn find_all_refs(
&self,