Apply --scope-output filters after getSourceReport

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 1.8.1-wip
 
 - Require Dart ^3.4
+- Fix bug where some ranges were able to bypass the `--scope-output` filters.
 
 ## 1.8.0
 

lib/src/collect.dart

@@ -178,11 +178,8 @@ Future<Map<String, dynamic>> _getAllCoverage(
         continue;
       }
       for (final script in scripts.scripts!) {
-        final uri = Uri.parse(script.uri!);
-        if (uri.scheme != 'package') continue;
-        final scope = uri.path.split('/').first;
         // Skip scripts which should not be included in the report.
-        if (!scopedOutput.contains(scope)) continue;
+        if (!scopedOutput.includesScript(script.uri)) continue;
         late final SourceReport scriptReport;
         try {
           scriptReport = await service.getSourceReport(
@@ -203,7 +200,8 @@ Future<Map<String, dynamic>> _getAllCoverage(
             includeDart,
             functionCoverage,
             reportLines,
-            coverableLineCache);
+            coverableLineCache,
+            scopedOutput);
         allCoverage.addAll(coverage);
       }
     } else {
@@ -229,7 +227,8 @@ Future<Map<String, dynamic>> _getAllCoverage(
           includeDart,
           functionCoverage,
           reportLines,
-          coverableLineCache);
+          coverableLineCache,
+          scopedOutput);
       allCoverage.addAll(coverage);
     }
   }
@@ -312,7 +311,8 @@ Future<List<Map<String, dynamic>>> _processSourceReport(
     bool includeDart,
     bool functionCoverage,
     bool reportLines,
-    Map<String, Set<int>>? coverableLineCache) async {
+    Map<String, Set<int>>? coverableLineCache,
+    Set<String> scopedOutput) async {
   final hitMaps = <Uri, HitMap>{};
   final scripts = <ScriptRef, Script>{};
   final libraries = <LibraryRef>{};
@@ -362,8 +362,14 @@ Future<List<Map<String, dynamic>>> _processSourceReport(
 
   for (var range in report.ranges!) {
     final scriptRef = report.scripts![range.scriptIndex!];
-    final scriptUriString = scriptRef.uri!;
-    final scriptUri = Uri.parse(scriptUriString);
+    final scriptUriString = scriptRef.uri;
+    if (!scopedOutput.includesScript(scriptUriString)) {
+      // Sometimes a range's script can be different to the function's script
+      // (eg mixins), so we have to re-check the scope filter.
+      // See https://github.com/dart-lang/coverage/issues/495
+      continue;
+    }
+    final scriptUri = Uri.parse(scriptUriString!);
 
     // If we have a coverableLineCache, use it in the same way we use
     // SourceReportCoverage.misses: to add zeros to the coverage result for all
@@ -497,3 +503,14 @@ class StdoutLog extends Log {
   @override
   void severe(String message) => print(message);
 }
+
+extension _ScopedOutput on Set<String> {
+  bool includesScript(String? scriptUriString) {
+    if (scriptUriString == null) return false;
+    if (isEmpty) return true;
+    final scriptUri = Uri.parse(scriptUriString);
+    if (scriptUri.scheme != 'package') return false;
+    final scope = scriptUri.path.split('/').first;
+    return contains(scope);
+  }
+}

test/collect_coverage_mock_test.dart

@@ -628,5 +628,52 @@ void main() {
         'package:baz/baz.dart': {36, 81},
       });
     });
+
+    test(
+        'Collect coverage, scoped output, library filters, '
+        'handles SourceReports that contain unfiltered ranges', () async {
+      // Regression test for https://github.com/dart-lang/coverage/issues/495
+      final service = _mockService(3, 57);
+      when(service.getSourceReport('isolate', ['Coverage'],
+              forceCompile: true,
+              reportLines: true,
+              libraryFilters: ['package:foo/']))
+          .thenAnswer((_) async => SourceReport(
+                ranges: [
+                  _range(
+                    0,
+                    SourceReportCoverage(
+                      hits: [12],
+                      misses: [47],
+                    ),
+                  ),
+                  _range(
+                    1,
+                    SourceReportCoverage(
+                      hits: [86],
+                      misses: [91],
+                    ),
+                  ),
+                ],
+                scripts: [
+                  ScriptRef(
+                    uri: 'package:foo/foo.dart',
+                    id: 'foo',
+                  ),
+                  ScriptRef(
+                    uri: 'package:bar/bar.dart',
+                    id: 'bar',
+                  ),
+                ],
+              ));
+
+      final jsonResult = await collect(Uri(), false, false, false, {'foo'},
+          serviceOverrideForTesting: service);
+      final result = await HitMap.parseJson(
+          jsonResult['coverage'] as List<Map<String, dynamic>>);
+
+      expect(result.length, 1);
+      expect(result['package:foo/foo.dart']?.lineHits, {12: 1, 47: 0});
+    });
   });
 }