diff options
author | Edwin Cheng <[email protected]> | 2021-03-27 05:48:15 +0000 |
---|---|---|
committer | Edwin Cheng <[email protected]> | 2021-03-27 06:42:49 +0000 |
commit | 4520002b63b5a27e7676822aecfb2d435bf36e5a (patch) | |
tree | d59641111ce77db0117714180ae1d448056cf3c6 /crates/hir/src | |
parent | a193666361f6ea9725b927a35f5baf77da713c0a (diff) |
Unleash macro 2.0 in hightlight and more
Diffstat (limited to 'crates/hir/src')
-rw-r--r-- | crates/hir/src/semantics.rs | 2 | ||||
-rw-r--r-- | crates/hir/src/semantics/source_to_def.rs | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index 3ff135f41..d3caeef4e 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs | |||
@@ -768,7 +768,7 @@ to_def_impls![ | |||
768 | (crate::TypeParam, ast::TypeParam, type_param_to_def), | 768 | (crate::TypeParam, ast::TypeParam, type_param_to_def), |
769 | (crate::LifetimeParam, ast::LifetimeParam, lifetime_param_to_def), | 769 | (crate::LifetimeParam, ast::LifetimeParam, lifetime_param_to_def), |
770 | (crate::ConstParam, ast::ConstParam, const_param_to_def), | 770 | (crate::ConstParam, ast::ConstParam, const_param_to_def), |
771 | (crate::MacroDef, ast::MacroRules, macro_rules_to_def), | 771 | (crate::MacroDef, ast::Macro, macro_to_def), |
772 | (crate::Local, ast::IdentPat, bind_pat_to_def), | 772 | (crate::Local, ast::IdentPat, bind_pat_to_def), |
773 | (crate::Local, ast::SelfParam, self_param_to_def), | 773 | (crate::Local, ast::SelfParam, self_param_to_def), |
774 | (crate::Label, ast::Label, label_to_def), | 774 | (crate::Label, ast::Label, label_to_def), |
diff --git a/crates/hir/src/semantics/source_to_def.rs b/crates/hir/src/semantics/source_to_def.rs index 762809fcd..9a5a2255f 100644 --- a/crates/hir/src/semantics/source_to_def.rs +++ b/crates/hir/src/semantics/source_to_def.rs | |||
@@ -191,10 +191,7 @@ impl SourceToDefCtx<'_, '_> { | |||
191 | } | 191 | } |
192 | 192 | ||
193 | // FIXME: use DynMap as well? | 193 | // FIXME: use DynMap as well? |
194 | pub(super) fn macro_rules_to_def( | 194 | pub(super) fn macro_to_def(&mut self, src: InFile<ast::Macro>) -> Option<MacroDefId> { |
195 | &mut self, | ||
196 | src: InFile<ast::MacroRules>, | ||
197 | ) -> Option<MacroDefId> { | ||
198 | let file_ast_id = self.db.ast_id_map(src.file_id).ast_id(&src.value); | 195 | let file_ast_id = self.db.ast_id_map(src.file_id).ast_id(&src.value); |
199 | let ast_id = AstId::new(src.file_id, file_ast_id.upcast()); | 196 | let ast_id = AstId::new(src.file_id, file_ast_id.upcast()); |
200 | let kind = MacroDefKind::Declarative(ast_id); | 197 | let kind = MacroDefKind::Declarative(ast_id); |