@@ -14,6 +14,7 @@ import 'package:analyzer/dart/ast/ast.dart';
1414import 'package:analyzer/dart/ast/visitor.dart' ;
1515import 'package:collection/equality.dart' ;
1616import 'package:crypto/crypto.dart' ;
17+ import 'package:dart_style/dart_style.dart' ;
1718import 'package:meta/meta.dart' ;
1819import '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+
10451048Future <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 '' ,
0 commit comments