Fix minor bugs

netglade · Apr 17, 2023 · 0ab5a3b · 0ab5a3b
1 parent f9da8bc
commit 0ab5a3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/cached_build_runner.dart b/lib/cached_build_runner.dart
@@ -334,6 +334,7 @@ class CachedBuildRunner {
         );
 
         dependencies.addAll(importDependency);
+        testFiles.add(dependencies);
       }
     }
 

diff --git a/lib/core/dependency_visitor.dart b/lib/core/dependency_visitor.dart
@@ -17,7 +17,7 @@ class DependencyVisitor {
   final withRegex = RegExp(r"with\s+([\w\s,]+)");
 
   /// Regex for parsing import statements
-  final importRegex = RegExp(r'''import\s+(?!'package:)(?:'|")(.*?)('|");?''');
+  final relativeImportRegex = RegExp(r'''import\s+(?!(\w+:))(?:'|")(.*?)('|");?''');
   final packageImportRegex = RegExp(
     'import\\s+\'package:${Utils.appPackageName}(.*)\';',
   );
@@ -76,13 +76,15 @@ class DependencyVisitor {
     final lines = dartSource.split('\n');
 
     for (final line in lines) {
-      final relativeMatch = importRegex.firstMatch(line);
+      final relativeMatch = relativeImportRegex.firstMatch(line);
       final packageMatch = packageImportRegex.firstMatch(line);
 
       if (relativeMatch != null) {
         final importedPath = relativeMatch.group(1);
         if (importedPath != null) relativeImports.add(importedPath);
-      } else if (packageMatch != null) {
+      }
+
+      if (packageMatch != null) {
         final importedPath = packageMatch.group(1);
         if (importedPath != null) absoluteImports.add(importedPath);
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -334,6 +334,7 @@ class CachedBuildRunner { @@
             );
             dependencies.addAll(importDependency);
+            testFiles.add(dependencies);
           }
         }
@@ Expand Down @@