From 133382d0344edc0efe9f19f97248a85b5f6b003a Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Mon, 29 Nov 2021 22:45:07 +0100
Subject: [PATCH] fix: check all import styles (#634)

---
 ethers-solc/src/utils.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ethers-solc/src/utils.rs b/ethers-solc/src/utils.rs
index 5f3c4955..6737edb7 100644
--- a/ethers-solc/src/utils.rs
+++ b/ethers-solc/src/utils.rs
@@ -10,7 +10,7 @@ use walkdir::WalkDir;
 /// statement with the named groups "path", "id".
 pub static RE_SOL_IMPORT: Lazy<Regex> = Lazy::new(|| {
     // Adapted from https://github.com/nomiclabs/hardhat/blob/cced766c65b25d3d0beb39ef847246ac9618bdd9/packages/hardhat-core/src/internal/solidity/parse.ts#L100
-    Regex::new(r#"import\s+(?:(?:"(?P<path>[^;]*)"|'([^;]*)')(?:;|\s+as\s+(?P<id>[^;]*);)|.+from\s+(?:"(.*)"|'(.*)');)"#).unwrap()
+    Regex::new(r#"import\s+(?:(?:"(?P<p1>[^;]*)"|'([^;]*)')(?:;|\s+as\s+(?P<id>[^;]*);)|.+from\s+(?:"(?P<p2>.*)"|'(?P<p3>.*)');)"#).unwrap()
 });
 
 /// A regex that matches the version part of a solidity pragma
@@ -27,7 +27,7 @@ pub static RE_SOL_PRAGMA_VERSION: Lazy<Regex> =
 pub fn find_import_paths(contract: &str) -> Vec<&str> {
     RE_SOL_IMPORT
         .captures_iter(contract)
-        .filter_map(|cap| cap.name("path"))
+        .filter_map(|cap| cap.name("p1").or_else(|| cap.name("p2")).or_else(|| cap.name("p3")))
         .map(|m| m.as_str())
         .collect()
 }
@@ -153,8 +153,13 @@ mod tests {
 pragma solidity ^0.8.0;
 import "hardhat/console.sol";
 import "../contract/Contract.sol";
+import { T } from "../Test.sol";
+import { T } from '../Test2.sol';
 "##;
-        assert_eq!(vec!["hardhat/console.sol", "../contract/Contract.sol"], find_import_paths(s));
+        assert_eq!(
+            vec!["hardhat/console.sol", "../contract/Contract.sol", "../Test.sol", "../Test2.sol"],
+            find_import_paths(s)
+        );
     }
     #[test]
     fn can_find_version() {