Skip to content

Commit 306b669

Browse files
authored
Generate code that formats faster with "short" style. (google#1336)
1 parent b0f0eb9 commit 306b669

31 files changed

+661
-488
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
# 8.9.3 (unreleased)
44

5+
- Generate code that formats faster with current "short" style. Both versions
6+
are fast with the coming "tall" style.
57
- Mark `@nullable` deprecated: it does nothing and should not be used.
68

79
# 8.9.2

benchmark/lib/node.g.dart

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

benchmark/lib/simple_value.g.dart

+5-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_generator/lib/src/enum_source_class.g.dart

+5-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_generator/lib/src/enum_source_field.g.dart

+5-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_generator/lib/src/enum_source_library.g.dart

+7-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_generator/lib/src/fixes.g.dart

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_generator/lib/src/memoized_getter.g.dart

+7-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_generator/lib/src/serializer_source_class.g.dart

+8-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_generator/lib/src/serializer_source_field.g.dart

+12-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_generator/lib/src/serializer_source_library.g.dart

+7-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_generator/lib/src/value_source_class.dart

+17-14
Original file line numberDiff line numberDiff line change
@@ -1104,20 +1104,23 @@ abstract class ValueSourceClass
11041104
}
11051105
result.writeln('_\$result = _\$v ?? ');
11061106
result.writeln('new $implName$_generics._(');
1107-
result.write(fieldBuilders.keys.map((field) {
1108-
final fieldBuilder = fieldBuilders[field];
1109-
if (needsNullCheck.contains(field)) {
1110-
if (genericFields.containsKey(field)) {
1111-
final genericType = genericFields[field];
1112-
return '$field: null is $genericType ? $fieldBuilder as $genericType '
1113-
': BuiltValueNullFieldError.checkNotNull($fieldBuilder'
1114-
", r'$name', '${escapeString(field)}')";
1115-
}
1116-
return '$field: BuiltValueNullFieldError.checkNotNull($fieldBuilder, '
1117-
"r'$name', '${escapeString(field)}')";
1118-
}
1119-
return '$field: $fieldBuilder';
1120-
}).join(','));
1107+
result.write(fieldBuilders.keys
1108+
.map((field) {
1109+
final fieldBuilder = fieldBuilders[field];
1110+
if (needsNullCheck.contains(field)) {
1111+
if (genericFields.containsKey(field)) {
1112+
final genericType = genericFields[field];
1113+
return '$field: null is $genericType ? $fieldBuilder as $genericType '
1114+
': BuiltValueNullFieldError.checkNotNull($fieldBuilder'
1115+
", r'$name', '${escapeString(field)}')";
1116+
}
1117+
return '$field: BuiltValueNullFieldError.checkNotNull($fieldBuilder, '
1118+
"r'$name', '${escapeString(field)}')";
1119+
}
1120+
return '$field: $fieldBuilder';
1121+
})
1122+
.map((fieldBuilder) => '$fieldBuilder,')
1123+
.join(''));
11211124
result.writeln(');');
11221125

11231126
if (needsTryCatchOnBuild) {

built_value_generator/lib/src/value_source_class.g.dart

+7-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_generator/lib/src/value_source_field.g.dart

+12-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

built_value_test/test/values.g.dart

+16-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)