aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_api/src/references/classify.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_ide_api/src/references/classify.rs')
-rw-r--r--crates/ra_ide_api/src/references/classify.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/crates/ra_ide_api/src/references/classify.rs b/crates/ra_ide_api/src/references/classify.rs
index 2ba1cf71c..5cb194c0e 100644
--- a/crates/ra_ide_api/src/references/classify.rs
+++ b/crates/ra_ide_api/src/references/classify.rs
@@ -32,32 +32,32 @@ pub(crate) fn classify_name(
32 let ast = hir::ModuleSource::Module(it); 32 let ast = hir::ModuleSource::Module(it);
33 let src = hir::Source { file_id, ast }; 33 let src = hir::Source { file_id, ast };
34 let def = hir::Module::from_definition(db, src)?; 34 let def = hir::Module::from_definition(db, src)?;
35 Some(from_module_def(db, def.into())) 35 Some(from_module_def(db, def.into(), None))
36 }, 36 },
37 ast::StructDef(it) => { 37 ast::StructDef(it) => {
38 let src = hir::Source { file_id, ast: it }; 38 let src = hir::Source { file_id, ast: it };
39 let def = hir::Struct::from_source(db, src)?; 39 let def = hir::Struct::from_source(db, src)?;
40 Some(from_module_def(db, def.into())) 40 Some(from_module_def(db, def.into(), None))
41 }, 41 },
42 ast::EnumDef(it) => { 42 ast::EnumDef(it) => {
43 let src = hir::Source { file_id, ast: it }; 43 let src = hir::Source { file_id, ast: it };
44 let def = hir::Enum::from_source(db, src)?; 44 let def = hir::Enum::from_source(db, src)?;
45 Some(from_module_def(db, def.into())) 45 Some(from_module_def(db, def.into(), None))
46 }, 46 },
47 ast::TraitDef(it) => { 47 ast::TraitDef(it) => {
48 let src = hir::Source { file_id, ast: it }; 48 let src = hir::Source { file_id, ast: it };
49 let def = hir::Trait::from_source(db, src)?; 49 let def = hir::Trait::from_source(db, src)?;
50 Some(from_module_def(db, def.into())) 50 Some(from_module_def(db, def.into(), None))
51 }, 51 },
52 ast::StaticDef(it) => { 52 ast::StaticDef(it) => {
53 let src = hir::Source { file_id, ast: it }; 53 let src = hir::Source { file_id, ast: it };
54 let def = hir::Static::from_source(db, src)?; 54 let def = hir::Static::from_source(db, src)?;
55 Some(from_module_def(db, def.into())) 55 Some(from_module_def(db, def.into(), None))
56 }, 56 },
57 ast::EnumVariant(it) => { 57 ast::EnumVariant(it) => {
58 let src = hir::Source { file_id, ast: it }; 58 let src = hir::Source { file_id, ast: it };
59 let def = hir::EnumVariant::from_source(db, src)?; 59 let def = hir::EnumVariant::from_source(db, src)?;
60 Some(from_module_def(db, def.into())) 60 Some(from_module_def(db, def.into(), None))
61 }, 61 },
62 ast::FnDef(it) => { 62 ast::FnDef(it) => {
63 let src = hir::Source { file_id, ast: it }; 63 let src = hir::Source { file_id, ast: it };
@@ -65,7 +65,7 @@ pub(crate) fn classify_name(
65 if parent.parent().and_then(ast::ItemList::cast).is_some() { 65 if parent.parent().and_then(ast::ItemList::cast).is_some() {
66 Some(from_assoc_item(db, def.into())) 66 Some(from_assoc_item(db, def.into()))
67 } else { 67 } else {
68 Some(from_module_def(db, def.into())) 68 Some(from_module_def(db, def.into(), None))
69 } 69 }
70 }, 70 },
71 ast::ConstDef(it) => { 71 ast::ConstDef(it) => {
@@ -74,7 +74,7 @@ pub(crate) fn classify_name(
74 if parent.parent().and_then(ast::ItemList::cast).is_some() { 74 if parent.parent().and_then(ast::ItemList::cast).is_some() {
75 Some(from_assoc_item(db, def.into())) 75 Some(from_assoc_item(db, def.into()))
76 } else { 76 } else {
77 Some(from_module_def(db, def.into())) 77 Some(from_module_def(db, def.into(), None))
78 } 78 }
79 }, 79 },
80 ast::TypeAliasDef(it) => { 80 ast::TypeAliasDef(it) => {
@@ -83,7 +83,7 @@ pub(crate) fn classify_name(
83 if parent.parent().and_then(ast::ItemList::cast).is_some() { 83 if parent.parent().and_then(ast::ItemList::cast).is_some() {
84 Some(from_assoc_item(db, def.into())) 84 Some(from_assoc_item(db, def.into()))
85 } else { 85 } else {
86 Some(from_module_def(db, def.into())) 86 Some(from_module_def(db, def.into(), None))
87 } 87 }
88 }, 88 },
89 _ => None, 89 _ => None,
@@ -143,7 +143,7 @@ pub(crate) fn classify_name_ref(
143 let path = name_ref.syntax().ancestors().find_map(ast::Path::cast)?; 143 let path = name_ref.syntax().ancestors().find_map(ast::Path::cast)?;
144 let resolved = analyzer.resolve_path(db, &path)?; 144 let resolved = analyzer.resolve_path(db, &path)?;
145 match resolved { 145 match resolved {
146 Def(def) => Some(from_module_def(db, def)), 146 Def(def) => Some(from_module_def(db, def, Some(container))),
147 AssocItem(item) => Some(from_assoc_item(db, item)), 147 AssocItem(item) => Some(from_assoc_item(db, item)),
148 LocalBinding(Either::A(pat)) => from_pat(db, file_id, pat), 148 LocalBinding(Either::A(pat)) => from_pat(db, file_id, pat),
149 LocalBinding(Either::B(par)) => { 149 LocalBinding(Either::B(par)) => {