Don't pass inline macro name to macro args token stream (#1786)

software-mansion · Nov 29, 2024 · 3342e75 · 3342e75
1 parent 715f414
commit 3342e75
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/scarb/src/compiler/plugin/proc_macro/host.rs b/scarb/src/compiler/plugin/proc_macro/host.rs
@@ -1072,7 +1072,8 @@ impl InlineMacroExprPlugin for ProcMacroInlinePlugin {
         _metadata: &MacroPluginMetadata<'_>,
     ) -> InlinePluginResult {
         let stable_ptr = syntax.clone().stable_ptr().untyped();
-        let token_stream = TokenStream::from_syntax_node(db, syntax);
+        let arguments = syntax.arguments(db);
+        let token_stream = TokenStream::from_syntax_node(db, &arguments);
         let result = self.instance().generate_code(
             self.expansion.name.clone(),
             TokenStream::empty(),

diff --git a/scarb/tests/build_cairo_plugin.rs b/scarb/tests/build_cairo_plugin.rs
@@ -868,7 +868,8 @@ fn can_implement_inline_macro() {
         use cairo_lang_macro::{ProcMacroResult, TokenStream, inline_macro};
 
         #[inline_macro]
-        pub fn some(_token_stream: TokenStream) -> ProcMacroResult {
+        pub fn some(token_stream: TokenStream) -> ProcMacroResult {
+            assert_eq!(token_stream.to_string(), "()");
             ProcMacroResult::new(TokenStream::new("34".to_string()))
         }
         "##})
@@ -879,7 +880,10 @@ fn can_implement_inline_macro() {
         .version("1.0.0")
         .dep("some", &t)
         .lib_cairo(indoc! {r#"
-            fn main() -> felt252 { some!() }
+            fn main() -> felt252 {
+                let x = some!();
+                x
+            }
         "#})
         .build(&project);