Merge remote-tracking branch 'upstream/main' into dwds2421

dwds/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - Update to be forward compatible with changes to `package:shelf_web_socket`.
 - Added support for some debugging APIs with the DDC library bundle format. - [#2537](https://github.com/dart-lang/webdev/issues/2537)
+- Added support for some debugging APIs with the DDC library bundle format. - [#2537](https://github.com/dart-lang/webdev/issues/2537),[#2544](https://github.com/dart-lang/webdev/issues/2544)
 - Expose a partial implementation of
   `FrontendServerDdcLibraryBundleStrategyProvider`.
 - Update `package:vm_service_interface` to '^2.0.1'.

dwds/lib/src/debugging/dart_runtime_debugger.dart

@@ -160,4 +160,13 @@ class DartRuntimeDebugger {
       'getSetElements(this)',
     );
   }
+
+  /// Generates a JS expression for retrieving the fields of a record.
+  String getRecordFieldsJsExpression() {
+    return _buildExpression(
+      '',
+      'getRecordFields(this)',
+      'getRecordFields(this)',
+    );
+  }
 }

dwds/lib/src/debugging/instance.dart

@@ -524,7 +524,8 @@ class InstanceHelper extends Domain {
     // We do this in in awkward way because we want the keys and values, but we
     // can't return things by value or some Dart objects will come back as
     // values that we need to be RemoteObject, e.g. a List of int.
-    final expression = _jsRuntimeFunctionCall('getRecordFields(this)');
+    final expression = globalToolConfiguration.loadStrategy.dartRuntimeDebugger
+        .getRecordFieldsJsExpression();
 
     final result = await inspector.jsCallFunctionOn(record, expression, []);
     final fieldNameElements =

dwds/test/instances/common/record_inspection_common.dart

@@ -66,6 +66,7 @@ void runTests({
           verboseCompiler: debug,
           experiments: ['records', 'patterns'],
           canaryFeatures: canaryFeatures,
+          moduleFormat: provider.ddcModuleFormat,
         ),
       );
       service = context.debugConnection.vmService;

dwds/test/instances/record_inspection_canary_test.dart → dwds/test/instances/record_inspection_amd_canary_test.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,6 +7,7 @@
 @Timeout(Duration(minutes: 2))
 library;
 
+import 'package:dwds/src/services/expression_compiler.dart';
 import 'package:test/test.dart';
 import 'package:test_common/test_sdk_configuration.dart';
 
@@ -22,6 +23,7 @@ void main() {
     final provider = TestSdkConfigurationProvider(
       verbose: debug,
       canaryFeatures: canaryFeatures,
+      ddcModuleFormat: ModuleFormat.amd,
     );
     tearDownAll(provider.dispose);
 

dwds/test/instances/record_inspection_test.dart → dwds/test/instances/record_inspection_amd_test.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -7,6 +7,7 @@
 @Timeout(Duration(minutes: 2))
 library;
 
+import 'package:dwds/src/services/expression_compiler.dart';
 import 'package:test/test.dart';
 import 'package:test_common/test_sdk_configuration.dart';
 
@@ -22,6 +23,7 @@ void main() {
     final provider = TestSdkConfigurationProvider(
       verbose: debug,
       canaryFeatures: canaryFeatures,
+      ddcModuleFormat: ModuleFormat.amd,
     );
     tearDownAll(provider.dispose);
 

dwds/test/instances/record_inspection_ddc_library_bundle_test.dart

@@ -0,0 +1,37 @@
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+@Tags(['daily'])
+@TestOn('vm')
+@Timeout(Duration(minutes: 2))
+library;
+
+import 'package:dwds/src/services/expression_compiler.dart';
+import 'package:test/test.dart';
+import 'package:test_common/test_sdk_configuration.dart';
+
+import '../fixtures/context.dart';
+import 'common/record_inspection_common.dart';
+
+void main() {
+  // Enable verbose logging for debugging.
+  final debug = false;
+  final canaryFeatures = true;
+  final compilationMode = CompilationMode.frontendServer;
+
+  group('canary: $canaryFeatures |', () {
+    final provider = TestSdkConfigurationProvider(
+      verbose: debug,
+      canaryFeatures: canaryFeatures,
+      ddcModuleFormat: ModuleFormat.ddc,
+    );
+    tearDownAll(provider.dispose);
+    runTests(
+      provider: provider,
+      compilationMode: compilationMode,
+      canaryFeatures: canaryFeatures,
+      debug: debug,
+    );
+  });
+}