fixes

Author: ci-bot

libs/remix-solidity/src/compiler/dependency-resolver.ts

@@ -206,27 +206,130 @@ export class DependencyResolver {
 
   /**
    * Extract import statements from Solidity source code
+   * Handles:
+   * 1. Comments (single-line and multi-line)
+   * 2. Multi-line imports
+   * 3. All Solidity import syntaxes
+   * 4. String literals (to avoid false matches)
    */
   private extractImports(content: string): string[] {
     const imports: string[] = []
 
-    // Match: import "path/to/file.sol";
-    // Match: import 'path/to/file.sol';
-    // Match: import {Symbol} from "path/to/file.sol";
-    // Match: import * as Name from "path/to/file.sol";
-    const importRegex = /import\s+(?:{[^}]*}\s+from\s+)?(?:\*\s+as\s+\w+\s+from\s+)?["']([^"']+)["']/g
+    // Step 1: Remove comments and string literals to avoid false matches
+    const cleanedContent = this.removeCommentsAndStrings(content)
+    
+    // Step 2: Extract imports from cleaned content
+    // Solidity import patterns:
+    // import "filename";
+    // import 'filename';
+    // import * as symbolName from "filename";
+    // import { symbol1, symbol2 } from "filename";
+    // import { symbol1 as alias1, symbol2 } from "filename";
+    // import symbolName from "filename";
+    // import "filename" as symbolName;
+    
+    // Multi-line regex that handles whitespace and newlines
+    const importRegex = /import\s+(?:(?:\*\s+as\s+\w+|{\s*[^}]*\s*}|\w+)\s+from\s+)?["']([^"']+)["'](?:\s+as\s+\w+)?/gms
 
     let match
-    while ((match = importRegex.exec(content)) !== null) {
-      const importPath = match[1]
+    while ((match = importRegex.exec(cleanedContent)) !== null) {
+      const importPath = match[1]?.trim()
       if (importPath) {
         imports.push(importPath)
+        this.log(`[DependencyResolver]     📄 Found import: ${importPath}`)
       }
     }
 
     return imports
   }
 
+  /**
+   * Remove comments and string literals from Solidity code to avoid false import matches
+   * This prevents matching imports inside comments or string literals
+   */
+  private removeCommentsAndStrings(content: string): string {
+    let result = ''
+    let i = 0
+    let inString = false
+    let stringChar = ''
+    let inSingleLineComment = false
+    let inMultiLineComment = false
+    
+    while (i < content.length) {
+      const char = content[i]
+      const nextChar = i + 1 < content.length ? content[i + 1] : ''
+      
+      // Handle multi-line comment start
+      if (!inString && !inSingleLineComment && !inMultiLineComment && char === '/' && nextChar === '*') {
+        inMultiLineComment = true
+        result += '  ' // Replace with spaces to preserve positions
+        i += 2
+        continue
+      }
+      
+      // Handle multi-line comment end
+      if (inMultiLineComment && char === '*' && nextChar === '/') {
+        inMultiLineComment = false
+        result += '  '
+        i += 2
+        continue
+      }
+      
+      // Handle single-line comment start
+      if (!inString && !inMultiLineComment && char === '/' && nextChar === '/') {
+        inSingleLineComment = true
+        result += '  '
+        i += 2
+        continue
+      }
+      
+      // Handle end of line (ends single-line comment)
+      if (inSingleLineComment && (char === '\n' || char === '\r')) {
+        inSingleLineComment = false
+        result += char // Keep newlines
+        i++
+        continue
+      }
+      
+      // Skip characters inside comments
+      if (inSingleLineComment || inMultiLineComment) {
+        result += char === '\n' || char === '\r' ? char : ' '
+        i++
+        continue
+      }
+      
+      // Handle string literals
+      if (!inString && (char === '"' || char === "'")) {
+        inString = true
+        stringChar = char
+        result += ' ' // Replace with space
+        i++
+        continue
+      }
+      
+      if (inString && char === stringChar && content[i - 1] !== '\\') {
+        inString = false
+        stringChar = ''
+        result += ' '
+        i++
+        continue
+      }
+      
+      // Skip characters inside strings (except preserve structure)
+      if (inString) {
+        result += char === '\n' || char === '\r' ? char : ' '
+        i++
+        continue
+      }
+      
+      // Keep normal characters
+      result += char
+      i++
+    }
+    
+    return result
+  }
+
   /**
    * Extract package context from a file path
    * E.g., "@openzeppelin/[email protected]/token/ERC20/IERC20.sol" -> "@openzeppelin/[email protected]"