fix: correctly set paths in ParsingContext

Author: DaniPopes

Cargo.toml

@@ -70,6 +70,5 @@ tokio = { version = "1.35", features = ["rt-multi-thread"] }
 snapbox = "0.6.9"
 
 [patch.crates-io]
-solar-parse  = { git = "https://github.com/paradigmxyz/solar", branch = "main" }
-solar-sema  = { git = "https://github.com/paradigmxyz/solar", branch = "main" }
-
+solar-parse = { git = "https://github.com/paradigmxyz/solar", branch = "main" }
+solar-sema = { git = "https://github.com/paradigmxyz/solar", branch = "main" }

crates/compilers/src/preprocessor/mod.rs

@@ -55,29 +55,32 @@ impl Preprocessor<SolcCompiler> for TestOptimizerPreprocessor {
 
         let sess = Session::builder().with_buffer_emitter(Default::default()).build();
         let _ = sess.enter_parallel(|| -> solar_parse::interface::Result {
+            // Set up the parsing context with the project paths.
             let mut parsing_context = ParsingContext::new(&sess);
-            // Set remappings into HIR parsing context.
+            parsing_context.file_resolver.set_current_dir(&paths.root);
             for remapping in &paths.remappings {
                 parsing_context
                     .file_resolver
                     .add_import_map(PathBuf::from(&remapping.name), PathBuf::from(&remapping.path));
             }
-            // Load and parse test and script contracts only (dependencies are automatically
-            // resolved).
+            for include_path in &paths.include_paths {
+                let _ = parsing_context.file_resolver.add_import_path(include_path.clone());
+            }
 
+            // Add the sources into the context.
             let mut preprocessed_paths = vec![];
             for (path, source) in sources.iter() {
-                if is_test_or_script(path, paths) && !source.content.is_empty() {
-                    if let Ok(src_file) = sess
-                        .source_map()
-                        .new_dummy_source_file(path.clone(), source.content.to_string())
+                if is_test_or_script(path, paths) {
+                    if let Ok(src_file) =
+                        sess.source_map().new_source_file(path.clone(), source.content.as_str())
                     {
                         parsing_context.add_file(src_file);
                         preprocessed_paths.push(path.clone());
                     }
                 }
             }
 
+            // Parse and preprocess.
             let hir_arena = ThreadLocal::new();
             if let Some(gcx) = parsing_context.parse_and_lower(&hir_arena)? {
                 let hir = &gcx.get().hir;

crates/compilers/src/project_util/mod.rs

@@ -124,7 +124,7 @@ impl TempProject<MultiCompiler, HardhatArtifacts> {
             .artifacts(HardhatArtifacts::default())
             .paths(paths)
             .build(Default::default())?;
-        Ok(Self::create_new(tmp_dir, inner)?)
+        Ok(TempProject::create_new(tmp_dir, inner)?)
     }
 }
 
@@ -133,7 +133,12 @@ impl<
         T: ArtifactOutput<CompilerContract = C::CompilerContract> + Default,
     > TempProject<C, T>
 {
-    /// Makes sure all resources are created
+    /// Wraps an existing project in a temp dir.
+    pub fn from_project(inner: Project<C, T>) -> std::result::Result<Self, SolcIoError> {
+        Self::create_new(tempdir("tmp_project")?, inner)
+    }
+
+    /// Makes sure all resources are created.
     pub fn create_new(
         root: TempDir,
         inner: Project<C, T>,
@@ -215,6 +220,14 @@ impl<
         &mut self.project_mut().paths
     }
 
+    /// Deletes the current project and copies it from `source`.
+    pub fn copy_project_from(&self, source: &Path) -> Result<()> {
+        let root = self.root();
+        std::fs::remove_dir_all(root).map_err(|e| SolcIoError::new(e, root))?;
+        std::fs::create_dir_all(root).map_err(|e| SolcIoError::new(e, root))?;
+        copy_dir(source, root)
+    }
+
     /// Copies a single file into the projects source
     pub fn copy_source(&self, source: &Path) -> Result<()> {
         copy_file(source, &self.paths().sources)

crates/compilers/tests/project.rs

@@ -4164,26 +4164,17 @@ fn can_preprocess_constructors_and_creation_code() {
         canonicalize(Path::new(env!("CARGO_MANIFEST_DIR")).join("../../test-data/preprocessor"))
             .unwrap();
 
-    let paths = ProjectPathsConfig::builder()
-        .sources(root.join("src"))
-        .tests(root.join("test"))
-        .root(&root)
-        .build::<SolcLanguage>()
-        .unwrap();
-
-    let project = ProjectBuilder::<SolcCompiler>::new(Default::default())
-        .paths(paths)
-        .build(SolcCompiler::default())
-        .unwrap();
-
-    // TODO: figure out how to set root to parsing context.
-    let cur_dir = env::current_dir().unwrap();
-    env::set_current_dir(root).unwrap();
-    let compiled = ProjectCompiler::new(&project)
+    let project = TempProject::hardhat().unwrap();
+    project.copy_project_from(&root).unwrap();
+    let r = ProjectCompiler::new(&project.project())
         .unwrap()
         .with_preprocessor(TestOptimizerPreprocessor)
-        .compile()
-        .expect("failed to compile");
+        .compile();
+
+    let compiled = match r {
+        Ok(compiled) => compiled,
+        Err(e) => panic!("failed to compile: {e}"),
+    };
     compiled.assert_success();
-    env::set_current_dir(cur_dir).unwrap();
+    assert!(!compiled.is_unchanged());
 }