[ package:vm_service ] Fix issue where TimelineEvent objects never had any content

Change-Id: I5bb1a3e538823cbaaa1a45a1fbbb55e63e1f61ef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/128960
Reviewed-by: Kenzie Schmoll <kenzieschmoll@google.com>
Commit-Queue: Ben Konyi <bkonyi@google.com>

Author: bkonyi

pkg/vm_service/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## 2.1.4
+- Fixed issue where `TimelineEvent` always had no content.
+
 ## 2.1.3
 - Fixed issue where exception would be thrown when attempting to parse a
   List entry in a response which is not present. This occurs when connected to

pkg/vm_service/lib/vm_service.dart

@@ -760,9 +760,9 @@ abstract class VmServiceInterface {
   ///
   /// This method immediately returns success. The VM will then begin delivering
   /// binary events on the `HeapSnapshot` event stream. The binary data in these
-  /// events, when concatenated together, conforms to the SnapshotGraph type.
+  /// events, when concatenated together, conforms to the [SnapshotGraph] type.
   /// The splitting of the SnapshotGraph into events can happen at any byte
-  /// offset, including the middle of scalar fields.
+  /// offset.
   Future<Success> requestHeapSnapshot(String isolateId);
 
   /// The `resume` RPC is used to resume execution of a paused isolate.
@@ -6069,12 +6069,15 @@ class TimelineEvent {
   static TimelineEvent parse(Map<String, dynamic> json) =>
       json == null ? null : TimelineEvent._fromJson(json);
 
+  Map<String, dynamic> json;
+
   TimelineEvent();
-  TimelineEvent._fromJson(Map<String, dynamic> json);
+  TimelineEvent._fromJson(this.json);
 
   Map<String, dynamic> toJson() {
-    var json = <String, dynamic>{};
-    return json;
+    var result = json == null ? <String, dynamic>{} : Map.of(json);
+    result['type'] = 'TimelineEvent';
+    return result;
   }
 
   String toString() => '[TimelineEvent ]';

pkg/vm_service/pubspec.yaml

@@ -2,7 +2,7 @@ name: vm_service
 description: >-
   A library to communicate with a service implementing the Dart VM
   service protocol.
-version: 2.1.3
+version: 2.1.4
 
 homepage: https://github.com/dart-lang/sdk/tree/master/pkg/vm_service
 

pkg/vm_service/tool/dart/generate_dart.dart

@@ -1334,7 +1334,7 @@ class Type extends Member {
         'json == null ? null : ${name}._fromJson(json);');
     gen.writeln();
 
-    if (name == 'Response') {
+    if (name == 'Response' || name == 'TimelineEvent') {
       gen.writeln('Map<String, dynamic> json;');
     }
     if (name == 'Script') {
@@ -1364,7 +1364,7 @@ class Type extends Member {
 
     // Build from JSON.
     String superCall = superName == null ? '' : ": super._fromJson(json) ";
-    if (name == 'Response') {
+    if (name == 'Response' || name == 'TimelineEvent') {
       gen.write('${name}._fromJson(this.json)');
     } else {
       gen.write('${name}._fromJson(Map<String, dynamic> json) ${superCall}');
@@ -1492,6 +1492,16 @@ Map<String, dynamic> toJson() {
   result['type'] = type ?? 'Response';
   return result;
 }''');
+    } else if (name == 'TimelineEvent') {
+      // TimelineEvent doesn't have any declared properties as the response is
+      // fairly dynamic. Return the json directly.
+      gen.writeln('''
+          Map<String, dynamic> toJson() {
+            var result = json == null ? <String, dynamic>{} : Map.of(json);
+            result['type'] = 'TimelineEvent';
+            return result;
+          }
+      ''');
     } else {
       if (isResponse) {
         gen.writeln('@override');