Fix cast error when debugging from VSCode (#2303)

dart-lang · Dec 14, 2023 · a12368f · a12368f
1 parent b339a50
commit a12368f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
@@ -2,6 +2,7 @@
 - Restructure `LoadStrategy` to provide build settings. - [#2270](https://github.com/dart-lang/webdev/pull/2270)
 - Add `FrontendServerLegacyStrategyProvider` and update bootstrap generation logic for `LegacyStrategy` - [#2285](https://github.com/dart-lang/webdev/pull/2285)
 - Tolerate failures to detect a dart execution context. - [#2286](https://github.com/dart-lang/webdev/pull/2286)
+- Fix a null cast error when debugging a `Class` from VS Code. - [#2303](https://github.com/dart-lang/webdev/pull/2303)
 
 ## 22.1.0
 - Update `package:vm_service` constraint to `^13.0.0`. - [#2265](https://github.com/dart-lang/webdev/pull/2265)

diff --git a/dwds/lib/src/debugging/classes.dart b/dwds/lib/src/debugging/classes.dart
@@ -96,10 +96,9 @@ class ClassHelper extends Domain {
       throw ChromeDebugException(e.json, evalContents: expression);
     }
 
-    final classDescriptor = result.value as Map<String, dynamic>;
+    final classDescriptor = _mapify(result.value);
     final methodRefs = <FuncRef>[];
-    final methodDescriptors =
-        classDescriptor['methods'] as Map<String, dynamic>;
+    final methodDescriptors = _mapify(classDescriptor['methods']);
     methodDescriptors.forEach((name, descriptor) {
       final methodId = 'methods|$classId|$name';
       methodRefs.add(
@@ -118,7 +117,7 @@ class ClassHelper extends Domain {
     });
     final fieldRefs = <FieldRef>[];
 
-    final fieldDescriptors = classDescriptor['fields'] as Map<String, dynamic>;
+    final fieldDescriptors = _mapify(classDescriptor['fields']);
     fieldDescriptors.forEach((name, descriptor) {
       final classMetaData = ClassMetaData(
         runtimeKind: RuntimeObjectKind.type,
@@ -168,4 +167,7 @@ class ClassHelper extends Domain {
       superClass: superClassRef,
     );
   }
+
+  Map<String, dynamic> _mapify(dynamic map) =>
+      (map as Map<String, dynamic>?) ?? <String, dynamic>{};
 }