@@ -9,6 +9,7 @@ use scarb_proc_macro_server_types::methods::expand::ExpandInline;
9
9
use scarb_proc_macro_server_types:: methods:: expand:: ExpandInlineMacroParams ;
10
10
use scarb_proc_macro_server_types:: scope:: ProcMacroScope ;
11
11
use scarb_test_support:: cairo_plugin_project_builder:: CairoPluginProjectBuilder ;
12
+ use scarb_test_support:: proc_macro_server:: DefinedMacrosInfo ;
12
13
use scarb_test_support:: proc_macro_server:: ProcMacroClient ;
13
14
use scarb_test_support:: proc_macro_server:: SIMPLE_MACROS ;
14
15
use scarb_test_support:: project_builder:: ProjectBuilder ;
@@ -33,7 +34,8 @@ fn defined_macros() {
33
34
34
35
let mut proc_macro_client = ProcMacroClient :: new ( & project) ;
35
36
36
- let defined_macros = proc_macro_client. defined_macros_for_package ( "test_package" ) ;
37
+ let DefinedMacrosInfo { defined_macros, .. } =
38
+ proc_macro_client. defined_macros_for_package ( "test_package" ) ;
37
39
38
40
assert_eq ! ( & defined_macros. attributes, & [ "some" . to_string( ) ] ) ;
39
41
assert_eq ! ( & defined_macros. derives, & [ "some_derive" . to_string( ) ] ) ;
@@ -78,13 +80,12 @@ fn expand_attribute() {
78
80
79
81
let mut proc_macro_client = ProcMacroClient :: new ( & project) ;
80
82
81
- let component = proc_macro_client
82
- . defined_macros_for_package ( "test_package" )
83
- . component ;
83
+ let DefinedMacrosInfo { package_id, .. } =
84
+ proc_macro_client. defined_macros_for_package ( "test_package" ) ;
84
85
85
86
let response = proc_macro_client
86
87
. request_and_wait :: < ExpandAttribute > ( ExpandAttributeParams {
87
- context : ProcMacroScope { component } ,
88
+ context : ProcMacroScope { package_id } ,
88
89
attr : "rename_to_very_new_name" . to_string ( ) ,
89
90
args : TokenStream :: empty ( ) ,
90
91
item : TokenStream :: new ( "fn some_test_fn(){}" . to_string ( ) ) ,
@@ -118,15 +119,14 @@ fn expand_derive() {
118
119
119
120
let mut proc_macro_client = ProcMacroClient :: new ( & project) ;
120
121
121
- let component = proc_macro_client
122
- . defined_macros_for_package ( "test_package" )
123
- . component ;
122
+ let DefinedMacrosInfo { package_id, .. } =
123
+ proc_macro_client. defined_macros_for_package ( "test_package" ) ;
124
124
125
125
let item = TokenStream :: new ( "fn some_test_fn(){}" . to_string ( ) ) ;
126
126
127
127
let response = proc_macro_client
128
128
. request_and_wait :: < ExpandDerive > ( ExpandDeriveParams {
129
- context : ProcMacroScope { component } ,
129
+ context : ProcMacroScope { package_id } ,
130
130
derives : vec ! [ "some_derive" . to_string( ) ] ,
131
131
item,
132
132
} )
@@ -166,13 +166,12 @@ fn expand_inline() {
166
166
167
167
let mut proc_macro_client = ProcMacroClient :: new ( & project) ;
168
168
169
- let component = proc_macro_client
170
- . defined_macros_for_package ( "test_package" )
171
- . component ;
169
+ let DefinedMacrosInfo { package_id, .. } =
170
+ proc_macro_client. defined_macros_for_package ( "test_package" ) ;
172
171
173
172
let response = proc_macro_client
174
173
. request_and_wait :: < ExpandInline > ( ExpandInlineMacroParams {
175
- context : ProcMacroScope { component } ,
174
+ context : ProcMacroScope { package_id } ,
176
175
name : "replace_all_15_with_25" . to_string ( ) ,
177
176
args : TokenStream :: new (
178
177
"struct A { field: 15 , other_field: macro_call!(12)}" . to_string ( ) ,
0 commit comments