Rust: improve handling of macro expansion

Author: aibaars

rust/extractor/src/translate/base.rs

@@ -26,7 +26,7 @@ use ra_ap_syntax::{
 macro_rules! pre_emit {
     (Item, $self:ident, $node:ident) => {
         if let Some(label) = $self.prepare_item_expansion(&$node.clone().into()) {
-            return Some(label);
+            return Some(label.into());
         }
     };
     ($($_:tt)*) => {};
@@ -694,10 +694,21 @@ impl<'a> Translator<'a> {
         }
     }
 
+    fn is_attribute_macro_target(&self, node: &ast::Item) -> bool {
+        // rust-analyzer considers as an `attr_macro_call` also a plain macro call, but we want to
+        // process that differently (in `extract_macro_call_expanded`)
+        !matches!(node, ast::Item::MacroCall(_))
+            && self.semantics.is_some_and(|semantics| {
+                let file = semantics.hir_file_for(node.syntax());
+                let node = InFile::new(file, node);
+                semantics.is_attr_macro_call(node)
+            })
+    }
+
     pub(crate) fn prepare_item_expansion(
         &mut self,
         node: &ast::Item,
-    ) -> Option<Label<generated::Item>> {
+    ) -> Option<Label<generated::MacroCall>> {
         if self.source_kind == SourceKind::Library {
             // if the item expands via an attribute macro, we want to only emit the expansion
             if let Some(expanded) = self.emit_attribute_macro_expansion(node) {
@@ -714,13 +725,10 @@ impl<'a> Translator<'a> {
                     expanded.into(),
                     &mut self.trap.writer,
                 );
-                return Some(label.into());
+                return Some(label);
             }
         }
-        let semantics = self.semantics.as_ref()?;
-        let file = semantics.hir_file_for(node.syntax());
-        let node = InFile::new(file, node);
-        if semantics.is_attr_macro_call(node) {
+        if self.is_attribute_macro_target(node) {
             self.macro_context_depth += 1;
         }
         None
@@ -730,10 +738,7 @@ impl<'a> Translator<'a> {
         &mut self,
         node: &ast::Item,
     ) -> Option<Label<generated::MacroItems>> {
-        let semantics = self.semantics?;
-        let file = semantics.hir_file_for(node.syntax());
-        let infile_node = InFile::new(file, node);
-        if !semantics.is_attr_macro_call(infile_node) {
+        if !self.is_attribute_macro_target(node) {
             return None;
         }
         self.macro_context_depth -= 1;
@@ -743,7 +748,7 @@ impl<'a> Translator<'a> {
         }
         let ExpandResult {
             value: expanded, ..
-        } = semantics.expand_attr_macro(node)?;
+        } = self.semantics.and_then(|s| s.expand_attr_macro(node))?;
         self.emit_macro_expansion_parse_errors(node, &expanded);
         let macro_items = ast::MacroItems::cast(expanded).or_else(|| {
             let message = "attribute macro expansion cannot be cast to MacroItems".to_owned();

rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected

@@ -579,17 +579,17 @@ macro_expansion.rs:
 #   43|   getItem(8): [Impl] impl S { ... }
 #   43|     getAssocItemList(): [AssocItemList] AssocItemList
 #   44|       getAssocItem(0): [MacroCall] def_x!...
-#   44|         getAttributeMacroExpansion(): [MacroItems] MacroItems
+#   44|         getPath(): [Path] def_x
+#   44|           getSegment(): [PathSegment] def_x
+#   44|             getIdentifier(): [NameRef] def_x
+#   44|         getTokenTree(): [TokenTree] TokenTree
+#   44|         getMacroCallExpansion(): [MacroItems] MacroItems
 #   44|           getItem(0): [Function] fn x
 #   44|             getParamList(): [ParamList] ParamList
 #   44|             getBody(): [BlockExpr] { ... }
 #   44|               getStmtList(): [StmtList] StmtList
 #   44|             getName(): [Name] x
 #   44|             getVisibility(): [Visibility] Visibility
-#   44|         getPath(): [Path] def_x
-#   44|           getSegment(): [PathSegment] def_x
-#   44|             getIdentifier(): [NameRef] def_x
-#   44|         getTokenTree(): [TokenTree] TokenTree
 #   43|     getSelfTy(): [PathTypeRepr] S
 #   43|       getPath(): [Path] S
 #   43|         getSegment(): [PathSegment] S

rust/ql/test/extractor-tests/macro-expansion/test.expected

@@ -14,7 +14,6 @@ attribute_macros
 | macro_expansion.rs:31:5:34:5 | fn bzz | 0 | macro_expansion.rs:32:5:33:17 | fn bzz_0 |
 | macro_expansion.rs:31:5:34:5 | fn bzz | 1 | macro_expansion.rs:32:5:33:17 | fn bzz_1 |
 | macro_expansion.rs:31:5:34:5 | fn bzz | 2 | macro_expansion.rs:32:5:33:17 | fn bzz_2 |
-| macro_expansion.rs:44:5:44:13 | def_x!... | 0 | macro_expansion.rs:44:5:44:13 | fn x |
 macro_calls
 | included/included.rs:2:9:2:39 | concat!... | included/included.rs:2:17:2:38 | "Hello world!" |
 | macro_expansion.rs:5:9:5:34 | concat!... | macro_expansion.rs:5:17:5:34 | "Hello world!" |
@@ -28,6 +27,7 @@ macro_calls
 | macro_expansion.rs:33:9:33:15 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
 | macro_expansion.rs:33:9:33:15 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
 | macro_expansion.rs:33:9:33:15 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
+| macro_expansion.rs:44:5:44:13 | def_x!... | macro_expansion.rs:44:5:44:13 | MacroItems |
 | macro_expansion.rs:53:9:53:25 | concat!... | macro_expansion.rs:53:17:53:24 | "xy" |
 | macro_expansion.rs:55:9:58:5 | my_macro!... | macro_expansion.rs:56:9:57:13 | MacroExpr |
 | macro_expansion.rs:56:9:56:31 | concat!... | macro_expansion.rs:56:17:56:30 | "<{}>" |
@@ -44,5 +44,4 @@ macro_calls
 unexpanded_macro_calls
 | macro_expansion.rs:5:9:5:35 | concat!... |
 | macro_expansion.rs:33:9:33:16 | hello!... |
-| macro_expansion.rs:44:5:44:13 | def_x!... |
 warnings