aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_api/src/references.rs
diff options
context:
space:
mode:
authorEkaterina Babshukova <[email protected]>2019-10-04 01:20:14 +0100
committerEkaterina Babshukova <[email protected]>2019-10-22 21:47:31 +0100
commit121aa35f12d282066651d906ea9a8b2da8209605 (patch)
treec9e896b2607d45ac72732572800d0397747ea680 /crates/ra_ide_api/src/references.rs
parent83f780eabfdaf37cb50c10c79af87506f2cc2afe (diff)
return Declaration from classify_name_ref
Diffstat (limited to 'crates/ra_ide_api/src/references.rs')
-rw-r--r--crates/ra_ide_api/src/references.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_ide_api/src/references.rs b/crates/ra_ide_api/src/references.rs
index 6777aa5f3..24453452b 100644
--- a/crates/ra_ide_api/src/references.rs
+++ b/crates/ra_ide_api/src/references.rs
@@ -69,13 +69,13 @@ pub(crate) fn find_all_refs(
69 Some((def_id, _)) => NavigationTarget::from_adt_def(db, def_id), 69 Some((def_id, _)) => NavigationTarget::from_adt_def(db, def_id),
70 None => return None, 70 None => return None,
71 }, 71 },
72 Pat(pat) => NavigationTarget::from_pat(db, position.file_id, pat), 72 Pat((_, pat)) => NavigationTarget::from_pat(db, position.file_id, pat),
73 SelfParam(par) => NavigationTarget::from_self_param(position.file_id, par), 73 SelfParam(par) => NavigationTarget::from_self_param(position.file_id, par),
74 GenericParam(_) => return None, 74 GenericParam(_) => return None,
75 }; 75 };
76 76
77 let references = match name_kind { 77 let references = match name_kind {
78 Pat(pat) => analyzer 78 Pat((_, pat)) => analyzer
79 .find_all_refs(&pat.to_node(&syntax)) 79 .find_all_refs(&pat.to_node(&syntax))
80 .into_iter() 80 .into_iter()
81 .map(move |ref_desc| FileRange { file_id: position.file_id, range: ref_desc.range }) 81 .map(move |ref_desc| FileRange { file_id: position.file_id, range: ref_desc.range })
@@ -99,7 +99,7 @@ pub(crate) fn find_all_refs(
99 let name_ref = find_node_at_offset::<ast::NameRef>(&syntax, position.offset)?; 99 let name_ref = find_node_at_offset::<ast::NameRef>(&syntax, position.offset)?;
100 let range = name_ref.syntax().text_range(); 100 let range = name_ref.syntax().text_range();
101 let analyzer = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax(), None); 101 let analyzer = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax(), None);
102 let name_kind = classify_name_ref(db, &analyzer, &name_ref)?; 102 let name_kind = classify_name_ref(db, position.file_id, &analyzer, &name_ref)?.item;
103 Some(RangeInfo::new(range, (analyzer, name_kind))) 103 Some(RangeInfo::new(range, (analyzer, name_kind)))
104 } 104 }
105} 105}