fix: resolve imports at the end

Author: DaniPopes

crates/compilers/src/compilers/mod.rs

@@ -166,6 +166,10 @@ pub trait SourceParser: Clone + Debug + Send + Sync {
             })
             .collect::<Result<_>>()
     }
+
+    fn finalize_imports(&mut self, _include_paths: &BTreeSet<PathBuf>) -> Result<()> {
+        Ok(())
+    }
 }
 
 /// Parser of the source files which is used to identify imports and version requirements of the

crates/compilers/src/compilers/multi.rs

@@ -412,6 +412,12 @@ impl SourceParser for MultiCompilerParser {
             )
             .collect())
     }
+
+    fn finalize_imports(&mut self, include_paths: &BTreeSet<PathBuf>) -> Result<()> {
+        self.solc.finalize_imports(include_paths)?;
+        self.vyper.finalize_imports(include_paths)?;
+        Ok(())
+    }
 }
 
 impl ParsedSource for MultiCompilerParsedSource {

crates/compilers/src/compilers/solc/mod.rs

@@ -401,6 +401,7 @@ impl SourceParser for SolParser {
     ) -> Result<Vec<(PathBuf, Node<Self::ParsedSource>)>> {
         self.compiler_mut().enter_mut(|compiler| {
             let mut pcx = compiler.parse();
+            pcx.set_resolve_imports(false);
             let files = sources
                 .par_iter()
                 .map(|(path, source)| {
@@ -447,6 +448,16 @@ impl SourceParser for SolParser {
             Ok(parsed)
         })
     }
+
+    fn finalize_imports(&mut self, include_paths: &BTreeSet<PathBuf>) -> Result<()> {
+        self.compiler_mut().sess_mut().opts.include_paths.extend(include_paths.iter().cloned());
+        self.compiler_mut().enter_mut(|compiler| {
+            let mut pcx = compiler.parse();
+            pcx.set_resolve_imports(true);
+            pcx.force_resolve_all_imports();
+        });
+        Ok(())
+    }
 }
 
 impl ParsedSource for SolData {

crates/compilers/src/resolver/mod.rs

@@ -484,6 +484,8 @@ impl<P: SourceParser> Graph<P> {
             );
         }
 
+        parser.finalize_imports(&resolved_solc_include_paths)?;
+
         let edges = GraphEdges {
             edges,
             rev_edges,