Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

restore index-based gotodef

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-05 12:17:38 +03:00
parent 84f2509730
commit 7960c8b276
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/ra_analysis/src/imp.rs
View file

@ -214,7 +214,7 @@ impl AnalysisImpl {
{
let scope = fn_descr.scope(&*self.db);
// First try to resolve the symbol locally
return if let Some(entry) = scope.resolve_local_name(name_ref) {
if let Some(entry) = scope.resolve_local_name(name_ref) {
let mut vec = vec![];
vec.push((
position.file_id,
@ -224,12 +224,11 @@ impl AnalysisImpl {
kind: NAME,
},
));
Ok(vec)
} else {
// If that fails try the index based approach.
self.index_resolve(name_ref)
return Ok(vec);
};
}
// If that fails try the index based approach.
return self.index_resolve(name_ref);
}
if let Some(name) = find_node_at_offset::<ast::Name>(syntax, position.offset) {
if let Some(module) = name.syntax().parent().and_then(ast::Module::cast) {

17
crates/ra_analysis/tests/tests.rs
View file

@ -18,6 +18,23 @@ fn get_signature(text: &str) -> (FnSignatureInfo, Option<usize>) {
analysis.resolve_callable(position).unwrap().unwrap()
}
#[test]
fn approximate_resolve_works_in_items() {
let (analysis, pos) = analysis_and_position(
"
//- /lib.rs
struct Foo;
enum E { X(Foo<|>) }
",
);
let symbols = analysis.approximately_resolve_symbol(pos).unwrap();
assert_eq_dbg(
r#"[(FileId(1), FileSymbol { name: "Foo", node_range: [0; 11), kind: STRUCT_DEF })]"#,
&symbols,
);
}
#[test]
fn test_resolve_module() {
let (analysis, pos) = analysis_and_position(