Skip to content

Commit 9802c1c

Browse files
authored
Normalize localizations with dartfmt in presubmit check (#160395)
Makes the presubmit check independent of whether the files in the repo are dartfmt formatted or not.
1 parent 7950632 commit 9802c1c

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

dev/bots/analyze.dart

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import 'package:analyzer/dart/ast/ast.dart';
1414
import 'package:analyzer/dart/ast/visitor.dart';
1515
import 'package:collection/equality.dart';
1616
import 'package:crypto/crypto.dart';
17+
import 'package:dart_style/dart_style.dart';
1718
import 'package:meta/meta.dart';
1819
import 'package:path/path.dart' as path;
1920

@@ -1042,6 +1043,8 @@ Future<void> verifyIntegrationTestTimeouts(String workingDirectory) async {
10421043
}
10431044
}
10441045

1046+
final DartFormatter _formatter = DartFormatter(languageVersion: DartFormatter.latestLanguageVersion);
1047+
10451048
Future<void> verifyInternationalizations(String workingDirectory, String dartExecutable) async {
10461049
final EvalResult materialGenResult = await _evalCommand(
10471050
dartExecutable,
@@ -1067,24 +1070,30 @@ Future<void> verifyInternationalizations(String workingDirectory, String dartExe
10671070
final String expectedMaterialResult = await File(materialLocalizationsFile).readAsString();
10681071
final String expectedCupertinoResult = await File(cupertinoLocalizationsFile).readAsString();
10691072

1070-
if (materialGenResult.stdout.trim() != expectedMaterialResult.trim()) {
1073+
// Normalize both with the Dart formatter.
1074+
final String formattedMaterialGenResult = _formatter.format(materialGenResult.stdout.trim());
1075+
final String formattedExpectedMaterialResult = _formatter.format(expectedMaterialResult.trim());
1076+
1077+
if (formattedMaterialGenResult != formattedExpectedMaterialResult) {
10711078
foundError(<String>[
10721079
'<<<<<<< $materialLocalizationsFile',
1073-
expectedMaterialResult.trim(),
1080+
formattedExpectedMaterialResult,
10741081
'=======',
1075-
materialGenResult.stdout.trim(),
1082+
formattedMaterialGenResult,
10761083
'>>>>>>> gen_localizations',
10771084
'The contents of $materialLocalizationsFile are different from that produced by gen_localizations.',
10781085
'',
10791086
'Did you forget to run gen_localizations.dart after updating a .arb file?',
10801087
]);
10811088
}
1082-
if (cupertinoGenResult.stdout.trim() != expectedCupertinoResult.trim()) {
1089+
final String formattedCupertinoGenResult = _formatter.format(cupertinoGenResult.stdout.trim());
1090+
final String formattedExpectedCupertinoResult = _formatter.format(expectedCupertinoResult.trim());
1091+
if (formattedCupertinoGenResult != formattedExpectedCupertinoResult) {
10831092
foundError(<String>[
10841093
'<<<<<<< $cupertinoLocalizationsFile',
1085-
expectedCupertinoResult.trim(),
1094+
formattedExpectedCupertinoResult,
10861095
'=======',
1087-
cupertinoGenResult.stdout.trim(),
1096+
formattedCupertinoGenResult,
10881097
'>>>>>>> gen_localizations',
10891098
'The contents of $cupertinoLocalizationsFile are different from that produced by gen_localizations.',
10901099
'',

dev/bots/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ dependencies:
88
analyzer: 6.11.0
99
args: 2.6.0
1010
crypto: 3.0.6
11+
dart_style: 2.3.7
1112
intl: 0.19.0
1213
file: 7.0.1
1314
flutter_devicelab:
@@ -77,4 +78,4 @@ dependencies:
7778
dev_dependencies:
7879
test_api: 0.7.4
7980

80-
# PUBSPEC CHECKSUM: cbf1
81+
# PUBSPEC CHECKSUM: e284

0 commit comments

Comments
 (0)