diff options
Diffstat (limited to 'crates/ra_ide/src/references/classify.rs')
-rw-r--r-- | crates/ra_ide/src/references/classify.rs | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/crates/ra_ide/src/references/classify.rs b/crates/ra_ide/src/references/classify.rs index ca5750521..478e18871 100644 --- a/crates/ra_ide/src/references/classify.rs +++ b/crates/ra_ide/src/references/classify.rs | |||
@@ -5,7 +5,7 @@ use ra_prof::profile; | |||
5 | use ra_syntax::{ast, AstNode}; | 5 | use ra_syntax::{ast, AstNode}; |
6 | use test_utils::tested_by; | 6 | use test_utils::tested_by; |
7 | 7 | ||
8 | use super::{NameDefinition, NameKind}; | 8 | use super::NameDefinition; |
9 | use ra_ide_db::RootDatabase; | 9 | use ra_ide_db::RootDatabase; |
10 | 10 | ||
11 | pub use ra_ide_db::defs::{classify_name, from_module_def, from_struct_field}; | 11 | pub use ra_ide_db::defs::{classify_name, from_module_def, from_struct_field}; |
@@ -46,8 +46,7 @@ pub(crate) fn classify_name_ref( | |||
46 | if let Some(macro_def) = | 46 | if let Some(macro_def) = |
47 | analyzer.resolve_macro_call(sb.db, name_ref.with_value(¯o_call)) | 47 | analyzer.resolve_macro_call(sb.db, name_ref.with_value(¯o_call)) |
48 | { | 48 | { |
49 | let kind = NameKind::Macro(macro_def); | 49 | return Some(NameDefinition::Macro(macro_def)); |
50 | return Some(NameDefinition { kind }); | ||
51 | } | 50 | } |
52 | } | 51 | } |
53 | 52 | ||
@@ -63,22 +62,10 @@ pub(crate) fn classify_name_ref( | |||
63 | }; | 62 | }; |
64 | from_module_def(def) | 63 | from_module_def(def) |
65 | } | 64 | } |
66 | PathResolution::Local(local) => { | 65 | PathResolution::Local(local) => NameDefinition::Local(local), |
67 | let kind = NameKind::Local(local); | 66 | PathResolution::TypeParam(par) => NameDefinition::TypeParam(par), |
68 | NameDefinition { kind } | 67 | PathResolution::Macro(def) => NameDefinition::Macro(def), |
69 | } | 68 | PathResolution::SelfType(impl_block) => NameDefinition::SelfType(impl_block), |
70 | PathResolution::TypeParam(par) => { | ||
71 | let kind = NameKind::TypeParam(par); | ||
72 | NameDefinition { kind } | ||
73 | } | ||
74 | PathResolution::Macro(def) => { | ||
75 | let kind = NameKind::Macro(def); | ||
76 | NameDefinition { kind } | ||
77 | } | ||
78 | PathResolution::SelfType(impl_block) => { | ||
79 | let kind = NameKind::SelfType(impl_block); | ||
80 | NameDefinition { kind } | ||
81 | } | ||
82 | }; | 69 | }; |
83 | Some(res) | 70 | Some(res) |
84 | } | 71 | } |