chore(solc): provide remappings on unresolved import message (#935)

* chore(solc): provide remappings on unresolved import message * feat: add on solc error * bump ethers
foundry-rs · Mar 14, 2022 · 62a5556 · 62a5556
1 parent 0f58c52
commit 62a5556
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/term.rs b/cli/src/term.rs
@@ -1,7 +1,8 @@
 //! terminal utils
 
+use ansi_term::Colour;
 use atty::{self, Stream};
-use ethers::solc::{report::Reporter, CompilerInput, Solc};
+use ethers::solc::{remappings::Remapping, report::Reporter, CompilerInput, Solc};
 use once_cell::sync::Lazy;
 use semver::Version;
 use std::{
@@ -220,8 +221,18 @@ impl Reporter for SpinnerReporter {
         self.send_msg(format!("Successfully installed solc {}", version));
     }
 
-    fn on_unresolved_import(&self, import: &Path) {
-        self.send_msg(format!("Unable to resolve imported file: \"{}\"", import.display()));
+    fn on_solc_installation_error(&self, version: &Version, error: &str) {
+        self.send_msg(
+            Colour::Red.paint(format!("Failed to install solc {}: {}", version, error)).to_string(),
+        );
+    }
+
+    fn on_unresolved_import(&self, import: &Path, remappings: &[Remapping]) {
+        self.send_msg(format!(
+            "Unable to resolve import: \"{}\" with remappings:\n    {}",
+            import.display(),
+            remappings.iter().map(|r| r.to_string()).collect::<Vec<_>>().join("\n    ")
+        ));
     }
 }