Use Path, add named args test

Author: grandizzy

crates/compilers/src/preprocessor/deps.rs

@@ -96,7 +96,7 @@ enum BytecodeDependencyKind {
     /// `type(Contract).creationCode`
     CreationCode,
     /// `new Contract`. Holds the name of the contract and args length.
-    New(String, usize),
+    New(String, usize, usize),
 }
 
 /// Represents a single bytecode dependency.
@@ -173,18 +173,26 @@ impl<'hir> Visit<'hir> for BytecodeDependencyCollector<'hir> {
 
     fn visit_expr(&mut self, expr: &'hir Expr<'hir>) -> ControlFlow<Self::BreakValue> {
         match &expr.kind {
-            ExprKind::Call(ty, _, _) => {
+            ExprKind::Call(ty, call_args, named_args) => {
                 if let ExprKind::New(ty_new) = &ty.kind {
                     if let TypeKind::Custom(item_id) = ty_new.kind {
                         if let Some(contract_id) = item_id.as_contract() {
                             let name_loc =
                                 SourceMapLocation::from_span(self.source_map, ty_new.span);
                             let name = &self.src[name_loc.start..name_loc.end];
+
+                            let offset = if named_args.is_some() && !call_args.is_empty() {
+                                (call_args.span().lo() - ty_new.span.hi()).to_usize() - 1
+                            } else {
+                                0
+                            };
+
                             let args_len = expr.span.hi() - ty_new.span.hi();
                             self.collect_dependency(BytecodeDependency {
                                 kind: BytecodeDependencyKind::New(
                                     name.to_string(),
                                     args_len.to_usize(),
+                                    offset,
                                 ),
                                 loc: SourceMapLocation::from_span(self.source_map, ty.span),
                                 referenced_contract: contract_id,
@@ -252,7 +260,7 @@ pub(crate) fn remove_bytecode_dependencies(
                         format!("{vm}.getCode(\"{artifact}\")"),
                     ));
                 }
-                BytecodeDependencyKind::New(name, args_length) => {
+                BytecodeDependencyKind::New(name, args_length, offset) => {
                     if constructor_data.is_none() {
                         // if there's no constructor, we can just call deployCode with one
                         // argument
@@ -266,7 +274,7 @@ pub(crate) fn remove_bytecode_dependencies(
                         used_helpers.insert(dep.referenced_contract);
                         updates.insert((
                             dep.loc.start,
-                            dep.loc.end,
+                            dep.loc.end + offset,
                             format!(
                                 "deployCode{id}(DeployHelper{id}.ConstructorArgs",
                                 id = dep.referenced_contract.get()

crates/compilers/src/preprocessor/mod.rs

@@ -146,7 +146,7 @@ impl Preprocessor<MultiCompiler> for TestOptimizerPreprocessor {
 }
 
 /// Helper function to compute hash of [`interface_representation`] of the source.
-pub(crate) fn interface_representation_hash(source: &Source, file: &PathBuf) -> String {
+pub(crate) fn interface_representation_hash(source: &Source, file: &Path) -> String {
     let Ok(repr) = interface_representation(&source.content, file) else {
         return source.content_hash();
     };
@@ -161,10 +161,9 @@ pub(crate) fn interface_representation_hash(source: &Source, file: &PathBuf) ->
 ///   - External functions bodies
 ///
 /// Preserves all libraries and interfaces.
-fn interface_representation(content: &str, file: &PathBuf) -> Result<String, EmittedDiagnostics> {
+fn interface_representation(content: &str, file: &Path) -> Result<String, EmittedDiagnostics> {
     let mut spans_to_remove: Vec<Span> = Vec::new();
-    let sess =
-        solar_parse::interface::Session::builder().with_buffer_emitter(Default::default()).build();
+    let sess = Session::builder().with_buffer_emitter(Default::default()).build();
     sess.enter(|| {
         let arena = solar_parse::ast::Arena::new();
         let filename = FileName::Real(file.to_path_buf());

test-data/preprocessor/test/CounterTest.sol

@@ -8,7 +8,10 @@ contract CounterTest {
     Counter public counter;
     Counter public counter2 = new Counter();
     CounterB public counter3 = new CounterB(address(this), 44, true, address(this));
+    CounterB public counter4 = new CounterB({a:address(this), b: 44, c: true, d:   address(this)});
     CounterV1 public counterv1;
+    Counter public counter5 = new Counter{salt: bytes32("123")}();
+    CounterB public counter6 = new CounterB {salt: bytes32("123")}   (address(this), 44, true, address(this));
 
     function setUp() public {
         counter = new Counter();