Skip to content

Commit 7638402

Browse files
committed
tool: share formatter
1 parent f6614d3 commit 7638402

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

json_serializable/tool/shared.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
import 'dart:io';
66

77
import 'package:build/build.dart';
8+
import 'package:dart_style/dart_style.dart';
89
import 'package:yaml/yaml.dart';
910

11+
final formatter = DartFormatter();
12+
1013
// Until we have verification in pkg:build and friends
1114
// https://github.com/dart-lang/build/issues/590
1215
Builder validate(String builderName, Builder builder) {

json_serializable/tool/test_builder.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@ import 'dart:async';
66
import 'dart:collection';
77

88
import 'package:build/build.dart';
9-
import 'package:dart_style/dart_style.dart';
109
import 'package:path/path.dart' as p;
1110

1211
import 'shared.dart';
1312

14-
final _formatter = DartFormatter();
15-
1613
Builder testBuilder([_]) => validate('_test_builder', const _TestBuilder());
1714

1815
class _TestBuilder implements Builder {
@@ -56,7 +53,7 @@ class _TestBuilder implements Builder {
5653

5754
final content = Replacement.generate(sourceContent, replacements);
5855

59-
await buildStep.writeAsString(newId, _formatter.format(content));
56+
await buildStep.writeAsString(newId, formatter.format(content));
6057
}
6158

6259
if (baseName == _kitchenSinkBaseName) {
@@ -73,7 +70,7 @@ class _TestBuilder implements Builder {
7370
'];',
7471
];
7572

76-
await buildStep.writeAsString(newId, _formatter.format(lines.join('\n')));
73+
await buildStep.writeAsString(newId, formatter.format(lines.join('\n')));
7774
}
7875
}
7976

json_serializable/tool/test_type_builder.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ import 'dart:async';
66

77
import 'package:build/build.dart';
88
import 'package:collection/collection.dart';
9-
import 'package:dart_style/dart_style.dart';
109
import 'package:json_serializable/src/type_helpers/map_helper.dart';
1110

1211
import 'shared.dart';
1312
import 'test_type_data.dart';
1413

15-
final _formatter = DartFormatter();
16-
1714
const _trivialTypesToTest = {
1815
'BigInt': TestTypeData.defaultFunc(
1916
jsonExpression: "'12345'",
@@ -128,7 +125,7 @@ class _TypeBuilder implements Builder {
128125

129126
await buildStep.writeAsString(
130127
newId,
131-
_formatter.format(entry.value.libContent(sourceContent, type)),
128+
formatter.format(entry.value.libContent(sourceContent, type)),
132129
);
133130
}
134131
}

0 commit comments

Comments
 (0)