Generate code that formats faster with "short" style. (#1336)

Author: davidmorgan

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 # 8.9.3 (unreleased)
 
+- Generate code that formats faster with current "short" style. Both versions
+  are fast with the coming "tall" style.
 - Mark `@nullable` deprecated: it does nothing and should not be used.
 
 # 8.9.2

benchmark/lib/node.g.dart

@@ -1104,20 +1104,23 @@ abstract class ValueSourceClass
     }
     result.writeln('_\$result = _\$v ?? ');
     result.writeln('new $implName$_generics._(');
-    result.write(fieldBuilders.keys.map((field) {
-      final fieldBuilder = fieldBuilders[field];
-      if (needsNullCheck.contains(field)) {
-        if (genericFields.containsKey(field)) {
-          final genericType = genericFields[field];
-          return '$field: null is $genericType ? $fieldBuilder as $genericType '
-              ': BuiltValueNullFieldError.checkNotNull($fieldBuilder'
-              ", r'$name', '${escapeString(field)}')";
-        }
-        return '$field: BuiltValueNullFieldError.checkNotNull($fieldBuilder, '
-            "r'$name', '${escapeString(field)}')";
-      }
-      return '$field: $fieldBuilder';
-    }).join(','));
+    result.write(fieldBuilders.keys
+        .map((field) {
+          final fieldBuilder = fieldBuilders[field];
+          if (needsNullCheck.contains(field)) {
+            if (genericFields.containsKey(field)) {
+              final genericType = genericFields[field];
+              return '$field: null is $genericType ? $fieldBuilder as $genericType '
+                  ': BuiltValueNullFieldError.checkNotNull($fieldBuilder'
+                  ", r'$name', '${escapeString(field)}')";
+            }
+            return '$field: BuiltValueNullFieldError.checkNotNull($fieldBuilder, '
+                "r'$name', '${escapeString(field)}')";
+          }
+          return '$field: $fieldBuilder';
+        })
+        .map((fieldBuilder) => '$fieldBuilder,')
+        .join(''));
     result.writeln(');');
 
     if (needsTryCatchOnBuild) {