Use block bodies for multiline lambdas. (#3946)

davidmorgan · web-flow · commit c3b13bd56cfd · 2025-03-24T08:47:05.000+01:00
diff --git a/build_daemon/lib/client.dart b/build_daemon/lib/client.dart
@@ -32,12 +32,10 @@ Future<void> _handleDaemonStartup(
   process.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(
     (line) {
       logHandler(
-        ServerLog(
-          (b) =>
-              b
-                ..level = Level.SEVERE
-                ..message = line,
-        ),
+        ServerLog((b) {
+          b.level = Level.SEVERE;
+          b.message = line;
+        }),
       );
     },
   );
@@ -82,12 +80,10 @@ Future<void> _handleDaemonStartup(
       nextLogRecord = StringBuffer();
     } else {
       logHandler(
-        ServerLog(
-          (b) =>
-              b
-                ..level = Level.INFO
-                ..message = line,
-        ),
+        ServerLog((b) {
+          b.level = Level.INFO;
+          b.message = line;
+        }),
       );
     }
   });
diff --git a/build_daemon/lib/data/server_log.dart b/build_daemon/lib/data/server_log.dart
@@ -73,15 +73,13 @@ abstract class ServerLog implements Built<ServerLog, ServerLogBuilder> {
 
   factory ServerLog([void Function(ServerLogBuilder b) updates]) = _$ServerLog;
 
-  factory ServerLog.fromLogRecord(logging.LogRecord record) => ServerLog(
-    (b) =>
-        b
-          ..message = record.message
-          ..level = Level.valueOf(record.level.name)
-          ..loggerName = record.loggerName
-          ..error = record.error?.toString()
-          ..stackTrace = record.stackTrace?.toString(),
-  );
+  factory ServerLog.fromLogRecord(logging.LogRecord record) => ServerLog((b) {
+    b.message = record.message;
+    b.level = Level.valueOf(record.level.name);
+    b.loggerName = record.loggerName;
+    b.error = record.error?.toString();
+    b.stackTrace = record.stackTrace?.toString();
+  });
 
   logging.LogRecord toLogRecord() {
     return logging.LogRecord(
diff --git a/build_daemon/lib/src/fakes/fake_test_builder.dart b/build_daemon/lib/src/fakes/fake_test_builder.dart
@@ -36,13 +36,11 @@ class FakeTestDaemonBuilder implements DaemonBuilder {
     Iterable<WatchEvent> changes,
   ) async {
     _outputStreamController.add(
-      ServerLog(
-        (b) =>
-            b
-              ..loggerName = loggerName
-              ..level = Level.INFO
-              ..message = buildCompletedMessage,
-      ),
+      ServerLog((b) {
+        b.loggerName = loggerName;
+        b.level = Level.INFO;
+        b.message = buildCompletedMessage;
+      }),
     );
 
     _buildsController.add(
diff --git a/build_daemon/lib/src/server.dart b/build_daemon/lib/src/server.dart
@@ -126,12 +126,10 @@ class Server {
         connection.sink.add(
           jsonEncode(
             _serializers.serialize(
-              ShutdownNotification(
-                (b) =>
-                    b
-                      ..message = message
-                      ..failureType = failureType,
-              ),
+              ShutdownNotification((b) {
+                b.message = message;
+                b.failureType = failureType;
+              }),
             ),
           ),
         );
@@ -243,14 +241,12 @@ class Server {
     Object? error,
     StackTrace? stackTrace,
   ]) => _outputStreamController.add(
-    ServerLog(
-      (b) =>
-          b
-            ..message = message
-            ..level = level
-            ..loggerName = loggerName
-            ..error = error?.toString()
-            ..stackTrace = stackTrace?.toString(),
-    ),
+    ServerLog((b) {
+      b.message = message;
+      b.level = level;
+      b.loggerName = loggerName;
+      b.error = error?.toString();
+      b.stackTrace = stackTrace?.toString();
+    }),
   );
 }
diff --git a/build_runner/lib/src/build_script_generate/build_script_generate.dart b/build_runner/lib/src/build_script_generate/build_script_generate.dart
@@ -204,54 +204,44 @@ class BuildScriptInfo {
 }
 
 /// A method forwarding to `run`.
-Method _main() => Method(
-  (b) =>
-      b
-        ..name = 'main'
-        ..returns = refer('void')
-        ..modifier = MethodModifier.async
-        ..requiredParameters.add(
-          Parameter(
-            (b) =>
-                b
-                  ..name = 'args'
-                  ..type = TypeReference(
-                    (b) =>
-                        b
-                          ..symbol = 'List'
-                          ..types.add(refer('String')),
-                  ),
-          ),
-        )
-        ..optionalParameters.add(
-          Parameter(
-            (b) =>
-                b
-                  ..name = 'sendPort'
-                  ..type = TypeReference(
-                    (b) =>
-                        b
-                          ..symbol = 'SendPort'
-                          ..url = 'dart:isolate'
-                          ..isNullable = true,
-                  ),
-          ),
-        )
-        ..body = Block.of([
-          declareVar('result')
-              .assign(
-                refer(
-                  'run',
-                  'package:build_runner/build_runner.dart',
-                ).call([refer('args'), refer('_builders')]).awaited,
-              )
-              .statement,
+Method _main() => Method((b) {
+  b.name = 'main';
+  b.returns = refer('void');
+  b.modifier = MethodModifier.async;
+  b.requiredParameters.add(
+    Parameter((b) {
+      b.name = 'args';
+      b.type = TypeReference((b) {
+        b.symbol = 'List';
+        b.types.add(refer('String'));
+      });
+    }),
+  );
+  b.optionalParameters.add(
+    Parameter((b) {
+      b.name = 'sendPort';
+      b.type = TypeReference((b) {
+        b.symbol = 'SendPort';
+        b.url = 'dart:isolate';
+        b.isNullable = true;
+      });
+    }),
+  );
+  b.body = Block.of([
+    declareVar('result')
+        .assign(
           refer(
-            'sendPort',
-          ).nullSafeProperty('send').call([refer('result')]).statement,
-          refer('exitCode', 'dart:io').assign(refer('result')).statement,
-        ]),
-);
+            'run',
+            'package:build_runner/build_runner.dart',
+          ).call([refer('args'), refer('_builders')]).awaited,
+        )
+        .statement,
+    refer(
+      'sendPort',
+    ).nullSafeProperty('send').call([refer('result')]).statement,
+    refer('exitCode', 'dart:io').assign(refer('result')).statement,
+  ]);
+});
 
 /// An expression calling `apply` with appropriate setup for a Builder.
 Expression _applyBuilder(BuilderDefinition definition) {
diff --git a/build_runner/lib/src/daemon/daemon_builder.dart b/build_runner/lib/src/daemon/daemon_builder.dart
@@ -148,39 +148,33 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
         if (result.status == core.BuildStatus.success) {
           // TODO(grouma) - Can we notify if a target was cached?
           results.add(
-            DefaultBuildResult(
-              (b) =>
-                  b
-                    ..status = BuildStatus.succeeded
-                    ..target = target.target,
-            ),
+            DefaultBuildResult((b) {
+              b.status = BuildStatus.succeeded;
+              b.target = target.target;
+            }),
           );
         } else {
           results.add(
-            DefaultBuildResult(
-              (b) =>
-                  b
-                    ..status = BuildStatus.failed
-                    // TODO(grouma) - We should forward the error messages
-                    // instead.
-                    // We can use the AssetGraph and FailureReporter to provide
-                    // a better error message.
-                    ..error = 'FailureType: ${result.failureType?.exitCode}'
-                    ..target = target.target,
-            ),
+            DefaultBuildResult((b) {
+              b.status = BuildStatus.failed;
+              // TODO(grouma) - We should forward the error messages
+              // instead.
+              // We can use the AssetGraph and FailureReporter to provide
+              // a better error message.;
+              b.error = 'FailureType: ${result.failureType?.exitCode}';
+              b.target = target.target;
+            }),
           );
         }
       }
     } catch (e) {
       for (var target in targets) {
         results.add(
-          DefaultBuildResult(
-            (b) =>
-                b
-                  ..status = BuildStatus.failed
-                  ..error = '$e'
-                  ..target = target.target,
-          ),
+          DefaultBuildResult((b) {
+            b.status = BuildStatus.failed;
+            b.error = '$e';
+            b.target = target.target;
+          }),
         );
       }
       _logMessage(Level.SEVERE, 'Build Failed:\n${e.toString()}');
@@ -195,12 +189,10 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
   }
 
   void _logMessage(Level level, String message) => _outputStreamController.add(
-    ServerLog(
-      (b) =>
-          b
-            ..message = message
-            ..level = level,
-    ),
+    ServerLog((b) {
+      b.message = message;
+      b.level = level;
+    }),
   );
 
   void _signalEnd(
@@ -224,12 +216,10 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
     var results = <BuildResult>[];
     for (var target in targets) {
       results.add(
-        DefaultBuildResult(
-          (b) =>
-              b
-                ..status = BuildStatus.started
-                ..target = target,
-        ),
+        DefaultBuildResult((b) {
+          b.status = BuildStatus.started;
+          b.target = target;
+        }),
       );
     }
     _buildResults.add(BuildResults((b) => b..results.addAll(results)));
diff --git a/build_runner_core/lib/src/asset_graph/graph.dart b/build_runner_core/lib/src/asset_graph/graph.dart
@@ -146,12 +146,10 @@ class AssetGraph implements GeneratedAssetHider {
         // Don't call _removeRecursive, that recursively removes all transitive
         // primary outputs. We only want to remove this node.
         _nodesByPackage[existing.id.package]!.remove(existing.id.path);
-        node = node.rebuild(
-          (b) =>
-              b
-                ..outputs.addAll(existing.outputs)
-                ..primaryOutputs.addAll(existing.primaryOutputs),
-        );
+        node = node.rebuild((b) {
+          b.outputs.addAll(existing.outputs);
+          b.primaryOutputs.addAll(existing.primaryOutputs);
+        });
       } else {
         throw StateError(
           'Tried to add node ${node.id} to the asset graph but it already '
diff --git a/build_runner_core/lib/src/asset_graph/node.dart b/build_runner_core/lib/src/asset_graph/node.dart
