From fcf22d68d45f1668dfca95d20d609dceb32eded5 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 8 Jun 2021 22:13:22 +0200 Subject: Prefer attr macros in "expand macro recursively" --- crates/ide/src/expand_macro.rs | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'crates/ide/src/expand_macro.rs') diff --git a/crates/ide/src/expand_macro.rs b/crates/ide/src/expand_macro.rs index 3f38e2145..cc43c5772 100644 --- a/crates/ide/src/expand_macro.rs +++ b/crates/ide/src/expand_macro.rs @@ -2,9 +2,7 @@ use std::iter; use hir::Semantics; use ide_db::RootDatabase; -use syntax::{ - ast, match_ast, ted, AstNode, NodeOrToken, SyntaxKind, SyntaxKind::*, SyntaxNode, WalkEvent, T, -}; +use syntax::{ast, ted, AstNode, NodeOrToken, SyntaxKind, SyntaxKind::*, SyntaxNode, WalkEvent, T}; use crate::FilePosition; @@ -32,25 +30,21 @@ pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option< let mut expanded = None; let mut name = None; for node in tok.ancestors() { - match_ast! { - match node { - ast::MacroCall(mac) => { - name = Some(mac.path()?.segment()?.name_ref()?.to_string()); - expanded = expand_macro_recur(&sema, &mac); - break; - }, - ast::Item(item) => { - // FIXME: add the macro name - // FIXME: make this recursive too - name = Some("?".to_string()); - expanded = sema.expand_attr_macro(&item); - if expanded.is_some() { - break; - } - }, - _ => {} + if let Some(item) = ast::Item::cast(node.clone()) { + expanded = sema.expand_attr_macro(&item); + if expanded.is_some() { + // FIXME: add the macro name + // FIXME: make this recursive too + name = Some("?".to_string()); + break; } } + + if let Some(mac) = ast::MacroCall::cast(node) { + name = Some(mac.path()?.segment()?.name_ref()?.to_string()); + expanded = expand_macro_recur(&sema, &mac); + break; + } } // FIXME: -- cgit v1.2.3