Made auto-generated copied structs properly mapped.

Minor patcher refactor for support.
starkware-libs · Aug 27, 2024 · c6fedaf · c6fedaf
1 parent 26ce43c
commit c6fedaf
Show file tree

Hide file tree

Showing 17 changed files with 421 additions and 398 deletions.
diff --git a/crates/cairo-lang-defs/src/patcher.rs b/crates/cairo-lang-defs/src/patcher.rs
@@ -23,6 +23,7 @@ pub enum RewriteNode {
         node: Box<RewriteNode>,
     },
     Text(String),
+    TextAndMapping(String, Vec<CodeMapping>),
 }
 impl RewriteNode {
     pub fn new_trimmed(syntax_node: SyntaxNode) -> Self {
@@ -123,7 +124,9 @@ impl RewriteNode {
                 extract_matches!(self, RewriteNode::Modified)
             }
             RewriteNode::Modified(modified) => modified,
-            RewriteNode::Text(_) => panic!("A text node can't be modified"),
+            RewriteNode::Text(_) | RewriteNode::TextAndMapping(_, _) => {
+                panic!("A text node can't be modified")
+            }
             RewriteNode::Mapped { .. } => panic!("A mapped node can't be modified"),
         }
     }
@@ -261,6 +264,12 @@ impl<'a> PatchBuilder<'a> {
         (self.code, self.code_mappings)
     }
 
+    /// Builds the patcher into a rewrite node enabling adding it to other patchers.
+    pub fn into_rewrite_node(self) -> RewriteNode {
+        let (code, mappings) = self.build();
+        RewriteNode::TextAndMapping(code, mappings)
+    }
+
     pub fn add_char(&mut self, c: char) {
         self.code.push(c);
     }
@@ -284,6 +293,15 @@ impl<'a> PatchBuilder<'a> {
                 }
             }
             RewriteNode::Text(s) => self.add_str(s.as_str()),
+            RewriteNode::TextAndMapping(s, mappings) => {
+                let mapping_fix = TextWidth::from_str(&self.code);
+                self.add_str(&s);
+                self.code_mappings.extend(mappings.into_iter().map(|mut mapping| {
+                    mapping.span.start = mapping.span.start.add_width(mapping_fix);
+                    mapping.span.end = mapping.span.end.add_width(mapping_fix);
+                    mapping
+                }));
+            }
         }
     }
 

diff --git a/crates/cairo-lang-starknet/src/plugin/derive/store.rs b/crates/cairo-lang-starknet/src/plugin/derive/store.rs
@@ -22,9 +22,7 @@ pub fn handle_store_derive(
             // a sub-pointers implementation.
             let store_trait_code = handle_struct_store(db, struct_ast)?;
             let sub_pointers_code = if !struct_ast.members(db).elements(db).is_empty() {
-                let (sub_pointers_code, _) =
-                    handle_storage_interface_struct(db, struct_ast, metadata);
-                RewriteNode::Text(sub_pointers_code)
+                handle_storage_interface_struct(db, struct_ast, metadata).into_rewrite_node()
             } else {
                 RewriteNode::Text("".to_string())
             };

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component
@@ -353,9 +353,9 @@ impl MyTraitSafeDispatcherImpl of MyTraitSafeDispatcherTrait<MyTraitSafeDispatch
 }
 
 
-lib.cairo:1:16
+lib.cairo:1:1
 #[derive(Drop, starknet::Store)]
-               ^*************^
+^******************************^
 impls:
 
 impl MyTypeSubPointersDrop of core::traits::Drop::<MyTypeSubPointers>;

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/diagnostics b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/diagnostics
@@ -123,17 +123,17 @@ pub trait HasComponent<TContractState> {
 
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {
@@ -303,17 +303,17 @@ pub trait HasComponent<TContractState> {
 
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {
@@ -483,17 +483,17 @@ pub trait HasComponent<TContractState> {
 
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {
@@ -659,17 +659,17 @@ pub trait HasComponent<TContractState> {
 
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {
@@ -835,17 +835,17 @@ pub trait HasComponent<TContractState> {
 
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {
@@ -1015,17 +1015,17 @@ pub trait HasComponent<TContractState> {
 
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {
@@ -1191,17 +1191,17 @@ pub trait HasComponent<TContractState> {
 
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {
@@ -1363,17 +1363,17 @@ pub trait HasComponent<TContractState> {
 
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {
@@ -1552,17 +1552,17 @@ pub impl MyImpl<
 > of MyTrait<TContractState> {
 }
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {
@@ -1776,17 +1776,17 @@ pub trait HasComponent<TContractState> {
 
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {
@@ -1956,17 +1956,17 @@ pub trait HasComponent<TContractState> {
 
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as
@@ -681,17 +681,17 @@ pub impl MyImpl<
     }
 }
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 impls:
 
 impl EventDrop of core::traits::Drop::<Event>;
 
 
-lib.cairo:1:1
-#[starknet::component]
-^********************^
+lib.cairo:5:5
+    #[storage]
+    ^********^
 starknet_derive:
 
 impl EventIsEvent of starknet::Event<Event> {