Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use VMScriptRef to identify VM scripts, not URI #216

Merged
merged 1 commit into from Oct 19, 2018
Merged

Use VMScriptRef to identify VM scripts, not URI #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 9 additions & 11 deletions lib/src/collect.dart
View file
Open in desktop
Expand Up @@ -80,10 +80,9 @@ Future _waitIsolatesPaused(VMServiceClient service, {Duration timeout}) async {
Future<List<Map<String, dynamic>>> _getCoverageJson(
VMServiceClient service, VMSourceReport report) async {
var scriptRefs = report.ranges.map((r) => r.script).toSet();
var scripts = <Uri, VMScript>{};
for (var script in await Future.wait<VMScript>(
scriptRefs.map((ref) => ref.load()).toList())) {
scripts[script.uri] = script;
var scripts = <VMScriptRef, VMScript>{};
for (var ref in scriptRefs) {
scripts[ref] = await ref.load();
}

// script uri -> { line -> hit count }
Expand All @@ -94,7 +93,7 @@ Future<List<Map<String, dynamic>>> _getCoverageJson(

hitMaps.putIfAbsent(range.script.uri, () => <int, int>{});
var hitMap = hitMaps[range.script.uri];
var script = scripts[range.script.uri];
var script = scripts[range.script];
for (VMScriptToken hit in range.hits ?? []) {
var line = script.sourceLocation(hit).line + 1;
hitMap[line] = hitMap.containsKey(line) ? hitMap[line] + 1 : 1;
Expand All @@ -108,27 +107,26 @@ Future<List<Map<String, dynamic>>> _getCoverageJson(
// Output JSON
var coverage = <Map<String, dynamic>>[];
hitMaps.forEach((uri, hitMap) {
var script = scripts[uri];
coverage.add(_toScriptCoverageJson(script, hitMap));
coverage.add(_toScriptCoverageJson(uri, hitMap));
});
return coverage;
}

/// Returns a JSON hit map backward-compatible with pre-1.16.0 SDKs.
Map<String, dynamic> _toScriptCoverageJson(
VMScript script, Map<int, int> hitMap) {
Uri scriptUri, Map<int, int> hitMap) {
var json = <String, dynamic>{};
var hits = <int>[];
hitMap.forEach((line, hitCount) {
hits.add(line);
hits.add(hitCount);
});
json['source'] = '${script.uri}';
json['source'] = '$scriptUri';
json['script'] = {
'type': '@Script',
'fixedId': true,
'id': 'libraries/1/scripts/${Uri.encodeComponent(script.uri.toString())}',
'uri': '${script.uri}',
'id': 'libraries/1/scripts/${Uri.encodeComponent(scriptUri.toString())}',
'uri': '$scriptUri',
'_kind': 'library',
};
json['hits'] = hits;
Expand Down