Manual roll Flutter from ead6b0d17c89 to 6bba08cbcc51 (37 revisions)

.ci/flutter_master.version

@@ -1 +1 @@
-ead6b0d17c893109b9424aaf116a74295472cc73
+6bba08cbcc516b599602673686813c6f3aa9a372

script/tool/lib/src/format_command.dart

@@ -47,7 +47,7 @@ class FormatCommand extends PackageCommand {
     super.processRunner,
     super.platform,
   }) {
-    argParser.addFlag('fail-on-change', hide: true);
+    argParser.addFlag(_failonChangeArg, hide: true);
     argParser.addFlag(_dartArg, help: 'Format Dart files', defaultsTo: true);
     argParser.addFlag(_clangFormatArg,
         help: 'Format with "clang-format"', defaultsTo: true);
@@ -66,6 +66,7 @@ class FormatCommand extends PackageCommand {
 
   static const String _dartArg = 'dart';
   static const String _clangFormatArg = 'clang-format';
+  static const String _failonChangeArg = 'fail-on-change';
   static const String _kotlinArg = 'kotlin';
   static const String _javaArg = 'java';
   static const String _swiftArg = 'swift';
@@ -109,7 +110,7 @@ class FormatCommand extends PackageCommand {
       await _formatAndLintSwift(files);
     }
 
-    if (getBoolArg('fail-on-change')) {
+    if (getBoolArg(_failonChangeArg)) {
       final bool modified = await _didModifyAnything();
       if (modified) {
         throw ToolExit(exitCommandFoundErrors);
@@ -120,8 +121,13 @@ class FormatCommand extends PackageCommand {
   Future<bool> _didModifyAnything() async {
     final io.ProcessResult modifiedFiles = await processRunner.run(
       'git',
-      <String>['ls-files', '--modified'],
-      workingDir: packagesDir,
+      <String>[
+        'ls-files',
+        '--modified',
+        packagesDir.path,
+        thirdPartyPackagesDir.path
+      ],
+      workingDir: packagesDir.parent,
       logOnError: true,
     );
     if (modifiedFiles.exitCode != 0) {
@@ -146,8 +152,8 @@ class FormatCommand extends PackageCommand {
 
     final io.ProcessResult diff = await processRunner.run(
       'git',
-      <String>['diff'],
-      workingDir: packagesDir,
+      <String>['diff', packagesDir.path, thirdPartyPackagesDir.path],
+      workingDir: packagesDir.parent,
       logOnError: true,
     );
     if (diff.exitCode != 0) {

script/tool/test/format_command_test.dart

@@ -814,6 +814,25 @@ void main() {
               'https://github.com/flutter/packages/blob/main/script/tool/README.md#format-code'),
           contains('patch -p1 <<DONE'),
         ]));
+
+    // Ensure that both packages and third_party/packages are checked.
+    final Directory thirdPartyDir = packagesDir.parent
+        .childDirectory('third_party')
+        .childDirectory('packages');
+    expect(
+        processRunner.recordedCalls,
+        containsAllInOrder(<ProcessCall>[
+          ProcessCall(
+            'git',
+            <String>[
+              'ls-files',
+              '--modified',
+              packagesDir.path,
+              thirdPartyDir.path
+            ],
+            packagesDir.parent.path,
+          ),
+        ]));
   });
 
   test('fails if git ls-files fails', () async {

third_party/packages/cupertino_icons/test/cupertino_icons_golden_test.dart

@@ -25,25 +25,31 @@ void main() async {
   if (kIsWeb || !Platform.isLinux) {
     return;
   }
-  final bool isMainChannel = !Platform.environment.containsKey('CHANNEL')
-    || Platform.environment['CHANNEL'] == 'main'
-    || Platform.environment['CHANNEL'] == 'master';
+  final bool isMainChannel = !Platform.environment.containsKey('CHANNEL') ||
+      Platform.environment['CHANNEL'] == 'main' ||
+      Platform.environment['CHANNEL'] == 'master';
   // Only test against main to avoid rendering differences between flutter channels.
   if (!isMainChannel) {
     return;
   }
   // Load font.
-  final String effectiveFontFamily = const TextStyle(fontFamily: CupertinoIcons.iconFont, package: CupertinoIcons.iconFontPackage).fontFamily!;
+  final String effectiveFontFamily = const TextStyle(
+          fontFamily: CupertinoIcons.iconFont,
+          package: CupertinoIcons.iconFontPackage)
+      .fontFamily!;
   final FontLoader fontLoader = FontLoader(effectiveFontFamily);
   final String filePath = path.canonicalize('assets/CupertinoIcons.ttf');
   final File file = File(filePath);
-  fontLoader.addFont(file.readAsBytes().then((Uint8List v) => v.buffer.asByteData()));
+  fontLoader
+      .addFont(file.readAsBytes().then((Uint8List v) => v.buffer.asByteData()));
   await fontLoader.load();
 
   assert(icons.isNotEmpty);
   for (int index = 0; index < icons.length;) {
-    final int groupEndCodePoint = (icons[index].codePoint ~/ iconsPerImage + 1) * iconsPerImage;
-    final int next = icons.indexWhere((IconData icon) => icon.codePoint >= groupEndCodePoint, index);
+    final int groupEndCodePoint =
+        (icons[index].codePoint ~/ iconsPerImage + 1) * iconsPerImage;
+    final int next = icons.indexWhere(
+        (IconData icon) => icon.codePoint >= groupEndCodePoint, index);
     final int nextIndex = next < 0 ? icons.length : next;
     registerTestForIconGroup(icons.slice(index, nextIndex));
     index = nextIndex;
@@ -56,19 +62,24 @@ void main() async {
 // symbols are added or removed.
 void registerTestForIconGroup(List<IconData> iconGroup) {
   assert(iconGroup.isNotEmpty);
-  String hexCodePoint(int codePoint) => codePoint.toRadixString(16).toUpperCase().padLeft(4, '0');
-  final int groupStartCodePoint = (iconGroup.first.codePoint ~/ iconsPerImage) * iconsPerImage;
-  final String range = 'U+${hexCodePoint(groupStartCodePoint)}-${hexCodePoint(groupStartCodePoint + iconsPerImage - 1)}';
+  String hexCodePoint(int codePoint) =>
+      codePoint.toRadixString(16).toUpperCase().padLeft(4, '0');
+  final int groupStartCodePoint =
+      (iconGroup.first.codePoint ~/ iconsPerImage) * iconsPerImage;
+  final String range =
+      'U+${hexCodePoint(groupStartCodePoint)}-${hexCodePoint(groupStartCodePoint + iconsPerImage - 1)}';
 
   testWidgets('font golden test: $range', (WidgetTester tester) async {
     addTearDown(tester.view.reset);
-    const Size canvasSize = Size(iconSize * iconsPerRow, iconSize * iconsPerCol);
+    const Size canvasSize =
+        Size(iconSize * iconsPerRow, iconSize * iconsPerCol);
     tester.view.physicalSize = canvasSize * tester.view.devicePixelRatio;
 
     const Widget fillerBox = SizedBox.square(dimension: iconSize);
     final List<Widget> children = List<Widget>.filled(iconsPerImage, fillerBox);
     for (final IconData icon in iconGroup) {
-      children[icon.codePoint - groupStartCodePoint] = Icon(icon, size: iconSize);
+      children[icon.codePoint - groupStartCodePoint] =
+          Icon(icon, size: iconSize);
     }
 
     final Widget widget = Directionality(
@@ -82,6 +93,7 @@ void registerTestForIconGroup(List<IconData> iconGroup) {
       ),
     );
     await tester.pumpWidget(widget);
-    await expectLater(find.byType(Wrap) , matchesGoldenFile('goldens/glyph_$range.png'));
+    await expectLater(
+        find.byType(Wrap), matchesGoldenFile('goldens/glyph_$range.png'));
   });
 }