aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/assists/src/handlers/add_turbo_fish.rs4
-rw-r--r--crates/assists/src/handlers/expand_glob_import.rs4
-rw-r--r--crates/ide/src/doc_links.rs6
-rw-r--r--crates/ide/src/goto_definition.rs6
-rw-r--r--crates/ide/src/hover.rs6
-rw-r--r--crates/ide/src/references.rs6
-rw-r--r--crates/ide/src/references/rename.rs6
-rw-r--r--crates/ide/src/syntax_highlighting.rs6
-rw-r--r--crates/ide_db/src/defs.rs338
-rw-r--r--crates/ide_db/src/imports_locator.rs4
-rw-r--r--crates/ide_db/src/search.rs6
11 files changed, 196 insertions, 196 deletions
diff --git a/crates/assists/src/handlers/add_turbo_fish.rs b/crates/assists/src/handlers/add_turbo_fish.rs
index f4f997d8e..e3d84d698 100644
--- a/crates/assists/src/handlers/add_turbo_fish.rs
+++ b/crates/assists/src/handlers/add_turbo_fish.rs
@@ -1,4 +1,4 @@
1use ide_db::defs::{classify_name_ref, Definition, NameRefClass}; 1use ide_db::defs::{Definition, NameRefClass};
2use syntax::{ast, AstNode, SyntaxKind, T}; 2use syntax::{ast, AstNode, SyntaxKind, T};
3use test_utils::mark; 3use test_utils::mark;
4 4
@@ -39,7 +39,7 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
39 return None; 39 return None;
40 } 40 }
41 let name_ref = ast::NameRef::cast(ident.parent())?; 41 let name_ref = ast::NameRef::cast(ident.parent())?;
42 let def = match classify_name_ref(&ctx.sema, &name_ref)? { 42 let def = match NameRefClass::classify(&ctx.sema, &name_ref)? {
43 NameRefClass::Definition(def) => def, 43 NameRefClass::Definition(def) => def,
44 NameRefClass::ExternCrate(_) | NameRefClass::FieldShorthand { .. } => return None, 44 NameRefClass::ExternCrate(_) | NameRefClass::FieldShorthand { .. } => return None,
45 }; 45 };
diff --git a/crates/assists/src/handlers/expand_glob_import.rs b/crates/assists/src/handlers/expand_glob_import.rs
index d1adff972..316a58d88 100644
--- a/crates/assists/src/handlers/expand_glob_import.rs
+++ b/crates/assists/src/handlers/expand_glob_import.rs
@@ -1,7 +1,7 @@
1use either::Either; 1use either::Either;
2use hir::{AssocItem, MacroDef, Module, ModuleDef, Name, PathResolution, ScopeDef}; 2use hir::{AssocItem, MacroDef, Module, ModuleDef, Name, PathResolution, ScopeDef};
3use ide_db::{ 3use ide_db::{
4 defs::{classify_name_ref, Definition, NameRefClass}, 4 defs::{Definition, NameRefClass},
5 search::SearchScope, 5 search::SearchScope,
6}; 6};
7use syntax::{ 7use syntax::{
@@ -217,7 +217,7 @@ fn find_imported_defs(ctx: &AssistContext, star: SyntaxToken) -> Option<Vec<Def>
217 .flatten() 217 .flatten()
218 .filter_map(|n| Some(n.descendants().filter_map(ast::NameRef::cast))) 218 .filter_map(|n| Some(n.descendants().filter_map(ast::NameRef::cast)))
219 .flatten() 219 .flatten()
220 .filter_map(|r| match classify_name_ref(&ctx.sema, &r)? { 220 .filter_map(|r| match NameRefClass::classify(&ctx.sema, &r)? {
221 NameRefClass::Definition(Definition::ModuleDef(def)) => Some(Def::ModuleDef(def)), 221 NameRefClass::Definition(Definition::ModuleDef(def)) => Some(Def::ModuleDef(def)),
222 NameRefClass::Definition(Definition::Macro(def)) => Some(Def::MacroDef(def)), 222 NameRefClass::Definition(Definition::Macro(def)) => Some(Def::MacroDef(def)),
223 _ => None, 223 _ => None,
diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index 5e4147362..592a8e3ad 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs
@@ -14,7 +14,7 @@ use hir::{
14 ModuleDef, 14 ModuleDef,
15}; 15};
16use ide_db::{ 16use ide_db::{
17 defs::{classify_name, classify_name_ref, Definition}, 17 defs::{Definition, NameClass, NameRefClass},
18 RootDatabase, 18 RootDatabase,
19}; 19};
20use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T}; 20use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
@@ -232,8 +232,8 @@ pub(crate) fn external_docs(
232 let node = token.parent(); 232 let node = token.parent();
233 let definition = match_ast! { 233 let definition = match_ast! {
234 match node { 234 match node {
235 ast::NameRef(name_ref) => classify_name_ref(&sema, &name_ref).map(|d| d.definition(sema.db)), 235 ast::NameRef(name_ref) => NameRefClass::classify(&sema, &name_ref).map(|d| d.definition(sema.db)),
236 ast::Name(name) => classify_name(&sema, &name).map(|d| d.reference_or_definition(sema.db)), 236 ast::Name(name) => NameClass::classify(&sema, &name).map(|d| d.reference_or_definition(sema.db)),
237 _ => None, 237 _ => None,
238 } 238 }
239 }; 239 };
diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs
index be2f81aab..db6ad689e 100644
--- a/crates/ide/src/goto_definition.rs
+++ b/crates/ide/src/goto_definition.rs
@@ -1,6 +1,6 @@
1use hir::Semantics; 1use hir::Semantics;
2use ide_db::{ 2use ide_db::{
3 defs::{classify_name, classify_name_ref}, 3 defs::{NameClass, NameRefClass},
4 symbol_index, RootDatabase, 4 symbol_index, RootDatabase,
5}; 5};
6use syntax::{ 6use syntax::{
@@ -40,7 +40,7 @@ pub(crate) fn goto_definition(
40 reference_definition(&sema, &name_ref).to_vec() 40 reference_definition(&sema, &name_ref).to_vec()
41 }, 41 },
42 ast::Name(name) => { 42 ast::Name(name) => {
43 let def = classify_name(&sema, &name)?.reference_or_definition(sema.db); 43 let def = NameClass::classify(&sema, &name)?.reference_or_definition(sema.db);
44 let nav = def.try_to_nav(sema.db)?; 44 let nav = def.try_to_nav(sema.db)?;
45 vec![nav] 45 vec![nav]
46 }, 46 },
@@ -81,7 +81,7 @@ pub(crate) fn reference_definition(
81 sema: &Semantics<RootDatabase>, 81 sema: &Semantics<RootDatabase>,
82 name_ref: &ast::NameRef, 82 name_ref: &ast::NameRef,
83) -> ReferenceResult { 83) -> ReferenceResult {
84 let name_kind = classify_name_ref(sema, name_ref); 84 let name_kind = NameRefClass::classify(sema, name_ref);
85 if let Some(def) = name_kind { 85 if let Some(def) = name_kind {
86 let def = def.definition(sema.db); 86 let def = def.definition(sema.db);
87 return match def.try_to_nav(sema.db) { 87 return match def.try_to_nav(sema.db) {
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 51f03c718..e915a753e 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -4,7 +4,7 @@ use hir::{
4 Module, ModuleDef, ModuleSource, Semantics, 4 Module, ModuleDef, ModuleSource, Semantics,
5}; 5};
6use ide_db::{ 6use ide_db::{
7 defs::{classify_name, classify_name_ref, Definition}, 7 defs::{Definition, NameClass, NameRefClass},
8 RootDatabase, 8 RootDatabase,
9}; 9};
10use itertools::Itertools; 10use itertools::Itertools;
@@ -107,8 +107,8 @@ pub(crate) fn hover(
107 let node = token.parent(); 107 let node = token.parent();
108 let definition = match_ast! { 108 let definition = match_ast! {
109 match node { 109 match node {
110 ast::NameRef(name_ref) => classify_name_ref(&sema, &name_ref).map(|d| d.definition(sema.db)), 110 ast::Name(name) => NameClass::classify(&sema, &name).and_then(|d| d.definition(sema.db)),
111 ast::Name(name) => classify_name(&sema, &name).and_then(|d| d.definition(sema.db)), 111 ast::NameRef(name_ref) => NameRefClass::classify(&sema, &name_ref).map(|d| d.definition(sema.db)),
112 _ => None, 112 _ => None,
113 } 113 }
114 }; 114 };
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index 95d872b83..fc537b9c0 100644
--- a/crates/ide/src/references.rs
+++ b/crates/ide/src/references.rs
@@ -13,7 +13,7 @@ pub(crate) mod rename;
13 13
14use hir::Semantics; 14use hir::Semantics;
15use ide_db::{ 15use ide_db::{
16 defs::{classify_name, classify_name_ref, Definition}, 16 defs::{Definition, NameClass, NameRefClass},
17 search::SearchScope, 17 search::SearchScope,
18 RootDatabase, 18 RootDatabase,
19}; 19};
@@ -132,13 +132,13 @@ fn find_name(
132 opt_name: Option<ast::Name>, 132 opt_name: Option<ast::Name>,
133) -> Option<RangeInfo<Definition>> { 133) -> Option<RangeInfo<Definition>> {
134 if let Some(name) = opt_name { 134 if let Some(name) = opt_name {
135 let def = classify_name(sema, &name)?.reference_or_definition(sema.db); 135 let def = NameClass::classify(sema, &name)?.reference_or_definition(sema.db);
136 let range = name.syntax().text_range(); 136 let range = name.syntax().text_range();
137 return Some(RangeInfo::new(range, def)); 137 return Some(RangeInfo::new(range, def));
138 } 138 }
139 let name_ref = 139 let name_ref =
140 sema.find_node_at_offset_with_descend::<ast::NameRef>(&syntax, position.offset)?; 140 sema.find_node_at_offset_with_descend::<ast::NameRef>(&syntax, position.offset)?;
141 let def = classify_name_ref(sema, &name_ref)?.definition(sema.db); 141 let def = NameRefClass::classify(sema, &name_ref)?.definition(sema.db);
142 let range = name_ref.syntax().text_range(); 142 let range = name_ref.syntax().text_range();
143 Some(RangeInfo::new(range, def)) 143 Some(RangeInfo::new(range, def))
144} 144}
diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs
index f9a11e43d..35aafc49d 100644
--- a/crates/ide/src/references/rename.rs
+++ b/crates/ide/src/references/rename.rs
@@ -3,7 +3,7 @@
3use base_db::SourceDatabaseExt; 3use base_db::SourceDatabaseExt;
4use hir::{Module, ModuleDef, ModuleSource, Semantics}; 4use hir::{Module, ModuleDef, ModuleSource, Semantics};
5use ide_db::{ 5use ide_db::{
6 defs::{classify_name, classify_name_ref, Definition, NameClass, NameRefClass}, 6 defs::{Definition, NameClass, NameRefClass},
7 RootDatabase, 7 RootDatabase,
8}; 8};
9 9
@@ -88,13 +88,13 @@ fn find_module_at_offset(
88 let module = match_ast! { 88 let module = match_ast! {
89 match (ident.parent()) { 89 match (ident.parent()) {
90 ast::NameRef(name_ref) => { 90 ast::NameRef(name_ref) => {
91 match classify_name_ref(sema, &name_ref)? { 91 match NameRefClass::classify(sema, &name_ref)? {
92 NameRefClass::Definition(Definition::ModuleDef(ModuleDef::Module(module))) => module, 92 NameRefClass::Definition(Definition::ModuleDef(ModuleDef::Module(module))) => module,
93 _ => return None, 93 _ => return None,
94 } 94 }
95 }, 95 },
96 ast::Name(name) => { 96 ast::Name(name) => {
97 match classify_name(&sema, &name)? { 97 match NameClass::classify(&sema, &name)? {
98 NameClass::Definition(Definition::ModuleDef(ModuleDef::Module(module))) => module, 98 NameClass::Definition(Definition::ModuleDef(ModuleDef::Module(module))) => module,
99 _ => return None, 99 _ => return None,
100 } 100 }
diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs
index 928f771a9..b35c03162 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs
@@ -8,7 +8,7 @@ mod tests;
8 8
9use hir::{Local, Name, Semantics, VariantDef}; 9use hir::{Local, Name, Semantics, VariantDef};
10use ide_db::{ 10use ide_db::{
11 defs::{classify_name, classify_name_ref, Definition, NameClass, NameRefClass}, 11 defs::{Definition, NameClass, NameRefClass},
12 RootDatabase, 12 RootDatabase,
13}; 13};
14use rustc_hash::FxHashMap; 14use rustc_hash::FxHashMap;
@@ -443,7 +443,7 @@ fn highlight_element(
443 // Highlight definitions depending on the "type" of the definition. 443 // Highlight definitions depending on the "type" of the definition.
444 NAME => { 444 NAME => {
445 let name = element.into_node().and_then(ast::Name::cast).unwrap(); 445 let name = element.into_node().and_then(ast::Name::cast).unwrap();
446 let name_kind = classify_name(sema, &name); 446 let name_kind = NameClass::classify(sema, &name);
447 447
448 if let Some(NameClass::Definition(Definition::Local(local))) = &name_kind { 448 if let Some(NameClass::Definition(Definition::Local(local))) = &name_kind {
449 if let Some(name) = local.name(db) { 449 if let Some(name) = local.name(db) {
@@ -480,7 +480,7 @@ fn highlight_element(
480 NAME_REF => { 480 NAME_REF => {
481 let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap(); 481 let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap();
482 highlight_func_by_name_ref(sema, &name_ref).unwrap_or_else(|| { 482 highlight_func_by_name_ref(sema, &name_ref).unwrap_or_else(|| {
483 match classify_name_ref(sema, &name_ref) { 483 match NameRefClass::classify(sema, &name_ref) {
484 Some(name_kind) => match name_kind { 484 Some(name_kind) => match name_kind {
485 NameRefClass::ExternCrate(_) => HighlightTag::Module.into(), 485 NameRefClass::ExternCrate(_) => HighlightTag::Module.into(),
486 NameRefClass::Definition(def) => { 486 NameRefClass::Definition(def) => {
diff --git a/crates/ide_db/src/defs.rs b/crates/ide_db/src/defs.rs
index 717581593..3cef0baf7 100644
--- a/crates/ide_db/src/defs.rs
+++ b/crates/ide_db/src/defs.rs
@@ -110,121 +110,121 @@ impl NameClass {
110 NameClass::PatFieldShorthand { local_def: _, field_ref } => field_ref, 110 NameClass::PatFieldShorthand { local_def: _, field_ref } => field_ref,
111 } 111 }
112 } 112 }
113}
114 113
115pub fn classify_name(sema: &Semantics<RootDatabase>, name: &ast::Name) -> Option<NameClass> { 114 pub fn classify(sema: &Semantics<RootDatabase>, name: &ast::Name) -> Option<NameClass> {
116 let _p = profile::span("classify_name"); 115 let _p = profile::span("classify_name");
117 116
118 let parent = name.syntax().parent()?; 117 let parent = name.syntax().parent()?;
119 118
120 if let Some(bind_pat) = ast::IdentPat::cast(parent.clone()) { 119 if let Some(bind_pat) = ast::IdentPat::cast(parent.clone()) {
121 if let Some(def) = sema.resolve_bind_pat_to_const(&bind_pat) { 120 if let Some(def) = sema.resolve_bind_pat_to_const(&bind_pat) {
122 return Some(NameClass::ConstReference(Definition::ModuleDef(def))); 121 return Some(NameClass::ConstReference(Definition::ModuleDef(def)));
122 }
123 } 123 }
124 }
125 124
126 match_ast! { 125 match_ast! {
127 match parent { 126 match parent {
128 ast::Rename(it) => { 127 ast::Rename(it) => {
129 if let Some(use_tree) = it.syntax().parent().and_then(ast::UseTree::cast) { 128 if let Some(use_tree) = it.syntax().parent().and_then(ast::UseTree::cast) {
130 let path = use_tree.path()?; 129 let path = use_tree.path()?;
131 let path_segment = path.segment()?; 130 let path_segment = path.segment()?;
132 let name_ref_class = path_segment 131 let name_ref_class = path_segment
133 .name_ref() 132 .name_ref()
134 // The rename might be from a `self` token, so fallback to the name higher 133 // The rename might be from a `self` token, so fallback to the name higher
135 // in the use tree. 134 // in the use tree.
136 .or_else(||{ 135 .or_else(||{
137 if path_segment.self_token().is_none() { 136 if path_segment.self_token().is_none() {
138 return None; 137 return None;
139 } 138 }
140 139
141 let use_tree = use_tree 140 let use_tree = use_tree
142 .syntax() 141 .syntax()
143 .parent() 142 .parent()
144 .as_ref() 143 .as_ref()
145 // Skip over UseTreeList 144 // Skip over UseTreeList
146 .and_then(SyntaxNode::parent) 145 .and_then(SyntaxNode::parent)
147 .and_then(ast::UseTree::cast)?; 146 .and_then(ast::UseTree::cast)?;
148 let path = use_tree.path()?; 147 let path = use_tree.path()?;
149 let path_segment = path.segment()?; 148 let path_segment = path.segment()?;
150 path_segment.name_ref() 149 path_segment.name_ref()
151 }) 150 })
152 .and_then(|name_ref| classify_name_ref(sema, &name_ref))?; 151 .and_then(|name_ref| NameRefClass::classify(sema, &name_ref))?;
153 152
154 Some(NameClass::Definition(name_ref_class.definition(sema.db))) 153 Some(NameClass::Definition(name_ref_class.definition(sema.db)))
155 } else { 154 } else {
156 let extern_crate = it.syntax().parent().and_then(ast::ExternCrate::cast)?; 155 let extern_crate = it.syntax().parent().and_then(ast::ExternCrate::cast)?;
157 let resolved = sema.resolve_extern_crate(&extern_crate)?; 156 let resolved = sema.resolve_extern_crate(&extern_crate)?;
158 Some(NameClass::ExternCrate(resolved)) 157 Some(NameClass::ExternCrate(resolved))
159 } 158 }
160 }, 159 },
161 ast::IdentPat(it) => { 160 ast::IdentPat(it) => {
162 let local = sema.to_def(&it)?; 161 let local = sema.to_def(&it)?;
163 162
164 if let Some(record_pat_field) = it.syntax().parent().and_then(ast::RecordPatField::cast) { 163 if let Some(record_pat_field) = it.syntax().parent().and_then(ast::RecordPatField::cast) {
165 if record_pat_field.name_ref().is_none() { 164 if record_pat_field.name_ref().is_none() {
166 if let Some(field) = sema.resolve_record_pat_field(&record_pat_field) { 165 if let Some(field) = sema.resolve_record_pat_field(&record_pat_field) {
167 let field = Definition::Field(field); 166 let field = Definition::Field(field);
168 return Some(NameClass::PatFieldShorthand { local_def: local, field_ref: field }); 167 return Some(NameClass::PatFieldShorthand { local_def: local, field_ref: field });
168 }
169 } 169 }
170 } 170 }
171 }
172 171
173 Some(NameClass::Definition(Definition::Local(local))) 172 Some(NameClass::Definition(Definition::Local(local)))
174 }, 173 },
175 ast::RecordField(it) => { 174 ast::RecordField(it) => {
176 let field: hir::Field = sema.to_def(&it)?; 175 let field: hir::Field = sema.to_def(&it)?;
177 Some(NameClass::Definition(Definition::Field(field))) 176 Some(NameClass::Definition(Definition::Field(field)))
178 }, 177 },
179 ast::Module(it) => { 178 ast::Module(it) => {
180 let def = sema.to_def(&it)?; 179 let def = sema.to_def(&it)?;
181 Some(NameClass::Definition(Definition::ModuleDef(def.into()))) 180 Some(NameClass::Definition(Definition::ModuleDef(def.into())))
182 }, 181 },
183 ast::Struct(it) => { 182 ast::Struct(it) => {
184 let def: hir::Struct = sema.to_def(&it)?; 183 let def: hir::Struct = sema.to_def(&it)?;
185 Some(NameClass::Definition(Definition::ModuleDef(def.into()))) 184 Some(NameClass::Definition(Definition::ModuleDef(def.into())))
186 }, 185 },
187 ast::Union(it) => { 186 ast::Union(it) => {
188 let def: hir::Union = sema.to_def(&it)?; 187 let def: hir::Union = sema.to_def(&it)?;
189 Some(NameClass::Definition(Definition::ModuleDef(def.into()))) 188 Some(NameClass::Definition(Definition::ModuleDef(def.into())))
190 }, 189 },
191 ast::Enum(it) => { 190 ast::Enum(it) => {
192 let def: hir::Enum = sema.to_def(&it)?; 191 let def: hir::Enum = sema.to_def(&it)?;
193 Some(NameClass::Definition(Definition::ModuleDef(def.into()))) 192 Some(NameClass::Definition(Definition::ModuleDef(def.into())))
194 }, 193 },
195 ast::Trait(it) => { 194 ast::Trait(it) => {
196 let def: hir::Trait = sema.to_def(&it)?; 195 let def: hir::Trait = sema.to_def(&it)?;
197 Some(NameClass::Definition(Definition::ModuleDef(def.into()))) 196 Some(NameClass::Definition(Definition::ModuleDef(def.into())))
198 }, 197 },
199 ast::Static(it) => { 198 ast::Static(it) => {
200 let def: hir::Static = sema.to_def(&it)?; 199 let def: hir::Static = sema.to_def(&it)?;
201 Some(NameClass::Definition(Definition::ModuleDef(def.into()))) 200 Some(NameClass::Definition(Definition::ModuleDef(def.into())))
202 }, 201 },
203 ast::Variant(it) => { 202 ast::Variant(it) => {
204 let def: hir::EnumVariant = sema.to_def(&it)?; 203 let def: hir::EnumVariant = sema.to_def(&it)?;
205 Some(NameClass::Definition(Definition::ModuleDef(def.into()))) 204 Some(NameClass::Definition(Definition::ModuleDef(def.into())))
206 }, 205 },
207 ast::Fn(it) => { 206 ast::Fn(it) => {
208 let def: hir::Function = sema.to_def(&it)?; 207 let def: hir::Function = sema.to_def(&it)?;
209 Some(NameClass::Definition(Definition::ModuleDef(def.into()))) 208 Some(NameClass::Definition(Definition::ModuleDef(def.into())))
210 }, 209 },
211 ast::Const(it) => { 210 ast::Const(it) => {
212 let def: hir::Const = sema.to_def(&it)?; 211 let def: hir::Const = sema.to_def(&it)?;
213 Some(NameClass::Definition(Definition::ModuleDef(def.into()))) 212 Some(NameClass::Definition(Definition::ModuleDef(def.into())))
214 }, 213 },
215 ast::TypeAlias(it) => { 214 ast::TypeAlias(it) => {
216 let def: hir::TypeAlias = sema.to_def(&it)?; 215 let def: hir::TypeAlias = sema.to_def(&it)?;
217 Some(NameClass::Definition(Definition::ModuleDef(def.into()))) 216 Some(NameClass::Definition(Definition::ModuleDef(def.into())))
218 }, 217 },
219 ast::MacroCall(it) => { 218 ast::MacroCall(it) => {
220 let def = sema.to_def(&it)?; 219 let def = sema.to_def(&it)?;
221 Some(NameClass::Definition(Definition::Macro(def))) 220 Some(NameClass::Definition(Definition::Macro(def)))
222 }, 221 },
223 ast::TypeParam(it) => { 222 ast::TypeParam(it) => {
224 let def = sema.to_def(&it)?; 223 let def = sema.to_def(&it)?;
225 Some(NameClass::Definition(Definition::TypeParam(def))) 224 Some(NameClass::Definition(Definition::TypeParam(def)))
226 }, 225 },
227 _ => None, 226 _ => None,
227 }
228 } 228 }
229 } 229 }
230} 230}
@@ -244,91 +244,91 @@ impl NameRefClass {
244 NameRefClass::FieldShorthand { local, field: _ } => Definition::Local(local), 244 NameRefClass::FieldShorthand { local, field: _ } => Definition::Local(local),
245 } 245 }
246 } 246 }
247}
248 247
249// Note: we don't have unit-tests for this rather important function. 248 // Note: we don't have unit-tests for this rather important function.
250// It is primarily exercised via goto definition tests in `ide`. 249 // It is primarily exercised via goto definition tests in `ide`.
251pub fn classify_name_ref( 250 pub fn classify(
252 sema: &Semantics<RootDatabase>, 251 sema: &Semantics<RootDatabase>,
253 name_ref: &ast::NameRef, 252 name_ref: &ast::NameRef,
254) -> Option<NameRefClass> { 253 ) -> Option<NameRefClass> {
255 let _p = profile::span("classify_name_ref"); 254 let _p = profile::span("classify_name_ref");
256 255
257 let parent = name_ref.syntax().parent()?; 256 let parent = name_ref.syntax().parent()?;
258 257
259 if let Some(method_call) = ast::MethodCallExpr::cast(parent.clone()) { 258 if let Some(method_call) = ast::MethodCallExpr::cast(parent.clone()) {
260 if let Some(func) = sema.resolve_method_call(&method_call) { 259 if let Some(func) = sema.resolve_method_call(&method_call) {
261 return Some(NameRefClass::Definition(Definition::ModuleDef(func.into()))); 260 return Some(NameRefClass::Definition(Definition::ModuleDef(func.into())));
261 }
262 } 262 }
263 }
264 263
265 if let Some(field_expr) = ast::FieldExpr::cast(parent.clone()) { 264 if let Some(field_expr) = ast::FieldExpr::cast(parent.clone()) {
266 if let Some(field) = sema.resolve_field(&field_expr) { 265 if let Some(field) = sema.resolve_field(&field_expr) {
267 return Some(NameRefClass::Definition(Definition::Field(field))); 266 return Some(NameRefClass::Definition(Definition::Field(field)));
267 }
268 } 268 }
269 }
270 269
271 if let Some(record_field) = ast::RecordExprField::for_field_name(name_ref) { 270 if let Some(record_field) = ast::RecordExprField::for_field_name(name_ref) {
272 if let Some((field, local)) = sema.resolve_record_field(&record_field) { 271 if let Some((field, local)) = sema.resolve_record_field(&record_field) {
273 let field = Definition::Field(field); 272 let field = Definition::Field(field);
274 let res = match local { 273 let res = match local {
275 None => NameRefClass::Definition(field), 274 None => NameRefClass::Definition(field),
276 Some(local) => NameRefClass::FieldShorthand { field, local }, 275 Some(local) => NameRefClass::FieldShorthand { field, local },
277 }; 276 };
278 return Some(res); 277 return Some(res);
278 }
279 } 279 }
280 }
281 280
282 if let Some(record_pat_field) = ast::RecordPatField::cast(parent.clone()) { 281 if let Some(record_pat_field) = ast::RecordPatField::cast(parent.clone()) {
283 if let Some(field) = sema.resolve_record_pat_field(&record_pat_field) { 282 if let Some(field) = sema.resolve_record_pat_field(&record_pat_field) {
284 let field = Definition::Field(field); 283 let field = Definition::Field(field);
285 return Some(NameRefClass::Definition(field)); 284 return Some(NameRefClass::Definition(field));
285 }
286 } 286 }
287 }
288 287
289 if ast::AssocTypeArg::cast(parent.clone()).is_some() { 288 if ast::AssocTypeArg::cast(parent.clone()).is_some() {
290 // `Trait<Assoc = Ty>` 289 // `Trait<Assoc = Ty>`
291 // ^^^^^ 290 // ^^^^^
292 let path = name_ref.syntax().ancestors().find_map(ast::Path::cast)?; 291 let path = name_ref.syntax().ancestors().find_map(ast::Path::cast)?;
293 let resolved = sema.resolve_path(&path)?; 292 let resolved = sema.resolve_path(&path)?;
294 if let PathResolution::Def(ModuleDef::Trait(tr)) = resolved { 293 if let PathResolution::Def(ModuleDef::Trait(tr)) = resolved {
295 if let Some(ty) = tr 294 if let Some(ty) = tr
296 .items(sema.db) 295 .items(sema.db)
297 .iter() 296 .iter()
298 .filter_map(|assoc| match assoc { 297 .filter_map(|assoc| match assoc {
299 hir::AssocItem::TypeAlias(it) => Some(*it), 298 hir::AssocItem::TypeAlias(it) => Some(*it),
300 _ => None, 299 _ => None,
301 }) 300 })
302 .find(|alias| alias.name(sema.db).to_string() == **name_ref.text()) 301 .find(|alias| alias.name(sema.db).to_string() == **name_ref.text())
303 { 302 {
304 return Some(NameRefClass::Definition(Definition::ModuleDef( 303 return Some(NameRefClass::Definition(Definition::ModuleDef(
305 ModuleDef::TypeAlias(ty), 304 ModuleDef::TypeAlias(ty),
306 ))); 305 )));
306 }
307 } 307 }
308 } 308 }
309 }
310 309
311 if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) { 310 if let Some(macro_call) = parent.ancestors().find_map(ast::MacroCall::cast) {
312 if let Some(path) = macro_call.path() { 311 if let Some(path) = macro_call.path() {
313 if path.qualifier().is_none() { 312 if path.qualifier().is_none() {
314 // Only use this to resolve single-segment macro calls like `foo!()`. Multi-segment 313 // Only use this to resolve single-segment macro calls like `foo!()`. Multi-segment
315 // paths are handled below (allowing `log<|>::info!` to resolve to the log crate). 314 // paths are handled below (allowing `log<|>::info!` to resolve to the log crate).
316 if let Some(macro_def) = sema.resolve_macro_call(&macro_call) { 315 if let Some(macro_def) = sema.resolve_macro_call(&macro_call) {
317 return Some(NameRefClass::Definition(Definition::Macro(macro_def))); 316 return Some(NameRefClass::Definition(Definition::Macro(macro_def)));
317 }
318 } 318 }
319 } 319 }
320 } 320 }
321 }
322 321
323 if let Some(path) = name_ref.syntax().ancestors().find_map(ast::Path::cast) { 322 if let Some(path) = name_ref.syntax().ancestors().find_map(ast::Path::cast) {
324 if let Some(resolved) = sema.resolve_path(&path) { 323 if let Some(resolved) = sema.resolve_path(&path) {
325 return Some(NameRefClass::Definition(resolved.into())); 324 return Some(NameRefClass::Definition(resolved.into()));
325 }
326 } 326 }
327 }
328 327
329 let extern_crate = ast::ExternCrate::cast(parent)?; 328 let extern_crate = ast::ExternCrate::cast(parent)?;
330 let resolved = sema.resolve_extern_crate(&extern_crate)?; 329 let resolved = sema.resolve_extern_crate(&extern_crate)?;
331 Some(NameRefClass::ExternCrate(resolved)) 330 Some(NameRefClass::ExternCrate(resolved))
331 }
332} 332}
333 333
334impl From<PathResolution> for Definition { 334impl From<PathResolution> for Definition {
diff --git a/crates/ide_db/src/imports_locator.rs b/crates/ide_db/src/imports_locator.rs
index e0d3e7293..8c925fbdc 100644
--- a/crates/ide_db/src/imports_locator.rs
+++ b/crates/ide_db/src/imports_locator.rs
@@ -5,7 +5,7 @@ use hir::{Crate, MacroDef, ModuleDef, Semantics};
5use syntax::{ast, AstNode, SyntaxKind::NAME}; 5use syntax::{ast, AstNode, SyntaxKind::NAME};
6 6
7use crate::{ 7use crate::{
8 defs::{classify_name, Definition}, 8 defs::{Definition, NameClass},
9 symbol_index::{self, FileSymbol, Query}, 9 symbol_index::{self, FileSymbol, Query},
10 RootDatabase, 10 RootDatabase,
11}; 11};
@@ -60,5 +60,5 @@ fn get_name_definition<'a>(
60 candidate_node 60 candidate_node
61 }; 61 };
62 let name = ast::Name::cast(candidate_name_node)?; 62 let name = ast::Name::cast(candidate_name_node)?;
63 classify_name(sema, &name)?.definition(sema.db) 63 NameClass::classify(sema, &name)?.definition(sema.db)
64} 64}
diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index 8048aa621..3af52ec5e 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -14,7 +14,7 @@ use syntax::{ast, match_ast, AstNode, TextRange, TextSize};
14 14
15use crate::defs::NameClass; 15use crate::defs::NameClass;
16use crate::{ 16use crate::{
17 defs::{classify_name, classify_name_ref, Definition, NameRefClass}, 17 defs::{Definition, NameRefClass},
18 RootDatabase, 18 RootDatabase,
19}; 19};
20 20
@@ -276,7 +276,7 @@ impl<'a> FindUsages<'a> {
276 name_ref: &ast::NameRef, 276 name_ref: &ast::NameRef,
277 sink: &mut dyn FnMut(Reference) -> bool, 277 sink: &mut dyn FnMut(Reference) -> bool,
278 ) -> bool { 278 ) -> bool {
279 match classify_name_ref(self.sema, &name_ref) { 279 match NameRefClass::classify(self.sema, &name_ref) {
280 Some(NameRefClass::Definition(def)) if &def == self.def => { 280 Some(NameRefClass::Definition(def)) if &def == self.def => {
281 let kind = if is_record_lit_name_ref(&name_ref) || is_call_expr_name_ref(&name_ref) 281 let kind = if is_record_lit_name_ref(&name_ref) || is_call_expr_name_ref(&name_ref)
282 { 282 {
@@ -313,7 +313,7 @@ impl<'a> FindUsages<'a> {
313 } 313 }
314 314
315 fn found_name(&self, name: &ast::Name, sink: &mut dyn FnMut(Reference) -> bool) -> bool { 315 fn found_name(&self, name: &ast::Name, sink: &mut dyn FnMut(Reference) -> bool) -> bool {
316 match classify_name(self.sema, name) { 316 match NameClass::classify(self.sema, name) {
317 Some(NameClass::PatFieldShorthand { local_def: _, field_ref }) => { 317 Some(NameClass::PatFieldShorthand { local_def: _, field_ref }) => {
318 let reference = match self.def { 318 let reference = match self.def {
319 Definition::Field(_) if &field_ref == self.def => Reference { 319 Definition::Field(_) if &field_ref == self.def => Reference {