firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalize localizations with dartfmt in presubmit check (#160395)

Browse Source 
Makes the presubmit check independent of whether the files in the repo
are dartfmt formatted or not.
This commit is contained in:
Michael Goderbauer 2024-12-16 17:07:17 -08:00 committed by GitHub
parent 79506323b9
commit 9802c1cde7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dev/bots/analyze.dart
View File

@ -14,6 +14,7 @@ import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/visitor.dart'; import 'package:analyzer/dart/ast/visitor.dart';
import 'package:collection/equality.dart'; import 'package:collection/equality.dart';
import 'package:crypto/crypto.dart'; import 'package:crypto/crypto.dart';
import 'package:dart_style/dart_style.dart';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
@ -1042,6 +1043,8 @@ Future<void> verifyIntegrationTestTimeouts(String workingDirectory) async {
} }
} }
final DartFormatter _formatter = DartFormatter(languageVersion: DartFormatter.latestLanguageVersion);
Future<void> verifyInternationalizations(String workingDirectory, String dartExecutable) async { Future<void> verifyInternationalizations(String workingDirectory, String dartExecutable) async {
final EvalResult materialGenResult = await _evalCommand( final EvalResult materialGenResult = await _evalCommand(
dartExecutable, dartExecutable,
@ -1067,24 +1070,30 @@ Future<void> verifyInternationalizations(String workingDirectory, String dartExe
final String expectedMaterialResult = await File(materialLocalizationsFile).readAsString(); final String expectedMaterialResult = await File(materialLocalizationsFile).readAsString();
final String expectedCupertinoResult = await File(cupertinoLocalizationsFile).readAsString(); final String expectedCupertinoResult = await File(cupertinoLocalizationsFile).readAsString();
if (materialGenResult.stdout.trim() != expectedMaterialResult.trim()) { // Normalize both with the Dart formatter.
final String formattedMaterialGenResult = _formatter.format(materialGenResult.stdout.trim());
final String formattedExpectedMaterialResult = _formatter.format(expectedMaterialResult.trim());
if (formattedMaterialGenResult != formattedExpectedMaterialResult) {
foundError(<String>[ foundError(<String>[
'<<<<<<< $materialLocalizationsFile', '<<<<<<< $materialLocalizationsFile',
expectedMaterialResult.trim(), formattedExpectedMaterialResult,
'=======', '=======',
materialGenResult.stdout.trim(), formattedMaterialGenResult,
'>>>>>>> gen_localizations', '>>>>>>> gen_localizations',
'The contents of $materialLocalizationsFile are different from that produced by gen_localizations.', 'The contents of $materialLocalizationsFile are different from that produced by gen_localizations.',
'', '',
'Did you forget to run gen_localizations.dart after updating a .arb file?', 'Did you forget to run gen_localizations.dart after updating a .arb file?',
]); ]);
} }
if (cupertinoGenResult.stdout.trim() != expectedCupertinoResult.trim()) { final String formattedCupertinoGenResult = _formatter.format(cupertinoGenResult.stdout.trim());
final String formattedExpectedCupertinoResult = _formatter.format(expectedCupertinoResult.trim());
if (formattedCupertinoGenResult != formattedExpectedCupertinoResult) {
foundError(<String>[ foundError(<String>[
'<<<<<<< $cupertinoLocalizationsFile', '<<<<<<< $cupertinoLocalizationsFile',
expectedCupertinoResult.trim(), formattedExpectedCupertinoResult,
'=======', '=======',
cupertinoGenResult.stdout.trim(), formattedCupertinoGenResult,
'>>>>>>> gen_localizations', '>>>>>>> gen_localizations',
'The contents of $cupertinoLocalizationsFile are different from that produced by gen_localizations.', 'The contents of $cupertinoLocalizationsFile are different from that produced by gen_localizations.',
'', '',

3
dev/bots/pubspec.yaml
View File

@ -8,6 +8,7 @@ dependencies:
analyzer: 6.11.0 analyzer: 6.11.0
args: 2.6.0 args: 2.6.0
crypto: 3.0.6 crypto: 3.0.6
dart_style: 2.3.7
intl: 0.19.0 intl: 0.19.0
file: 7.0.1 file: 7.0.1
flutter_devicelab: flutter_devicelab:
@ -77,4 +78,4 @@ dependencies:
dev_dependencies: dev_dependencies:
test_api: 0.7.4 test_api: 0.7.4
# PUBSPEC CHECKSUM: cbf1 # PUBSPEC CHECKSUM: e284