Include static member information for classes

dwds/lib/src/debugging/classes.dart

@@ -117,7 +117,7 @@ class ClassHelper extends Domain {
           "isStatic": false,
         }
       }
-      // TODO(jakemac): static fields once ddc supports them
+
       var fields = sdkUtils.getFields(clazz);
       var fieldNames = fields ? Object.keys(fields) : [];
       descriptor['fields'] = {};
@@ -135,6 +135,34 @@ class ClassHelper extends Domain {
           "classRefLibraryId" : field["type"][libraryUri],
         }
       }
+
+      // TODO(elliette): The following static member information is minimal and 
+      // should be replaced once DDC provides full symbol information (see 
+      // https://github.com/dart-lang/sdk/issues/40273):
+
+      descriptor['staticFields'] = {};
+      var staticFieldNames = sdkUtils.getStaticFields(clazz) ?? [];
+      for (const name of staticFieldNames) {
+        descriptor['staticFields'][name] = {
+          "isStatic": true,
+          // DDC only provides names of static members, we set isConst/isFinal 
+          // to false even though they could be true.
+          "isConst": false,
+          "isFinal": false,
+        }
+      }
+
+      descriptor['staticMethods'] = {};
+      var staticMethodNames = sdkUtils.getStaticMethods(clazz) ?? [];
+      for (var name of staticMethodNames) {
+        descriptor['methods'][name] = {
+          // DDC only provides names of static members, we set isConst
+          // to false even though it could be true.
+          "isConst": false,
+          "isStatic": true,
+        } 
+      }
+
       return descriptor;
     })()
     ''';
@@ -153,6 +181,9 @@ class ClassHelper extends Domain {
     var classDescriptor = result.value as Map<String, dynamic>;
     var methodRefs = <FuncRef>[];
     var methodDescriptors = classDescriptor['methods'] as Map<String, dynamic>;
+    var staticMethodDescriptors =
+        classDescriptor['staticMethods'] as Map<String, dynamic>;
+    methodDescriptors.addAll(staticMethodDescriptors);
     methodDescriptors.forEach((name, descriptor) {
       var methodId = 'methods|${classRef.id}|$name';
       methodRefs.add(FuncRef(
@@ -176,16 +207,39 @@ class ClassHelper extends Domain {
           name: name,
           owner: classRef,
           declaredType: InstanceRef(
-              identityHashCode: createId().hashCode,
-              id: createId(),
-              kind: InstanceKind.kType,
-              classRef: classMetaData.classRef),
+            identityHashCode: createId().hashCode,
+            id: createId(),
+            kind: InstanceKind.kType,
+            // TODO(elliette): Is this the same as classRef?
+            classRef: classMetaData.classRef,
+          ),
           isConst: descriptor['isConst'] as bool,
           isFinal: descriptor['isFinal'] as bool,
           isStatic: descriptor['isStatic'] as bool,
           id: createId()));
     });
 
+    var staticFieldDescriptors =
+        classDescriptor['staticFields'] as Map<String, dynamic>;
+    staticFieldDescriptors.forEach((name, descriptor) async {
+      fieldRefs.add(
+        FieldRef(
+          name: name,
+          owner: classRef,
+          declaredType: InstanceRef(
+            identityHashCode: createId().hashCode,
+            id: createId(),
+            kind: InstanceKind.kType,
+            classRef: classRef,
+          ),
+          isConst: descriptor['isConst'] as bool,
+          isFinal: descriptor['isFinal'] as bool,
+          isStatic: descriptor['isStatic'] as bool,
+          id: createId(),
+        ),
+      );
+    });
+
     // TODO: Implement the rest of these
     // https://github.com/dart-lang/webdev/issues/176.
     return Class(

dwds/test/chrome_proxy_service_test.dart

@@ -451,6 +451,7 @@ void main() {
         expect(
             testClass.functions,
             unorderedEquals([
+              predicate((FuncRef f) => f.name == 'staticHello' && f.isStatic),
               predicate((FuncRef f) => f.name == 'message' && !f.isStatic),
               predicate((FuncRef f) => f.name == 'notFinal' && !f.isStatic),
               predicate((FuncRef f) => f.name == 'hello' && !f.isStatic),
@@ -475,6 +476,12 @@ void main() {
                   !f.isStatic &&
                   !f.isConst &&
                   !f.isFinal),
+              predicate((FieldRef f) =>
+                  f.name == 'staticMessage' &&
+                  f.declaredType != null &&
+                  f.isStatic &&
+                  !f.isConst &&
+                  !f.isFinal),
             ]));
       });
 

fixtures/_test/example/hello_world/main.dart

@@ -117,6 +117,10 @@ class MyTestClass {
 
   String notFinal;
 
+  static final String staticMessage = 'static';
+
+  static String staticHello() => 'static hello';
+
   MyTestClass({this.message = 'world'});
 
   String hello() => message;