Update method signature of `lookupResolvedPackageUris` (#1633)
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
index 95e4f5c..e2f8186 100644
--- a/dwds/CHANGELOG.md
+++ b/dwds/CHANGELOG.md
@@ -7,10 +7,11 @@
- Update `package:vm_service` to 8.3.0.
- Convert JavaScript stack traces in uncaught exceptions to Dart stack traces.
- Fix failure to set breakpoints on windows with a base change in index.html.
-- Add the setIsolatePauseMode method to Chrome Proxy Service.
+- Add the `setIsolatePauseMode` method to Chrome Proxy Service.
- Batch extension `Debugger.scriptParsed` events and send batches every 1000ms
to the server.
- Move `batched_stream.dart` into shared utilities.
+- Update the method signature for `lookupResolvedPackageUris`.
## 14.0.2
- Update the min SDK constraint to 2.17.0.
diff --git a/dwds/lib/src/services/chrome_proxy_service.dart b/dwds/lib/src/services/chrome_proxy_service.dart
index ba872c4..5b19d0e 100644
--- a/dwds/lib/src/services/chrome_proxy_service.dart
+++ b/dwds/lib/src/services/chrome_proxy_service.dart
@@ -692,9 +692,11 @@
return (await _debugger).pause();
}
+ // Note: Ignore the optional local parameter, it is there to keep the method
+ // signature consistent with the VM service interface.
@override
- Future<UriList> lookupResolvedPackageUris(
- String isolateId, List<String> uris) async {
+ Future<UriList> lookupResolvedPackageUris(String isolateId, List<String> uris,
+ {bool local}) async {
await isInitialized;
return UriList(uris: uris.map(DartUri.toResolvedUri).toList());
}
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
index e1ddaab..7a91308 100644
--- a/dwds/pubspec.yaml
+++ b/dwds/pubspec.yaml
@@ -14,7 +14,7 @@
built_collection: ^5.1.1
built_value: ^8.3.0
crypto: ^3.0.2
- dds: ^2.2.0
+ dds: ^2.2.5
file: ^6.1.2
http: ^0.13.4
http_multi_server: ^3.2.0
@@ -33,7 +33,7 @@
stack_trace: ^1.10.0
sse: ^4.1.0
uuid: ^3.0.6
- vm_service: ^8.3.0
+ vm_service: ^9.0.0
web_socket_channel: ^2.2.0
webkit_inspection_protocol: ^1.0.1
diff --git a/dwds/test/chrome_proxy_service_test.dart b/dwds/test/chrome_proxy_service_test.dart
index b9ad3eb..cce68d9 100644
--- a/dwds/test/chrome_proxy_service_test.dart
+++ b/dwds/test/chrome_proxy_service_test.dart
@@ -1409,6 +1409,39 @@
]));
});
+ test('lookupPackageUris ignores local parameter', () async {
+ final vm = await service.getVM();
+ final isolateId = vm.isolates.first.id;
+ final scriptList = await service.getScripts(isolateId);
+
+ final uris = scriptList.scripts.map((e) => e.uri).toList();
+ final resolvedUrisWithLocal =
+ await service.lookupResolvedPackageUris(isolateId, uris, local: true);
+
+ final packageUrisWithLocal = await service.lookupPackageUris(
+ isolateId, resolvedUrisWithLocal.uris);
+ expect(
+ packageUrisWithLocal.uris,
+ containsAll([
+ 'org-dartlang-app:///example/hello_world/main.dart',
+ 'package:path/path.dart',
+ 'package:path/src/path_set.dart',
+ ]));
+
+ final resolvedUrisWithoutLocal =
+ await service.lookupResolvedPackageUris(isolateId, uris, local: true);
+
+ final packageUrisWithoutLocal = await service.lookupPackageUris(
+ isolateId, resolvedUrisWithoutLocal.uris);
+ expect(
+ packageUrisWithoutLocal.uris,
+ containsAll([
+ 'org-dartlang-app:///example/hello_world/main.dart',
+ 'package:path/path.dart',
+ 'package:path/src/path_set.dart',
+ ]));
+ });
+
test('lookupPackageUris does not translate non-existent paths', () async {
final vm = await service.getVM();
final isolateId = vm.isolates.first.id;
diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml
index 7a94ee6..665f19d 100644
--- a/webdev/pubspec.yaml
+++ b/webdev/pubspec.yaml
@@ -48,9 +48,9 @@
webdriver: ^3.0.0
# Comment out before releasing webdev.
-dependency_overrides:
- dwds:
- path: ../dwds
+# dependency_overrides:
+# dwds:
+# path: ../dwds
executables:
webdev:
