commit b39607abc53b163707fad441533eb8f5bec08efb
author Parker Lougheed <parlough@gmail.com> Thu Sep 26 19:32:52 2024 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 26 19:32:52 2024 +0000
tree e917240e992000c13d42c5f78cef1ba08d022474
parent 59f54a76adb33695b297387dfe44166f494cb1fd

[sdk/timeline] Address TODO to use collection literal

CoreLibraryReviewExempt: No behavior change to function implementation.
Change-Id: I81cc5d4038a90e4bce0e6558283167fdb6d6b8b1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/387061
Reviewed-by: Derek Xu <derekx@google.com>
Auto-Submit: Parker Lougheed <parlough@gmail.com>
Reviewed-by: Ben Konyi <bkonyi@google.com>
Commit-Queue: Ben Konyi <bkonyi@google.com>

sdk/lib/developer/timeline.dart

diff --git a/sdk/lib/developer/timeline.dart b/sdk/lib/developer/timeline.dart
index 78c16f3..bbd477a 100644
--- a/sdk/lib/developer/timeline.dart
+++ b/sdk/lib/developer/timeline.dart
@@ -234,21 +234,13 @@
       _stack.add(null);
       return;
     }
-    var block = new _AsyncBlock._(name, _taskId);
+    final block = _AsyncBlock._(name, _taskId);
     _stack.add(block);
-    // TODO(39115): Spurious error about collection literal ambiguity.
-    // TODO(39117): Spurious error about typing of `...?arguments`.
-    // TODO(39120): Spurious error even about `...arguments`.
-    // When these TODOs are done, we can use spread and if elements.
-    var map = <Object?, Object?>{};
-    if (arguments != null) {
-      for (var key in arguments.keys) {
-        map[key] = arguments[key];
-      }
-    }
-    if (_parent != null) map['parentId'] = _parent._taskId.toRadixString(16);
-    if (_filterKey != null) map[_kFilterKey] = _filterKey;
-    block._start(map);
+    block._start({
+      ...?arguments,
+      if (_parent != null) 'parentId': _parent._taskId.toRadixString(16),
+      if (_filterKey != null) _kFilterKey: _filterKey,
+    });
   }
 
   /// Emit an instant event for this task.
@@ -261,14 +253,10 @@
       // Stream is disabled.
       return;
     }
-    Map? instantArguments;
-    if (arguments != null) {
-      instantArguments = new Map.from(arguments);
-    }
-    if (_filterKey != null) {
-      instantArguments ??= {};
-      instantArguments[_kFilterKey] = _filterKey;
-    }
+    final instantArguments = {
+      ...?arguments,
+      if (_filterKey != null) _kFilterKey: _filterKey,
+    };
     _reportTaskEvent(_taskId, /*flowId=*/ _noFlowId, _asyncInstant, name,
         _argumentsAsJson(instantArguments));
   }