Refined filtering functionality for collect function #529

Author: Victowolf

pkgs/coverage/lib/src/collect.dart

@@ -43,7 +43,8 @@ const _debugTokenPositions = bool.fromEnvironment('DEBUG_COVERAGE');
 /// scripts that start with any of the provided paths are considered.
 ///
 /// If [isolateIds] is set, coverage gathering **will not be restricted** to
-/// only those VM isolates. Instead, coverage will be collected for **all isolates
+/// only those VM isolates. Instead, coverage will be collected for 
+/// **all isolates
 /// in the same isolate group** as the provided isolate(s).
 ///
 /// If [coverableLineCache] is set, the collector will avoid recompiling
@@ -57,11 +58,12 @@ const _debugTokenPositions = bool.fromEnvironment('DEBUG_COVERAGE');
 Future<Map<String, dynamic>> collect(Uri serviceUri, bool resume,
     bool waitPaused, bool includeDart, Set<String>? scopedOutput,
     {Set<String>? isolateIds,
-    Duration? timeout,
-    bool functionCoverage = false,
-    bool branchCoverage = false,
-    Map<String, Set<int>>? coverableLineCache,
-    VmService? serviceOverrideForTesting}) async {
+     Duration? timeout,
+     bool functionCoverage = false,
+     bool branchCoverage = false,
+     Map<String, Set<int>>? coverableLineCache,
+     VmService? serviceOverrideForTesting,
+      bool Function(String)? filter}) async { // Correct function type
   scopedOutput ??= <String>{};
 
   late VmService service;
@@ -95,7 +97,7 @@ Future<Map<String, dynamic>> collect(Uri serviceUri, bool resume,
   }
 
   try {
-    return await _getAllCoverage(
+    final coverageData = await _getAllCoverage(
         service,
         includeDart,
         functionCoverage,
@@ -104,6 +106,13 @@ Future<Map<String, dynamic>> collect(Uri serviceUri, bool resume,
         isolateIds,
         coverableLineCache,
         waitPaused);
+
+    // Apply filtering if a filter function is provided
+    if (filter != null) {
+      coverageData.removeWhere((key, value) => !filter(key));
+    }
+
+    return coverageData;
   } finally {
     if (resume && !waitPaused) {
       await _resumeIsolates(service);
@@ -114,6 +123,8 @@ Future<Map<String, dynamic>> collect(Uri serviceUri, bool resume,
   }
 }
 
+
+
 Future<Map<String, dynamic>> _getAllCoverage(
     VmService service,
     bool includeDart,

pkgs/coverage/lib/src/resolver.dart

@@ -9,6 +9,21 @@ import 'package:path/path.dart' as p;
 
 /// [Resolver] resolves imports with respect to a given environment.
 class Resolver {
+
+  @Deprecated('Use Resolver.create')
+  
+  Resolver
+  ({this.packagesPath, this.sdkRoot})
+      : _packages = packagesPath != null ? _parsePackages(packagesPath) : null,
+        packagePath = null;
+
+  Resolver._
+  (
+      {this.packagesPath,
+      this.packagePath,
+      this.sdkRoot,
+      Map<String, Uri>? packages})
+      : _packages = packages;
   /// Returns a list of all Dart files in the project.
   List<String> listAllDartFiles({String directoryPath = '.'}) {
     final dir = Directory(directoryPath);
@@ -22,18 +37,6 @@ class Resolver {
         .toList();
   }
 
-  @Deprecated('Use Resolver.create')
-  Resolver({this.packagesPath, this.sdkRoot})
-      : _packages = packagesPath != null ? _parsePackages(packagesPath) : null,
-        packagePath = null;
-
-  Resolver._(
-      {this.packagesPath,
-      this.packagePath,
-      this.sdkRoot,
-      Map<String, Uri>? packages})
-      : _packages = packages;
-
   static Future<Resolver> create({
     String? packagesPath,
     String? packagePath,