From 81561069e997aa13a08ea3a75984342f48544180 Mon Sep 17 00:00:00 2001
From: Derek Xu <derekx@google.com>
Date: Wed, 4 Sep 2024 16:50:49 -0400
Subject: [PATCH] [DWDS] Account for the optional parameters that will be added
 in package:vm_service_interface 2.0.0 (#2490)

This is needed to land the SDK CL that checks in package:vm_service_interface 2.0.0, because this is needed to make the g3-cbuild-try job pass.
---
 dwds/CHANGELOG.md                             |  1 +
 .../src/services/chrome_proxy_service.dart    | 41 ++++++++++++++++---
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
index 314a66bc3..52b5dbabe 100644
--- a/dwds/CHANGELOG.md
+++ b/dwds/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Spawn DDS in a separate process using `dart development-service` instead of launching from `package:dds`. - [#2466](https://github.com/dart-lang/webdev/pull/2466)
 - Update package `web_socket_channel: '>=2.2.0 <4.0.0'`.
 - Require Dart `^3.4`
+- Prepare to update `package:vm_service_interface` constraint to `2.0.0`.
 
 ## 24.0.0
 
diff --git a/dwds/lib/src/services/chrome_proxy_service.dart b/dwds/lib/src/services/chrome_proxy_service.dart
index b32b8d19c..8a5be72b4 100644
--- a/dwds/lib/src/services/chrome_proxy_service.dart
+++ b/dwds/lib/src/services/chrome_proxy_service.dart
@@ -623,6 +623,11 @@ ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.
     Map<String, String>? scope,
     // TODO(798) - respect disableBreakpoints.
     bool? disableBreakpoints,
+
+    /// Note that `idZoneId` arguments will be ignored. This parameter is only
+    /// here to make this method is a valid override of
+    /// [VmServiceInterface.evaluate].
+    String? idZoneId,
   }) =>
       wrapInErrorHandlerAsync(
         'evaluate',
@@ -716,6 +721,11 @@ ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.
     Map<String, String>? scope,
     // TODO(798) - respect disableBreakpoints.
     bool? disableBreakpoints,
+
+    /// Note that `idZoneId` arguments will be ignored. This parameter is only
+    /// here to make this method is a valid override of
+    /// [VmServiceInterface.evaluateInFrame].
+    String? idZoneId,
   }) =>
       wrapInErrorHandlerAsync(
         'evaluateInFrame',
@@ -805,6 +815,7 @@ ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.
     int limit, {
     bool? includeImplementers,
     bool? includeSubclasses,
+    String? idZoneId,
   }) {
     return _rpcNotSupportedFuture('getInstances');
   }
@@ -845,6 +856,11 @@ ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.
     String objectId, {
     int? offset,
     int? count,
+
+    /// Note that `idZoneId` arguments will be ignored. This parameter is only
+    /// here to make this method is a valid override of
+    /// [VmServiceInterface.getObject].
+    String? idZoneId,
   }) =>
       wrapInErrorHandlerAsync(
         'getObject',
@@ -946,7 +962,15 @@ ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.
   ///
   /// The returned stack will contain up to [limit] frames if provided.
   @override
-  Future<Stack> getStack(String isolateId, {int? limit}) =>
+  Future<Stack> getStack(
+    String isolateId, {
+    int? limit,
+
+    /// Note that `idZoneId` arguments will be ignored. This parameter is only
+    /// here to make this method is a valid override of
+    /// [VmServiceInterface.getStack].
+    String? idZoneId,
+  }) =>
       wrapInErrorHandlerAsync(
         'getStack',
         () => _getStack(isolateId, limit: limit),
@@ -1002,6 +1026,11 @@ ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.
     List argumentIds, {
     // TODO(798) - respect disableBreakpoints.
     bool? disableBreakpoints,
+
+    /// Note that `idZoneId` arguments will be ignored. This parameter is only
+    /// here to make this method is a valid override of
+    /// [VmServiceInterface.invoke].
+    String? idZoneId,
   }) =>
       wrapInErrorHandlerAsync(
         'invoke',
@@ -1591,8 +1620,9 @@ ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.
   Future<InboundReferences> getInboundReferences(
     String isolateId,
     String targetId,
-    int limit,
-  ) {
+    int limit, {
+    String? idZoneId,
+  }) {
     return _rpcNotSupportedFuture('getInboundReferences');
   }
 
@@ -1600,8 +1630,9 @@ ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.
   Future<RetainingPath> getRetainingPath(
     String isolateId,
     String targetId,
-    int limit,
-  ) {
+    int limit, {
+    String? idZoneId,
+  }) {
     return _rpcNotSupportedFuture('getRetainingPath');
   }