Simplify class metadata

dwds/CHANGELOG.md

@@ -3,6 +3,7 @@
 - Do not show async frame errors on evaluation. - [#2073](https://github.com/dart-lang/webdev/pull/2073)
 - Refactor code for presenting record instances. - [#2074](https://github.com/dart-lang/webdev/pull/2074)
 - Display record types concisely. - [#2070](https://github.com/dart-lang/webdev/pull/2070)
+- Simplify class metadata. - [#2102](https://github.com/dart-lang/webdev/pull/2102)
 
 ## 19.0.0
 

dwds/lib/src/debugging/classes.dart

@@ -199,8 +199,11 @@ class ClassHelper extends Domain {
     fieldDescriptors.forEach((name, descriptor) {
       final classMetaData = ClassMetaData(
         jsName: descriptor['classRefName'],
-        libraryId: descriptor['classRefLibraryId'],
-        dartName: descriptor['classRefDartName'],
+        kind: InstanceKind.kType,
+        classRef: classRefFor(
+          descriptor['classRefLibraryId'],
+          descriptor['classRefDartName'],
+        ),
       );
       fieldRefs.add(
         FieldRef(
@@ -209,8 +212,7 @@ class ClassHelper extends Domain {
           declaredType: InstanceRef(
             identityHashCode: createId().hashCode,
             id: createId(),
-            kind: InstanceKind.kType,
-            // TODO(elliette): Is this the same as classRef?
+            kind: classMetaData.kind,
             classRef: classMetaData.classRef,
           ),
           isConst: descriptor['isConst'] as bool,

dwds/lib/src/debugging/instance.dart

@@ -114,79 +114,65 @@ class InstanceHelper extends Domain {
     final objectId = remoteObject?.objectId;
     if (remoteObject == null || objectId == null) return null;
 
-    // TODO: This is checking the JS object ID for the dart pattern we use for
-    // VM objects, which seems wrong (and, we catch 'string' types above).
-    if (isStringId(objectId)) {
-      return _stringInstanceFor(remoteObject, offset, count);
-    }
-
     final metaData = await ClassMetaData.metaDataFor(
       remoteObject,
       inspector,
     );
 
     final classRef = metaData?.classRef;
     if (metaData == null || classRef == null) return null;
-    if (metaData.isFunction) {
-      return _closureInstanceFor(remoteObject);
-    }
 
-    if (metaData.isSystemList) {
-      return await _listInstanceFor(
-        classRef,
-        remoteObject,
-        offset: offset,
-        count: count,
-        length: metaData.length,
-      );
-    } else if (metaData.isSystemMap) {
-      return await _mapInstanceFor(
-        classRef,
-        remoteObject,
-        offset: offset,
-        count: count,
-        length: metaData.length,
-      );
-    } else if (metaData.isRecord) {
-      return await _recordInstanceFor(
-        classRef,
-        remoteObject,
-        offset: offset,
-        count: count,
-        length: metaData.length,
-      );
-    } else if (metaData.isRecordType) {
-      return await _recordTypeInstanceFor(
-        classRef,
-        remoteObject,
-        offset: offset,
-        count: count,
-        length: metaData.length,
-      );
-    } else if (metaData.isSet) {
-      return await _setInstanceFor(
-        classRef,
-        remoteObject,
-        offset: offset,
-        count: count,
-        length: metaData.length,
-      );
-    } else if (metaData.isNativeError) {
-      return await _plainInstanceFor(
-        classRefForNativeJsError,
-        remoteObject,
-        offset: offset,
-        count: count,
-        length: metaData.length,
-      );
-    } else {
-      return await _plainInstanceFor(
-        classRef,
-        remoteObject,
-        offset: offset,
-        count: count,
-        length: metaData.length,
-      );
+    switch (metaData.kind) {
+      case InstanceKind.kClosure:
+        return _closureInstanceFor(remoteObject);
+      case InstanceKind.kList:
+        return await _listInstanceFor(
+          classRef,
+          remoteObject,
+          offset: offset,
+          count: count,
+          length: metaData.length,
+        );
+      case InstanceKind.kSet:
+        return await _setInstanceFor(
+          classRef,
+          remoteObject,
+          offset: offset,
+          count: count,
+          length: metaData.length,
+        );
+      case InstanceKind.kMap:
+        return await _mapInstanceFor(
+          classRef,
+          remoteObject,
+          offset: offset,
+          count: count,
+          length: metaData.length,
+        );
+      case InstanceKind.kRecord:
+        return await _recordInstanceFor(
+          classRef,
+          remoteObject,
+          offset: offset,
+          count: count,
+          length: metaData.length,
+        );
+      case InstanceKind.kRecordType:
+        return await _recordTypeInstanceFor(
+          classRef,
+          remoteObject,
+          offset: offset,
+          count: count,
+          length: metaData.length,
+        );
+      default:
+        return await _plainInstanceFor(
+          classRef,
+          remoteObject,
+          offset: offset,
+          count: count,
+          length: metaData.length,
+        );
     }
   }
 
@@ -868,69 +854,21 @@ class InstanceHelper extends Domain {
           inspector,
         );
         if (metaData == null) return null;
-        if (metaData.isSystemList) {
-          return InstanceRef(
-            kind: InstanceKind.kList,
-            id: objectId,
-            identityHashCode: remoteObject.objectId.hashCode,
-            classRef: metaData.classRef,
-          )..length = metaData.length;
-        }
-        if (metaData.isSystemMap) {
-          return InstanceRef(
-            kind: InstanceKind.kMap,
-            id: objectId,
-            identityHashCode: remoteObject.objectId.hashCode,
-            classRef: metaData.classRef,
-          )..length = metaData.length;
-        }
-        if (metaData.isRecord) {
-          return InstanceRef(
-            kind: InstanceKind.kRecord,
-            id: objectId,
-            identityHashCode: remoteObject.objectId.hashCode,
-            classRef: metaData.classRef,
-          )..length = metaData.length;
-        }
-        if (metaData.isRecordType) {
-          return InstanceRef(
-            kind: InstanceKind.kRecordType,
-            id: objectId,
-            identityHashCode: remoteObject.objectId.hashCode,
-            classRef: metaData.classRef,
-          )..length = metaData.length;
-        }
-        if (metaData.isSet) {
-          return InstanceRef(
-            kind: InstanceKind.kSet,
-            id: objectId,
-            identityHashCode: remoteObject.objectId.hashCode,
-            classRef: metaData.classRef,
-          )..length = metaData.length;
-        }
-        if (metaData.isNativeError) {
-          return InstanceRef(
-            kind: InstanceKind.kPlainInstance,
-            id: objectId,
-            identityHashCode: remoteObject.objectId.hashCode,
-            classRef: classRefForNativeJsError,
-          )..length = metaData.length;
-        }
         return InstanceRef(
-          kind: InstanceKind.kPlainInstance,
+          kind: metaData.kind,
           id: objectId,
           identityHashCode: remoteObject.objectId.hashCode,
           classRef: metaData.classRef,
-        );
+        )..length = metaData.length;
       case 'function':
-        final functionMetaData = await FunctionMetaData.metaDataFor(
-          inspector.remoteDebugger,
-          remoteObject,
-        );
         final objectId = remoteObject.objectId;
         if (objectId == null) {
           return _primitiveInstanceRef(InstanceKind.kNull, remoteObject);
         }
+        final functionMetaData = await FunctionMetaData.metaDataFor(
+          inspector.remoteDebugger,
+          remoteObject,
+        );
         return InstanceRef(
           kind: InstanceKind.kClosure,
           id: objectId,

dwds/lib/src/debugging/libraries.dart

@@ -120,9 +120,12 @@ class LibraryHelper extends Domain {
           List<Map<String, dynamic>>.from(jsonValues['classes'] ?? []);
       for (final classDescriptor in classDescriptors) {
         final classMetaData = ClassMetaData(
-          jsName: classDescriptor['name'] as Object?,
-          libraryId: libraryRef.id,
-          dartName: classDescriptor['dartName'] as Object?,
+          jsName: classDescriptor['name'],
+          kind: InstanceKind.kType,
+          classRef: classRefFor(
+            libraryRef.id,
+            classDescriptor['dartName'],
+          ),
         );
         classRefs.add(classMetaData.classRef);
       }