Fix inner DDC types display

Closes: #54694
Change-Id: Ie141959eedc9cdbb5c675d33da985eb1ac5588e1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/347761
Reviewed-by: Nicholas Shahan <[email protected]>
Commit-Queue: Anna Gringauze <[email protected]>

Author: Anna Gringauze

pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_suite.dart

@@ -772,7 +772,8 @@ class ExpressionEvaluationTestDriver {
   ///           }
   Future<String> stringifyRemoteObject(wip.RemoteObject obj) async {
     String str;
-    switch (obj.type) {
+    final type = obj.json.containsKey('type') ? obj.type : null;
+    switch (type) {
       case 'function':
         str = obj.description ?? '';
         break;

pkg/dev_compiler/test/expression_compiler/runtime_debugger_api_test.dart

@@ -553,6 +553,62 @@ void runSharedTests(
       );
     });
 
+    test('getObjectMetadata (DartType)', () async {
+      final innerType = 'dart.dloadRepl(object.runtimeType, "_type")';
+      final typeName = await driver.evaluateJsExpression(
+        breakpointId: 'BP',
+        expression: '$innerType.toString()',
+      );
+      expect(typeName, startsWith('class Object'));
+
+      await driver.checkRuntimeInFrame(
+          breakpointId: 'BP',
+          expression: 'dart.getObjectMetadata($innerType)',
+          expectedResult: {
+            'className': 'Type',
+            'libraryId': null,
+            'runtimeKind': 'function',
+            'length': 0,
+          });
+    }, skip: 'Only applies to old type system');
+
+    test('getObjectMetadata (RecordType)', () async {
+      final innerType = 'dart.dloadRepl(record.runtimeType, "_type")';
+      final typeName = await driver.evaluateJsExpression(
+        breakpointId: 'BP',
+        expression: '$innerType.toString()',
+      );
+      expect(typeName, '(int, int, {String name})');
+
+      await driver.checkRuntimeInFrame(
+          breakpointId: 'BP',
+          expression: 'dart.getObjectMetadata($innerType)',
+          expectedResult: {
+            'className': 'Type',
+            'libraryId': 'dart:core',
+            'runtimeKind': 'type',
+            'typeName': '(int, int, {String name})'
+          });
+    }, skip: 'Only applies to old type system');
+
+    test('getObjectMetadata (Rti)', () async {
+      final rti = 'dart.dloadRepl(object.runtimeType, "_rti")';
+      final typeName = await driver.evaluateJsExpression(
+        breakpointId: 'BP',
+        expression: '$rti.runtimeType.toString()',
+      );
+      expect(typeName, 'Rti');
+
+      await driver.checkRuntimeInFrame(
+          breakpointId: 'BP',
+          expression: 'dart.getObjectMetadata($rti)',
+          expectedResult: {
+            'className': typeName,
+            'libraryId': 'dart:_rti',
+            'runtimeKind': 'object',
+          });
+    });
+
     test('getObjectFieldNames (object)', () async {
       await driver.checkRuntimeInFrame(
           breakpointId: 'BP',

sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/debugger.dart

@@ -532,7 +532,7 @@ bool _isRecordType(@notNull Type type) {
   if (JS_GET_FLAG('NEW_RUNTIME_TYPES')) {
     return rti.isRecordType(type);
   } else {
-    return isRecordType(type);
+    return type is _Type ? isRecordType(type) : false;
   }
 }