add missing trailing commas (#81329)

diff --git a/packages/flutter/test/material/about_test.dart b/packages/flutter/test/material/about_test.dart
index f15b7c1..7ec73f0 100644
--- a/packages/flutter/test/material/about_test.dart
+++ b/packages/flutter/test/material/about_test.dart

@@ -232,9 +232,7 @@
     expect(find.text('Another license'), findsOneWidget);
   }, skip: isBrowser); // https://github.com/flutter/flutter/issues/54385
 
-  testWidgets('_PackageLicensePage title style without AppBarTheme', (
-    WidgetTester tester,
-  ) async {
+  testWidgets('_PackageLicensePage title style without AppBarTheme', (WidgetTester tester) async {
     LicenseRegistry.addLicense(() {
       return Stream<LicenseEntry>.fromIterable(<LicenseEntry>[
         const LicenseEntryWithLineBreaks(<String>['AAA'], 'BBB'),
@@ -281,9 +279,7 @@
     expect(subtitle.style, subtitleTextStyle);
   }, skip: isBrowser); // https://github.com/flutter/flutter/issues/54385
 
-  testWidgets('_PackageLicensePage title style with AppBarTheme', (
-    WidgetTester tester,
-  ) async {
+  testWidgets('_PackageLicensePage title style with AppBarTheme', (WidgetTester tester) async {
     LicenseRegistry.addLicense(() {
       return Stream<LicenseEntry>.fromIterable(<LicenseEntry>[
         const LicenseEntryWithLineBreaks(<String>['AAA'], 'BBB'),
@@ -683,7 +679,7 @@
                   applicationName: 'MyApp',
                   applicationVersion: '1.0.0',
                 );
-              }
+              },
             ),
           ),
         ),

diff --git a/packages/flutter/test/material/app_bar_test.dart b/packages/flutter/test/material/app_bar_test.dart
index 1e2787b..e4fed5e 100644
--- a/packages/flutter/test/material/app_bar_test.dart
+++ b/packages/flutter/test/material/app_bar_test.dart

@@ -271,7 +271,8 @@
       );
 
       expect(tester.getTopLeft(find.text('X')).dx, 72.0);
-    });
+    },
+  );
 
   testWidgets(
     'AppBar centerTitle:false leading button title left edge is 72.0 (RTL)',
@@ -294,7 +295,8 @@
       );
 
       expect(tester.getTopRight(find.text('X')).dx, 800.0 - 72.0);
-    });
+    },
+  );
 
   testWidgets('AppBar centerTitle:false title overflow OK', (WidgetTester tester) async {
     // The app bar's title should be constrained to fit within the available space
@@ -325,11 +327,15 @@
 
     final Finder title = find.byKey(titleKey);
     expect(tester.getTopLeft(title).dx, 72.0);
-    expect(tester.getSize(title).width, equals(
+    expect(
+      tester.getSize(title).width,
+      equals(
         800.0 // Screen width.
         - 56.0 // Leading button width.
         - 16.0 // Leading button to title padding.
-        - 16.0)); // Title right side padding.
+        - 16.0, // Title right side padding.
+      ),
+    );
 
     actions = <Widget>[
       const SizedBox(width: 100.0),
@@ -340,11 +346,12 @@
     expect(tester.getTopLeft(title).dx, 72.0);
     // The title shrinks by 200.0 to allow for the actions widgets.
     expect(tester.getSize(title).width, equals(
-        800.0 // Screen width.
-        - 56.0 // Leading button width.
-        - 16.0 // Leading button to title padding.
-        - 16.0 // Title to actions padding
-        - 200.0)); // Actions' width.
+      800.0 // Screen width.
+      - 56.0 // Leading button width.
+      - 16.0 // Leading button to title padding.
+      - 16.0 // Title to actions padding
+      - 200.0,
+    )); // Actions' width.
 
     leading = Container(); // AppBar will constrain the width to 24.0
     await tester.pumpWidget(buildApp());
@@ -1061,16 +1068,17 @@
           DefaultWidgetsLocalizations.delegate,
         ],
         child: Directionality(
-        textDirection: TextDirection.ltr,
-        child: MediaQuery(
-          data: topPadding100,
-          child: Scaffold(
-            primary: false,
-            appBar: AppBar(),
+          textDirection: TextDirection.ltr,
+          child: MediaQuery(
+            data: topPadding100,
+            child: Scaffold(
+              primary: false,
+              appBar: AppBar(),
+            ),
           ),
         ),
       ),
-    ));
+    );
     expect(appBarTop(tester), 0.0);
     expect(appBarHeight(tester), kToolbarHeight);
 
@@ -1089,12 +1097,13 @@
               primary: true,
               appBar: AppBar(
                 backwardsCompatibility: false,
-                title: const Text('title')
+                title: const Text('title'),
               ),
+            ),
           ),
         ),
       ),
-    ));
+    );
     expect(appBarTop(tester), 0.0);
     expect(tester.getTopLeft(find.text('title')).dy, greaterThan(100.0));
     expect(appBarHeight(tester), kToolbarHeight + 100.0);
@@ -1117,12 +1126,13 @@
                 bottom: PreferredSize(
                   preferredSize: const Size.fromHeight(200.0),
                   child: Container(),
+                ),
               ),
             ),
           ),
         ),
       ),
-    ));
+    );
     expect(appBarTop(tester), 0.0);
     expect(appBarHeight(tester), kToolbarHeight + 200.0);
 
@@ -1134,22 +1144,23 @@
           DefaultWidgetsLocalizations.delegate,
         ],
         child: Directionality(
-        textDirection: TextDirection.ltr,
-        child: MediaQuery(
-          data: topPadding100,
-          child: Scaffold(
-            primary: true,
-            appBar: AppBar(
-              backwardsCompatibility: false,
-              bottom: PreferredSize(
-                preferredSize: const Size.fromHeight(200.0),
-                child: Container(),
+          textDirection: TextDirection.ltr,
+          child: MediaQuery(
+            data: topPadding100,
+            child: Scaffold(
+              primary: true,
+              appBar: AppBar(
+                backwardsCompatibility: false,
+                bottom: PreferredSize(
+                  preferredSize: const Size.fromHeight(200.0),
+                  child: Container(),
+                ),
               ),
             ),
           ),
         ),
       ),
-    ));
+    );
     expect(appBarTop(tester), 0.0);
     expect(appBarHeight(tester), kToolbarHeight + 100.0 + 200.0);
 
@@ -1187,23 +1198,24 @@
           DefaultWidgetsLocalizations.delegate,
         ],
         child: Directionality(
-        textDirection: TextDirection.ltr,
-        child: MediaQuery(
-          data: const MediaQueryData(padding: EdgeInsets.symmetric(vertical: 100.0)),
-          child: Scaffold(
-            primary: true,
-            body: Column(
-              children: <Widget>[
-                AppBar(
-                  backwardsCompatibility: false,
-                  title: const Text('title'),
-                ),
-              ],
+          textDirection: TextDirection.ltr,
+          child: MediaQuery(
+            data: const MediaQueryData(padding: EdgeInsets.symmetric(vertical: 100.0)),
+            child: Scaffold(
+              primary: true,
+              body: Column(
+                children: <Widget>[
+                  AppBar(
+                    backwardsCompatibility: false,
+                    title: const Text('title'),
+                  ),
+                ],
+              ),
             ),
           ),
         ),
       ),
-    ));
+    );
     expect(appBarTop(tester), 0.0);
     expect(appBarHeight(tester), kToolbarHeight + 100.0);
   });
@@ -1249,14 +1261,14 @@
       child: Scaffold(
         key: const ValueKey<String>('1'),
         appBar: AppBar(),
-      )
+      ),
     );
     final Page<void> page2 = MaterialPage<void>(
         key: const ValueKey<String>('2'),
         child: Scaffold(
           key: const ValueKey<String>('2'),
           appBar: AppBar(),
-        )
+        ),
     );
     List<Page<void>> pages = <Page<void>>[ page1 ];
     await tester.pumpWidget(
@@ -1283,18 +1295,18 @@
 
   testWidgets('AppBar does not update the leading if a route is popped case 2', (WidgetTester tester) async {
     final Page<void> page1 = MaterialPage<void>(
+      key: const ValueKey<String>('1'),
+      child: Scaffold(
         key: const ValueKey<String>('1'),
-        child: Scaffold(
-          key: const ValueKey<String>('1'),
-          appBar: AppBar(),
-        )
+        appBar: AppBar(),
+      ),
     );
     final Page<void> page2 = MaterialPage<void>(
+      key: const ValueKey<String>('2'),
+      child: Scaffold(
         key: const ValueKey<String>('2'),
-        child: Scaffold(
-          key: const ValueKey<String>('2'),
-          appBar: AppBar(),
-        )
+        appBar: AppBar(),
+      ),
     );
     List<Page<void>> pages = <Page<void>>[ page1, page2 ];
     await tester.pumpWidget(
@@ -1311,7 +1323,7 @@
         of: find.byKey(const ValueKey<String>('2')),
         matching: find.byType(BackButton),
       ),
-      findsOneWidget
+      findsOneWidget,
     );
     // Update pages
     pages = <Page<void>>[ page1 ];
@@ -1330,7 +1342,7 @@
         of: find.byKey(const ValueKey<String>('2')),
         matching: find.byType(BackButton),
       ),
-      findsOneWidget
+      findsOneWidget,
     );
   });
 
@@ -1370,8 +1382,8 @@
           of: find.byType(AppBar),
           matching: find.byType(Stack),
         ),
-        matching: find.byType(Material)
-      )
+        matching: find.byType(Material),
+      ),
     );
     await tester.tap(find.byKey(key));
     expect(painter, paints..save()..translate()..save()..translate()..circle(x: 24.0, y: 28.0));
@@ -1520,21 +1532,22 @@
           DefaultWidgetsLocalizations.delegate,
         ],
         child: Directionality(
-        textDirection: TextDirection.rtl,
-        child: MediaQuery(
-          data: topPadding100,
-          child: Scaffold(
-            primary: false,
-            appBar: AppBar(
-              backwardsCompatibility: false,
-              leading: Placeholder(key: leadingKey), // Forced to 56x56, see _kLeadingWidth in app_bar.dart.
-              title: Placeholder(key: titleKey, fallbackHeight: kToolbarHeight),
-              actions: <Widget>[ Placeholder(key: trailingKey, fallbackWidth: 10) ],
+          textDirection: TextDirection.rtl,
+          child: MediaQuery(
+            data: topPadding100,
+            child: Scaffold(
+              primary: false,
+              appBar: AppBar(
+                backwardsCompatibility: false,
+                leading: Placeholder(key: leadingKey), // Forced to 56x56, see _kLeadingWidth in app_bar.dart.
+                title: Placeholder(key: titleKey, fallbackHeight: kToolbarHeight),
+                actions: <Widget>[ Placeholder(key: trailingKey, fallbackWidth: 10) ],
+              ),
             ),
           ),
         ),
       ),
-    ));
+    );
     expect(tester.getTopLeft(find.byType(AppBar)), Offset.zero);
     expect(tester.getTopLeft(find.byKey(leadingKey)), const Offset(800.0 - 56.0, 100));
     expect(tester.getTopLeft(find.byKey(trailingKey)), const Offset(0.0, 100));
@@ -1564,23 +1577,24 @@
           DefaultWidgetsLocalizations.delegate,
         ],
         child: Directionality(
-        textDirection: TextDirection.rtl,
-        child: MediaQuery(
-          data: topPadding100,
-          child: CustomScrollView(
-            primary: true,
-            slivers: <Widget>[
-              SliverAppBar(
-                backwardsCompatibility: false,
-                leading: Placeholder(key: leadingKey),
-                title: Placeholder(key: titleKey, fallbackHeight: kToolbarHeight),
-                actions: <Widget>[ Placeholder(key: trailingKey) ],
-              ),
-            ],
+          textDirection: TextDirection.rtl,
+          child: MediaQuery(
+            data: topPadding100,
+            child: CustomScrollView(
+              primary: true,
+              slivers: <Widget>[
+                SliverAppBar(
+                  backwardsCompatibility: false,
+                  leading: Placeholder(key: leadingKey),
+                  title: Placeholder(key: titleKey, fallbackHeight: kToolbarHeight),
+                  actions: <Widget>[ Placeholder(key: trailingKey) ],
+                ),
+              ],
+            ),
           ),
         ),
       ),
-    ));
+    );
     expect(tester.getTopLeft(find.byType(AppBar)), Offset.zero);
     expect(tester.getTopLeft(find.byKey(leadingKey)), const Offset(800.0 - 56.0, 100.0));
     expect(tester.getTopLeft(find.byKey(titleKey)), const Offset(416.0, 100.0));
@@ -1602,23 +1616,24 @@
           DefaultWidgetsLocalizations.delegate,
         ],
         child: Directionality(
-        textDirection: TextDirection.rtl,
-        child: MediaQuery(
-          data: topPadding100,
-          child: CustomScrollView(
-            primary: true,
-            slivers: <Widget>[
-              SliverAppBar(
-                backwardsCompatibility: false,
-                leading: Placeholder(key: leadingKey),
-                title: Placeholder(key: titleKey),
-                actions: <Widget>[ Placeholder(key: trailingKey) ],
-              ),
-            ],
+          textDirection: TextDirection.rtl,
+          child: MediaQuery(
+            data: topPadding100,
+            child: CustomScrollView(
+              primary: true,
+              slivers: <Widget>[
+                SliverAppBar(
+                  backwardsCompatibility: false,
+                  leading: Placeholder(key: leadingKey),
+                  title: Placeholder(key: titleKey),
+                  actions: <Widget>[ Placeholder(key: trailingKey) ],
+                ),
+              ],
+            ),
           ),
         ),
       ),
-    ));
+    );
     expect(tester.getRect(find.byType(AppBar)), const Rect.fromLTRB(0.0, 0.0, 800.00, 100.0 + 56.0));
     expect(tester.getRect(find.byKey(leadingKey)), const Rect.fromLTRB(800.0 - 56.0, 100.0, 800.0, 100.0 + 56.0));
     expect(tester.getRect(find.byKey(trailingKey)), const Rect.fromLTRB(0.0, 100.0, 400.0, 100.0 + 56.0));
@@ -2011,7 +2026,7 @@
       home: Scaffold(
         appBar: AppBar(
           backwardsCompatibility: false,
-          title: const Text('test')
+          title: const Text('test'),
         ),
       ),
     ));
@@ -2032,7 +2047,7 @@
         home: Scaffold(
           appBar: AppBar(
             backwardsCompatibility: false,
-            title: const Text('test')
+            title: const Text('test'),
           ),
         ),
       ),
@@ -2053,7 +2068,7 @@
       home: Scaffold(
         appBar: AppBar(
           backwardsCompatibility: false,
-          title: const Text('test')
+          title: const Text('test'),
         ),
       ),
     ));
@@ -2074,7 +2089,7 @@
         home: Scaffold(
           appBar: AppBar(
             backwardsCompatibility: false,
-            title: const Text('test')
+            title: const Text('test'),
           ),
         ),
       ),
@@ -2174,7 +2189,7 @@
 
   testWidgets('AppBar with shape', (WidgetTester tester) async {
     const RoundedRectangleBorder roundedRectangleBorder = RoundedRectangleBorder(
-      borderRadius: BorderRadius.all(Radius.circular(15.0))
+      borderRadius: BorderRadius.all(Radius.circular(15.0)),
     );
     await tester.pumpWidget(
       MaterialApp(
@@ -2404,7 +2419,7 @@
           ),
           body: Container(),
         ),
-      )
+      ),
     );
 
     expect(appBarHeight(tester), 48);
@@ -2439,7 +2454,7 @@
       floating: false,
       pinned: false,
       toolbarHeight: toolbarHeight,
-      collapsedHeight: collapsedHeight
+      collapsedHeight: collapsedHeight,
     ));
 
     final ScrollController controller = primaryScrollController(tester);
@@ -2456,9 +2471,9 @@
     const double collapsedHeight = 56.0;
 
     await tester.pumpWidget(buildSliverAppBarApp(
-        floating: false,
-        pinned: false,
-        collapsedHeight: collapsedHeight
+      floating: false,
+      pinned: false,
+      collapsedHeight: collapsedHeight,
     ));
 
     final ScrollController controller = primaryScrollController(tester);
@@ -2490,7 +2505,7 @@
 
   testWidgets('SliverAppBar respects leadingWidth', (WidgetTester tester) async {
     const Key key = Key('leading');
-    await tester.pumpWidget( const MaterialApp(
+    await tester.pumpWidget(const MaterialApp(
       home: CustomScrollView(
         slivers: <Widget>[
           SliverAppBar(
@@ -2500,7 +2515,7 @@
             title: Text('Title'),
           ),
         ],
-      )
+      ),
     ));
 
     // By default toolbarHeight is 56.0.

diff --git a/packages/flutter/test/material/app_bar_theme_test.dart b/packages/flutter/test/material/app_bar_theme_test.dart
index 9b32ba4..c6d3011 100644
--- a/packages/flutter/test/material/app_bar_theme_test.dart
+++ b/packages/flutter/test/material/app_bar_theme_test.dart

@@ -324,7 +324,7 @@
                   backwardsCompatibility: false,
                   iconTheme: IconThemeData(color: appBarIconColor),
                   actions: <Widget>[
-                    IconButton(icon: const Icon(Icons.share), onPressed: () { })
+                    IconButton(icon: const Icon(Icons.share), onPressed: () { }),
                   ],
                 ),
               );
@@ -385,7 +385,7 @@
       theme: ThemeData(platform: TargetPlatform.iOS),
       home: Scaffold(appBar: AppBar(
         backwardsCompatibility: false,
-        title: const Text('Title')
+        title: const Text('Title'),
       )),
     ));
 

diff --git a/packages/flutter/test/material/app_test.dart b/packages/flutter/test/material/app_test.dart
index 5e99d34..9d83a42 100644
--- a/packages/flutter/test/material/app_test.dart
+++ b/packages/flutter/test/material/app_test.dart

@@ -105,7 +105,7 @@
                 onPressed: () { Navigator.of(context).pushNamed('/next'); },
               ),
             );
-          }
+          },
         ),
         routes: <String, WidgetBuilder>{
           '/next': (BuildContext context) {
@@ -146,7 +146,7 @@
           builder: (BuildContext context) {
             ++buildCounter;
             return const Text('A');
-          }
+          },
         ),
       ),
     );
@@ -158,7 +158,7 @@
           builder: (BuildContext context) {
             ++buildCounter;
             return const Text('B');
-          }
+          },
         ),
       ),
     );
@@ -172,7 +172,7 @@
       builder: (BuildContext context) {
         ++buildCounter;
         return const Placeholder();
-      }
+      },
     );
     await tester.pumpWidget(
       MaterialApp(
@@ -255,16 +255,16 @@
     await tester.pumpWidget(
         MaterialApp(
           home: Builder(
-              builder: (BuildContext context) {
-                return Material(
-                  child: ElevatedButton(
-                      child: const Text('X'),
-                      onPressed: () async {
-                        result = Navigator.of(context).pushNamed<Object?>('/a');
-                      },
-                  ),
-                );
-              }
+            builder: (BuildContext context) {
+              return Material(
+                child: ElevatedButton(
+                    child: const Text('X'),
+                    onPressed: () async {
+                      result = Navigator.of(context).pushNamed<Object?>('/a');
+                    },
+                ),
+              );
+            },
           ),
           routes: <String, WidgetBuilder>{
             '/a': (BuildContext context) {
@@ -525,7 +525,7 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-            brightness: Brightness.light
+          brightness: Brightness.light,
         ),
         darkTheme: ThemeData(
           brightness: Brightness.dark,
@@ -546,7 +546,7 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-            brightness: Brightness.light
+          brightness: Brightness.light,
         ),
         darkTheme: ThemeData(
           brightness: Brightness.dark,
@@ -571,7 +571,7 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-            brightness: Brightness.light
+          brightness: Brightness.light,
         ),
         darkTheme: ThemeData(
           brightness: Brightness.dark,
@@ -592,7 +592,7 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-            brightness: Brightness.light
+          brightness: Brightness.light,
         ),
         darkTheme: ThemeData(
           brightness: Brightness.dark,
@@ -619,7 +619,7 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-          brightness: Brightness.light
+          brightness: Brightness.light,
         ),
         darkTheme: ThemeData(
           brightness: Brightness.dark,
@@ -645,7 +645,7 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-            brightness: Brightness.light
+          brightness: Brightness.light,
         ),
         darkTheme: ThemeData(
           brightness: Brightness.dark,
@@ -672,7 +672,7 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-          brightness: Brightness.light
+          brightness: Brightness.light,
         ),
         home: Builder(
           builder: (BuildContext context) {
@@ -741,7 +741,7 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-          brightness: Brightness.light
+          brightness: Brightness.light,
         ),
         darkTheme: ThemeData(
           brightness: Brightness.dark,
@@ -857,7 +857,7 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-          brightness: Brightness.light
+          brightness: Brightness.light,
         ),
         darkTheme: ThemeData(
           brightness: Brightness.dark,
@@ -927,17 +927,19 @@
               pageBuilder: (
                 BuildContext context,
                 Animation<double> animation,
-                Animation<double> secondaryAnimation) {
+                Animation<double> secondaryAnimation,
+              ) {
                 return const Text('non-regular page one');
-              }
+              },
             ),
             PageRouteBuilder<void>(
               pageBuilder: (
                 BuildContext context,
                 Animation<double> animation,
-                Animation<double> secondaryAnimation) {
+                Animation<double> secondaryAnimation,
+              ) {
                 return const Text('non-regular page two');
-              }
+              },
             ),
           ];
         },
@@ -946,7 +948,7 @@
           '/': (BuildContext context) => const Text('regular page one'),
           '/abc': (BuildContext context) => const Text('regular page two'),
         },
-      )
+      ),
     );
     expect(find.text('non-regular page two'), findsOneWidget);
     expect(find.text('non-regular page one'), findsNothing);
@@ -964,7 +966,7 @@
     final HeroController controller = MaterialApp.createMaterialHeroController();
     final Tween<Rect?> tween = controller.createRectTween!(
       const Rect.fromLTRB(0.0, 0.0, 10.0, 10.0),
-      const Rect.fromLTRB(0.0, 0.0, 20.0, 20.0)
+      const Rect.fromLTRB(0.0, 0.0, 20.0, 20.0),
     );
     expect(tween, isA<MaterialRectArcTween>());
   });
@@ -1000,7 +1002,7 @@
           location: 'popped',
         );
         return route.didPop(result);
-      }
+      },
     );
     await tester.pumpWidget(MaterialApp.router(
       routeInformationProvider: provider,
@@ -1148,7 +1150,7 @@
         MaterialPage<void>(
           key: ValueKey<String>(routeInformation.location!),
           child: builder(context, routeInformation),
-        )
+        ),
       ],
     );
   }

diff --git a/packages/flutter/test/material/back_button_test.dart b/packages/flutter/test/material/back_button_test.dart
index 8f3ad95..eb4db41 100644
--- a/packages/flutter/test/material/back_button_test.dart
+++ b/packages/flutter/test/material/back_button_test.dart

@@ -126,8 +126,8 @@
     );
 
     final RichText iconText = tester.firstWidget(find.descendant(
-        of: find.byType(BackButton),
-        matching: find.byType(RichText)
+      of: find.byType(BackButton),
+      matching: find.byType(RichText),
     ));
     expect(iconText.text.style!.color, Colors.blue);
   });
@@ -176,8 +176,8 @@
     );
 
     final RichText iconText = tester.firstWidget(find.descendant(
-        of: find.byType(CloseButton),
-        matching: find.byType(RichText)
+      of: find.byType(CloseButton),
+      matching: find.byType(RichText),
     ));
     expect(iconText.text.style!.color, Colors.red);
   });

diff --git a/packages/flutter/test/material/bottom_app_bar_test.dart b/packages/flutter/test/material/bottom_app_bar_test.dart
index 0d4bd5a..c65b99a 100644
--- a/packages/flutter/test/material/bottom_app_bar_test.dart
+++ b/packages/flutter/test/material/bottom_app_bar_test.dart

@@ -96,7 +96,7 @@
                 bottomNavigationBar: BottomAppBar(),
               ),
             );
-          }
+          },
         ),
       ),
     );
@@ -119,11 +119,11 @@
                   onPressed: null,
                 ),
                 bottomNavigationBar: BottomAppBar(
-                  color: Color(0xff0000ff)
+                  color: Color(0xff0000ff),
                 ),
               ),
             );
-          }
+          },
         ),
       ),
     );
@@ -143,7 +143,7 @@
             color: const ColorScheme.dark().surface,
           ),
         ),
-      )
+      ),
     );
 
     final PhysicalShape physicalShape = tester.widget(find.byType(PhysicalShape).at(0));

diff --git a/packages/flutter/test/material/bottom_navigation_bar_test.dart b/packages/flutter/test/material/bottom_navigation_bar_test.dart
index 19c08c9..f94c5b9 100644
--- a/packages/flutter/test/material/bottom_navigation_bar_test.dart
+++ b/packages/flutter/test/material/bottom_navigation_bar_test.dart

@@ -1141,23 +1141,23 @@
             child: Navigator(
               onGenerateRoute: (RouteSettings settings) {
                 return MaterialPageRoute<void>(
-                    builder: (BuildContext context) {
-                      return Scaffold(
-                        bottomNavigationBar: BottomNavigationBar(
-                          items: const <BottomNavigationBarItem>[
-                            BottomNavigationBarItem(
-                              label: label,
-                              icon: Icon(Icons.ac_unit),
-                              tooltip: label,
-                            ),
-                            BottomNavigationBarItem(
-                              label: 'B',
-                              icon: Icon(Icons.battery_alert),
-                            ),
-                          ],
-                        ),
-                      );
-                    }
+                  builder: (BuildContext context) {
+                    return Scaffold(
+                      bottomNavigationBar: BottomNavigationBar(
+                        items: const <BottomNavigationBarItem>[
+                          BottomNavigationBarItem(
+                            label: label,
+                            icon: Icon(Icons.ac_unit),
+                            tooltip: label,
+                          ),
+                          BottomNavigationBarItem(
+                            label: 'B',
+                            icon: Icon(Icons.battery_alert),
+                          ),
+                        ],
+                      ),
+                    );
+                  },
                 );
               },
             ),
@@ -1684,7 +1684,8 @@
       expect(find.text('Green'), findsOneWidget);
       expect(tester.widget<Opacity>(find.byType(Opacity).first).opacity, 0.0);
       expect(tester.widget<Opacity>(find.byType(Opacity).last).opacity, 0.0);
-    });
+    },
+  );
 
   testWidgets(
     'BottomNavigationBar [showSelectedLabels]=false and [showUnselectedLabels]=false '
@@ -1721,7 +1722,8 @@
       expect(find.text('Green'), findsOneWidget);
       expect(tester.widget<Opacity>(find.byType(Opacity).first).opacity, 0.0);
       expect(tester.widget<Opacity>(find.byType(Opacity).last).opacity, 0.0);
-    });
+    },
+  );
 
   testWidgets('BottomNavigationBar.fixed [showSelectedLabels]=false and [showUnselectedLabels]=false semantics', (WidgetTester tester) async {
     await tester.pumpWidget(
@@ -1933,7 +1935,7 @@
 
       await tester.pumpWidget(feedbackBoilerplate(
         enableFeedbackTheme: enableFeedbackTheme,
-        enableFeedback: enableFeedback
+        enableFeedback: enableFeedback,
       ));
 
       await tester.tap(find.byType(InkResponse).first);
@@ -1943,8 +1945,7 @@
     });
   });
 
-  testWidgets('BottomNavigationBar excludes semantics',
-      (WidgetTester tester) async {
+  testWidgets('BottomNavigationBar excludes semantics', (WidgetTester tester) async {
     final SemanticsTester semantics = SemanticsTester(tester);
 
     await tester.pumpWidget(
@@ -1984,7 +1985,7 @@
                             TestSemantics(
                               flags: <SemanticsFlag>[
                                 SemanticsFlag.isSelected,
-                                SemanticsFlag.isFocusable
+                                SemanticsFlag.isFocusable,
                               ],
                               actions: <SemanticsAction>[SemanticsAction.tap],
                               label: 'A\nTab 1 of 2',

diff --git a/packages/flutter/test/material/bottom_sheet_test.dart b/packages/flutter/test/material/bottom_sheet_test.dart
index dbc404f..15a379d 100644
--- a/packages/flutter/test/material/bottom_sheet_test.dart
+++ b/packages/flutter/test/material/bottom_sheet_test.dart

@@ -687,11 +687,9 @@
     expect(tester.getBottomLeft(find.byType(BottomSheet)).dy, 600.0);
   });
 
-  testWidgets('Verify that route settings can be set in the showModalBottomSheet',
-      (WidgetTester tester) async {
+  testWidgets('Verify that route settings can be set in the showModalBottomSheet', (WidgetTester tester) async {
     final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();
-    const RouteSettings routeSettings =
-        RouteSettings(name: 'route_name', arguments: 'route_argument');
+    const RouteSettings routeSettings = RouteSettings(name: 'route_name', arguments: 'route_argument');
 
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(

diff --git a/packages/flutter/test/material/button_bar_theme_test.dart b/packages/flutter/test/material/button_bar_theme_test.dart
index 0daab30..f7214c6 100644
--- a/packages/flutter/test/material/button_bar_theme_test.dart
+++ b/packages/flutter/test/material/button_bar_theme_test.dart

@@ -120,7 +120,7 @@
           builder: (BuildContext context) {
             capturedContext = context;
             return Container();
-          }
+          },
         ),
       ),
     );
@@ -146,7 +146,7 @@
                 },
               ),
             );
-          }
+          },
         ),
       ),
     );

diff --git a/packages/flutter/test/material/button_style_test.dart b/packages/flutter/test/material/button_style_test.dart
index 6be544c..998dbc5 100644
--- a/packages/flutter/test/material/button_style_test.dart
+++ b/packages/flutter/test/material/button_style_test.dart

@@ -154,7 +154,7 @@
 
     expect(
       style.copyWith(),
-      style.merge(const ButtonStyle())
+      style.merge(const ButtonStyle()),
     );
   });
 

diff --git a/packages/flutter/test/material/calendar_date_picker_test.dart b/packages/flutter/test/material/calendar_date_picker_test.dart
index df65060..82c64ef 100644
--- a/packages/flutter/test/material/calendar_date_picker_test.dart
+++ b/packages/flutter/test/material/calendar_date_picker_test.dart

@@ -146,8 +146,7 @@
       expect(find.text('31'), findsNothing);
     });
 
-    testWidgets('Changing year does not change selected date', (
-        WidgetTester tester) async {
+    testWidgets('Changing year does not change selected date', (WidgetTester tester) async {
       DateTime? selectedDate;
       await tester.pumpWidget(calendarDatePicker(
         onDateChanged: (DateTime date) => selectedDate = date,
@@ -259,8 +258,7 @@
       expect(displayedMonth, isNull);
     });
 
-    testWidgets('Selecting firstDate year respects firstDate', (
-        WidgetTester tester) async {
+    testWidgets('Selecting firstDate year respects firstDate', (WidgetTester tester) async {
       DateTime? displayedMonth;
       await tester.pumpWidget(calendarDatePicker(
         firstDate: DateTime(2016, DateTime.june, 9),
@@ -277,8 +275,7 @@
       expect(displayedMonth, DateTime(2016, DateTime.june, 1));
     });
 
-    testWidgets('Selecting lastDate year respects lastDate', (
-        WidgetTester tester) async {
+    testWidgets('Selecting lastDate year respects lastDate', (WidgetTester tester) async {
       DateTime? displayedMonth;
       await tester.pumpWidget(calendarDatePicker(
         firstDate: DateTime(2016, DateTime.june, 9),
@@ -295,8 +292,7 @@
       expect(displayedMonth, DateTime(2019, DateTime.january, 1));
     });
 
-    testWidgets(
-        'Only predicate days are selectable', (WidgetTester tester) async {
+    testWidgets('Only predicate days are selectable', (WidgetTester tester) async {
       DateTime? selectedDate;
       await tester.pumpWidget(calendarDatePicker(
         firstDate: DateTime(2017, DateTime.january, 10),
@@ -313,8 +309,7 @@
       expect(selectedDate, DateTime(2017, DateTime.january, 10));
     });
 
-    testWidgets(
-        'Can select initial calendar picker mode', (WidgetTester tester) async {
+    testWidgets('Can select initial calendar picker mode', (WidgetTester tester) async {
       await tester.pumpWidget(calendarDatePicker(
         initialDate: DateTime(2014, DateTime.january, 15),
         initialCalendarMode: DatePickerMode.year,
@@ -332,17 +327,17 @@
       ));
       const Color todayColor = Color(0xff2196f3); // default primary color
       expect(
-          Material.of(tester.element(find.text('2'))),
-          // The current day should be painted with a circle outline.
-          paints
-            ..circle(color: todayColor,
-                style: PaintingStyle.stroke,
-                strokeWidth: 1.0)
+        Material.of(tester.element(find.text('2'))),
+        // The current day should be painted with a circle outline.
+        paints..circle(
+          color: todayColor,
+          style: PaintingStyle.stroke,
+          strokeWidth: 1.0,
+        ),
       );
     });
 
-    testWidgets('Selecting date does not switch picker to year selection', (
-        WidgetTester tester) async {
+    testWidgets('Selecting date does not switch picker to year selection', (WidgetTester tester) async {
       await tester.pumpWidget(calendarDatePicker(
         initialDate: DateTime(2020, DateTime.may, 10),
         initialCalendarMode: DatePickerMode.year,
@@ -356,8 +351,7 @@
       expect(find.text('2017'), findsNothing);
     });
 
-    testWidgets('Updates to initialDate parameter is reflected in the state', (
-        WidgetTester tester) async {
+    testWidgets('Updates to initialDate parameter is reflected in the state', (WidgetTester tester) async {
       final Key pickerKey = UniqueKey();
       final DateTime initialDate = DateTime(2020, 1, 21);
       final DateTime updatedDate = DateTime(1976, 2, 23);
@@ -378,8 +372,8 @@
       expect(find.text('January 2020'), findsOneWidget);
       // Selected date should be painted with a colored circle.
       expect(
-          Material.of(tester.element(find.text('21'))),
-          paints..circle(color: selectedColor, style: PaintingStyle.fill)
+        Material.of(tester.element(find.text('21'))),
+        paints..circle(color: selectedColor, style: PaintingStyle.fill),
       );
 
       // Change to the updated initialDate
@@ -398,14 +392,12 @@
       expect(find.text('February 1976'), findsOneWidget);
       // Selected date should be painted with a colored circle.
       expect(
-          Material.of(tester.element(find.text('23'))),
-          paints..circle(color: selectedColor, style: PaintingStyle.fill)
+        Material.of(tester.element(find.text('23'))),
+        paints..circle(color: selectedColor, style: PaintingStyle.fill),
       );
     });
 
-    testWidgets(
-        'Updates to initialCalendarMode parameter is reflected in the state', (
-        WidgetTester tester) async {
+    testWidgets('Updates to initialCalendarMode parameter is reflected in the state', (WidgetTester tester) async {
       final Key pickerKey = UniqueKey();
 
       await tester.pumpWidget(calendarDatePicker(
@@ -431,8 +423,7 @@
       expect(find.text('2016'), findsNothing); // 2016 in year grid
     });
 
-    testWidgets('Dragging more than half the width should not cause a jump', (
-        WidgetTester tester) async {
+    testWidgets('Dragging more than half the width should not cause a jump', (WidgetTester tester) async {
       await tester.pumpWidget(calendarDatePicker());
       await tester.pumpAndSettle();
       final TestGesture gesture = await tester.startGesture(tester.getCenter(find.byType(PageView)));
@@ -465,8 +456,7 @@
         expect(find.text('January 2016'), findsOneWidget);
       });
 
-      testWidgets(
-          'Can navigate next/previous months', (WidgetTester tester) async {
+      testWidgets('Can navigate next/previous months', (WidgetTester tester) async {
         await tester.pumpWidget(calendarDatePicker());
         expect(find.text('January 2016'), findsOneWidget);
         // Navigate to the previous month button and activate it twice.
@@ -493,8 +483,7 @@
         expect(find.text('March 2016'), findsOneWidget);
       });
 
-      testWidgets('Can navigate date grid with arrow keys', (
-          WidgetTester tester) async {
+      testWidgets('Can navigate date grid with arrow keys', (WidgetTester tester) async {
         DateTime? selectedDate;
         await tester.pumpWidget(calendarDatePicker(
           onDateChanged: (DateTime date) => selectedDate = date,
@@ -523,8 +512,7 @@
         expect(selectedDate, DateTime(2016, DateTime.january, 18));
       });
 
-      testWidgets('Navigating with arrow keys scrolls months', (
-          WidgetTester tester) async {
+      testWidgets('Navigating with arrow keys scrolls months', (WidgetTester tester) async {
         DateTime? selectedDate;
         await tester.pumpWidget(calendarDatePicker(
           onDateChanged: (DateTime date) => selectedDate = date,
@@ -564,9 +552,7 @@
         expect(selectedDate, DateTime(2015, DateTime.november, 26));
       });
 
-      testWidgets(
-          'RTL text direction reverses the horizontal arrow key navigation', (
-          WidgetTester tester) async {
+      testWidgets('RTL text direction reverses the horizontal arrow key navigation', (WidgetTester tester) async {
         DateTime? selectedDate;
         await tester.pumpWidget(calendarDatePicker(
           onDateChanged: (DateTime date) => selectedDate = date,
@@ -632,8 +618,7 @@
         expect(feedback.hapticCount, 3);
       });
 
-      testWidgets('Tapping unselectable date does not vibrate', (
-          WidgetTester tester) async {
+      testWidgets('Tapping unselectable date does not vibrate', (WidgetTester tester) async {
         await tester.pumpWidget(calendarDatePicker(
           initialDate: DateTime(2016, DateTime.january, 10),
           selectableDayPredicate: (DateTime date) => date.day.isEven,

diff --git a/packages/flutter/test/material/card_test.dart b/packages/flutter/test/material/card_test.dart
index daf6f46..908e141 100644
--- a/packages/flutter/test/material/card_test.dart
+++ b/packages/flutter/test/material/card_test.dart

@@ -199,7 +199,7 @@
 
     Card _getCard(WidgetTester tester) {
       return tester.widget<Card>(
-          find.byType(Card)
+        find.byType(Card),
       );
     }
 

diff --git a/packages/flutter/test/material/checkbox_list_tile_test.dart b/packages/flutter/test/material/checkbox_list_tile_test.dart
index 9c1eaef..b36145c 100644
--- a/packages/flutter/test/material/checkbox_list_tile_test.dart
+++ b/packages/flutter/test/material/checkbox_list_tile_test.dart

@@ -132,7 +132,7 @@
             contentPadding: EdgeInsets.fromLTRB(10, 18, 4, 2),
           ),
         ),
-      )
+      ),
     );
 
     final Rect paddingRect = tester.getRect(find.byType(SafeArea));
@@ -231,7 +231,7 @@
 
   testWidgets('CheckboxListTile respects shape', (WidgetTester tester) async {
     const ShapeBorder shapeBorder = RoundedRectangleBorder(
-      borderRadius: BorderRadius.horizontal(right: Radius.circular(100))
+      borderRadius: BorderRadius.horizontal(right: Radius.circular(100)),
     );
 
     await tester.pumpWidget(wrap(

diff --git a/packages/flutter/test/material/checkbox_test.dart b/packages/flutter/test/material/checkbox_test.dart
index 6422423..d477588 100644
--- a/packages/flutter/test/material/checkbox_test.dart
+++ b/packages/flutter/test/material/checkbox_test.dart

@@ -495,7 +495,7 @@
     await tester.pumpAndSettle();
     expect(
       Material.of(tester.element(find.byType(Checkbox))),
-      paints..circle(color: Colors.orange[500], radius: splashRadius)
+      paints..circle(color: Colors.orange[500], radius: splashRadius),
     );
   });
 
@@ -902,8 +902,7 @@
       return MaterialApp(
         home: Material(
           child: Center(
-            child: StatefulBuilder(
-                builder: (BuildContext context, StateSetter setState) {
+            child: StatefulBuilder(builder: (BuildContext context, StateSetter setState) {
               return Checkbox(
                 value: false,
                 onChanged: (bool? newValue) {},
@@ -919,8 +918,7 @@
     await tester.pumpWidget(buildApp());
     await tester.pumpAndSettle();
 
-    expect(tester.widget<Checkbox>(find.byType(Checkbox)).shape,
-        roundedRectangleBorder);
+    expect(tester.widget<Checkbox>(find.byType(Checkbox)).shape, roundedRectangleBorder);
     expect(tester.widget<Checkbox>(find.byType(Checkbox)).side, side);
     expect(
       Material.of(tester.element(find.byType(Checkbox))),

diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
index 2502d93..9addbeb 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart

@@ -1464,7 +1464,7 @@
   testWidgets('Chip merges ChipThemeData label style with the provided label style', (WidgetTester tester) async {
     // The font family should be preserved even if the chip overrides some label style properties
     final ThemeData theme = ThemeData(
-      fontFamily: 'MyFont'
+      fontFamily: 'MyFont',
     );
 
     Widget buildChip() {
@@ -1657,7 +1657,9 @@
         ),
       ));
 
-      expect(semanticsTester, hasSemantics(
+      expect(
+        semanticsTester,
+        hasSemantics(
           TestSemantics.root(
             children: <TestSemantics>[
               TestSemantics(
@@ -1683,7 +1685,12 @@
                 ],
               ),
             ],
-          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ),
+          ignoreTransform: true,
+          ignoreId: true,
+          ignoreRect: true,
+        ),
+      );
       semanticsTester.dispose();
     });
 
@@ -1699,7 +1706,9 @@
         ),
       ));
 
-      expect(semanticsTester, hasSemantics(
+      expect(
+        semanticsTester,
+        hasSemantics(
           TestSemantics.root(
             children: <TestSemantics>[
               TestSemantics(
@@ -1735,7 +1744,12 @@
                 ],
               ),
             ],
-          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ),
+          ignoreTransform: true,
+          ignoreId: true,
+          ignoreRect: true,
+        ),
+      );
       semanticsTester.dispose();
     });
 
@@ -1751,7 +1765,9 @@
         ),
       ));
 
-      expect(semanticsTester, hasSemantics(
+      expect(
+        semanticsTester,
+        hasSemantics(
           TestSemantics.root(
             children: <TestSemantics>[
               TestSemantics(
@@ -1780,7 +1796,12 @@
                 ],
               ),
             ],
-          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ),
+          ignoreTransform: true,
+          ignoreId: true,
+          ignoreRect: true,
+        ),
+      );
 
       semanticsTester.dispose();
     });
@@ -1803,7 +1824,9 @@
         ),
       ));
 
-      expect(semanticsTester, hasSemantics(
+      expect(
+        semanticsTester,
+        hasSemantics(
           TestSemantics.root(
             children: <TestSemantics>[
               TestSemantics(
@@ -1832,7 +1855,12 @@
                 ],
               ),
             ],
-          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ),
+          ignoreTransform: true,
+          ignoreId: true,
+          ignoreRect: true,
+        ),
+      );
 
       await tester.tap(find.byType(RawChip));
       await tester.pumpWidget(MaterialApp(
@@ -1849,7 +1877,9 @@
       ));
 
       expect(selected, true);
-      expect(semanticsTester, hasSemantics(
+      expect(
+        semanticsTester,
+        hasSemantics(
           TestSemantics.root(
             children: <TestSemantics>[
               TestSemantics(
@@ -1879,7 +1909,12 @@
                 ],
               ),
             ],
-          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ),
+          ignoreTransform: true,
+          ignoreId: true,
+          ignoreRect: true,
+        ),
+      );
 
       semanticsTester.dispose();
     });
@@ -1897,7 +1932,9 @@
         ),
       ));
 
-      expect(semanticsTester, hasSemantics(
+      expect(
+        semanticsTester,
+        hasSemantics(
           TestSemantics.root(
             children: <TestSemantics>[
               TestSemantics(
@@ -1924,7 +1961,12 @@
                 ],
               ),
             ],
-          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ),
+          ignoreTransform: true,
+          ignoreId: true,
+          ignoreRect: true,
+        ),
+      );
 
       semanticsTester.dispose();
     });
@@ -1941,7 +1983,9 @@
         ),
       ));
 
-      expect(semanticsTester, hasSemantics(
+      expect(
+        semanticsTester,
+        hasSemantics(
           TestSemantics.root(
             children: <TestSemantics>[
               TestSemantics(
@@ -1965,7 +2009,12 @@
                 ],
               ),
             ],
-          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ),
+          ignoreTransform: true,
+          ignoreId: true,
+          ignoreRect: true,
+        ),
+      );
 
       semanticsTester.dispose();
     });
@@ -1985,7 +2034,9 @@
         ),
       ));
 
-      expect(semanticsTester, hasSemantics(
+      expect(
+        semanticsTester,
+        hasSemantics(
           TestSemantics.root(
             children: <TestSemantics>[
               TestSemantics(
@@ -2014,7 +2065,12 @@
                 ],
               ),
             ],
-          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ),
+          ignoreTransform: true,
+          ignoreId: true,
+          ignoreRect: true,
+        ),
+      );
 
       semanticsTester.dispose();
     });
@@ -2032,7 +2088,9 @@
         ),
       ));
 
-      expect(semanticsTester, hasSemantics(
+      expect(
+        semanticsTester,
+        hasSemantics(
           TestSemantics.root(
             children: <TestSemantics>[
               TestSemantics(
@@ -2058,7 +2116,12 @@
                 ],
               ),
             ],
-          ), ignoreTransform: true, ignoreId: true, ignoreRect: true));
+          ),
+          ignoreTransform: true,
+          ignoreId: true,
+          ignoreRect: true,
+        ),
+      );
 
       semanticsTester.dispose();
     });
@@ -3124,7 +3187,7 @@
       _chipWithOptionalDeleteButton(
         deletable: true,
         hasDeleteButtonTooltip: false,
-      )
+      ),
     );
 
     // Tap at the delete icon of the chip, which is at the right

diff --git a/packages/flutter/test/material/chip_theme_test.dart b/packages/flutter/test/material/chip_theme_test.dart
index 2de5b05..e6c026f 100644
--- a/packages/flutter/test/material/chip_theme_test.dart
+++ b/packages/flutter/test/material/chip_theme_test.dart

@@ -89,30 +89,31 @@
       return MaterialApp(
         locale: const Locale('en', 'us'),
         home: Directionality(
-        textDirection: TextDirection.ltr,
-        child: MediaQuery(
-          data: MediaQueryData.fromWindow(window),
-          child: Material(
-            child: Center(
-              child: Theme(
-                data: theme,
-                child: RawChip(
-                  showCheckmark: true,
-                  onDeleted: () { },
-                  tapEnabled: true,
-                  avatar: const Placeholder(),
-                  deleteIcon: const Placeholder(),
-                  isEnabled: true,
-                  selected: false,
-                  label: const Text('Chip'),
-                  onSelected: (bool newValue) { },
-                  onPressed: null,
+          textDirection: TextDirection.ltr,
+          child: MediaQuery(
+            data: MediaQueryData.fromWindow(window),
+            child: Material(
+              child: Center(
+                child: Theme(
+                  data: theme,
+                  child: RawChip(
+                    showCheckmark: true,
+                    onDeleted: () { },
+                    tapEnabled: true,
+                    avatar: const Placeholder(),
+                    deleteIcon: const Placeholder(),
+                    isEnabled: true,
+                    selected: false,
+                    label: const Text('Chip'),
+                    onSelected: (bool newValue) { },
+                    onPressed: null,
+                  ),
                 ),
               ),
             ),
           ),
         ),
-      ));
+      );
     }
 
     await tester.pumpWidget(buildChip(chipTheme));
@@ -139,33 +140,34 @@
     Widget buildChip(ChipThemeData data) {
       return MaterialApp(
         home: Directionality(
-        textDirection: TextDirection.ltr,
-        child: MediaQuery(
-          data: MediaQueryData.fromWindow(window),
-          child: Material(
-            child: Center(
-              child: Theme(
-                data: theme,
-                child: ChipTheme(
-                  data: customTheme,
-                  child: RawChip(
-                    showCheckmark: true,
-                    onDeleted: () { },
-                    tapEnabled: true,
-                    avatar: const Placeholder(),
-                    deleteIcon: const Placeholder(),
-                    isEnabled: true,
-                    selected: value,
-                    label: const Text('$value'),
-                    onSelected: (bool newValue) { },
-                    onPressed: null,
+          textDirection: TextDirection.ltr,
+          child: MediaQuery(
+            data: MediaQueryData.fromWindow(window),
+            child: Material(
+              child: Center(
+                child: Theme(
+                  data: theme,
+                  child: ChipTheme(
+                    data: customTheme,
+                    child: RawChip(
+                      showCheckmark: true,
+                      onDeleted: () { },
+                      tapEnabled: true,
+                      avatar: const Placeholder(),
+                      deleteIcon: const Placeholder(),
+                      isEnabled: true,
+                      selected: value,
+                      label: const Text('$value'),
+                      onSelected: (bool newValue) { },
+                      onPressed: null,
+                    ),
                   ),
                 ),
               ),
             ),
           ),
         ),
-      ));
+      );
     }
 
     await tester.pumpWidget(buildChip(chipTheme));

diff --git a/packages/flutter/test/material/circle_avatar_test.dart b/packages/flutter/test/material/circle_avatar_test.dart
index a49de4d..6c74321 100644
--- a/packages/flutter/test/material/circle_avatar_test.dart
+++ b/packages/flutter/test/material/circle_avatar_test.dart

@@ -211,7 +211,8 @@
             textScaleFactor: 2.0,
             size: Size(111.0, 111.0),
             devicePixelRatio: 1.1,
-            padding: EdgeInsets.all(11.0)),
+            padding: EdgeInsets.all(11.0),
+          ),
           child: CircleAvatar(
             child: Builder(
               builder: (BuildContext context) {
@@ -225,7 +226,7 @@
                 // This should be overridden to 1.0.
                 expect(data.textScaleFactor, equals(1.0));
                 return const Text('Z');
-              }
+              },
             ),
           ),
         ),

diff --git a/packages/flutter/test/material/data_table_test.dart b/packages/flutter/test/material/data_table_test.dart
index aadacb1..01c4356 100644
--- a/packages/flutter/test/material/data_table_test.dart
+++ b/packages/flutter/test/material/data_table_test.dart

@@ -462,7 +462,7 @@
     Transform transformOfArrow = tester.widget<Transform>(find.widgetWithIcon(Transform, Icons.arrow_upward));
     expect(
       transformOfArrow.transform.getRotation(),
-      equals(Matrix3.identity())
+      equals(Matrix3.identity()),
     );
 
     // Check for descending list.
@@ -474,7 +474,7 @@
     transformOfArrow = tester.widget<Transform>(find.widgetWithIcon(Transform, Icons.arrow_upward));
     expect(
       transformOfArrow.transform.getRotation(),
-      equals(Matrix3.rotationZ(math.pi))
+      equals(Matrix3.rotationZ(math.pi)),
     );
   });
 
@@ -1152,7 +1152,7 @@
               DataCell(Text('A long desert name')),
             ],
           ),
-        ]
+        ],
       );
     }
 
@@ -1226,7 +1226,7 @@
               DataCell(Text('Content2')),
             ],
           ),
-        ]
+        ],
       );
     }
 
@@ -1451,7 +1451,7 @@
               DataCell(Text('Content1')),
             ],
           ),
-        ]
+        ],
       );
     }
 

diff --git a/packages/flutter/test/material/date_picker_test.dart b/packages/flutter/test/material/date_picker_test.dart
index cf011e2..c5de359 100644
--- a/packages/flutter/test/material/date_picker_test.dart
+++ b/packages/flutter/test/material/date_picker_test.dart

@@ -56,9 +56,9 @@
 
   Future<void> prepareDatePicker(
     WidgetTester tester,
-    Future<void> Function(Future<DateTime?> date) callback,
-    { TextDirection textDirection = TextDirection.ltr }
-  ) async {
+    Future<void> Function(Future<DateTime?> date) callback, {
+    TextDirection textDirection = TextDirection.ltr,
+  }) async {
     late BuildContext buttonContext;
     await tester.pumpWidget(MaterialApp(
       home: Material(
@@ -303,7 +303,7 @@
       // Test that the defaults work
       const DialogTheme datePickerDefaultDialogTheme = DialogTheme(
         shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(4.0))
+          borderRadius: BorderRadius.all(Radius.circular(4.0)),
         ),
         elevation: 24,
       );
@@ -337,7 +337,7 @@
       // Test that it honors ThemeData.dialogTheme settings
       const DialogTheme customDialogTheme = DialogTheme(
         shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(40.0))
+          borderRadius: BorderRadius.all(Radius.circular(40.0)),
         ),
         elevation: 50,
       );
@@ -651,7 +651,7 @@
         expect(
           Material.of(tester.element(find.text('2'))),
           // The current day should be painted with a circle outline
-          paints..circle(color: todayColor, style: PaintingStyle.stroke, strokeWidth: 1.0)
+          paints..circle(color: todayColor, style: PaintingStyle.stroke, strokeWidth: 1.0),
         );
       });
     });
@@ -1053,8 +1053,7 @@
 
         // Should have selected Jan 18
         expect(await date, DateTime(2016, DateTime.january, 19));
-      },
-      textDirection: TextDirection.rtl);
+      }, textDirection: TextDirection.rtl);
     });
   });
 
@@ -1254,7 +1253,7 @@
         arguments: <String, dynamic>{
           'selectedDate': _selectedDate.value.millisecondsSinceEpoch,
           'datePickerEntryMode': widget.datePickerEntryMode.index,
-        }
+        },
       );
     },
   );

diff --git a/packages/flutter/test/material/date_range_picker_test.dart b/packages/flutter/test/material/date_range_picker_test.dart
index cfd1099..9f1d266 100644
--- a/packages/flutter/test/material/date_range_picker_test.dart
+++ b/packages/flutter/test/material/date_range_picker_test.dart

@@ -52,9 +52,9 @@
 
   Future<void> preparePicker(
     WidgetTester tester,
-    Future<void> Function(Future<DateTimeRange?> date) callback,
-    { TextDirection textDirection = TextDirection.ltr }
-  ) async {
+    Future<void> Function(Future<DateTimeRange?> date) callback, {
+    TextDirection textDirection = TextDirection.ltr,
+  }) async {
     late BuildContext buttonContext;
     await tester.pumpWidget(MaterialApp(
       home: Material(
@@ -116,15 +116,17 @@
   testWidgets('Initial date is the default', (WidgetTester tester) async {
     await preparePicker(tester, (Future<DateTimeRange?> range) async {
       await tester.tap(find.text('SAVE'));
-      expect(await range, DateTimeRange(
-        start: DateTime(2016, DateTime.january, 15),
-        end: DateTime(2016, DateTime.january, 25)
-      ));
+      expect(
+        await range,
+        DateTimeRange(
+          start: DateTime(2016, DateTime.january, 15),
+          end: DateTime(2016, DateTime.january, 25),
+        ),
+      );
     });
   });
 
-  testWidgets('Last month header should be visible if last date is selected',
-      (WidgetTester tester) async {
+  testWidgets('Last month header should be visible if last date is selected', (WidgetTester tester) async {
     firstDate = DateTime(2015, DateTime.january, 1);
     lastDate = DateTime(2016, DateTime.december, 31);
     initialDateRange = DateTimeRange(
@@ -138,8 +140,7 @@
     });
   });
 
-  testWidgets('First month header should be visible if first date is selected',
-      (WidgetTester tester) async {
+  testWidgets('First month header should be visible if first date is selected', (WidgetTester tester) async {
     firstDate = DateTime(2015, DateTime.january, 1);
     lastDate = DateTime(2016, DateTime.december, 31);
     initialDateRange = DateTimeRange(
@@ -154,8 +155,7 @@
     });
   });
 
-  testWidgets('Current month header should be visible if no date is selected',
-      (WidgetTester tester) async {
+  testWidgets('Current month header should be visible if no date is selected', (WidgetTester tester) async {
     firstDate = DateTime(2015, DateTime.january, 1);
     lastDate = DateTime(2016, DateTime.december, 31);
     currentDate = DateTime(2016, DateTime.september, 1);
@@ -612,8 +612,7 @@
           start: DateTime(2016, DateTime.january, 19),
           end: DateTime(2016, DateTime.january, 21),
         ));
-      },
-      textDirection: TextDirection.rtl);
+      }, textDirection: TextDirection.rtl);
     });
   });
 
@@ -984,7 +983,7 @@
         _dateRangePickerRoute,
         arguments: <String, dynamic>{
           'datePickerEntryMode': widget.datePickerEntryMode.index,
-        }
+        },
       );
     },
   );

diff --git a/packages/flutter/test/material/debug_test.dart b/packages/flutter/test/material/debug_test.dart
index 0c132c7..b3d4f25 100644
--- a/packages/flutter/test/material/debug_test.dart
+++ b/packages/flutter/test/material/debug_test.dart

@@ -24,7 +24,8 @@
     );
     expect(error.diagnostics[3], isA<DiagnosticsProperty<Element>>());
     expect(error.diagnostics[4], isA<DiagnosticsBlock>());
-    expect(error.toStringDeep(),
+    expect(
+      error.toStringDeep(),
       'FlutterError\n'
       '   No Material widget found.\n'
       '   ListTile widgets require a Material widget ancestor.\n'
@@ -40,12 +41,11 @@
       '   The specific widget that could not find a Material ancestor was:\n'
       '     ListTile\n'
       '   The ancestors of this widget were:\n'
-      '     [root]\n'
+      '     [root]\n',
     );
   });
 
-  testWidgets('debugCheckHasMaterialLocalizations control test', (
-      WidgetTester tester) async {
+  testWidgets('debugCheckHasMaterialLocalizations control test', (WidgetTester tester) async {
     await tester.pumpWidget(const BackButton());
     final dynamic exception = tester.takeException();
     expect(exception, isFlutterError);
@@ -62,7 +62,8 @@
     );
     expect(error.diagnostics[4], isA<DiagnosticsProperty<Element>>());
     expect(error.diagnostics[5], isA<DiagnosticsBlock>());
-    expect(error.toStringDeep(),
+    expect(
+      error.toStringDeep(),
       'FlutterError\n'
       '   No MaterialLocalizations found.\n'
       '   BackButton widgets require MaterialLocalizations to be provided\n'
@@ -76,12 +77,11 @@
       '   ancestor was:\n'
       '     BackButton\n'
       '   The ancestors of this widget were:\n'
-      '     [root]\n'
+      '     [root]\n',
     );
   });
 
-  testWidgets(
-      'debugCheckHasScaffold control test', (WidgetTester tester) async {
+  testWidgets('debugCheckHasScaffold control test', (WidgetTester tester) async {
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
@@ -93,10 +93,12 @@
         ),
         home: Builder(
           builder: (BuildContext context) {
-            showBottomSheet<void>(context: context,
-                builder: (BuildContext context) => Container());
+            showBottomSheet<void>(
+              context: context,
+              builder: (BuildContext context) => Container(),
+            );
             return Container();
-          }
+          },
         ),
       ),
     );
@@ -218,7 +220,7 @@
     final GlobalKey<ScaffoldMessengerState> _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
     final SnackBar snackBar = SnackBar(
       content: const Text('Snack'),
-      action: SnackBarAction(label: 'Test', onPressed: () {})
+      action: SnackBarAction(label: 'Test', onPressed: () {}),
     );
     await tester.pumpWidget(Directionality(
       textDirection: TextDirection.ltr,
@@ -232,10 +234,10 @@
                 key: _scaffoldKey,
                 body: Container(),
               );
-            }
-          )
+            },
+          ),
         ),
-      )
+      ),
     ));
     final List<dynamic> exceptions = <dynamic>[];
     final FlutterExceptionHandler? oldHandler = FlutterError.onError;
@@ -288,7 +290,7 @@
       '     Directionality\n'
       '     [root]\n'
       '   Typically, the ScaffoldMessenger widget is introduced by the\n'
-      '   MaterialApp at the top of your application widget tree.\n'
+      '   MaterialApp at the top of your application widget tree.\n',
     ));
   });
 }

diff --git a/packages/flutter/test/material/dialog_test.dart b/packages/flutter/test/material/dialog_test.dart
index bf09e1d..aba21dc 100644
--- a/packages/flutter/test/material/dialog_test.dart
+++ b/packages/flutter/test/material/dialog_test.dart

@@ -32,7 +32,7 @@
               },
             ),
           );
-        }
+        },
       ),
     ),
   );
@@ -1284,13 +1284,15 @@
       ),
     );
     await tester.pumpAndSettle();
-    expect(tester.getRect(find.byType(Placeholder)),
-        Rect.fromLTRB(
-          screenRect.left + 10.0,
-          screenRect.top + 20.0,
-          screenRect.right - 30.0,
-          screenRect.bottom - 40.0,
-        ));
+    expect(
+      tester.getRect(find.byType(Placeholder)),
+      Rect.fromLTRB(
+        screenRect.left + 10.0,
+        screenRect.top + 20.0,
+        screenRect.right - 30.0,
+        screenRect.bottom - 40.0,
+      ),
+    );
   });
 
   testWidgets('AlertDialog widget contains route semantics from title for iOS', (WidgetTester tester) async {
@@ -1326,8 +1328,8 @@
     );
 
     expect(semantics, isNot(includesNodeWith(
-        label: 'Title',
-        flags: <SemanticsFlag>[SemanticsFlag.namesRoute],
+      label: 'Title',
+      flags: <SemanticsFlag>[SemanticsFlag.namesRoute],
     )));
 
     await tester.tap(find.text('X'));
@@ -1346,14 +1348,14 @@
     final SemanticsTester semantics = SemanticsTester(tester);
 
     await tester.pumpWidget(
-        MaterialApp(
-          theme: ThemeData(platform: TargetPlatform.iOS),
-          home: const AlertDialog(
-            title: Text('title'),
-            content: Text('content'),
-            actions: <Widget>[ TextButton(onPressed: null, child: Text('action')) ],
-          ),
-        )
+      MaterialApp(
+        theme: ThemeData(platform: TargetPlatform.iOS),
+        home: const AlertDialog(
+          title: Text('title'),
+          content: Text('content'),
+          actions: <Widget>[ TextButton(onPressed: null, child: Text('action')) ],
+        ),
+      ),
     );
 
     expect(semantics, hasSemantics(TestSemantics.root(
@@ -1387,8 +1389,10 @@
                         ),
                         TestSemantics(
                           id: 7,
-                          flags: <SemanticsFlag>[SemanticsFlag.isButton,
-                            SemanticsFlag.hasEnabledState],
+                          flags: <SemanticsFlag>[
+                            SemanticsFlag.isButton,
+                            SemanticsFlag.hasEnabledState,
+                          ],
                           label: 'action',
                           textDirection: TextDirection.ltr,
                         ),
@@ -1509,16 +1513,16 @@
     final SemanticsTester semantics = SemanticsTester(tester);
 
     await tester.pumpWidget(
-        MaterialApp(
-          theme: ThemeData(platform: TargetPlatform.iOS),
-          home: const SimpleDialog(
-            title: Text('title'),
-            children: <Widget>[
-              Text('content'),
-              TextButton(onPressed: null, child: Text('action'))
-            ],
-          ),
-        )
+      MaterialApp(
+        theme: ThemeData(platform: TargetPlatform.iOS),
+        home: const SimpleDialog(
+          title: Text('title'),
+          children: <Widget>[
+            Text('content'),
+            TextButton(onPressed: null, child: Text('action')),
+          ],
+        ),
+      ),
     );
 
     expect(semantics, hasSemantics(TestSemantics.root(
@@ -1556,8 +1560,10 @@
                             ),
                             TestSemantics(
                               id: 8,
-                              flags: <SemanticsFlag>[SemanticsFlag.isButton,
-                                SemanticsFlag.hasEnabledState],
+                              flags: <SemanticsFlag>[
+                                SemanticsFlag.isButton,
+                                SemanticsFlag.hasEnabledState,
+                              ],
                               label: 'action',
                               textDirection: TextDirection.ltr,
                             ),
@@ -1946,7 +1952,7 @@
         navigatorObservers: <NavigatorObserver>[
           _ClosureNavigatorObserver(onDidChange: (Route<dynamic> newRoute) {
             currentRouteSetting = newRoute.settings;
-          })
+          }),
         ],
         home: const Material(
           child: Center(

diff --git a/packages/flutter/test/material/dialog_theme_test.dart b/packages/flutter/test/material/dialog_theme_test.dart
index be8a7c7..a82c887 100644
--- a/packages/flutter/test/material/dialog_theme_test.dart
+++ b/packages/flutter/test/material/dialog_theme_test.dart

@@ -87,7 +87,7 @@
     final ThemeData theme = ThemeData(dialogTheme: const DialogTheme(elevation: customElevation));
 
     await tester.pumpWidget(
-        _appWithDialog(tester, dialog, theme: theme)
+      _appWithDialog(tester, dialog, theme: theme),
     );
     await tester.tap(find.text('X'));
     await tester.pumpAndSettle();
@@ -106,7 +106,7 @@
     final ThemeData theme = ThemeData(dialogTheme: const DialogTheme(shape: customBorder));
 
     await tester.pumpWidget(
-      _appWithDialog(tester, dialog, theme: theme)
+      _appWithDialog(tester, dialog, theme: theme),
     );
     await tester.tap(find.text('X'));
     await tester.pumpAndSettle();

diff --git a/packages/flutter/test/material/dropdown_form_field_test.dart b/packages/flutter/test/material/dropdown_form_field_test.dart
index 91b47db..7c2babb 100644
--- a/packages/flutter/test/material/dropdown_form_field_test.dart
+++ b/packages/flutter/test/material/dropdown_form_field_test.dart

@@ -130,7 +130,7 @@
   final List<RRect> rrects = List<RRect>.generate(3, (int index) {
     return RRect.fromRectAndRadius(
       originalRectangle.shift(
-        boxShadows[index].offset
+        boxShadows[index].offset,
       ).inflate(boxShadows[index].spreadRadius),
       const Radius.circular(2.0),
     );
@@ -160,7 +160,7 @@
                 value: value,
                 hint: const Text('Select Value'),
                 decoration: const InputDecoration(
-                  prefixIcon: Icon(Icons.fastfood)
+                  prefixIcon: Icon(Icons.fastfood),
                 ),
                 items: menuItems.map((String value) {
                   return DropdownMenuItem<String>(

diff --git a/packages/flutter/test/material/dropdown_test.dart b/packages/flutter/test/material/dropdown_test.dart
index 41c8a7b..5818bd5 100644
--- a/packages/flutter/test/material/dropdown_test.dart
+++ b/packages/flutter/test/material/dropdown_test.dart

@@ -244,7 +244,7 @@
   final List<RRect> rrects = List<RRect>.generate(3, (int index) {
     return RRect.fromRectAndRadius(
       originalRectangle.shift(
-        boxShadows[index].offset
+        boxShadows[index].offset,
       ).inflate(boxShadows[index].spreadRadius),
       const Radius.circular(2.0),
     );
@@ -299,13 +299,14 @@
   expect(
     find.ancestor(
       of: find.text(text).last,
-      matching: find.byType(CustomPaint)).at(2),
+      matching: find.byType(CustomPaint),
+    ).at(2),
     paints
       ..save()
       ..rrect()
       ..rrect()
       ..rrect()
-      ..rrect(color: color ?? Colors.grey[50], hasMaskFilter: false)
+      ..rrect(color: color ?? Colors.grey[50], hasMaskFilter: false),
   );
 }
 
@@ -502,38 +503,38 @@
     final GlobalKey<FormState> formKey = GlobalKey<FormState>();
     String? value;
     await tester.pumpWidget(
-        StatefulBuilder(
-            builder: (BuildContext context, StateSetter setState) {
-              return MaterialApp(
-                home: Material(
-                  child: Form(
-                    key: formKey,
-                    child: DropdownButtonFormField<String>(
-                      key: buttonKey,
-                      value: value,
-                      hint: const Text('Select Value'),
-                      decoration: const InputDecoration(
-                          prefixIcon: Icon(Icons.fastfood)
-                      ),
-                      items: menuItems.map((String val) {
-                        return DropdownMenuItem<String>(
-                            value: val,
-                            child: Text(val)
-                        );
-                      }).toList(),
-                      validator: (String? v) => v == null ? 'Must select value' : null,
-                      onChanged: (String? newValue) {},
-                      onSaved: (String? v) {
-                        setState(() {
-                          value = v;
-                        });
-                      },
-                    ),
+      StatefulBuilder(
+        builder: (BuildContext context, StateSetter setState) {
+          return MaterialApp(
+            home: Material(
+              child: Form(
+                key: formKey,
+                child: DropdownButtonFormField<String>(
+                  key: buttonKey,
+                  value: value,
+                  hint: const Text('Select Value'),
+                  decoration: const InputDecoration(
+                    prefixIcon: Icon(Icons.fastfood),
                   ),
+                  items: menuItems.map((String val) {
+                    return DropdownMenuItem<String>(
+                      value: val,
+                      child: Text(val),
+                    );
+                  }).toList(),
+                  validator: (String? v) => v == null ? 'Must select value' : null,
+                  onChanged: (String? newValue) {},
+                  onSaved: (String? v) {
+                    setState(() {
+                      value = v;
+                    });
+                  },
                 ),
-              );
-            }
-        )
+              ),
+            ),
+          );
+        },
+      ),
     );
     int getIndex() {
       final IndexedStack stack = tester.element(find.byType(IndexedStack)).widget as IndexedStack;
@@ -710,8 +711,10 @@
         assert(textDirection != null);
         switch (textDirection) {
           case TextDirection.rtl:
-            expect(buttonBox.localToGlobal(buttonBox.size.bottomRight(Offset.zero)),
-                   equals(itemBox.localToGlobal(itemBox.size.bottomRight(Offset.zero))));
+            expect(
+              buttonBox.localToGlobal(buttonBox.size.bottomRight(Offset.zero)),
+              equals(itemBox.localToGlobal(itemBox.size.bottomRight(Offset.zero))),
+            );
             break;
           case TextDirection.ltr:
             expect(buttonBox.localToGlobal(Offset.zero), equals(itemBox.localToGlobal(Offset.zero)));
@@ -741,8 +744,10 @@
     assert(arrowIcon.attached);
 
     // Arrow icon should be aligned with far right of button when expanded
-    expect(arrowIcon.localToGlobal(Offset.zero).dx,
-        buttonBox.size.centerRight(Offset(-arrowIcon.size.width, 0.0)).dx);
+    expect(
+      arrowIcon.localToGlobal(Offset.zero).dx,
+      buttonBox.size.centerRight(Offset(-arrowIcon.size.width, 0.0)).dx,
+    );
   });
 
   testWidgets('Dropdown button icon will accept widgets as icons', (WidgetTester tester) async {
@@ -954,7 +959,8 @@
     final Finder menuItemFinder = find.byType(Scrollable);
     final RenderBox menuItemContainer = tester.renderObject<RenderBox>(menuItemFinder);
     final RenderBox firstItem = tester.renderObject<RenderBox>(
-      find.descendant(of: menuItemFinder, matching: find.byKey(const ValueKey<String>('0'))));
+      find.descendant(of: menuItemFinder, matching: find.byKey(const ValueKey<String>('0'))),
+    );
 
     // List should be scrolled so that the first item is at the top. Menu items
     // are offset 8.0 from the top edge of the scrollable menu.
@@ -980,7 +986,8 @@
 
     // Find the selected item in the scrollable dropdown list
     final RenderBox selectedItem = tester.renderObject<RenderBox>(
-      find.descendant(of: find.byType(Scrollable), matching: find.byKey(const ValueKey<String>('50'))));
+      find.descendant(of: find.byType(Scrollable), matching: find.byKey(const ValueKey<String>('50'))),
+    );
 
     // List should be scrolled so that the selected item is in line with the button
     expect(
@@ -1171,19 +1178,19 @@
     // so that it fits within the frame.
 
     await popUpAndDown(
-      buildFrame(alignment: Alignment.topLeft, value: menuItems.last, onChanged: onChanged)
+      buildFrame(alignment: Alignment.topLeft, value: menuItems.last, onChanged: onChanged),
     );
     expect(menuRect.topLeft, Offset.zero);
     expect(menuRect.topRight, Offset(menuRect.width, 0.0));
 
     await popUpAndDown(
-      buildFrame(alignment: Alignment.topCenter, value: menuItems.last, onChanged: onChanged)
+      buildFrame(alignment: Alignment.topCenter, value: menuItems.last, onChanged: onChanged),
     );
     expect(menuRect.topLeft, Offset(buttonRect.left, 0.0));
     expect(menuRect.topRight, Offset(buttonRect.right, 0.0));
 
     await popUpAndDown(
-      buildFrame(alignment: Alignment.topRight, value: menuItems.last, onChanged: onChanged)
+      buildFrame(alignment: Alignment.topRight, value: menuItems.last, onChanged: onChanged),
     );
     expect(menuRect.topLeft, Offset(800.0 - menuRect.width, 0.0));
     expect(menuRect.topRight, const Offset(800.0, 0.0));
@@ -1193,19 +1200,19 @@
     // is selected) and shifted horizontally so that it fits within the frame.
 
     await popUpAndDown(
-      buildFrame(alignment: Alignment.centerLeft, value: menuItems.first, onChanged: onChanged)
+      buildFrame(alignment: Alignment.centerLeft, value: menuItems.first, onChanged: onChanged),
     );
     expect(menuRect.topLeft, Offset(0.0, buttonRect.top));
     expect(menuRect.topRight, Offset(menuRect.width, buttonRect.top));
 
     await popUpAndDown(
-      buildFrame(alignment: Alignment.center, value: menuItems.first, onChanged: onChanged)
+      buildFrame(alignment: Alignment.center, value: menuItems.first, onChanged: onChanged),
     );
     expect(menuRect.topLeft, buttonRect.topLeft);
     expect(menuRect.topRight, buttonRect.topRight);
 
     await popUpAndDown(
-      buildFrame(alignment: Alignment.centerRight, value: menuItems.first, onChanged: onChanged)
+      buildFrame(alignment: Alignment.centerRight, value: menuItems.first, onChanged: onChanged),
     );
     expect(menuRect.topLeft, Offset(800.0 - menuRect.width, buttonRect.top));
     expect(menuRect.topRight, Offset(800.0, buttonRect.top));
@@ -1215,19 +1222,19 @@
     // so that it fits within the frame.
 
     await popUpAndDown(
-      buildFrame(alignment: Alignment.bottomLeft, value: menuItems.first, onChanged: onChanged)
+      buildFrame(alignment: Alignment.bottomLeft, value: menuItems.first, onChanged: onChanged),
     );
     expect(menuRect.bottomLeft, const Offset(0.0, 600.0));
     expect(menuRect.bottomRight, Offset(menuRect.width, 600.0));
 
     await popUpAndDown(
-      buildFrame(alignment: Alignment.bottomCenter, value: menuItems.first, onChanged: onChanged)
+      buildFrame(alignment: Alignment.bottomCenter, value: menuItems.first, onChanged: onChanged),
     );
     expect(menuRect.bottomLeft, Offset(buttonRect.left, 600.0));
     expect(menuRect.bottomRight, Offset(buttonRect.right, 600.0));
 
     await popUpAndDown(
-      buildFrame(alignment: Alignment.bottomRight, value: menuItems.first, onChanged: onChanged)
+      buildFrame(alignment: Alignment.bottomRight, value: menuItems.first, onChanged: onChanged),
     );
     expect(menuRect.bottomLeft, Offset(800.0 - menuRect.width, 600.0));
     expect(menuRect.bottomRight, const Offset(800.0, 600.0));
@@ -1392,7 +1399,8 @@
       buttonKey: buttonKey,
       value: null,
       hint: const Text('enabled'),
-      disabledHint: const Text('disabled'));
+      disabledHint: const Text('disabled'),
+    );
 
     // [disabledHint] should display when [items] is null
     await tester.pumpWidget(build(items: null, onChanged: onChanged));
@@ -1502,7 +1510,7 @@
             child: Column(children: <Widget>[
               DropdownButtonFormField<String>(
                 style: const TextStyle(
-                  color: Colors.yellow
+                  color: Colors.yellow,
                 ),
                 disabledHint: disabledHint,
                 hint: hint,
@@ -1516,9 +1524,9 @@
                     value: 'two',
                   ),
                 ],
-              value: value,
-              onChanged: onChanged,
-              )
+                value: value,
+                onChanged: onChanged,
+              ),
             ]),
           ),
         ),
@@ -1634,7 +1642,7 @@
         hint: const SizedBox(
           height: 50,
           width: 50,
-          child: Text('hint')
+          child: Text('hint'),
         ),
         items: items,
         itemHeight: null,
@@ -1752,7 +1760,7 @@
         hint: const SizedBox(
           height: 125,
           width: 125,
-          child: Text('hint')
+          child: Text('hint'),
         ),
         items: items,
         itemHeight: null,
@@ -1790,7 +1798,7 @@
         disabledHint: const SizedBox(
           height: 50,
           width: 50,
-          child: Text('hint')
+          child: Text('hint'),
         ),
         items: items,
         itemHeight: null,
@@ -1828,7 +1836,7 @@
         disabledHint: const SizedBox(
           height: 125,
           width: 125,
-          child: Text('hint')
+          child: Text('hint'),
         ),
         items: items,
         itemHeight: null,
@@ -1855,9 +1863,10 @@
   );
 
   testWidgets('Dropdown in middle showing middle item', (WidgetTester tester) async {
-    final List<DropdownMenuItem<int>> items =
-      List<DropdownMenuItem<int>>.generate(100, (int i) =>
-        DropdownMenuItem<int>(value: i, child: Text('$i')));
+    final List<DropdownMenuItem<int>> items = List<DropdownMenuItem<int>>.generate(
+      100,
+      (int i) => DropdownMenuItem<int>(value: i, child: Text('$i')),
+    );
 
     final DropdownButton<int> button = DropdownButton<int>(
       value: 50,
@@ -1891,9 +1900,10 @@
   });
 
   testWidgets('Dropdown in top showing bottom item', (WidgetTester tester) async {
-    final List<DropdownMenuItem<int>> items =
-      List<DropdownMenuItem<int>>.generate(100, (int i) =>
-        DropdownMenuItem<int>(value: i, child: Text('$i')));
+    final List<DropdownMenuItem<int>> items = List<DropdownMenuItem<int>>.generate(
+      100,
+      (int i) => DropdownMenuItem<int>(value: i, child: Text('$i')),
+    );
 
     final DropdownButton<int> button = DropdownButton<int>(
       value: 99,
@@ -1927,9 +1937,10 @@
   });
 
   testWidgets('Dropdown in bottom showing top item', (WidgetTester tester) async {
-    final List<DropdownMenuItem<int>> items =
-      List<DropdownMenuItem<int>>.generate(100, (int i) =>
-        DropdownMenuItem<int>(value: i, child: Text('$i')));
+    final List<DropdownMenuItem<int>> items = List<DropdownMenuItem<int>>.generate(
+      100,
+      (int i) => DropdownMenuItem<int>(value: i, child: Text('$i')),
+    );
 
     final DropdownButton<int> button = DropdownButton<int>(
       value: 0,
@@ -1963,9 +1974,10 @@
   });
 
   testWidgets('Dropdown in center showing bottom item', (WidgetTester tester) async {
-    final List<DropdownMenuItem<int>> items =
-      List<DropdownMenuItem<int>>.generate(100, (int i) =>
-        DropdownMenuItem<int>(value: i, child: Text('$i')));
+    final List<DropdownMenuItem<int>> items = List<DropdownMenuItem<int>>.generate(
+      100,
+      (int i) => DropdownMenuItem<int>(value: i, child: Text('$i')),
+    );
 
     final DropdownButton<int> button = DropdownButton<int>(
       value: 99,
@@ -2060,8 +2072,12 @@
       matching: find.byType(DecoratedBox),
     );
 
-    await tester.pumpWidget(buildFrame(buttonKey: buttonKey, underline: customUnderline,
-        value: 'two', onChanged: onChanged));
+    await tester.pumpWidget(buildFrame(
+      buttonKey: buttonKey,
+      underline: customUnderline,
+      value: 'two',
+      onChanged: onChanged,
+    ));
     expect(tester.widgetList<DecoratedBox>(decoratedBox).last.decoration, decoration);
 
     await tester.pumpWidget(buildFrame(buttonKey: buttonKey, value: 'two', onChanged: onChanged));
@@ -2489,8 +2505,7 @@
   });
 
   // Regression test for https://github.com/flutter/flutter/issues/77655.
-  testWidgets('DropdownButton selecting a null valued item should be selected',
-      (WidgetTester tester) async {
+  testWidgets('DropdownButton selecting a null valued item should be selected', (WidgetTester tester) async {
     final List<MapEntry<String?, String>> items = <MapEntry<String?, String>>[
       const MapEntry<String?, String>(null, 'None'),
       const MapEntry<String?, String>('one', 'One'),
@@ -2530,8 +2545,7 @@
     expect(find.text('None'), findsOneWidget);
   });
 
-  testWidgets('DropdownButton is activated with the space key',
-      (WidgetTester tester) async {
+  testWidgets('DropdownButton is activated with the space key', (WidgetTester tester) async {
     final FocusNode focusNode = FocusNode(debugLabel: 'DropdownButton');
     String? value = 'one';
 
@@ -3158,7 +3172,7 @@
         ..rrect()
         ..rrect()
         // The height of menu is 47.0.
-        ..rrect(rrect: const RRect.fromLTRBXY(0.0, 0.0, 112.0, 47.0, 2.0, 2.0), color: Colors.grey[50], hasMaskFilter: false)
+        ..rrect(rrect: const RRect.fromLTRBXY(0.0, 0.0, 112.0, 47.0, 2.0, 2.0), color: Colors.grey[50], hasMaskFilter: false),
     );
   });
 
@@ -3223,7 +3237,7 @@
               DropdownMenuItem<String>(
                 value: 'enabled',
                 child: Text('enabled'),
-              )
+              ),
             ],
           ),
         ),

diff --git a/packages/flutter/test/material/elevated_button_test.dart b/packages/flutter/test/material/elevated_button_test.dart
index 951aae3..608e784 100644
--- a/packages/flutter/test/material/elevated_button_test.dart
+++ b/packages/flutter/test/material/elevated_button_test.dart

@@ -951,7 +951,7 @@
                   child: ElevatedButton(
                     style: ElevatedButton.styleFrom(padding: const EdgeInsets.all(22)),
                     onPressed: () {},
-                    child: const Text('ElevatedButton')
+                    child: const Text('ElevatedButton'),
                   ),
                 ),
               ),

diff --git a/packages/flutter/test/material/expand_icon_test.dart b/packages/flutter/test/material/expand_icon_test.dart
index 14a4bab..2b6fffb 100644
--- a/packages/flutter/test/material/expand_icon_test.dart
+++ b/packages/flutter/test/material/expand_icon_test.dart

@@ -24,7 +24,7 @@
       child: ExpandIcon(
         onPressed: (bool isExpanded) {
           expanded = !expanded;
-        }
+        },
       ),
     ));
     await tester.pumpAndSettle();
@@ -140,7 +140,7 @@
     );
 
     await tester.pumpWidget(wrap(
-      child: expandIcon
+      child: expandIcon,
     ));
 
     final ExpandIcon icon = tester.firstWidget(find.byWidget(expandIcon));
@@ -154,7 +154,7 @@
     );
 
     await tester.pumpWidget(wrap(
-      child: expandIcon
+      child: expandIcon,
     ));
 
     ExpandIcon icon = tester.firstWidget(find.byWidget(expandIcon));
@@ -166,7 +166,7 @@
     );
 
     await tester.pumpWidget(wrap(
-      child: expandIcon
+      child: expandIcon,
     ));
 
     icon = tester.firstWidget(find.byWidget(expandIcon));

diff --git a/packages/flutter/test/material/expansion_panel_test.dart b/packages/flutter/test/material/expansion_panel_test.dart
index a850f2a..6a3240f 100644
--- a/packages/flutter/test/material/expansion_panel_test.dart
+++ b/packages/flutter/test/material/expansion_panel_test.dart

@@ -728,8 +728,8 @@
               home: Scaffold(
                 body: SingleChildScrollView(
                   child: isRadioList
-                  ? buildRadioExpansionPanelList()
-                  : buildExpansionPanelList(setState)
+                    ? buildRadioExpansionPanelList()
+                    : buildExpansionPanelList(setState),
                 ),
                 floatingActionButton: FloatingActionButton(
                   onPressed: () => setState(() { isRadioList = !isRadioList; }),
@@ -828,7 +828,7 @@
                     ],
                   ),
                 );
-              }
+              },
             ),
           );
         },
@@ -891,7 +891,7 @@
               ),
             ),
           );
-        }
+        },
       ),
     );
 
@@ -1453,7 +1453,7 @@
     expect(exception, isAssertionError);
     expect((exception as AssertionError).toString(), contains(
       'Invalid value for elevation. See the kElevationToShadow constant for'
-      ' possible elevation values.'
+      ' possible elevation values.',
     ));
   });
 

diff --git a/packages/flutter/test/material/expansion_tile_test.dart b/packages/flutter/test/material/expansion_tile_test.dart
index 26e3892..e829a4c 100644
--- a/packages/flutter/test/material/expansion_tile_test.dart
+++ b/packages/flutter/test/material/expansion_tile_test.dart

@@ -230,37 +230,38 @@
   });
 
   testWidgets('ExpansionTile maintainState', (WidgetTester tester) async {
-     await tester.pumpWidget(
-       MaterialApp(
-         theme: ThemeData(
-           platform: TargetPlatform.iOS,
-           dividerColor: _dividerColor,
-         ),
-         home: Material(
-           child: SingleChildScrollView(
-             child: Column(
-               children: const <Widget>[
-                 ExpansionTile(
-                   title: Text('Tile 1'),
-                   initiallyExpanded: false,
-                   maintainState: true,
-                   children: <Widget>[
-                     Text('Maintaining State'),
-                   ],
-                 ),
-                 ExpansionTile(
-                   title: Text('Title 2'),
-                   initiallyExpanded: false,
-                   maintainState: false,
-                   children: <Widget>[
-                     Text('Discarding State'),
-                   ],
-                 ),
-               ],
-             ),
-           ),
-         ),
-     ));
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: ThemeData(
+          platform: TargetPlatform.iOS,
+          dividerColor: _dividerColor,
+        ),
+        home: Material(
+          child: SingleChildScrollView(
+            child: Column(
+              children: const <Widget>[
+                ExpansionTile(
+                  title: Text('Tile 1'),
+                  initiallyExpanded: false,
+                  maintainState: true,
+                  children: <Widget>[
+                    Text('Maintaining State'),
+                  ],
+                ),
+                ExpansionTile(
+                  title: Text('Title 2'),
+                  initiallyExpanded: false,
+                  maintainState: false,
+                  children: <Widget>[
+                    Text('Discarding State'),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
 
      // This text should be offstage while ExpansionTile collapsed
      expect(find.text('Maintaining State', skipOffstage: false), findsOneWidget);
@@ -381,8 +382,10 @@
         ),
       );
     } on AssertionError catch (error) {
-      expect(error.toString(), contains('CrossAxisAlignment.baseline is not supported since the expanded'
-          ' children are aligned in a column, not a row. Try to use another constant.'));
+      expect(error.toString(), contains(
+        'CrossAxisAlignment.baseline is not supported since the expanded'
+        ' children are aligned in a column, not a row. Try to use another constant.',
+      ));
       return;
     }
     fail('AssertionError was not thrown when expandedCrossAxisAlignment is CrossAxisAlignment.baseline.');

diff --git a/packages/flutter/test/material/flexible_space_bar_test.dart b/packages/flutter/test/material/flexible_space_bar_test.dart
index 9c9985e..a39927b 100644
--- a/packages/flutter/test/material/flexible_space_bar_test.dart
+++ b/packages/flutter/test/material/flexible_space_bar_test.dart

@@ -218,7 +218,7 @@
                                   rect: const Rect.fromLTRB(0.0, 0.0, 100.0, 20.0),
                                   flags: <SemanticsFlag>[
                                     SemanticsFlag.isHeader,
-                                    SemanticsFlag.namesRoute
+                                    SemanticsFlag.namesRoute,
                                   ],
                                   label: 'Title',
                                   textDirection: TextDirection.ltr,
@@ -324,7 +324,7 @@
                                   rect: const Rect.fromLTRB(0.0, 0.0, 100.0, 20.0),
                                   flags: <SemanticsFlag>[
                                     SemanticsFlag.isHeader,
-                                    SemanticsFlag.namesRoute
+                                    SemanticsFlag.namesRoute,
                                   ],
                                   label: 'Title',
                                   textDirection: TextDirection.ltr,
@@ -449,7 +449,7 @@
                   ),
                 ],
               );
-            }
+            },
           ),
         ),
       ),

diff --git a/packages/flutter/test/material/floating_action_button_location_test.dart b/packages/flutter/test/material/floating_action_button_location_test.dart
index 6796a0f..7a892f6 100644
--- a/packages/flutter/test/material/floating_action_button_location_test.dart
+++ b/packages/flutter/test/material/floating_action_button_location_test.dart

@@ -130,8 +130,7 @@
           final Iterable<RotationTransition> rotationTransitions = tester.widgetList(
             find.byType(RotationTransition),
           );
-          final Iterable<double> currentRotations = rotationTransitions.map(
-              (RotationTransition t) => t.turns.value);
+          final Iterable<double> currentRotations = rotationTransitions.map((RotationTransition t) => t.turns.value);
 
           if (previousRotations != null && previousRotations!.isNotEmpty
               && currentRotations != null && currentRotations.isNotEmpty
@@ -657,10 +656,10 @@
                   mini: mini,
                   key: key,
                 );
-              }
+              },
             ),
-          )
-        )
+          ),
+        ),
       );
     }
 
@@ -775,7 +774,7 @@
         const MediaQueryData(
           padding: EdgeInsets.only(bottom: viewPadding),
           viewPadding: EdgeInsets.only(bottom: viewPadding),
-          viewInsets: EdgeInsets.only(bottom: keyboardHeight)
+          viewInsets: EdgeInsets.only(bottom: keyboardHeight),
         ),
         floatingActionButton,
         bottomNavigationBar: true,
@@ -834,7 +833,7 @@
         const MediaQueryData(
           padding: EdgeInsets.only(bottom: viewPadding),
           viewPadding: EdgeInsets.only(bottom: viewPadding),
-          viewInsets: EdgeInsets.only(bottom: keyboardHeight)
+          viewInsets: EdgeInsets.only(bottom: keyboardHeight),
         ),
         floatingActionButton,
         bottomNavigationBar: true,
@@ -884,7 +883,7 @@
         location,
         const MediaQueryData(
           viewPadding: EdgeInsets.only(bottom: viewPadding),
-          viewInsets: EdgeInsets.only(bottom: keyboardHeight)
+          viewInsets: EdgeInsets.only(bottom: keyboardHeight),
         ),
         floatingActionButton,
         bottomSheet: true,
@@ -915,7 +914,7 @@
         location,
         const MediaQueryData(
           viewPadding: EdgeInsets.only(bottom: viewPadding),
-          viewInsets: EdgeInsets.only(bottom: keyboardHeight)
+          viewInsets: EdgeInsets.only(bottom: keyboardHeight),
         ),
         floatingActionButton,
         mini: mini,
@@ -1162,7 +1161,7 @@
         const MediaQueryData(
           padding: EdgeInsets.only(bottom: viewPadding),
           viewPadding: EdgeInsets.only(bottom: viewPadding),
-          viewInsets: EdgeInsets.only(bottom: keyboardHeight)
+          viewInsets: EdgeInsets.only(bottom: keyboardHeight),
         ),
         floatingActionButton,
         bottomNavigationBar: true,
@@ -1223,7 +1222,7 @@
         const MediaQueryData(
           padding: EdgeInsets.only(bottom: viewPadding),
           viewPadding: EdgeInsets.only(bottom: viewPadding),
-          viewInsets: EdgeInsets.only(bottom: keyboardHeight)
+          viewInsets: EdgeInsets.only(bottom: keyboardHeight),
         ),
         floatingActionButton,
         bottomNavigationBar: true,
@@ -1273,7 +1272,7 @@
         location,
         const MediaQueryData(
           viewPadding: EdgeInsets.only(bottom: viewPadding),
-          viewInsets: EdgeInsets.only(bottom: keyboardHeight)
+          viewInsets: EdgeInsets.only(bottom: keyboardHeight),
         ),
         floatingActionButton,
         mini: mini,
@@ -1526,7 +1525,7 @@
   @override
   Widget build(BuildContext context) {
     return CustomPaint(
-      painter: cache
+      painter: cache,
     );
   }
 
@@ -1642,18 +1641,19 @@
       DefaultMaterialLocalizations.delegate,
     ],
     child: Directionality(
-    textDirection: textDirection,
-    child: MediaQuery(
-      data: MediaQueryData(viewInsets: viewInsets),
-      child: Scaffold(
-        appBar: AppBar(title: const Text('FabLocation Test')),
-        floatingActionButtonLocation: location,
-        floatingActionButton: fab,
-        bottomNavigationBar: bab,
-        body: listener,
+      textDirection: textDirection,
+      child: MediaQuery(
+        data: MediaQueryData(viewInsets: viewInsets),
+        child: Scaffold(
+          appBar: AppBar(title: const Text('FabLocation Test')),
+          floatingActionButtonLocation: location,
+          floatingActionButton: fab,
+          bottomNavigationBar: bab,
+          body: listener,
+        ),
       ),
     ),
-  ));
+  );
 }
 
 class _StartTopFloatingActionButtonLocation extends FloatingActionButtonLocation {

diff --git a/packages/flutter/test/material/grid_title_test.dart b/packages/flutter/test/material/grid_title_test.dart
index 560731a..7cee24b 100644
--- a/packages/flutter/test/material/grid_title_test.dart
+++ b/packages/flutter/test/material/grid_title_test.dart

@@ -35,8 +35,10 @@
     expect(find.text('Header'), findsOneWidget);
     expect(find.text('Footer'), findsOneWidget);
 
-    expect(tester.getBottomLeft(find.byKey(headerKey)).dy,
-           lessThan(tester.getTopLeft(find.byKey(footerKey)).dy));
+    expect(
+      tester.getBottomLeft(find.byKey(headerKey)).dy,
+      lessThan(tester.getTopLeft(find.byKey(footerKey)).dy),
+    );
 
     await tester.pumpWidget(
       const Directionality(

diff --git a/packages/flutter/test/material/icon_button_test.dart b/packages/flutter/test/material/icon_button_test.dart
index f2495aa..01c4a6f 100644
--- a/packages/flutter/test/material/icon_button_test.dart
+++ b/packages/flutter/test/material/icon_button_test.dart

@@ -337,8 +337,7 @@
     await gesture.up();
   });
 
-  testWidgets('IconButton with explicit splash radius',
-      (WidgetTester tester) async {
+  testWidgets('IconButton with explicit splash radius', (WidgetTester tester) async {
     const double splashRadius = 30.0;
     await tester.pumpWidget(
       MaterialApp(
@@ -362,7 +361,7 @@
     expect(
       Material.of(tester.element(find.byType(IconButton))),
       paints
-        ..circle(radius: splashRadius)
+        ..circle(radius: splashRadius),
     );
 
     await gesture.up();

diff --git a/packages/flutter/test/material/icons_test.dart b/packages/flutter/test/material/icons_test.dart
index 9b7033d..7e75d79 100644
--- a/packages/flutter/test/material/icons_test.dart
+++ b/packages/flutter/test/material/icons_test.dart

@@ -99,9 +99,7 @@
   );
 
   final Future<ByteData> bytes = Future<ByteData>.value(
-      iconFont.readAsBytesSync()
-      .buffer
-      .asByteData()
+      iconFont.readAsBytesSync().buffer.asByteData(),
   );
 
   await (FontLoader('MaterialIcons')..addFont(bytes)).load();

diff --git a/packages/flutter/test/material/ink_splash_test.dart b/packages/flutter/test/material/ink_splash_test.dart
index 3722753..0537aae 100644
--- a/packages/flutter/test/material/ink_splash_test.dart
+++ b/packages/flutter/test/material/ink_splash_test.dart

@@ -12,14 +12,15 @@
   testWidgets('InkSplash receives textDirection', (WidgetTester tester) async {
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(
-      appBar: AppBar(title: const Text('Button Border Test')),
-      body: Center(
-        child: ElevatedButton(
-          child: const Text('Test'),
-          onPressed: () { },
+        appBar: AppBar(title: const Text('Button Border Test')),
+        body: Center(
+          child: ElevatedButton(
+            child: const Text('Test'),
+            onPressed: () { },
+          ),
         ),
       ),
-    )));
+    ));
     await tester.tap(find.text('Test'));
     // start ink animation which asserts for a textDirection.
     await tester.pumpAndSettle(const Duration(milliseconds: 30));

diff --git a/packages/flutter/test/material/ink_well_test.dart b/packages/flutter/test/material/ink_well_test.dart
index 2e01e81..f5a9cb0 100644
--- a/packages/flutter/test/material/ink_well_test.dart
+++ b/packages/flutter/test/material/ink_well_test.dart

@@ -221,8 +221,10 @@
     expect(inkFeatures, paintsExactlyCountTimes(#drawRect, 0));
     focusNode.requestFocus();
     await tester.pumpAndSettle();
-    expect(inkFeatures, paints
-      ..rect(rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0), color: const Color(0xff0000ff)));
+    expect(
+      inkFeatures,
+      paints ..rect(rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0), color: const Color(0xff0000ff)),
+    );
   });
 
   testWidgets('ink response changes color on focus with overlayColor', (WidgetTester tester) async {
@@ -264,8 +266,10 @@
     expect(inkFeatures, paintsExactlyCountTimes(#drawRect, 0));
     focusNode.requestFocus();
     await tester.pumpAndSettle();
-    expect(inkFeatures, paints
-           ..rect(rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0), color: const Color(0xff0000ff)));
+    expect(
+      inkFeatures,
+      paints..rect(rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0), color: const Color(0xff0000ff)),
+    );
   });
 
   testWidgets('ink response splashColor matches splashColor parameter', (WidgetTester tester) async {
@@ -1104,7 +1108,7 @@
                           child: rightChild,
                         ),
                       ),
-                    )
+                    ),
                   ),
                 ],
               ),

diff --git a/packages/flutter/test/material/input_decorator_test.dart b/packages/flutter/test/material/input_decorator_test.dart
index 8ae3805..3a2144f 100644
--- a/packages/flutter/test/material/input_decorator_test.dart
+++ b/packages/flutter/test/material/input_decorator_test.dart

@@ -178,7 +178,7 @@
         // isFocused: false (default)
         decoration: const InputDecoration(
           labelText: 'label',
-          floatingLabelBehavior: FloatingLabelBehavior.always
+          floatingLabelBehavior: FloatingLabelBehavior.always,
         ),
       ),
     );
@@ -193,7 +193,7 @@
         // isFocused: false (default)
         decoration: const InputDecoration(
           labelText: 'label',
-          floatingLabelBehavior: FloatingLabelBehavior.never
+          floatingLabelBehavior: FloatingLabelBehavior.never,
         ),
       ),
     );
@@ -3137,7 +3137,7 @@
     ]));
 
     final Set<Object> nodeValues = Set<Object>.from(
-      renderer.debugDescribeChildren().map<Object>((DiagnosticsNode node) => node.value!)
+      renderer.debugDescribeChildren().map<Object>((DiagnosticsNode node) => node.value!),
     );
     expect(nodeValues.length, 11);
   });

diff --git a/packages/flutter/test/material/list_tile_test.dart b/packages/flutter/test/material/list_tile_test.dart
index 98292a7..d75e750 100644
--- a/packages/flutter/test/material/list_tile_test.dart
+++ b/packages/flutter/test/material/list_tile_test.dart

@@ -293,7 +293,7 @@
                     title: TestText('title', key: titleKey),
                     subtitle: TestText('subtitle', key: subtitleKey),
                   );
-                }
+                },
               ),
             ),
           ),
@@ -1284,10 +1284,12 @@
       paints
         ..rect(
             color: Colors.orange[500],
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0)),
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          ),
     );
 
     // Check when the list tile is disabled.
@@ -1299,7 +1301,8 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0)),
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          ),
     );
   });
 
@@ -1334,10 +1337,12 @@
       paints
         ..rect(
             color: const Color(0x1f000000),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0)),
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          ),
     );
 
     // Start hovering
@@ -1353,13 +1358,16 @@
       paints
         ..rect(
             color: const Color(0x1f000000),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..rect(
             color: Colors.orange[500],
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0)),
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          ),
     );
 
     await tester.pumpWidget(buildApp(enabled: false));
@@ -1370,10 +1378,12 @@
       paints
         ..rect(
             color: Colors.orange[500],
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0)),
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          ),
     );
   });
 
@@ -2024,7 +2034,7 @@
   testWidgets('ListTile horizontalTitleGap with visualDensity', (WidgetTester tester) async {
     Widget buildFrame({
       double? horizontalTitleGap,
-      VisualDensity? visualDensity
+      VisualDensity? visualDensity,
     }) {
       return MediaQuery(
         data: const MediaQueryData(

diff --git a/packages/flutter/test/material/material_button_test.dart b/packages/flutter/test/material/material_button_test.dart
index 55d96a0..ebd769a 100644
--- a/packages/flutter/test/material/material_button_test.dart
+++ b/packages/flutter/test/material/material_button_test.dart

@@ -846,8 +846,8 @@
     const double disabledElevation = 16;
 
     final Finder rawMaterialButtonFinder = find.descendant(
-        of: find.byType(MaterialButton),
-        matching: find.byType(RawMaterialButton)
+      of: find.byType(MaterialButton),
+      matching: find.byType(RawMaterialButton),
     );
 
     await tester.pumpWidget(
@@ -867,8 +867,8 @@
 
   testWidgets('MaterialButton.disabledElevation defaults to 0.0 when not provided', (WidgetTester tester) async {
     final Finder rawMaterialButtonFinder = find.descendant(
-        of: find.byType(MaterialButton),
-        matching: find.byType(RawMaterialButton)
+      of: find.byType(MaterialButton),
+      matching: find.byType(RawMaterialButton),
     );
 
     await tester.pumpWidget(

diff --git a/packages/flutter/test/material/material_test.dart b/packages/flutter/test/material/material_test.dart
index b71635c..0d6d6c0 100644
--- a/packages/flutter/test/material/material_test.dart
+++ b/packages/flutter/test/material/material_test.dart

@@ -435,7 +435,7 @@
       expect(
         find.byKey(materialKey),
         clipsWithBoundingRRect(
-          borderRadius: const BorderRadius.all(Radius.circular(10.0))
+          borderRadius: const BorderRadius.all(Radius.circular(10.0)),
         ),
       );
     });

diff --git a/packages/flutter/test/material/mergeable_material_test.dart b/packages/flutter/test/material/mergeable_material_test.dart
index 913a891..ab44a41 100644
--- a/packages/flutter/test/material/mergeable_material_test.dart
+++ b/packages/flutter/test/material/mergeable_material_test.dart

@@ -222,7 +222,7 @@
     );
 
     final RRect rrect = kMaterialEdges[MaterialType.card]!.toRRect(
-      const Rect.fromLTRB(0.0, 0.0, 800.0, 100.0)
+      const Rect.fromLTRB(0.0, 0.0, 800.0, 100.0),
     );
     expect(
       find.byType(MergeableMaterial),
@@ -248,7 +248,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('x')
+                  key: ValueKey<String>('x'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
@@ -358,7 +358,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('x')
+                  key: ValueKey<String>('x'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
@@ -436,7 +436,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('x')
+                  key: ValueKey<String>('x'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
@@ -517,7 +517,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('x')
+                  key: ValueKey<String>('x'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
@@ -745,7 +745,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('x')
+                  key: ValueKey<String>('x'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
@@ -755,7 +755,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('y')
+                  key: ValueKey<String>('y'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
@@ -801,7 +801,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('x')
+                  key: ValueKey<String>('x'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
@@ -811,7 +811,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('y')
+                  key: ValueKey<String>('y'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
@@ -889,7 +889,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('x')
+                  key: ValueKey<String>('x'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
@@ -925,7 +925,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('y')
+                  key: ValueKey<String>('y'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
@@ -935,7 +935,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('z')
+                  key: ValueKey<String>('z'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
@@ -981,7 +981,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('x')
+                  key: ValueKey<String>('x'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
@@ -991,7 +991,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('y')
+                  key: ValueKey<String>('y'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
@@ -1028,7 +1028,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('z')
+                  key: ValueKey<String>('z'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
@@ -1148,7 +1148,7 @@
                   ),
                 ),
                 MaterialGap(
-                  key: ValueKey<String>('x')
+                  key: ValueKey<String>('x'),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),

diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart
index b0dc553..1b59f0b 100644
--- a/packages/flutter/test/material/outline_button_test.dart
+++ b/packages/flutter/test/material/outline_button_test.dart

@@ -779,8 +779,8 @@
     expect(tester.widget<OutlineButton>(outlineButton).enabled, false);
     expect(
       outlineButton,
-      paints
-        ..path(color: disabledBorderColor, strokeWidth: borderWidth));
+      paints..path(color: disabledBorderColor, strokeWidth: borderWidth),
+    );
     _checkPhysicalLayer(
       tester.element(outlineButton),
       const Color(0x00000000),
@@ -800,8 +800,8 @@
     expect(tester.widget<OutlineButton>(outlineButton).enabled, true);
     expect(
       outlineButton,
-      paints
-        ..path(color: borderColor, strokeWidth: borderWidth));
+      paints..path(color: borderColor, strokeWidth: borderWidth),
+    );
     // initially, the interior of the button is transparent
     _checkPhysicalLayer(
       tester.element(outlineButton),
@@ -818,8 +818,8 @@
     await tester.pump(const Duration(milliseconds: 200));
     expect(
       outlineButton,
-      paints
-        ..path(color: highlightedBorderColor, strokeWidth: borderWidth));
+      paints..path(color: highlightedBorderColor, strokeWidth: borderWidth),
+    );
     _checkPhysicalLayer(
       tester.element(outlineButton),
       fillColor.withAlpha(0xFF),
@@ -832,8 +832,8 @@
     await tester.pumpAndSettle();
     expect(
       outlineButton,
-      paints
-        ..path(color: borderColor, strokeWidth: borderWidth));
+      paints..path(color: borderColor, strokeWidth: borderWidth),
+    );
     _checkPhysicalLayer(
       tester.element(outlineButton),
       fillColor.withAlpha(0x00),
@@ -860,8 +860,8 @@
     );
 
     expect(
-        tester.renderObject(find.byKey(buttonKey)),
-        paintsExactlyCountTimes(#clipPath, 0),
+      tester.renderObject(find.byKey(buttonKey)),
+      paintsExactlyCountTimes(#clipPath, 0),
     );
   });
 

diff --git a/packages/flutter/test/material/outlined_button_test.dart b/packages/flutter/test/material/outlined_button_test.dart
index da32c8a..3c463e0 100644
--- a/packages/flutter/test/material/outlined_button_test.dart
+++ b/packages/flutter/test/material/outlined_button_test.dart

@@ -675,7 +675,7 @@
 
     BorderSide getBorderSide() {
       final OutlinedBorder border = tester.widget<Material>(
-        find.descendant(of: outlinedButton, matching: find.byType(Material))
+        find.descendant(of: outlinedButton, matching: find.byType(Material)),
       ).shape! as OutlinedBorder;
       return border.side;
     }
@@ -1199,7 +1199,7 @@
                   child: OutlinedButton(
                     style: OutlinedButton.styleFrom(padding: const EdgeInsets.all(22)),
                     onPressed: () {},
-                    child: const Text('OutlinedButton')
+                    child: const Text('OutlinedButton'),
                   ),
                 ),
               ),

diff --git a/packages/flutter/test/material/page_test.dart b/packages/flutter/test/material/page_test.dart
index cdaa7fc..2b1a77b 100644
--- a/packages/flutter/test/material/page_test.dart
+++ b/packages/flutter/test/material/page_test.dart

@@ -659,7 +659,7 @@
           body: GestureDetector(
             onTap: () {
               homeTapCount += 1;
-            }
+            },
           ),
         ),
       ),
@@ -679,7 +679,7 @@
             child: GestureDetector(
               onTap: () {
                 pageTapCount += 1;
-              }
+              },
             ),
           ),
         );
@@ -729,7 +729,7 @@
           body: GestureDetector(
             onTap: () {
               homeTapCount += 1;
-            }
+            },
           ),
         ),
       ),
@@ -752,7 +752,7 @@
             child: GestureDetector(
               onTap: () {
                 pageTapCount += 1;
-              }
+              },
             ),
           ),
         );
@@ -827,7 +827,7 @@
           return true;
         },
         transitionDelegate: detector,
-      )
+      ),
     );
 
     expect(detector.hasTransition, isFalse);
@@ -845,7 +845,7 @@
           return true;
         },
         transitionDelegate: detector,
-      )
+      ),
     );
     // There should be no transition because the page has the same key.
     expect(detector.hasTransition, isFalse);
@@ -870,7 +870,7 @@
           return true;
         },
         transitionDelegate: detector,
-      )
+      ),
     );
 
     expect(detector.hasTransition, isFalse);
@@ -891,7 +891,7 @@
           return true;
         },
         transitionDelegate: detector,
-      )
+      ),
     );
     // There should be no transition because the page has the same key.
     expect(detector.hasTransition, isFalse);
@@ -980,13 +980,13 @@
   Iterable<RouteTransitionRecord> resolve({
     required List<RouteTransitionRecord> newPageRouteHistory,
     required Map<RouteTransitionRecord?, RouteTransitionRecord> locationToExitingPageRoute,
-    required Map<RouteTransitionRecord?, List<RouteTransitionRecord>> pageRouteToPagelessRoutes
+    required Map<RouteTransitionRecord?, List<RouteTransitionRecord>> pageRouteToPagelessRoutes,
   }) {
     hasTransition = true;
     return super.resolve(
       newPageRouteHistory: newPageRouteHistory,
       locationToExitingPageRoute: locationToExitingPageRoute,
-      pageRouteToPagelessRoutes: pageRouteToPagelessRoutes
+      pageRouteToPagelessRoutes: pageRouteToPagelessRoutes,
     );
   }
 }
@@ -995,7 +995,7 @@
   required List<Page<dynamic>> pages,
   required PopPageCallback onPopPage,
   GlobalKey<NavigatorState>? key,
-  TransitionDelegate<dynamic>? transitionDelegate
+  TransitionDelegate<dynamic>? transitionDelegate,
 }) {
   return MediaQuery(
     data: MediaQueryData.fromWindow(WidgetsBinding.instance!.window),
@@ -1003,7 +1003,7 @@
       locale: const Locale('en', 'US'),
       delegates: const <LocalizationsDelegate<dynamic>>[
         DefaultMaterialLocalizations.delegate,
-        DefaultWidgetsLocalizations.delegate
+        DefaultWidgetsLocalizations.delegate,
       ],
       child: Directionality(
         textDirection: TextDirection.ltr,

diff --git a/packages/flutter/test/material/paginated_data_table_test.dart b/packages/flutter/test/material/paginated_data_table_test.dart
index 04f20b5..2d862e9 100644
--- a/packages/flutter/test/material/paginated_data_table_test.dart
+++ b/packages/flutter/test/material/paginated_data_table_test.dart

@@ -116,8 +116,10 @@
     expect(find.text('Eclair (0)'), findsNothing);
     expect(find.text('Gingerbread (0)'), findsNothing);
 
-    final Finder lastPageButton = find.ancestor(of: find.byTooltip('Last page'),
-        matching: find.byWidgetPredicate((Widget widget) => widget is IconButton));
+    final Finder lastPageButton = find.ancestor(
+      of: find.byTooltip('Last page'),
+      matching: find.byWidgetPredicate((Widget widget) => widget is IconButton),
+    );
 
     expect(tester.widget<IconButton>(lastPageButton).onPressed, isNotNull);
 
@@ -134,8 +136,10 @@
     expect(find.text('Donut (49)'), findsOneWidget);
     expect(find.text('KitKat (49)'), findsOneWidget);
 
-    final Finder firstPageButton = find.ancestor(of: find.byTooltip('First page'),
-        matching: find.byWidgetPredicate((Widget widget) => widget is IconButton));
+    final Finder firstPageButton = find.ancestor(
+      of: find.byTooltip('First page'),
+      matching: find.byWidgetPredicate((Widget widget) => widget is IconButton),
+    );
 
     expect(tester.widget<IconButton>(firstPageButton).onPressed, isNotNull);
 
@@ -431,10 +435,10 @@
       ),
     ));
     expect(tester.renderObject<RenderBox>(
-      find.widgetWithText(Container, 'Name').first
+      find.widgetWithText(Container, 'Name').first,
     ).size.height, 56.0); // This is the header row height
     expect(tester.renderObject<RenderBox>(
-      find.widgetWithText(Container, 'Frozen yogurt (0)').first
+      find.widgetWithText(Container, 'Frozen yogurt (0)').first,
     ).size.height, 48.0); // This is the data row height
 
     // CUSTOM VALUES
@@ -442,28 +446,28 @@
       home: Material(child: buildCustomHeightPaginatedTable(headingRowHeight: 48.0)),
     ));
     expect(tester.renderObject<RenderBox>(
-      find.widgetWithText(Container, 'Name').first
+      find.widgetWithText(Container, 'Name').first,
     ).size.height, 48.0);
 
     await tester.pumpWidget(MaterialApp(
       home: Material(child: buildCustomHeightPaginatedTable(headingRowHeight: 64.0)),
     ));
     expect(tester.renderObject<RenderBox>(
-      find.widgetWithText(Container, 'Name').first
+      find.widgetWithText(Container, 'Name').first,
     ).size.height, 64.0);
 
     await tester.pumpWidget(MaterialApp(
       home: Material(child: buildCustomHeightPaginatedTable(dataRowHeight: 30.0)),
     ));
     expect(tester.renderObject<RenderBox>(
-      find.widgetWithText(Container, 'Frozen yogurt (0)').first
+      find.widgetWithText(Container, 'Frozen yogurt (0)').first,
     ).size.height, 30.0);
 
     await tester.pumpWidget(MaterialApp(
       home: Material(child: buildCustomHeightPaginatedTable(dataRowHeight: 56.0)),
     ));
     expect(tester.renderObject<RenderBox>(
-      find.widgetWithText(Container, 'Frozen yogurt (0)').first
+      find.widgetWithText(Container, 'Frozen yogurt (0)').first,
     ).size.height, 56.0);
   });
 
@@ -790,8 +794,7 @@
     // Widths should be equal before we resize...
     expect(
       tester.renderObject<RenderBox>(find.byType(DataTable).first).size.width,
-      moreOrLessEquals(
-        tester.renderObject<RenderBox>(find.byType(Card).first).size.width)
+      moreOrLessEquals(tester.renderObject<RenderBox>(find.byType(Card).first).size.width),
     );
 
     await binding.setSurfaceSize(const Size(_expandedWidth, _height));
@@ -802,7 +805,7 @@
     // ... and should still be equal after the resize.
     expect(
       tester.renderObject<RenderBox>(find.byType(DataTable).first).size.width,
-      moreOrLessEquals(cardWidth)
+      moreOrLessEquals(cardWidth),
     );
 
     // Double check to ensure we actually resized the surface properly.

diff --git a/packages/flutter/test/material/persistent_bottom_sheet_test.dart b/packages/flutter/test/material/persistent_bottom_sheet_test.dart
index dc9a60e..dc0ff9d 100644
--- a/packages/flutter/test/material/persistent_bottom_sheet_test.dart
+++ b/packages/flutter/test/material/persistent_bottom_sheet_test.dart

@@ -38,7 +38,7 @@
         builder: (BuildContext context) {
           buildCount += 1;
           return Container(height: 200.0);
-        }
+        },
       );
     });
 
@@ -390,7 +390,7 @@
             builder: (BuildContext context) {
               scaffoldContext = context;
               return Container();
-            }
+            },
           ),
         ),
       ),
@@ -477,26 +477,29 @@
   });
 
   // Regression test for https://github.com/flutter/flutter/issues/71435
-  testWidgets('Scaffold.bottomSheet should be updated without creating a new RO'
-      ' when the new widget has the same key and type.', (WidgetTester tester) async {
-    Widget buildFrame(String text) {
-      return MaterialApp(
-        home: Scaffold(
-          body: const Placeholder(),
-          bottomSheet: Text(text),
-        ),
-      );
-    }
+  testWidgets(
+    'Scaffold.bottomSheet should be updated without creating a new RO'
+    ' when the new widget has the same key and type.',
+    (WidgetTester tester) async {
+      Widget buildFrame(String text) {
+        return MaterialApp(
+          home: Scaffold(
+            body: const Placeholder(),
+            bottomSheet: Text(text),
+          ),
+        );
+      }
 
-    await tester.pumpWidget(buildFrame('I love Flutter!'));
-    final RenderParagraph renderBeforeUpdate = tester.renderObject(find.text('I love Flutter!'));
+      await tester.pumpWidget(buildFrame('I love Flutter!'));
+      final RenderParagraph renderBeforeUpdate = tester.renderObject(find.text('I love Flutter!'));
 
-    await tester.pumpWidget(buildFrame('Flutter is the best!'));
-    await tester.pumpAndSettle();
-    final RenderParagraph renderAfterUpdate = tester.renderObject(find.text('Flutter is the best!'));
+      await tester.pumpWidget(buildFrame('Flutter is the best!'));
+      await tester.pumpAndSettle();
+      final RenderParagraph renderAfterUpdate = tester.renderObject(find.text('Flutter is the best!'));
 
-    expect(renderBeforeUpdate, renderAfterUpdate);
-  });
+      expect(renderBeforeUpdate, renderAfterUpdate);
+    },
+  );
 
   testWidgets('Verify that visual properties are passed through', (WidgetTester tester) async {
     final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();
@@ -546,7 +549,7 @@
       return Builder(
         builder: (BuildContext context) {
           return Container(height: 200.0);
-        }
+        },
       );
     });
 

diff --git a/packages/flutter/test/material/popup_menu_test.dart b/packages/flutter/test/material/popup_menu_test.dart
index 24c7aca..8e06b62 100644
--- a/packages/flutter/test/material/popup_menu_test.dart
+++ b/packages/flutter/test/material/popup_menu_test.dart

@@ -1790,25 +1790,25 @@
     final GlobalKey<PopupMenuButtonState<int>> globalKey = GlobalKey();
 
     await tester.pumpWidget(
-        MaterialApp(
-          home: Material(
-            child: Column(
-              children: <Widget>[
-                PopupMenuButton<int>(
-                  key: globalKey,
-                  itemBuilder: (BuildContext context) {
-                    return <PopupMenuEntry<int>>[
-                      const PopupMenuItem<int>(
-                        value: 1,
-                        child: Text('Tap me please!'),
-                      ),
-                    ];
-                  },
-                ),
-              ],
-            ),
+      MaterialApp(
+        home: Material(
+          child: Column(
+            children: <Widget>[
+              PopupMenuButton<int>(
+                key: globalKey,
+                itemBuilder: (BuildContext context) {
+                  return <PopupMenuEntry<int>>[
+                    const PopupMenuItem<int>(
+                      value: 1,
+                      child: Text('Tap me please!'),
+                    ),
+                  ];
+                },
+              ),
+            ],
           ),
-        )
+        ),
+      ),
     );
 
     expect(find.text('Tap me please!'), findsNothing);
@@ -2033,8 +2033,8 @@
                 ),
               ),
               itemBuilder: (BuildContext context) => <PopupMenuEntry<int>>[
-                const PopupMenuItem<int>(child: Text('-1-'), value: 1,),
-                const PopupMenuItem<int>(child: Text('-2-'), value: 2,),
+                const PopupMenuItem<int>(child: Text('-1-'), value: 1),
+                const PopupMenuItem<int>(child: Text('-2-'), value: 2),
               ],
             )],
           ),
@@ -2231,8 +2231,8 @@
                     ),
                   ),
                   itemBuilder: (BuildContext context) => <PopupMenuEntry<int>>[
-                    const PopupMenuItem<int>(child: Text('-1-'), value: 1,),
-                    const PopupMenuItem<int>(child: Text('-2-'), value: 2,),
+                    const PopupMenuItem<int>(child: Text('-1-'), value: 1),
+                    const PopupMenuItem<int>(child: Text('-2-'), value: 2),
                   ],
                 ),
                 const SizedBox(height: 600),

diff --git a/packages/flutter/test/material/progress_indicator_test.dart b/packages/flutter/test/material/progress_indicator_test.dart
index 0a6eb08..095ae6a 100644
--- a/packages/flutter/test/material/progress_indicator_test.dart
+++ b/packages/flutter/test/material/progress_indicator_test.dart

@@ -374,8 +374,8 @@
     final List<Layer> layers1 = tester.layers;
     await tester.pumpWidget(Directionality(
       textDirection: TextDirection.ltr,
-      child: ListView(children: const <Widget>[LinearProgressIndicator(value: 0.5)])),
-    );
+      child: ListView(children: const <Widget>[LinearProgressIndicator(value: 0.5)]),
+    ));
     final List<Layer> layers2 = tester.layers;
     expect(layers1, isNot(equals(layers2)));
   });
@@ -535,7 +535,7 @@
             builder: (BuildContext context, StateSetter setter) {
               setState = setter;
               return CircularProgressIndicator(value: progressValue);
-            }
+            },
           ),
         ),
       ),
@@ -756,7 +756,6 @@
       value: value,
     ));
 
-
     handle.dispose();
   });
 
@@ -798,10 +797,11 @@
       );
 
       expect(find.byType(CupertinoActivityIndicator), findsOneWidget);
-    }, variant: const TargetPlatformVariant(<TargetPlatform> {
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform> {
       TargetPlatform.iOS,
       TargetPlatform.macOS,
-    })
+    }),
   );
 
   testWidgets(
@@ -818,7 +818,8 @@
       );
 
       expect(find.byType(CupertinoActivityIndicator), findsNothing);
-    }, variant: const TargetPlatformVariant(<TargetPlatform> {
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform> {
       TargetPlatform.android,
       TargetPlatform.fuchsia,
       TargetPlatform.windows,

diff --git a/packages/flutter/test/material/radio_list_tile_test.dart b/packages/flutter/test/material/radio_list_tile_test.dart
index 9841a93..07f4ced 100644
--- a/packages/flutter/test/material/radio_list_tile_test.dart
+++ b/packages/flutter/test/material/radio_list_tile_test.dart

@@ -23,8 +23,7 @@
 }
 
 void main() {
-  testWidgets('RadioListTile should initialize according to groupValue',
-      (WidgetTester tester) async {
+  testWidgets('RadioListTile should initialize according to groupValue', (WidgetTester tester) async {
     final List<int> values = <int>[0, 1, 2];
     int? selectedValue;
     // Constructor parameters are required for [RadioListTile], but they are
@@ -275,8 +274,7 @@
     expect(log, equals(<int>[0]));
   });
 
-  testWidgets('Selected RadioListTile should trigger onChanged when toggleable',
-      (WidgetTester tester) async {
+  testWidgets('Selected RadioListTile should trigger onChanged when toggleable', (WidgetTester tester) async {
     final List<int> values = <int>[0, 1, 2];
     int? selectedValue;
     // Constructor parameters are required for [Radio], but they are irrelevant
@@ -623,9 +621,9 @@
             title: const Text('Title'),
             onChanged: (_){},
             contentPadding: const EdgeInsets.fromLTRB(8, 10, 15, 20),
-          )
-        )
-      )
+          ),
+        ),
+      ),
     );
 
     final Rect paddingRect = tester.getRect(find.byType(SafeArea));

diff --git a/packages/flutter/test/material/radio_test.dart b/packages/flutter/test/material/radio_test.dart
index a62195d..bd8efbb 100644
--- a/packages/flutter/test/material/radio_test.dart
+++ b/packages/flutter/test/material/radio_test.dart

@@ -388,7 +388,7 @@
       Material.of(tester.element(
         find.byWidgetPredicate((Widget widget) => widget is Radio<int>),
       )),
-      paints..circle(color: Colors.orange[500], radius: splashRadius)
+      paints..circle(color: Colors.orange[500], radius: splashRadius),
     );
   });
 
@@ -434,7 +434,8 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..circle(color: Colors.orange[500])
         ..circle(color: const Color(0xff1e88e5))
         ..circle(color: const Color(0xff1e88e5)),
@@ -450,9 +451,10 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..circle(color: Colors.orange[500])
-        ..circle(color: const Color(0x8a000000), style: PaintingStyle.stroke, strokeWidth: 2.0)
+        ..circle(color: const Color(0x8a000000), style: PaintingStyle.stroke, strokeWidth: 2.0),
     );
 
     // Check when the radio is selected, but disabled.
@@ -465,7 +467,8 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..circle(color: const Color(0x61000000))
         ..circle(color: const Color(0x61000000)),
     );
@@ -510,7 +513,8 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..circle(color: const Color(0xff1e88e5))
         ..circle(color: const Color(0xff1e88e5)),
     );
@@ -530,7 +534,8 @@
         paints
           ..rect(
               color: const Color(0xffffffff),
-              rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+              rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+            )
           ..circle(color: Colors.orange[500])
           ..circle(color: const Color(0x8a000000), style: PaintingStyle.stroke, strokeWidth: 2.0),
     );
@@ -545,7 +550,8 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..circle(color: const Color(0x61000000))
         ..circle(color: const Color(0x61000000)),
     );
@@ -808,7 +814,8 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..circle(color: activeEnabledFillColor)
         ..circle(color: activeEnabledFillColor),
     );
@@ -822,8 +829,9 @@
         paints
           ..rect(
               color: const Color(0xffffffff),
-              rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
-          ..circle(color: inactiveEnabledFillColor, style: PaintingStyle.stroke, strokeWidth: 2.0)
+              rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+            )
+          ..circle(color: inactiveEnabledFillColor, style: PaintingStyle.stroke, strokeWidth: 2.0),
     );
 
     // Check when the radio is selected, but disabled.
@@ -835,7 +843,8 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..circle(color: activeDisabledFillColor)
         ..circle(color: activeDisabledFillColor),
     );
@@ -849,7 +858,8 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..circle(color: inactiveDisabledFillColor, style: PaintingStyle.stroke, strokeWidth: 2.0),
     );
   });
@@ -912,7 +922,8 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..circle(color: Colors.black12)
         ..circle(color: focusedFillColor),
     );
@@ -929,7 +940,8 @@
       paints
         ..rect(
             color: const Color(0xffffffff),
-            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0))
+            rect: const Rect.fromLTRB(350.0, 250.0, 450.0, 350.0),
+          )
         ..circle(color: Colors.black12)
         ..circle(color: hoveredFillColor),
     );
@@ -1087,7 +1099,7 @@
         home: Material(
           child: Center(
             child: show ? Radio<bool>(key: key, value: true, groupValue: false, onChanged: (_) { }) : Container(),
-          )
+          ),
         ),
       );
     }

diff --git a/packages/flutter/test/material/range_slider_test.dart b/packages/flutter/test/material/range_slider_test.dart
index 8ce3f1c..61650ab 100644
--- a/packages/flutter/test/material/range_slider_test.dart
+++ b/packages/flutter/test/material/range_slider_test.dart

@@ -1070,13 +1070,19 @@
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(RangeSlider));
 
     // Check default theme for enabled widget.
-    expect(sliderBox, paints
-      ..rrect(color: sliderTheme.inactiveTrackColor)
-      ..rect(color: sliderTheme.activeTrackColor)
-      ..rrect(color: sliderTheme.inactiveTrackColor));
-    expect(sliderBox, paints
-      ..circle(color: sliderTheme.thumbColor)
-      ..circle(color: sliderTheme.thumbColor));
+    expect(
+      sliderBox,
+      paints
+        ..rrect(color: sliderTheme.inactiveTrackColor)
+        ..rect(color: sliderTheme.activeTrackColor)
+        ..rrect(color: sliderTheme.inactiveTrackColor),
+    );
+    expect(
+      sliderBox,
+      paints
+        ..circle(color: sliderTheme.thumbColor)
+        ..circle(color: sliderTheme.thumbColor),
+    );
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.disabledThumbColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.disabledActiveTrackColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.disabledInactiveTrackColor)));
@@ -1094,16 +1100,18 @@
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(RangeSlider));
 
     expect(
-        sliderBox,
-        paints
-          ..rrect(color: sliderTheme.inactiveTrackColor)
-          ..rect(color: activeColor)
-          ..rrect(color: sliderTheme.inactiveTrackColor));
+      sliderBox,
+      paints
+        ..rrect(color: sliderTheme.inactiveTrackColor)
+        ..rect(color: activeColor)
+        ..rrect(color: sliderTheme.inactiveTrackColor),
+    );
     expect(
-        sliderBox,
-        paints
-          ..circle(color: activeColor)
-          ..circle(color: activeColor));
+      sliderBox,
+      paints
+        ..circle(color: activeColor)
+        ..circle(color: activeColor),
+    );
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.thumbColor)));
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.disabledThumbColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.disabledActiveTrackColor)));
@@ -1120,16 +1128,18 @@
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(RangeSlider));
 
     expect(
-        sliderBox,
-        paints
-          ..rrect(color: inactiveColor)
-          ..rect(color: sliderTheme.activeTrackColor)
-          ..rrect(color: inactiveColor));
+      sliderBox,
+      paints
+        ..rrect(color: inactiveColor)
+        ..rect(color: sliderTheme.activeTrackColor)
+        ..rrect(color: inactiveColor),
+    );
     expect(
-        sliderBox,
-        paints
-          ..circle(color: sliderTheme.thumbColor)
-          ..circle(color: sliderTheme.thumbColor));
+      sliderBox,
+      paints
+        ..circle(color: sliderTheme.thumbColor)
+        ..circle(color: sliderTheme.thumbColor),
+    );
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.disabledThumbColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.disabledActiveTrackColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.disabledInactiveTrackColor)));
@@ -1150,16 +1160,18 @@
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(RangeSlider));
 
     expect(
-        sliderBox,
-        paints
-          ..rrect(color: inactiveColor)
-          ..rect(color: activeColor)
-          ..rrect(color: inactiveColor));
+      sliderBox,
+      paints
+        ..rrect(color: inactiveColor)
+        ..rect(color: activeColor)
+        ..rrect(color: inactiveColor),
+    );
     expect(
-        sliderBox,
-        paints
-          ..circle(color: activeColor)
-          ..circle(color: activeColor));
+      sliderBox,
+      paints
+        ..circle(color: activeColor)
+        ..circle(color: activeColor),
+    );
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.thumbColor)));
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.disabledThumbColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.disabledActiveTrackColor)));
@@ -1175,20 +1187,22 @@
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(RangeSlider));
 
     expect(
-        sliderBox,
-        paints
-          ..rrect(color: sliderTheme.inactiveTrackColor)
-          ..rect(color: sliderTheme.activeTrackColor)
-          ..rrect(color: sliderTheme.inactiveTrackColor));
+      sliderBox,
+      paints
+        ..rrect(color: sliderTheme.inactiveTrackColor)
+        ..rect(color: sliderTheme.activeTrackColor)
+        ..rrect(color: sliderTheme.inactiveTrackColor),
+    );
     expect(
-        sliderBox,
-        paints
-          ..circle(color: sliderTheme.inactiveTickMarkColor)
-          ..circle(color: sliderTheme.inactiveTickMarkColor)
-          ..circle(color: sliderTheme.activeTickMarkColor)
-          ..circle(color: sliderTheme.inactiveTickMarkColor)
-          ..circle(color: sliderTheme.thumbColor)
-          ..circle(color: sliderTheme.thumbColor));
+      sliderBox,
+      paints
+        ..circle(color: sliderTheme.inactiveTickMarkColor)
+        ..circle(color: sliderTheme.inactiveTickMarkColor)
+        ..circle(color: sliderTheme.activeTickMarkColor)
+        ..circle(color: sliderTheme.inactiveTickMarkColor)
+        ..circle(color: sliderTheme.thumbColor)
+        ..circle(color: sliderTheme.thumbColor),
+    );
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.disabledThumbColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.disabledActiveTrackColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.disabledInactiveTrackColor)));
@@ -1211,20 +1225,22 @@
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(RangeSlider));
 
     expect(
-        sliderBox,
-        paints
-          ..rrect(color: inactiveColor)
-          ..rect(color: activeColor)
-          ..rrect(color: inactiveColor));
+      sliderBox,
+      paints
+        ..rrect(color: inactiveColor)
+        ..rect(color: activeColor)
+        ..rrect(color: inactiveColor),
+    );
     expect(
-        sliderBox,
-        paints
-          ..circle(color: activeColor)
-          ..circle(color: activeColor)
-          ..circle(color: inactiveColor)
-          ..circle(color: activeColor)
-          ..circle(color: activeColor)
-          ..circle(color: activeColor));
+      sliderBox,
+      paints
+        ..circle(color: activeColor)
+        ..circle(color: activeColor)
+        ..circle(color: inactiveColor)
+        ..circle(color: activeColor)
+        ..circle(color: activeColor)
+        ..circle(color: activeColor),
+    );
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.thumbColor)));
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.disabledThumbColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.disabledActiveTrackColor)));
@@ -1242,11 +1258,12 @@
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(RangeSlider));
 
     expect(
-        sliderBox,
-        paints
-          ..rrect(color: sliderTheme.disabledInactiveTrackColor)
-          ..rect(color: sliderTheme.disabledActiveTrackColor)
-          ..rrect(color: sliderTheme.disabledInactiveTrackColor));
+      sliderBox,
+      paints
+        ..rrect(color: sliderTheme.disabledInactiveTrackColor)
+        ..rect(color: sliderTheme.disabledActiveTrackColor)
+        ..rrect(color: sliderTheme.disabledInactiveTrackColor),
+    );
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.thumbColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.activeTrackColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.inactiveTrackColor)));
@@ -1268,11 +1285,12 @@
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(RangeSlider));
 
     expect(
-        sliderBox,
-        paints
-          ..rrect(color: sliderTheme.disabledInactiveTrackColor)
-          ..rect(color: sliderTheme.disabledActiveTrackColor)
-          ..rrect(color: sliderTheme.disabledInactiveTrackColor));
+      sliderBox,
+      paints
+        ..rrect(color: sliderTheme.disabledInactiveTrackColor)
+        ..rect(color: sliderTheme.disabledActiveTrackColor)
+        ..rrect(color: sliderTheme.disabledInactiveTrackColor),
+    );
     expect(sliderBox, isNot(paints..circle(color: sliderTheme.thumbColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.activeTrackColor)));
     expect(sliderBox, isNot(paints..rect(color: sliderTheme.inactiveTrackColor)));
@@ -1330,7 +1348,7 @@
       valueIndicatorBox,
       paints
         ..path(color: sliderTheme.valueIndicatorColor)
-        ..paragraph()
+        ..paragraph(),
     );
     await gesture.up();
     // Wait for value indicator animation to finish.
@@ -1579,7 +1597,7 @@
       valueIndicatorBox,
       paints
         ..path(color: sliderTheme.valueIndicatorColor)
-        ..paragraph()
+        ..paragraph(),
     );
 
     await gesture.up();
@@ -1654,7 +1672,7 @@
       valueIndicatorBox,
       paints
         ..path(color: sliderTheme.valueIndicatorColor)
-        ..paragraph()
+        ..paragraph(),
     );
 
     await gesture.up();
@@ -1722,45 +1740,45 @@
     /// The first circle is the thumb, the second one is the overlapping shape
     /// circle, and the last one is the second thumb.
     expect(
-        find.byType(RangeSlider),
-        paints
-          ..circle()
-          ..circle(color: sliderTheme.overlappingShapeStrokeColor)
-          ..circle()
+      find.byType(RangeSlider),
+      paints
+        ..circle()
+        ..circle(color: sliderTheme.overlappingShapeStrokeColor)
+        ..circle(),
     );
 
     await gesture.up();
 
     expect(
-        find.byType(RangeSlider),
-        paints
-          ..circle()
-          ..circle(color: sliderTheme.overlappingShapeStrokeColor)
-          ..circle()
+      find.byType(RangeSlider),
+      paints
+        ..circle()
+        ..circle(color: sliderTheme.overlappingShapeStrokeColor)
+        ..circle(),
     );
   });
 
   testWidgets('Range Slider Semantics', (WidgetTester tester) async {
     await tester.pumpWidget(
-        MaterialApp(
-          home: Theme(
-            data: ThemeData.light(),
-            child: Directionality(
-              textDirection: TextDirection.ltr,
-              child: MediaQuery(
-                data: MediaQueryData.fromWindow(window),
-                child: Material(
-                  child: RangeSlider(
-                    values: const RangeValues(10.0, 12.0),
-                    min: 0.0,
-                    max: 100.0,
-                    onChanged: (RangeValues v) { },
-                  ),
+      MaterialApp(
+        home: Theme(
+          data: ThemeData.light(),
+          child: Directionality(
+            textDirection: TextDirection.ltr,
+            child: MediaQuery(
+              data: MediaQueryData.fromWindow(window),
+              child: Material(
+                child: RangeSlider(
+                  values: const RangeValues(10.0, 12.0),
+                  min: 0.0,
+                  max: 100.0,
+                  onChanged: (RangeValues v) { },
                 ),
               ),
             ),
           ),
-        )
+        ),
+      ),
     );
 
     await tester.pumpAndSettle();
@@ -1858,17 +1876,18 @@
     // _RenderRangeSlider is the last render object in the tree.
     final RenderObject renderObject = tester.allRenderObjects.last;
 
-    expect(renderObject,
-        paints
-          // left inactive track RRect
-          ..rrect(rrect: RRect.fromLTRBAndCorners(-24.0, 3.0, -12.0, 7.0, topLeft: const Radius.circular(2.0), bottomLeft: const Radius.circular(2.0)))
-          // active track RRect
-          ..rect(rect: const Rect.fromLTRB(-12.0, 2.0, 0.0, 8.0))
-          // right inactive track RRect
-          ..rrect(rrect: RRect.fromLTRBAndCorners(0.0, 3.0, 24.0, 7.0, topRight: const Radius.circular(2.0), bottomRight: const Radius.circular(2.0)))
-          // thumbs
-          ..circle(x: -12.0, y: 5.0, radius: 10.0)
-          ..circle(x: 0.0, y: 5.0, radius: 10.0)
+    expect(
+      renderObject,
+      paints
+        // left inactive track RRect
+        ..rrect(rrect: RRect.fromLTRBAndCorners(-24.0, 3.0, -12.0, 7.0, topLeft: const Radius.circular(2.0), bottomLeft: const Radius.circular(2.0)))
+        // active track RRect
+        ..rect(rect: const Rect.fromLTRB(-12.0, 2.0, 0.0, 8.0))
+        // right inactive track RRect
+        ..rrect(rrect: RRect.fromLTRBAndCorners(0.0, 3.0, 24.0, 7.0, topRight: const Radius.circular(2.0), bottomRight: const Radius.circular(2.0)))
+        // thumbs
+        ..circle(x: -12.0, y: 5.0, radius: 10.0)
+        ..circle(x: 0.0, y: 5.0, radius: 10.0),
     );
   });
 
@@ -1876,9 +1895,9 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-            sliderTheme: const SliderThemeData(
-              rangeTrackShape: RectangularRangeSliderTrackShape(),
-            )
+          sliderTheme: const SliderThemeData(
+            rangeTrackShape: RectangularRangeSliderTrackShape(),
+          ),
         ),
         home: Directionality(
           textDirection: TextDirection.ltr,
@@ -1902,17 +1921,18 @@
     final RenderObject renderObject = tester.allRenderObjects.last;
 
     //There should no gap between the inactive track and active track.
-    expect(renderObject,
-        paints
+    expect(
+      renderObject,
+      paints
         // left inactive track RRect
-          ..rect(rect: const Rect.fromLTRB(-24.0, 3.0, -12.0, 7.0))
+        ..rect(rect: const Rect.fromLTRB(-24.0, 3.0, -12.0, 7.0))
         // active track RRect
-          ..rect(rect: const Rect.fromLTRB(-12.0, 3.0, 0.0, 7.0))
+        ..rect(rect: const Rect.fromLTRB(-12.0, 3.0, 0.0, 7.0))
         // right inactive track RRect
-          ..rect(rect: const Rect.fromLTRB(0.0, 3.0, 24.0, 7.0))
+        ..rect(rect: const Rect.fromLTRB(0.0, 3.0, 24.0, 7.0))
         // thumbs
-          ..circle(x: -12.0, y: 5.0, radius: 10.0)
-          ..circle(x: 0.0, y: 5.0, radius: 10.0)
+        ..circle(x: -12.0, y: 5.0, radius: 10.0)
+        ..circle(x: 0.0, y: 5.0, radius: 10.0),
     );
   });
 

diff --git a/packages/flutter/test/material/raw_material_button_test.dart b/packages/flutter/test/material/raw_material_button_test.dart
index 4444279..5970698 100644
--- a/packages/flutter/test/material/raw_material_button_test.dart
+++ b/packages/flutter/test/material/raw_material_button_test.dart

@@ -239,24 +239,25 @@
           crossAxisAlignment: CrossAxisAlignment.center,
           children: <Widget>[
             RawMaterialButton(
-            materialTapTargetSize: MaterialTapTargetSize.padded,
-            onPressed: () { },
-            child: SizedBox(
-              width: 400.0,
-              height: 400.0,
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: const <Widget>[
-                  SizedBox(
-                    height: 50.0,
-                    width: 400.0,
-                    child: Text('Material'),
-                  ),
-                ],
+              materialTapTargetSize: MaterialTapTargetSize.padded,
+              onPressed: () { },
+              child: SizedBox(
+                width: 400.0,
+                height: 400.0,
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: const <Widget>[
+                    SizedBox(
+                      height: 50.0,
+                      width: 400.0,
+                      child: Text('Material'),
+                    ),
+                  ],
+                ),
               ),
             ),
-          ),
-        ]),
+          ],
+        ),
       ),
     );
     expect(find.text('Material').hitTestable(), findsOneWidget);
@@ -280,7 +281,8 @@
                 ),
               ),
             ),
-        ]),
+          ],
+        ),
       ),
     );
     expect(find.byKey(key).hitTestable(), findsOneWidget);

diff --git a/packages/flutter/test/material/refresh_indicator_test.dart b/packages/flutter/test/material/refresh_indicator_test.dart
index 87ba2ec..d781713 100644
--- a/packages/flutter/test/material/refresh_indicator_test.dart
+++ b/packages/flutter/test/material/refresh_indicator_test.dart

@@ -454,97 +454,97 @@
 
   testWidgets('RefreshIndicator responds to strokeWidth', (WidgetTester tester) async {
     await tester.pumpWidget(
-        MaterialApp(
-          home: RefreshIndicator(
-            onRefresh: () async {},
-            child: ListView(
-              physics: const AlwaysScrollableScrollPhysics(),
-              children: <String>['A', 'B', 'C', 'D', 'E', 'F'].map<Widget>((String item) {
-                return SizedBox(
-                  height: 200.0,
-                  child: Text(item),
-                );
-              }).toList(),
-            ),
+      MaterialApp(
+        home: RefreshIndicator(
+          onRefresh: () async {},
+          child: ListView(
+            physics: const AlwaysScrollableScrollPhysics(),
+            children: <String>['A', 'B', 'C', 'D', 'E', 'F'].map<Widget>((String item) {
+              return SizedBox(
+                height: 200.0,
+                child: Text(item),
+              );
+            }).toList(),
           ),
-        )
+        ),
+      ),
     );
 
     //By default the value of strokeWidth is 2.0
     expect(
-        tester.widget<RefreshIndicator>(find.byType(RefreshIndicator)).strokeWidth,
-        2.0,
+      tester.widget<RefreshIndicator>(find.byType(RefreshIndicator)).strokeWidth,
+      2.0,
     );
 
     await tester.pumpWidget(
-        MaterialApp(
-          home: RefreshIndicator(
-            onRefresh: () async {},
-            strokeWidth: 4.0,
-            child: ListView(
-              physics: const AlwaysScrollableScrollPhysics(),
-              children: <String>['A', 'B', 'C', 'D', 'E', 'F'].map<Widget>((String item) {
-                return SizedBox(
-                  height: 200.0,
-                  child: Text(item),
-                );
-              }).toList(),
-            ),
+      MaterialApp(
+        home: RefreshIndicator(
+          onRefresh: () async {},
+          strokeWidth: 4.0,
+          child: ListView(
+            physics: const AlwaysScrollableScrollPhysics(),
+            children: <String>['A', 'B', 'C', 'D', 'E', 'F'].map<Widget>((String item) {
+              return SizedBox(
+                height: 200.0,
+                child: Text(item),
+              );
+            }).toList(),
           ),
-        )
+        ),
+      ),
     );
 
     expect(
-        tester.widget<RefreshIndicator>(find.byType(RefreshIndicator)).strokeWidth,
-        4.0,
+      tester.widget<RefreshIndicator>(find.byType(RefreshIndicator)).strokeWidth,
+      4.0,
     );
   });
 
   testWidgets('RefreshIndicator responds to edgeOffset', (WidgetTester tester) async {
     await tester.pumpWidget(
-        MaterialApp(
-          home: RefreshIndicator(
-            onRefresh: () async {},
-            child: ListView(
-              physics: const AlwaysScrollableScrollPhysics(),
-              children: <String>['A', 'B', 'C', 'D', 'E', 'F'].map<Widget>((String item) {
-                return SizedBox(
-                  height: 200.0,
-                  child: Text(item),
-                );
-              }).toList(),
-            ),
+      MaterialApp(
+        home: RefreshIndicator(
+          onRefresh: () async {},
+          child: ListView(
+            physics: const AlwaysScrollableScrollPhysics(),
+            children: <String>['A', 'B', 'C', 'D', 'E', 'F'].map<Widget>((String item) {
+              return SizedBox(
+                height: 200.0,
+                child: Text(item),
+              );
+            }).toList(),
           ),
-        )
+        ),
+      ),
     );
 
     //By default the value of edgeOffset is 0.0
     expect(
-        tester.widget<RefreshIndicator>(find.byType(RefreshIndicator)).edgeOffset,
-        0.0,
+      tester.widget<RefreshIndicator>(find.byType(RefreshIndicator)).edgeOffset,
+      0.0,
     );
 
     await tester.pumpWidget(
-        MaterialApp(
-          home: RefreshIndicator(
-            onRefresh: () async {},
-            edgeOffset: kToolbarHeight,
-            child: ListView(
-              physics: const AlwaysScrollableScrollPhysics(),
-              children: <String>['A', 'B', 'C', 'D', 'E', 'F'].map<Widget>((String item) {
-                return SizedBox(
-                  height: 200.0,
-                  child: Text(item),
-                );
-              }).toList(),
-            ),
+      MaterialApp(
+        home: RefreshIndicator(
+          onRefresh: () async {},
+          edgeOffset: kToolbarHeight,
+          child: ListView(
+            physics: const AlwaysScrollableScrollPhysics(),
+            children: <String>['A', 'B', 'C', 'D', 'E', 'F'].map<Widget>((String item) {
+              return SizedBox(
+                height: 200.0,
+                child: Text(item),
+              );
+            }).toList(),
           ),
-        )
+        ),
+      ),
     );
 
     expect(
-        tester.widget<RefreshIndicator>(find.byType(RefreshIndicator)).edgeOffset,
-        kToolbarHeight,
+      tester.widget<RefreshIndicator>(find.byType(RefreshIndicator)).edgeOffset,
+      kToolbarHeight,
     );
   });
 

diff --git a/packages/flutter/test/material/reorderable_list_test.dart b/packages/flutter/test/material/reorderable_list_test.dart
index d8894c4..63c2309 100644
--- a/packages/flutter/test/material/reorderable_list_test.dart
+++ b/packages/flutter/test/material/reorderable_list_test.dart

@@ -423,14 +423,14 @@
         customController.animateTo(
           40.0,
           duration: const Duration(milliseconds: 200),
-          curve: Curves.linear
+          curve: Curves.linear,
         );
         await tester.pumpAndSettle();
         Offset listViewTopLeft = tester.getTopLeft(
           find.byType(ReorderableListView),
         );
         Offset firstBoxTopLeft = tester.getTopLeft(
-          find.byKey(firstBox)
+          find.byKey(firstBox),
         );
         expect(firstBoxTopLeft.dy, listViewTopLeft.dy - 40.0);
 
@@ -467,7 +467,7 @@
         );
         final Widget overlay = Overlay(
           initialEntries: <OverlayEntry>[
-            OverlayEntry(builder: (BuildContext context) => reorderableList)
+            OverlayEntry(builder: (BuildContext context) => reorderableList),
           ],
         );
         final Widget boilerplate = Localizations(
@@ -874,7 +874,7 @@
                     padding: const EdgeInsets.all(24),
                     child: reorderableListView,
                   );
-                })
+                }),
               ],
             ),
           ),

diff --git a/packages/flutter/test/material/scaffold_test.dart b/packages/flutter/test/material/scaffold_test.dart
index f868339..fa09987 100644
--- a/packages/flutter/test/material/scaffold_test.dart
+++ b/packages/flutter/test/material/scaffold_test.dart

@@ -17,19 +17,20 @@
 
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(
-          drawer: Container(
-            color: Colors.blue,
-          ),
-          onDrawerChanged: (bool isOpen) {
-            isDrawerOpen = isOpen;
-          },
-          endDrawer: Container(
-            color: Colors.green,
-          ),
-          onEndDrawerChanged: (bool isOpen) {
-            isEndDrawerOpen = isOpen;
-          },
-          body: Container()),
+        drawer: Container(
+          color: Colors.blue,
+        ),
+        onDrawerChanged: (bool isOpen) {
+          isDrawerOpen = isOpen;
+        },
+        endDrawer: Container(
+          color: Colors.green,
+        ),
+        onEndDrawerChanged: (bool isOpen) {
+          isEndDrawerOpen = isOpen;
+        },
+        body: Container(),
+      ),
     ));
 
     final ScaffoldState scaffoldState = tester.state(find.byType(Scaffold));
@@ -783,7 +784,7 @@
                     builder: (BuildContext context) {
                       mediaQueryTop = MediaQuery.of(context).padding.top;
                       return Container(key: bodyKey);
-                    }
+                    },
                   ),
                 );
               },
@@ -1716,7 +1717,7 @@
                 title: const Text('Title'),
               ),
             );
-          }
+          },
         ),
       ),
     );
@@ -1841,7 +1842,7 @@
             final ThemeData themeData = Theme.of(context);
             return Container(
               decoration: BoxDecoration(
-                border: Border(top: BorderSide(color: themeData.disabledColor))
+                border: Border(top: BorderSide(color: themeData.disabledColor)),
               ),
               child: Padding(
                 padding: const EdgeInsets.all(32.0),
@@ -1867,11 +1868,12 @@
             '   showBottomSheet().\n',
           ));
         }
-      }
+      },
     );
 
-    testWidgets('didUpdate bottomSheet while a previous bottom sheet is still displayed',
-        (WidgetTester tester) async {
+    testWidgets(
+      'didUpdate bottomSheet while a previous bottom sheet is still displayed',
+      (WidgetTester tester) async {
         final GlobalKey<ScaffoldState> key = GlobalKey<ScaffoldState>();
         const Key buttonKey = Key('button');
         final List<FlutterErrorDetails> errors = <FlutterErrorDetails>[];
@@ -1889,11 +1891,11 @@
                     onPressed: () {
                       state += 1;
                       setState(() {});
-                    }
+                    },
                   ),
                   bottomSheet: state == 0 ? null : const SizedBox(),
                 );
-              }
+              },
             ),
           ),
         );
@@ -1918,9 +1920,10 @@
           '   displayed with showBottomSheet() is still visible.\n'
           '   Use the PersistentBottomSheetController returned by\n'
           '   showBottomSheet() to close the old bottom sheet before creating a\n'
-          '   Scaffold with a (non null) bottomSheet.\n'
+          '   Scaffold with a (non null) bottomSheet.\n',
         );
-    });
+      },
+    );
 
     testWidgets('Call to Scaffold.of() without context', (WidgetTester tester) async {
       await tester.pumpWidget(
@@ -1966,7 +1969,8 @@
         ),
       );
       expect(error.diagnostics[4], isA<DiagnosticsProperty<Element>>());
-      expect(error.toStringDeep(),
+      expect(
+        error.toStringDeep(),
         'FlutterError\n'
         '   Scaffold.of() called with a context that does not contain a\n'
         '   Scaffold.\n'
@@ -1989,7 +1993,7 @@
         '   to the Scaffold, then use the key.currentState property to obtain\n'
         '   the ScaffoldState rather than using the Scaffold.of() function.\n'
         '   The context used was:\n'
-        '     Builder\n'
+        '     Builder\n',
       );
       await tester.pumpAndSettle();
     });
@@ -2035,7 +2039,8 @@
         ),
       );
       expect(error.diagnostics[4], isA<DiagnosticsProperty<Element>>());
-      expect(error.toStringDeep(),
+      expect(
+        error.toStringDeep(),
         'FlutterError\n'
         '   Scaffold.geometryOf() called with a context that does not contain\n'
         '   a Scaffold.\n'
@@ -2054,7 +2059,7 @@
         '   new inner widgets, and then in these inner widgets you would use\n'
         '   Scaffold.geometryOf().\n'
         '   The context used was:\n'
-        '     Builder\n'
+        '     Builder\n',
       );
       await tester.pumpAndSettle();
     });
@@ -2111,7 +2116,7 @@
                   width: 100.0,
                 ),
               );
-            }
+            },
           ),
         ),
       ),
@@ -2148,7 +2153,7 @@
                   width: 100.0,
                 ),
               );
-            }
+            },
           ),
         ),
       ),
@@ -2199,7 +2204,7 @@
       '     Directionality\n'
       '     [root]\n'
       '   Typically, the ScaffoldMessenger widget is introduced by the\n'
-      '   MaterialApp at the top of your application widget tree.\n'
+      '   MaterialApp at the top of your application widget tree.\n',
     ));
   });
 
@@ -2234,7 +2239,7 @@
                                 Navigator.pop(context, null);
                               },
                               child: const Text('Pop route'),
-                            )
+                            ),
                           ],
                         ),
                       );
@@ -2246,7 +2251,7 @@
             ),
           ),
         ),
-      )
+      ),
     ));
 
     expect(find.text(snackBarContent), findsNothing);
@@ -2284,7 +2289,7 @@
   @override
   Widget build(BuildContext context) {
     return CustomPaint(
-      painter: cache
+      painter: cache,
     );
   }
 

diff --git a/packages/flutter/test/material/scrollbar_paint_test.dart b/packages/flutter/test/material/scrollbar_paint_test.dart
index 1fd9ccb..256e594 100644
--- a/packages/flutter/test/material/scrollbar_paint_test.dart
+++ b/packages/flutter/test/material/scrollbar_paint_test.dart

@@ -83,13 +83,13 @@
     await tester.pumpWidget(MaterialApp(
       home: MediaQuery(
         data: const MediaQueryData(
-          padding: EdgeInsets.fromLTRB(0, 20, 0, 34)
+          padding: EdgeInsets.fromLTRB(0, 20, 0, 34),
         ),
         child: Scaffold(
           appBar: AppBar(title: const Text('Title')),
           body: Scrollbar(
             child: ListView(
-              children: const <Widget>[SizedBox(width: 4000, height: 4000)]
+              children: const <Widget>[SizedBox(width: 4000, height: 4000)],
             ),
           ),
         ),
@@ -127,13 +127,13 @@
     await tester.pumpWidget(MaterialApp(
       home: MediaQuery(
         data: const MediaQueryData(
-          padding: EdgeInsets.fromLTRB(0, 20, 0, 34)
+          padding: EdgeInsets.fromLTRB(0, 20, 0, 34),
         ),
         child: Scaffold(
           appBar: AppBar(title: const Text('Title')),
           body: Scrollbar(
             child: ListView(
-              children: const <Widget>[SizedBox(width: 40, height: 40)]
+              children: const <Widget>[SizedBox(width: 40, height: 40)],
             ),
           ),
         ),

diff --git a/packages/flutter/test/material/scrollbar_test.dart b/packages/flutter/test/material/scrollbar_test.dart
index fa1123c..f27d4f1 100644
--- a/packages/flutter/test/material/scrollbar_test.dart
+++ b/packages/flutter/test/material/scrollbar_test.dart

@@ -71,7 +71,7 @@
         child: Center(
           child: Container(
             decoration: BoxDecoration(
-              border: Border.all(color: const Color(0xFFFFFF00))
+              border: Border.all(color: const Color(0xFFFFFF00)),
             ),
             height: 200.0,
             width: 300.0,
@@ -150,58 +150,61 @@
     expect(canvas.invocations.isEmpty, isTrue);
   });
 
-  testWidgets('When isAlwaysShown is true, must pass a controller or find PrimaryScrollController',
-      (WidgetTester tester) async {
-    Widget viewWithScroll() {
-      return _buildBoilerplate(
-        child: Theme(
-          data: ThemeData(),
-          child: const Scrollbar(
-            isAlwaysShown: true,
-            child: SingleChildScrollView(
-              child: SizedBox(
-                width: 4000.0,
-                height: 4000.0,
+  testWidgets(
+    'When isAlwaysShown is true, must pass a controller or find PrimaryScrollController',
+    (WidgetTester tester) async {
+      Widget viewWithScroll() {
+        return _buildBoilerplate(
+          child: Theme(
+            data: ThemeData(),
+            child: const Scrollbar(
+              isAlwaysShown: true,
+              child: SingleChildScrollView(
+                child: SizedBox(
+                  width: 4000.0,
+                  height: 4000.0,
+                ),
               ),
             ),
           ),
-        ),
-      );
-    }
+        );
+      }
 
-    await tester.pumpWidget(viewWithScroll());
-    final dynamic exception = tester.takeException();
-    expect(exception, isAssertionError);
-  });
+      await tester.pumpWidget(viewWithScroll());
+      final dynamic exception = tester.takeException();
+      expect(exception, isAssertionError);
+    },
+  );
 
-  testWidgets('When isAlwaysShown is true, must pass a controller that is attached to a scroll view or find PrimaryScrollController',
-      (WidgetTester tester) async {
-    final ScrollController controller = ScrollController();
-    Widget viewWithScroll() {
-      return _buildBoilerplate(
-        child: Theme(
-          data: ThemeData(),
-          child: Scrollbar(
-            isAlwaysShown: true,
-            controller: controller,
-            child: const SingleChildScrollView(
-              child: SizedBox(
-                width: 4000.0,
-                height: 4000.0,
+  testWidgets(
+    'When isAlwaysShown is true, must pass a controller that is attached to a scroll view or find PrimaryScrollController',
+    (WidgetTester tester) async {
+      final ScrollController controller = ScrollController();
+      Widget viewWithScroll() {
+        return _buildBoilerplate(
+          child: Theme(
+            data: ThemeData(),
+            child: Scrollbar(
+              isAlwaysShown: true,
+              controller: controller,
+              child: const SingleChildScrollView(
+                child: SizedBox(
+                  width: 4000.0,
+                  height: 4000.0,
+                ),
               ),
             ),
           ),
-        ),
-      );
-    }
+        );
+      }
 
-    await tester.pumpWidget(viewWithScroll());
-    final dynamic exception = tester.takeException();
-    expect(exception, isAssertionError);
-  });
+      await tester.pumpWidget(viewWithScroll());
+      final dynamic exception = tester.takeException();
+      expect(exception, isAssertionError);
+    },
+  );
 
-  testWidgets('On first render with isAlwaysShown: true, the thumb shows',
-      (WidgetTester tester) async {
+  testWidgets('On first render with isAlwaysShown: true, the thumb shows', (WidgetTester tester) async {
     final ScrollController controller = ScrollController();
     Widget viewWithScroll() {
       return _buildBoilerplate(
@@ -259,8 +262,7 @@
     expect(find.byType(Scrollbar), paints..rect());
   });
 
-  testWidgets('On first render with isAlwaysShown: false, the thumb is hidden',
-      (WidgetTester tester) async {
+  testWidgets('On first render with isAlwaysShown: false, the thumb is hidden', (WidgetTester tester) async {
     final ScrollController controller = ScrollController();
     Widget viewWithScroll() {
       return _buildBoilerplate(
@@ -287,212 +289,216 @@
   });
 
   testWidgets(
-      'With isAlwaysShown: true, fling a scroll. While it is still scrolling, set isAlwaysShown: false. The thumb should not fade out until the scrolling stops.',
-      (WidgetTester tester) async {
-    final ScrollController controller = ScrollController();
-    bool isAlwaysShown = true;
-    Widget viewWithScroll() {
-      return _buildBoilerplate(
-        child: StatefulBuilder(
-          builder: (BuildContext context, StateSetter setState) {
-            return Theme(
-              data: ThemeData(),
-              child: Scaffold(
-                floatingActionButton: FloatingActionButton(
-                  child: const Icon(Icons.threed_rotation),
-                  onPressed: () {
-                    setState(() {
-                      isAlwaysShown = !isAlwaysShown;
-                    });
-                  },
-                ),
-                body: Scrollbar(
-                  isAlwaysShown: isAlwaysShown,
-                  controller: controller,
-                  child: SingleChildScrollView(
+    'With isAlwaysShown: true, fling a scroll. While it is still scrolling, set isAlwaysShown: false. The thumb should not fade out until the scrolling stops.',
+    (WidgetTester tester) async {
+      final ScrollController controller = ScrollController();
+      bool isAlwaysShown = true;
+      Widget viewWithScroll() {
+        return _buildBoilerplate(
+          child: StatefulBuilder(
+            builder: (BuildContext context, StateSetter setState) {
+              return Theme(
+                data: ThemeData(),
+                child: Scaffold(
+                  floatingActionButton: FloatingActionButton(
+                    child: const Icon(Icons.threed_rotation),
+                    onPressed: () {
+                      setState(() {
+                        isAlwaysShown = !isAlwaysShown;
+                      });
+                    },
+                  ),
+                  body: Scrollbar(
+                    isAlwaysShown: isAlwaysShown,
                     controller: controller,
-                    child: const SizedBox(
-                      width: 4000.0,
-                      height: 4000.0,
+                    child: SingleChildScrollView(
+                      controller: controller,
+                      child: const SizedBox(
+                        width: 4000.0,
+                        height: 4000.0,
+                      ),
                     ),
                   ),
                 ),
-              ),
-            );
-          },
-        ),
+              );
+            },
+          ),
+        );
+      }
+
+      await tester.pumpWidget(viewWithScroll());
+      await tester.pumpAndSettle();
+      await tester.fling(
+        find.byType(SingleChildScrollView),
+        const Offset(0.0, -10.0),
+        10,
       );
-    }
+      expect(find.byType(Scrollbar), paints..rect());
 
-    await tester.pumpWidget(viewWithScroll());
-    await tester.pumpAndSettle();
-    await tester.fling(
-      find.byType(SingleChildScrollView),
-      const Offset(0.0, -10.0),
-      10,
-    );
-    expect(find.byType(Scrollbar), paints..rect());
-
-    await tester.tap(find.byType(FloatingActionButton));
-    await tester.pumpAndSettle();
-    // Scrollbar is not showing after scroll finishes
-    expect(find.byType(Scrollbar), isNot(paints..rect()));
-  });
+      await tester.tap(find.byType(FloatingActionButton));
+      await tester.pumpAndSettle();
+      // Scrollbar is not showing after scroll finishes
+      expect(find.byType(Scrollbar), isNot(paints..rect()));
+    },
+  );
 
   testWidgets(
-      'With isAlwaysShown: false, set isAlwaysShown: true. The thumb should be always shown directly',
-      (WidgetTester tester) async {
-    final ScrollController controller = ScrollController();
-    bool isAlwaysShown = false;
-    Widget viewWithScroll() {
-      return _buildBoilerplate(
-        child: StatefulBuilder(
-          builder: (BuildContext context, StateSetter setState) {
-            return Theme(
-              data: ThemeData(),
-              child: Scaffold(
-                floatingActionButton: FloatingActionButton(
-                  child: const Icon(Icons.threed_rotation),
-                  onPressed: () {
-                    setState(() {
-                      isAlwaysShown = !isAlwaysShown;
-                    });
-                  },
-                ),
-                body: Scrollbar(
-                  isAlwaysShown: isAlwaysShown,
-                  controller: controller,
-                  child: SingleChildScrollView(
+    'With isAlwaysShown: false, set isAlwaysShown: true. The thumb should be always shown directly',
+    (WidgetTester tester) async {
+      final ScrollController controller = ScrollController();
+      bool isAlwaysShown = false;
+      Widget viewWithScroll() {
+        return _buildBoilerplate(
+          child: StatefulBuilder(
+            builder: (BuildContext context, StateSetter setState) {
+              return Theme(
+                data: ThemeData(),
+                child: Scaffold(
+                  floatingActionButton: FloatingActionButton(
+                    child: const Icon(Icons.threed_rotation),
+                    onPressed: () {
+                      setState(() {
+                        isAlwaysShown = !isAlwaysShown;
+                      });
+                    },
+                  ),
+                  body: Scrollbar(
+                    isAlwaysShown: isAlwaysShown,
                     controller: controller,
-                    child: const SizedBox(
-                      width: 4000.0,
-                      height: 4000.0,
+                    child: SingleChildScrollView(
+                      controller: controller,
+                      child: const SizedBox(
+                        width: 4000.0,
+                        height: 4000.0,
+                      ),
                     ),
                   ),
                 ),
-              ),
-            );
-          },
-        ),
-      );
-    }
+              );
+            },
+          ),
+        );
+      }
 
-    await tester.pumpWidget(viewWithScroll());
-    await tester.pumpAndSettle();
-    expect(find.byType(Scrollbar), isNot(paints..rect()));
+      await tester.pumpWidget(viewWithScroll());
+      await tester.pumpAndSettle();
+      expect(find.byType(Scrollbar), isNot(paints..rect()));
 
-    await tester.tap(find.byType(FloatingActionButton));
-    await tester.pumpAndSettle();
-    // Scrollbar is not showing after scroll finishes
-    expect(find.byType(Scrollbar), paints..rect());
-  });
+      await tester.tap(find.byType(FloatingActionButton));
+      await tester.pumpAndSettle();
+      // Scrollbar is not showing after scroll finishes
+      expect(find.byType(Scrollbar), paints..rect());
+    },
+  );
 
   testWidgets(
-      'With isAlwaysShown: false, fling a scroll. While it is still scrolling, set isAlwaysShown: true. The thumb should not fade even after the scrolling stops',
-      (WidgetTester tester) async {
-    final ScrollController controller = ScrollController();
-    bool isAlwaysShown = false;
-    Widget viewWithScroll() {
-      return _buildBoilerplate(
-        child: StatefulBuilder(
-          builder: (BuildContext context, StateSetter setState) {
-            return Theme(
-              data: ThemeData(),
-              child: Scaffold(
-                floatingActionButton: FloatingActionButton(
-                  child: const Icon(Icons.threed_rotation),
-                  onPressed: () {
-                    setState(() {
-                      isAlwaysShown = !isAlwaysShown;
-                    });
-                  },
-                ),
-                body: Scrollbar(
-                  isAlwaysShown: isAlwaysShown,
-                  controller: controller,
-                  child: SingleChildScrollView(
+    'With isAlwaysShown: false, fling a scroll. While it is still scrolling, set isAlwaysShown: true. The thumb should not fade even after the scrolling stops',
+    (WidgetTester tester) async {
+      final ScrollController controller = ScrollController();
+      bool isAlwaysShown = false;
+      Widget viewWithScroll() {
+        return _buildBoilerplate(
+          child: StatefulBuilder(
+            builder: (BuildContext context, StateSetter setState) {
+              return Theme(
+                data: ThemeData(),
+                child: Scaffold(
+                  floatingActionButton: FloatingActionButton(
+                    child: const Icon(Icons.threed_rotation),
+                    onPressed: () {
+                      setState(() {
+                        isAlwaysShown = !isAlwaysShown;
+                      });
+                    },
+                  ),
+                  body: Scrollbar(
+                    isAlwaysShown: isAlwaysShown,
                     controller: controller,
-                    child: const SizedBox(
-                      width: 4000.0,
-                      height: 4000.0,
+                    child: SingleChildScrollView(
+                      controller: controller,
+                      child: const SizedBox(
+                        width: 4000.0,
+                        height: 4000.0,
+                      ),
                     ),
                   ),
                 ),
-              ),
-            );
-          },
-        ),
+              );
+            },
+          ),
+        );
+      }
+
+      await tester.pumpWidget(viewWithScroll());
+      await tester.pumpAndSettle();
+      expect(find.byType(Scrollbar), isNot(paints..rect()));
+      await tester.fling(
+        find.byType(SingleChildScrollView),
+        const Offset(0.0, -10.0),
+        10,
       );
-    }
+      expect(find.byType(Scrollbar), paints..rect());
 
-    await tester.pumpWidget(viewWithScroll());
-    await tester.pumpAndSettle();
-    expect(find.byType(Scrollbar), isNot(paints..rect()));
-    await tester.fling(
-      find.byType(SingleChildScrollView),
-      const Offset(0.0, -10.0),
-      10,
-    );
-    expect(find.byType(Scrollbar), paints..rect());
+      await tester.tap(find.byType(FloatingActionButton));
+      await tester.pump();
+      expect(find.byType(Scrollbar), paints..rect());
 
-    await tester.tap(find.byType(FloatingActionButton));
-    await tester.pump();
-    expect(find.byType(Scrollbar), paints..rect());
-
-    // Wait for the timer delay to expire.
-    await tester.pump(const Duration(milliseconds: 600)); // _kScrollbarTimeToFade
-    await tester.pumpAndSettle();
-    // Scrollbar thumb is showing after scroll finishes and timer ends.
-    expect(find.byType(Scrollbar), paints..rect());
-  });
+      // Wait for the timer delay to expire.
+      await tester.pump(const Duration(milliseconds: 600)); // _kScrollbarTimeToFade
+      await tester.pumpAndSettle();
+      // Scrollbar thumb is showing after scroll finishes and timer ends.
+      expect(find.byType(Scrollbar), paints..rect());
+    },
+  );
 
   testWidgets(
-      'Toggling isAlwaysShown while not scrolling fades the thumb in/out. This works even when you have never scrolled at all yet',
-      (WidgetTester tester) async {
-    final ScrollController controller = ScrollController();
-    bool isAlwaysShown = true;
-    Widget viewWithScroll() {
-      return _buildBoilerplate(
-        child: StatefulBuilder(
-          builder: (BuildContext context, StateSetter setState) {
-            return Theme(
-              data: ThemeData(),
-              child: Scaffold(
-                floatingActionButton: FloatingActionButton(
-                  child: const Icon(Icons.threed_rotation),
-                  onPressed: () {
-                    setState(() {
-                      isAlwaysShown = !isAlwaysShown;
-                    });
-                  },
-                ),
-                body: Scrollbar(
-                  isAlwaysShown: isAlwaysShown,
-                  controller: controller,
-                  child: SingleChildScrollView(
+    'Toggling isAlwaysShown while not scrolling fades the thumb in/out. This works even when you have never scrolled at all yet',
+    (WidgetTester tester) async {
+      final ScrollController controller = ScrollController();
+      bool isAlwaysShown = true;
+      Widget viewWithScroll() {
+        return _buildBoilerplate(
+          child: StatefulBuilder(
+            builder: (BuildContext context, StateSetter setState) {
+              return Theme(
+                data: ThemeData(),
+                child: Scaffold(
+                  floatingActionButton: FloatingActionButton(
+                    child: const Icon(Icons.threed_rotation),
+                    onPressed: () {
+                      setState(() {
+                        isAlwaysShown = !isAlwaysShown;
+                      });
+                    },
+                  ),
+                  body: Scrollbar(
+                    isAlwaysShown: isAlwaysShown,
                     controller: controller,
-                    child: const SizedBox(
-                      width: 4000.0,
-                      height: 4000.0,
+                    child: SingleChildScrollView(
+                      controller: controller,
+                      child: const SizedBox(
+                        width: 4000.0,
+                        height: 4000.0,
+                      ),
                     ),
                   ),
                 ),
-              ),
-            );
-          },
-        ),
-      );
-    }
+              );
+            },
+          ),
+        );
+      }
 
-    await tester.pumpWidget(viewWithScroll());
-    await tester.pumpAndSettle();
-    final Finder materialScrollbar = find.byType(Scrollbar);
-    expect(materialScrollbar, paints..rect());
+      await tester.pumpWidget(viewWithScroll());
+      await tester.pumpAndSettle();
+      final Finder materialScrollbar = find.byType(Scrollbar);
+      expect(materialScrollbar, paints..rect());
 
-    await tester.tap(find.byType(FloatingActionButton));
-    await tester.pumpAndSettle();
-    expect(materialScrollbar, isNot(paints..rect()));
-  });
+      await tester.tap(find.byType(FloatingActionButton));
+      await tester.pumpAndSettle();
+      expect(materialScrollbar, isNot(paints..rect()));
+    },
+  );
 
   testWidgets('Scrollbar respects thickness and radius', (WidgetTester tester) async {
     final ScrollController controller = ScrollController();
@@ -651,7 +657,7 @@
       const MaterialApp(
         home: Scrollbar(
           child: SingleChildScrollView(
-            child: SizedBox(width: 4000.0, height: 4000.0)
+            child: SizedBox(width: 4000.0, height: 4000.0),
           ),
         ),
       ),
@@ -738,7 +744,7 @@
             isAlwaysShown: true,
             controller: scrollController,
             child: const SingleChildScrollView(
-              child: SizedBox(width: 4000.0, height: 4000.0)
+              child: SizedBox(width: 4000.0, height: 4000.0),
             ),
           ),
         ),
@@ -823,7 +829,7 @@
       MaterialApp(
         theme: ThemeData(scrollbarTheme: const ScrollbarThemeData(isAlwaysShown: true)),
         home: const SingleChildScrollView(
-          child: SizedBox(width: 4000.0, height: 4000.0)
+          child: SizedBox(width: 4000.0, height: 4000.0),
         ),
       ),
     );
@@ -872,7 +878,7 @@
           showTrackOnHover: true,
         )),
         home: const SingleChildScrollView(
-          child: SizedBox(width: 4000.0, height: 4000.0)
+          child: SizedBox(width: 4000.0, height: 4000.0),
         ),
       ),
     );
@@ -945,7 +951,7 @@
           showTrackOnHover: true,
         )),
         home: const SingleChildScrollView(
-          child: SizedBox(width: 4000.0, height: 4000.0)
+          child: SizedBox(width: 4000.0, height: 4000.0),
         ),
       ),
     );
@@ -1003,7 +1009,7 @@
       return _buildBoilerplate(
         child: Theme(
           data: ThemeData(
-            platform: platform
+            platform: platform,
           ),
           child: const Scrollbar(
             child: SingleChildScrollView(
@@ -1023,7 +1029,7 @@
 
     await tester.pumpWidget(viewWithScroll(TargetPlatform.iOS));
     final TestGesture gesture = await tester.startGesture(
-      tester.getCenter(find.byType(SingleChildScrollView))
+      tester.getCenter(find.byType(SingleChildScrollView)),
     );
     await gesture.moveBy(const Offset(0.0, -10.0));
     await tester.drag(find.byType(SingleChildScrollView), const Offset(0.0, -10.0));
@@ -1041,7 +1047,7 @@
       return _buildBoilerplate(
         child: Theme(
           data: ThemeData(
-            platform: platform
+            platform: platform,
           ),
           child: Scrollbar(
             controller: controller,
@@ -1055,7 +1061,7 @@
 
     await tester.pumpWidget(viewWithScroll(debugDefaultTargetPlatformOverride));
     final TestGesture gesture = await tester.startGesture(
-      tester.getCenter(find.byType(SingleChildScrollView))
+      tester.getCenter(find.byType(SingleChildScrollView)),
     );
     await gesture.moveBy(const Offset(0.0, -10.0));
     await tester.drag(find.byType(SingleChildScrollView), const Offset(0.0, -10.0));
@@ -1209,7 +1215,7 @@
             isAlwaysShown: true,
             controller: scrollController,
             child: const SingleChildScrollView(
-              child: SizedBox(width: 4000.0, height: 4000.0)
+              child: SizedBox(width: 4000.0, height: 4000.0),
             ),
           ),
         ),
@@ -1275,7 +1281,7 @@
             isAlwaysShown: true,
             controller: scrollController,
             child: const SingleChildScrollView(
-                child: SizedBox(width: 4000.0, height: 4000.0)
+              child: SizedBox(width: 4000.0, height: 4000.0),
             ),
           ),
         ),

diff --git a/packages/flutter/test/material/scrollbar_theme_test.dart b/packages/flutter/test/material/scrollbar_theme_test.dart
index b57d3c8..17bfbe0 100644
--- a/packages/flutter/test/material/scrollbar_theme_test.dart
+++ b/packages/flutter/test/material/scrollbar_theme_test.dart

@@ -37,7 +37,7 @@
             controller: scrollController,
             child: SingleChildScrollView(
               controller: scrollController,
-              child: const SizedBox(width: 4000.0, height: 4000.0)
+              child: const SizedBox(width: 4000.0, height: 4000.0),
             ),
           ),
         ),
@@ -130,7 +130,7 @@
           controller: scrollController,
           child: SingleChildScrollView(
             controller: scrollController,
-            child: const SizedBox(width: 4000.0, height: 4000.0)
+            child: const SizedBox(width: 4000.0, height: 4000.0),
           ),
         ),
       ),
@@ -217,7 +217,7 @@
         controller: scrollController,
         child: SingleChildScrollView(
           controller: scrollController,
-          child: const SizedBox(width: 4000.0, height: 4000.0)
+          child: const SizedBox(width: 4000.0, height: 4000.0),
         ),
       ),
     ));
@@ -265,7 +265,7 @@
         controller: scrollController,
         child: SingleChildScrollView(
           controller: scrollController,
-          child: const SizedBox(width: 4000.0, height: 4000.0)
+          child: const SizedBox(width: 4000.0, height: 4000.0),
         ),
       ),
     ));
@@ -326,7 +326,7 @@
             controller: scrollController,
             child: SingleChildScrollView(
               controller: scrollController,
-              child: const SizedBox(width: 4000.0, height: 4000.0)
+              child: const SizedBox(width: 4000.0, height: 4000.0),
             ),
           ),
         ),
@@ -419,10 +419,10 @@
             controller: scrollController,
             child: SingleChildScrollView(
               controller: scrollController,
-              child: const SizedBox(width: 4000.0, height: 4000.0)
+              child: const SizedBox(width: 4000.0, height: 4000.0),
             ),
           ),
-        )
+        ),
       );
     }
 
@@ -616,7 +616,7 @@
       'trackBorderColor: Instance of \'_MaterialStatePropertyWith<Color?>\'',
       'crossAxisMargin: 3.0',
       'mainAxisMargin: 6.0',
-      'minThumbLength: 120.0'
+      'minThumbLength: 120.0',
     ]);
 
     // On the web, Dart doubles and ints are backed by the same kind of object because

diff --git a/packages/flutter/test/material/search_test.dart b/packages/flutter/test/material/search_test.dart
index a07a585..c3444bb 100644
--- a/packages/flutter/test/material/search_test.dart
+++ b/packages/flutter/test/material/search_test.dart

@@ -676,8 +676,12 @@
       await tester.tap(find.byTooltip('Search'));
       await tester.pumpAndSettle();
 
-      expect(semantics, hasSemantics(buildExpected(routeName: 'Search'),
-          ignoreId: true, ignoreRect: true, ignoreTransform: true));
+      expect(semantics, hasSemantics(
+        buildExpected(routeName: 'Search'),
+        ignoreId: true,
+        ignoreRect: true,
+        ignoreTransform: true,
+      ));
 
       semantics.dispose();
     });
@@ -692,15 +696,18 @@
       await tester.tap(find.byTooltip('Search'));
       await tester.pumpAndSettle();
 
-      expect(semantics, hasSemantics(buildExpected(routeName: ''),
-          ignoreId: true, ignoreRect: true, ignoreTransform: true));
+      expect(semantics, hasSemantics(
+        buildExpected(routeName: ''),
+        ignoreId: true,
+        ignoreRect: true,
+        ignoreTransform: true,
+      ));
 
       semantics.dispose();
     }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
   });
 
-  testWidgets('Custom searchFieldDecorationTheme value',
-      (WidgetTester tester) async {
+  testWidgets('Custom searchFieldDecorationTheme value', (WidgetTester tester) async {
     const InputDecorationTheme searchFieldDecorationTheme = InputDecorationTheme(
       hintStyle: TextStyle(color: _TestSearchDelegate.hintTextColor),
     );
@@ -718,58 +725,58 @@
 
   // Regression test for: https://github.com/flutter/flutter/issues/66781
   testWidgets('text in search bar contrasts background (light mode)', (WidgetTester tester) async {
-      final ThemeData themeData = ThemeData.light();
-      final _TestSearchDelegate delegate = _TestSearchDelegate(
-        defaultAppBarTheme: true,
-      );
-      const String query = 'search query';
-      await tester.pumpWidget(TestHomePage(
-        delegate: delegate,
-        passInInitialQuery: true,
-        initialQuery: query,
-        themeData: themeData,
-      ));
+    final ThemeData themeData = ThemeData.light();
+    final _TestSearchDelegate delegate = _TestSearchDelegate(
+      defaultAppBarTheme: true,
+    );
+    const String query = 'search query';
+    await tester.pumpWidget(TestHomePage(
+      delegate: delegate,
+      passInInitialQuery: true,
+      initialQuery: query,
+      themeData: themeData,
+    ));
 
-      await tester.tap(find.byTooltip('Search'));
-      await tester.pumpAndSettle();
+    await tester.tap(find.byTooltip('Search'));
+    await tester.pumpAndSettle();
 
-      final Material appBarBackground = tester.widget<Material>(find.descendant(
-        of: find.byType(AppBar),
-        matching: find.byType(Material),
-      ));
-      expect(appBarBackground.color, Colors.white);
+    final Material appBarBackground = tester.widget<Material>(find.descendant(
+      of: find.byType(AppBar),
+      matching: find.byType(Material),
+    ));
+    expect(appBarBackground.color, Colors.white);
 
-      final TextField textField = tester.widget<TextField>(find.byType(TextField));
-      expect(textField.style!.color, themeData.textTheme.bodyText1!.color);
-      expect(textField.style!.color, isNot(equals(Colors.white)));
+    final TextField textField = tester.widget<TextField>(find.byType(TextField));
+    expect(textField.style!.color, themeData.textTheme.bodyText1!.color);
+    expect(textField.style!.color, isNot(equals(Colors.white)));
   });
 
   // Regression test for: https://github.com/flutter/flutter/issues/66781
   testWidgets('text in search bar contrasts background (dark mode)', (WidgetTester tester) async {
-      final ThemeData themeData = ThemeData.dark();
-      final _TestSearchDelegate delegate = _TestSearchDelegate(
-        defaultAppBarTheme: true,
-      );
-      const String query = 'search query';
-      await tester.pumpWidget(TestHomePage(
-        delegate: delegate,
-        passInInitialQuery: true,
-        initialQuery: query,
-        themeData: themeData,
-      ));
+    final ThemeData themeData = ThemeData.dark();
+    final _TestSearchDelegate delegate = _TestSearchDelegate(
+      defaultAppBarTheme: true,
+    );
+    const String query = 'search query';
+    await tester.pumpWidget(TestHomePage(
+      delegate: delegate,
+      passInInitialQuery: true,
+      initialQuery: query,
+      themeData: themeData,
+    ));
 
-      await tester.tap(find.byTooltip('Search'));
-      await tester.pumpAndSettle();
+    await tester.tap(find.byTooltip('Search'));
+    await tester.pumpAndSettle();
 
-      final Material appBarBackground = tester.widget<Material>(find.descendant(
-        of: find.byType(AppBar),
-        matching: find.byType(Material),
-      ));
-      expect(appBarBackground.color, themeData.primaryColor);
+    final Material appBarBackground = tester.widget<Material>(find.descendant(
+      of: find.byType(AppBar),
+      matching: find.byType(Material),
+    ));
+    expect(appBarBackground.color, themeData.primaryColor);
 
-      final TextField textField = tester.widget<TextField>(find.byType(TextField));
-      expect(textField.style!.color, themeData.textTheme.bodyText1!.color);
-      expect(textField.style!.color, isNot(equals(themeData.primaryColor)));
+    final TextField textField = tester.widget<TextField>(find.byType(TextField));
+    expect(textField.style!.color, themeData.textTheme.bodyText1!.color);
+    expect(textField.style!.color, isNot(equals(themeData.primaryColor)));
   });
 
   // Regression test for: https://github.com/flutter/flutter/issues/78144

diff --git a/packages/flutter/test/material/slider_test.dart b/packages/flutter/test/material/slider_test.dart
index c973b99..956ac09 100644
--- a/packages/flutter/test/material/slider_test.dart
+++ b/packages/flutter/test/material/slider_test.dart

@@ -697,14 +697,14 @@
     await tester.pumpWidget(buildApp(divisions: 3));
     expect(material, paints..rrect(color: sliderTheme.activeTrackColor)..rrect(color: sliderTheme.inactiveTrackColor));
     expect(
-        material,
-        paints
-          ..circle(color: sliderTheme.activeTickMarkColor)
-          ..circle(color: sliderTheme.activeTickMarkColor)
-          ..circle(color: sliderTheme.inactiveTickMarkColor)
-          ..circle(color: sliderTheme.inactiveTickMarkColor)
-          ..shadow(color: Colors.black)
-          ..circle(color: sliderTheme.thumbColor)
+      material,
+      paints
+        ..circle(color: sliderTheme.activeTickMarkColor)
+        ..circle(color: sliderTheme.activeTickMarkColor)
+        ..circle(color: sliderTheme.inactiveTickMarkColor)
+        ..circle(color: sliderTheme.inactiveTickMarkColor)
+        ..shadow(color: Colors.black)
+        ..circle(color: sliderTheme.thumbColor),
     );
     expect(material, isNot(paints..circle(color: sliderTheme.disabledThumbColor)));
     expect(material, isNot(paints..rrect(color: sliderTheme.disabledActiveTrackColor)));
@@ -718,14 +718,15 @@
     ));
     expect(material, paints..rrect(color: customColor1)..rrect(color: customColor2));
     expect(
-        material,
-        paints
-          ..circle(color: customColor2)
-          ..circle(color: customColor2)
-          ..circle(color: customColor1)
-          ..circle(color: customColor1)
-          ..shadow(color: Colors.black)
-          ..circle(color: customColor1));
+      material,
+      paints
+        ..circle(color: customColor2)
+        ..circle(color: customColor2)
+        ..circle(color: customColor1)
+        ..circle(color: customColor1)
+        ..shadow(color: Colors.black)
+        ..circle(color: customColor1),
+    );
     expect(material, isNot(paints..circle(color: sliderTheme.thumbColor)));
     expect(material, isNot(paints..circle(color: sliderTheme.disabledThumbColor)));
     expect(material, isNot(paints..rrect(color: sliderTheme.disabledActiveTrackColor)));
@@ -737,10 +738,11 @@
     await tester.pumpWidget(buildApp(enabled: false));
     await tester.pumpAndSettle();
     expect(
-        material,
-        paints
-          ..rrect(color: sliderTheme.disabledActiveTrackColor)
-          ..rrect(color: sliderTheme.disabledInactiveTrackColor));
+      material,
+      paints
+        ..rrect(color: sliderTheme.disabledActiveTrackColor)
+        ..rrect(color: sliderTheme.disabledInactiveTrackColor),
+    );
     expect(material, paints..shadow(color: Colors.black)..circle(color: sliderTheme.disabledThumbColor));
     expect(material, isNot(paints..circle(color: sliderTheme.thumbColor)));
     expect(material, isNot(paints..rrect(color: sliderTheme.activeTrackColor)));
@@ -749,10 +751,11 @@
     // Test setting the activeColor and inactiveColor for disabled widget.
     await tester.pumpWidget(buildApp(activeColor: customColor1, inactiveColor: customColor2, enabled: false));
     expect(
-        material,
-        paints
-          ..rrect(color: sliderTheme.disabledActiveTrackColor)
-          ..rrect(color: sliderTheme.disabledInactiveTrackColor));
+      material,
+      paints
+        ..rrect(color: sliderTheme.disabledActiveTrackColor)
+        ..rrect(color: sliderTheme.disabledInactiveTrackColor),
+    );
     expect(material, paints..circle(color: sliderTheme.disabledThumbColor));
     expect(material, isNot(paints..circle(color: sliderTheme.thumbColor)));
     expect(material, isNot(paints..rrect(color: sliderTheme.activeTrackColor)));
@@ -1471,25 +1474,25 @@
     final SemanticsTester semantics = SemanticsTester(tester);
 
     await tester.pumpWidget(
-        MaterialApp(
-          home: Theme(
-            data: ThemeData.light(),
-            child: Directionality(
-              textDirection: TextDirection.ltr,
-              child: MediaQuery(
-                data: MediaQueryData.fromWindow(window),
-                child: Material(
-                  child: Slider(
-                    value: 100.0,
-                    min: 0.0,
-                    max: 200.0,
-                    onChanged: (double v) { },
-                  ),
+      MaterialApp(
+        home: Theme(
+          data: ThemeData.light(),
+          child: Directionality(
+            textDirection: TextDirection.ltr,
+            child: MediaQuery(
+              data: MediaQueryData.fromWindow(window),
+              child: Material(
+                child: Slider(
+                  value: 100.0,
+                  min: 0.0,
+                  max: 200.0,
+                  onChanged: (double v) { },
                 ),
               ),
             ),
           ),
-        )
+        ),
+      ),
     );
 
     expect(
@@ -2123,7 +2126,7 @@
         ..paragraph()
         // Represents the Slider.
         ..path(color: fillColor)
-        ..paragraph()
+        ..paragraph(),
     );
 
     expect(valueIndicatorBox, paintsExactlyCountTimes(#drawPath, 2));
@@ -2267,7 +2270,7 @@
             ),
           ),
         ),
-      )
+      ),
     );
 
     final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse, pointer: 1);
@@ -2296,7 +2299,7 @@
             ),
           ),
         ),
-      )
+      ),
     );
 
     expect(RendererBinding.instance!.mouseTracker.debugDeviceActiveCursor(1), SystemMouseCursors.text);
@@ -2318,7 +2321,7 @@
             ),
           ),
         ),
-      )
+      ),
     );
 
     expect(RendererBinding.instance!.mouseTracker.debugDeviceActiveCursor(1), SystemMouseCursors.click);
@@ -2361,9 +2364,9 @@
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
-            sliderTheme: const SliderThemeData(
-              trackShape: RectangularSliderTrackShape(),
-            ),
+          sliderTheme: const SliderThemeData(
+            trackShape: RectangularSliderTrackShape(),
+          ),
         ),
         home: Directionality(
           textDirection: TextDirection.ltr,
@@ -2387,10 +2390,11 @@
 
     // The active track rect should start at 24.0 pixels,
     // and there should not have a gap between active and inactive track.
-    expect(renderObject,
-        paints
-          ..rect(rect: const Rect.fromLTRB(24.0, 298.0, 400.0, 302.0)) // active track Rect.
-          ..rect(rect: const Rect.fromLTRB(400.0, 298.0, 776.0, 302.0)) // inactive track Rect.
+    expect(
+      renderObject,
+      paints
+        ..rect(rect: const Rect.fromLTRB(24.0, 298.0, 400.0, 302.0)) // active track Rect.
+        ..rect(rect: const Rect.fromLTRB(400.0, 298.0, 776.0, 302.0)), // inactive track Rect.
     );
   });
 
@@ -2418,14 +2422,15 @@
     // _RenderSlider is the last render object in the tree.
     final RenderObject renderObject = tester.allRenderObjects.last;
 
-    expect(renderObject,
-        paints
-          // active track RRect
-          ..rrect(rrect: RRect.fromLTRBAndCorners(-14.0, 2.0, 5.0, 8.0, topLeft: const Radius.circular(3.0), bottomLeft: const Radius.circular(3.0)))
-          // inactive track RRect
-          ..rrect(rrect: RRect.fromLTRBAndCorners(5.0, 3.0, 24.0, 7.0, topRight: const Radius.circular(2.0), bottomRight: const Radius.circular(2.0)))
-          // thumb
-          ..circle(x: 5.0, y: 5.0, radius: 10.0, )
+    expect(
+      renderObject,
+      paints
+        // active track RRect
+        ..rrect(rrect: RRect.fromLTRBAndCorners(-14.0, 2.0, 5.0, 8.0, topLeft: const Radius.circular(3.0), bottomLeft: const Radius.circular(3.0)))
+        // inactive track RRect
+        ..rrect(rrect: RRect.fromLTRBAndCorners(5.0, 3.0, 24.0, 7.0, topRight: const Radius.circular(2.0), bottomRight: const Radius.circular(2.0)))
+        // thumb
+        ..circle(x: 5.0, y: 5.0, radius: 10.0, ),
     );
   });
 

diff --git a/packages/flutter/test/material/slider_theme_test.dart b/packages/flutter/test/material/slider_theme_test.dart
index 965cd2f..83be5a0 100644
--- a/packages/flutter/test/material/slider_theme_test.dart
+++ b/packages/flutter/test/material/slider_theme_test.dart

@@ -888,7 +888,7 @@
             bottomRight: const Radius.circular(2.0),
         ))
         // The thumb.
-        ..circle(x: 400.0, y: 300.0, radius: 10.0, )
+        ..circle(x: 400.0, y: 300.0, radius: 10.0),
     );
   });
 
@@ -1152,7 +1152,7 @@
         ..shadow(elevation: 1.0)
         ..circle(x: 24.0, y: 300.0)
         ..shadow(elevation: 6.0)
-        ..circle(x: 24.0, y: 300.0)
+        ..circle(x: 24.0, y: 300.0),
     );
 
     await gesture.up();

diff --git a/packages/flutter/test/material/snack_bar_test.dart b/packages/flutter/test/material/snack_bar_test.dart
index c452c0b..61ade5c 100644
--- a/packages/flutter/test/material/snack_bar_test.dart
+++ b/packages/flutter/test/material/snack_bar_test.dart

@@ -29,7 +29,7 @@
                 width: 100.0,
               ),
             );
-          }
+          },
         ),
       ),
     ));
@@ -74,7 +74,7 @@
                 width: 100.0,
               ),
             );
-          }
+          },
         ),
       ),
     ));
@@ -120,7 +120,7 @@
                 width: 100.0,
               ),
             );
-          }
+          },
         ),
       ),
     ));
@@ -195,7 +195,7 @@
                 width: 100.0,
               ),
             );
-          }
+          },
         ),
       ),
     ));
@@ -272,7 +272,7 @@
                 width: 100.0,
               ),
             );
-          }
+          },
         ),
       ),
     ));
@@ -358,7 +358,7 @@
                 width: 100.0,
               ),
             );
-          }
+          },
         ),
       ),
     ));
@@ -442,7 +442,7 @@
                 width: 100.0,
               ),
             );
-          }
+          },
         ),
       ),
     ));
@@ -487,7 +487,7 @@
                 width: 100.0,
               ),
             );
-          }
+          },
         ),
       ),
     ));
@@ -531,7 +531,7 @@
               },
               child: const Text('X'),
             );
-          }
+          },
         ),
       ),
     ));
@@ -570,7 +570,7 @@
               },
               child: const Text('X'),
             );
-          }
+          },
         ),
       ),
     ));
@@ -611,7 +611,7 @@
                 },
                 child: const Text('X'),
               );
-            }
+            },
           ),
         ),
       ),
@@ -622,7 +622,7 @@
     await tester.pump(const Duration(milliseconds: 750));
 
     final RenderPhysicalModel renderModel = tester.renderObject(
-      find.widgetWithText(Material, 'I am a snack bar.').first
+      find.widgetWithText(Material, 'I am a snack bar.').first,
     );
     // There is a somewhat complicated background color calculation based
     // off of the surface color. For the default light theme it
@@ -653,7 +653,7 @@
                 },
                 child: const Text('X'),
               );
-            }
+            },
           ),
         ),
       ),
@@ -664,7 +664,7 @@
     await tester.pump(const Duration(milliseconds: 750));
 
     final RenderPhysicalModel renderModel = tester.renderObject(
-      find.widgetWithText(Material, 'I am a snack bar.').first
+      find.widgetWithText(Material, 'I am a snack bar.').first,
     );
     expect(renderModel.color, equals(darkTheme.colorScheme.onSurface));
   });
@@ -819,20 +819,20 @@
       MaterialApp(
         home: Scaffold(
           body: Builder(
-              builder: (BuildContext context) {
-                return GestureDetector(
-                  onTap: () {
-                    Scaffold.of(context).showSnackBar(
-                      SnackBar(
-                        content: const Text('I am a snack bar.'),
-                        margin: const EdgeInsets.all(padding),
-                        behavior: SnackBarBehavior.floating,
-                      ),
-                    );
-                  },
-                  child: const Text('X'),
-                );
-              }
+            builder: (BuildContext context) {
+              return GestureDetector(
+                onTap: () {
+                  Scaffold.of(context).showSnackBar(
+                    SnackBar(
+                      content: const Text('I am a snack bar.'),
+                      margin: const EdgeInsets.all(padding),
+                      behavior: SnackBarBehavior.floating,
+                    ),
+                  );
+                },
+                child: const Text('X'),
+              );
+            },
           ),
         ),
       ),
@@ -877,7 +877,7 @@
                   },
                   child: const Text('X'),
                 );
-              }
+              },
             ),
           ),
         ),
@@ -924,7 +924,7 @@
                   },
                   child: const Text('X'),
                 );
-              }
+              },
             ),
           ),
         ),
@@ -953,19 +953,19 @@
       MaterialApp(
         home: Scaffold(
           body: Builder(
-              builder: (BuildContext context) {
-                return GestureDetector(
-                  onTap: () {
-                    ScaffoldMessenger.of(context).showSnackBar(
-                      const SnackBar(
-                        content: Text('I am a snack bar.'),
-                        padding: EdgeInsets.all(padding),
-                      ),
-                    );
-                  },
-                  child: const Text('X'),
-                );
-              }
+            builder: (BuildContext context) {
+              return GestureDetector(
+                onTap: () {
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    const SnackBar(
+                      content: Text('I am a snack bar.'),
+                      padding: EdgeInsets.all(padding),
+                    ),
+                  );
+                },
+                child: const Text('X'),
+              );
+            },
           ),
         ),
       ),
@@ -997,20 +997,20 @@
       MaterialApp(
         home: Scaffold(
           body: Builder(
-              builder: (BuildContext context) {
-                return GestureDetector(
-                  onTap: () {
-                    ScaffoldMessenger.of(context).showSnackBar(
-                      SnackBar(
-                        content: const Text('I am a snack bar.'),
-                        width: width,
-                        behavior: SnackBarBehavior.floating,
-                      ),
-                    );
-                  },
-                  child: const Text('X'),
-                );
-              }
+            builder: (BuildContext context) {
+              return GestureDetector(
+                onTap: () {
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: const Text('I am a snack bar.'),
+                      width: width,
+                      behavior: SnackBarBehavior.floating,
+                    ),
+                  );
+                },
+                child: const Text('X'),
+              );
+            },
           ),
         ),
       ),
@@ -1053,7 +1053,7 @@
                 },
                 child: const Text('X'),
               );
-            }
+            },
           ),
         ),
       ),
@@ -1098,7 +1098,7 @@
                 },
                 child: const Text('X'),
               );
-            }
+            },
           ),
         ),
       ),
@@ -1153,7 +1153,7 @@
                   },
                   child: const Text('X'),
                 );
-              }
+              },
             ),
           ),
         ),
@@ -1174,7 +1174,8 @@
       expect(actionTextBottomLeft.dx - textBottomRight.dx, 24.0 + 12.0); // action padding + margin
       expect(snackBarBottomRight.dx - actionTextBottomRight.dx, 24.0 + 12.0 + 30.0); // action (padding + margin) + right padding
       expect(snackBarBottomRight.dy - actionTextBottomRight.dy, 17.0); // margin (with no bottom padding)
-    });
+    },
+  );
 
   testWidgets('SnackBar should push FloatingActionButton above', (WidgetTester tester) async {
     await tester.pumpWidget(MaterialApp(
@@ -1204,7 +1205,7 @@
                 },
                 child: const Text('X'),
               );
-            }
+            },
           ),
         ),
       ),
@@ -1234,7 +1235,7 @@
   testWidgets('Floating SnackBar button text alignment', (WidgetTester tester) async {
     await tester.pumpWidget(MaterialApp(
       theme: ThemeData(
-        snackBarTheme: const SnackBarThemeData(behavior: SnackBarBehavior.floating)
+        snackBarTheme: const SnackBarThemeData(behavior: SnackBarBehavior.floating),
       ),
       home: MediaQuery(
         data: const MediaQueryData(
@@ -1258,7 +1259,7 @@
                 },
                 child: const Text('X'),
               );
-            }
+            },
           ),
         ),
       ),
@@ -1286,7 +1287,7 @@
     (WidgetTester tester) async {
       await tester.pumpWidget(MaterialApp(
         theme: ThemeData(
-          snackBarTheme: const SnackBarThemeData(behavior: SnackBarBehavior.floating)
+          snackBarTheme: const SnackBarThemeData(behavior: SnackBarBehavior.floating),
         ),
         home: MediaQuery(
           data: const MediaQueryData(
@@ -1316,7 +1317,7 @@
                   },
                   child: const Text('X'),
                 );
-              }
+              },
             ),
           ),
         ),
@@ -1337,7 +1338,8 @@
       expect(actionTextBottomLeft.dx - textBottomRight.dx, 16.0 + 8.0); // action (margin + padding)
       expect(snackBarBottomRight.dx - actionTextBottomRight.dx, 31.0 + 30.0 + 8.0); // margin + right (padding + margin)
       expect(snackBarBottomRight.dy - actionTextBottomRight.dy, 27.0); // margin (with no bottom padding)
-    });
+    },
+  );
 
   testWidgets('SnackBarClosedReason', (WidgetTester tester) async {
     final GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
@@ -1483,8 +1485,8 @@
                   child: const Text('X'),
                 ),
               );
-            }
-          )
+            },
+          ),
         ),
       ),
     ));
@@ -1526,7 +1528,7 @@
             );
           }),
         ),
-      )
+      ),
     ));
     await tester.tap(find.text('X'));
     await tester.pumpAndSettle();
@@ -1569,7 +1571,7 @@
             );
           }),
         ),
-      )
+      ),
     ));
     await tester.tap(find.text('X'));
     await tester.pumpAndSettle();
@@ -1605,7 +1607,7 @@
                 width: 100.0,
               ),
             );
-          }
+          },
         ),
       ),
     ));
@@ -1651,7 +1653,7 @@
                   behavior: HitTestBehavior.opaque,
                   child: const Text('X'),
                 );
-              }
+              },
             ),
           ),
         ),
@@ -1684,25 +1686,25 @@
   testWidgets('SnackBar handles updates to accessibleNavigation - ScaffoldMessenger', (WidgetTester tester) async {
     Future<void> boilerplate({ required bool accessibleNavigation }) {
       return tester.pumpWidget(MaterialApp(
-          home: MediaQuery(
-              data: MediaQueryData(accessibleNavigation: accessibleNavigation),
-              child: Scaffold(
-                  body: Builder(
-                      builder: (BuildContext context) {
-                        return GestureDetector(
-                            onTap: () {
-                              ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-                                  content: const Text('test'),
-                                  action: SnackBarAction(label: 'foo', onPressed: () { }),
-                              ));
-                            },
-                            behavior: HitTestBehavior.opaque,
-                            child: const Text('X'),
-                        );
-                      }
-                  ),
-              ),
+        home: MediaQuery(
+          data: MediaQueryData(accessibleNavigation: accessibleNavigation),
+          child: Scaffold(
+            body: Builder(
+              builder: (BuildContext context) {
+                return GestureDetector(
+                  onTap: () {
+                    ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                      content: const Text('test'),
+                      action: SnackBarAction(label: 'foo', onPressed: () { }),
+                    ));
+                  },
+                  behavior: HitTestBehavior.opaque,
+                  child: const Text('X'),
+                );
+              },
+            ),
           ),
+        ),
       ));
     }
 
@@ -2195,9 +2197,8 @@
               ),
             );
           },
-          '/second': (BuildContext context) => Scaffold(appBar: AppBar(title: const Text(secondHeader)),
-      ),
-        }
+          '/second': (BuildContext context) => Scaffold(appBar: AppBar(title: const Text(secondHeader))),
+        },
       );
     }
     await tester.pumpWidget(_buildApp());
@@ -2346,7 +2347,7 @@
                   width: 100.0,
                 ),
               );
-            }
+            },
           ),
         ),
       ),

diff --git a/packages/flutter/test/material/snack_bar_theme_test.dart b/packages/flutter/test/material/snack_bar_theme_test.dart
index 3713b5e..8462bee 100644
--- a/packages/flutter/test/material/snack_bar_theme_test.dart
+++ b/packages/flutter/test/material/snack_bar_theme_test.dart

@@ -79,7 +79,7 @@
               },
               child: const Text('X'),
             );
-          }
+          },
         ),
       ),
     ));
@@ -106,18 +106,18 @@
       theme: ThemeData(snackBarTheme: snackBarTheme),
       home: Scaffold(
         body: Builder(
-            builder: (BuildContext context) {
-              return GestureDetector(
-                onTap: () {
-                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-                    content: const Text(text),
-                    duration: const Duration(seconds: 2),
-                    action: SnackBarAction(label: action, onPressed: () {}),
-                  ));
-                },
-                child: const Text('X'),
-              );
-            }
+          builder: (BuildContext context) {
+            return GestureDetector(
+              onTap: () {
+                ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                  content: const Text(text),
+                  duration: const Duration(seconds: 2),
+                  action: SnackBarAction(label: action, onPressed: () {}),
+                ));
+              },
+              child: const Text('X'),
+            );
+          },
         ),
       ),
     ));
@@ -150,25 +150,25 @@
       theme: ThemeData(snackBarTheme: _snackBarTheme()),
       home: Scaffold(
         body: Builder(
-            builder: (BuildContext context) {
-              return GestureDetector(
-                onTap: () {
-                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-                    backgroundColor: backgroundColor,
-                    elevation: elevation,
-                    shape: shape,
-                    content: const Text('I am a snack bar.'),
-                    duration: const Duration(seconds: 2),
-                    action: SnackBarAction(
-                      textColor: textColor,
-                      label: action,
-                      onPressed: () {},
-                    ),
-                  ));
-                },
-                child: const Text('X'),
-              );
-            }
+          builder: (BuildContext context) {
+            return GestureDetector(
+              onTap: () {
+                ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                  backgroundColor: backgroundColor,
+                  elevation: elevation,
+                  shape: shape,
+                  content: const Text('I am a snack bar.'),
+                  duration: const Duration(seconds: 2),
+                  action: SnackBarAction(
+                    textColor: textColor,
+                    label: action,
+                    onPressed: () {},
+                  ),
+                ));
+              },
+              child: const Text('X'),
+            );
+          },
         ),
       ),
     ));
@@ -189,7 +189,7 @@
   testWidgets('SnackBar theme behavior is correct for floating', (WidgetTester tester) async {
     await tester.pumpWidget(MaterialApp(
       theme: ThemeData(
-        snackBarTheme: const SnackBarThemeData(behavior: SnackBarBehavior.floating)
+        snackBarTheme: const SnackBarThemeData(behavior: SnackBarBehavior.floating),
       ),
       home: Scaffold(
         floatingActionButton: FloatingActionButton(
@@ -231,7 +231,7 @@
   testWidgets('SnackBar theme behavior is correct for fixed', (WidgetTester tester) async {
     await tester.pumpWidget(MaterialApp(
       theme: ThemeData(
-        snackBarTheme: const SnackBarThemeData(behavior: SnackBarBehavior.fixed)
+        snackBarTheme: const SnackBarThemeData(behavior: SnackBarBehavior.fixed),
       ),
       home: Scaffold(
         floatingActionButton: FloatingActionButton(

diff --git a/packages/flutter/test/material/stepper_test.dart b/packages/flutter/test/material/stepper_test.dart
index 115f5e4..4fc7236 100644
--- a/packages/flutter/test/material/stepper_test.dart
+++ b/packages/flutter/test/material/stepper_test.dart

@@ -527,7 +527,7 @@
     expect(errorMessage.length, lessThan(fullErrorMessage.length));
     expect(errorMessage, startsWith(
       '══╡ EXCEPTION CAUGHT BY WIDGETS LIBRARY ╞════════════════════════\n'
-      'The following assertion was thrown building Stepper('
+      'The following assertion was thrown building Stepper(',
     ));
     // The description string of the stepper looks slightly different depending
     // on the platform and is omitted here.
@@ -536,7 +536,7 @@
       'Steppers must not be nested.\n'
       'The material specification advises that one should avoid\n'
       'embedding steppers within steppers.\n'
-      'https://material.io/archive/guidelines/components/steppers.html#steppers-usage'
+      'https://material.io/archive/guidelines/components/steppers.html#steppers-usage',
     ));
   });
 
@@ -668,7 +668,7 @@
                 steps: const <Step>[
                   Step(
                     title: Text(longText),
-                    content: Text('Text content')
+                    content: Text('Text content'),
                   ),
                 ],
               ),
@@ -695,7 +695,7 @@
                   Step(
                     title: Text('Regular title'),
                     subtitle: Text(longText),
-                    content: Text('Text content')
+                    content: Text('Text content'),
                   ),
                 ],
               ),
@@ -730,7 +730,7 @@
 
     Material buttonMaterial(String label) {
       return tester.widget<Material>(
-        find.descendant(of: find.widgetWithText(TextButton, label), matching: find.byType(Material))
+        find.descendant(of: find.widgetWithText(TextButton, label), matching: find.byType(Material)),
       );
     }
 
@@ -788,7 +788,7 @@
 
     Material buttonMaterial(String label) {
       return tester.widget<Material>(
-        find.descendant(of: find.widgetWithText(TextButton, label), matching: find.byType(Material))
+        find.descendant(of: find.widgetWithText(TextButton, label), matching: find.byType(Material)),
       );
     }
 

diff --git a/packages/flutter/test/material/switch_list_tile_test.dart b/packages/flutter/test/material/switch_list_tile_test.dart
index 3d160bb..597f107 100644
--- a/packages/flutter/test/material/switch_list_tile_test.dart
+++ b/packages/flutter/test/material/switch_list_tile_test.dart

@@ -342,7 +342,7 @@
 
   testWidgets('SwitchListTile respects shape', (WidgetTester tester) async {
     const ShapeBorder shapeBorder = RoundedRectangleBorder(
-      borderRadius: BorderRadius.horizontal(right: Radius.circular(100))
+      borderRadius: BorderRadius.horizontal(right: Radius.circular(100)),
     );
 
     await tester.pumpWidget(const MaterialApp(

diff --git a/packages/flutter/test/material/switch_test.dart b/packages/flutter/test/material/switch_test.dart
index 980b4bf..b3d8f32 100644
--- a/packages/flutter/test/material/switch_test.dart
+++ b/packages/flutter/test/material/switch_test.dart

@@ -300,30 +300,32 @@
     );
 
     expect(
-        Material.of(tester.element(find.byType(Switch))),
-        paints
-          ..rrect(
-              color: const Color(0x52000000), // Black with 32% opacity
-              rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
-          ..circle(color: const Color(0x33000000))
-          ..circle(color: const Color(0x24000000))
-          ..circle(color: const Color(0x1f000000))
-          ..circle(color: Colors.grey.shade50),
+      Material.of(tester.element(find.byType(Switch))),
+      paints
+        ..rrect(
+            color: const Color(0x52000000), // Black with 32% opacity
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
+        ..circle(color: const Color(0x33000000))
+        ..circle(color: const Color(0x24000000))
+        ..circle(color: const Color(0x1f000000))
+        ..circle(color: Colors.grey.shade50),
       reason: 'Inactive enabled switch should match these colors',
     );
     await tester.drag(find.byType(Switch), const Offset(-30.0, 0.0));
     await tester.pump();
 
     expect(
-        Material.of(tester.element(find.byType(Switch))),
-        paints
-          ..rrect(
-              color: Colors.blue[600]!.withAlpha(0x80),
-              rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
-          ..circle(color: const Color(0x33000000))
-          ..circle(color: const Color(0x24000000))
-          ..circle(color: const Color(0x1f000000))
-          ..circle(color: Colors.blue[600]),
+      Material.of(tester.element(find.byType(Switch))),
+      paints
+        ..rrect(
+            color: Colors.blue[600]!.withAlpha(0x80),
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
+        ..circle(color: const Color(0x33000000))
+        ..circle(color: const Color(0x24000000))
+        ..circle(color: const Color(0x1f000000))
+        ..circle(color: Colors.blue[600]),
       reason: 'Active enabled switch should match these colors',
     );
   });
@@ -352,7 +354,8 @@
       paints
         ..rrect(
             color: Colors.black12,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -383,7 +386,8 @@
       paints
         ..rrect(
             color: Colors.black12,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -426,7 +430,8 @@
       paints
         ..rrect(
             color: Colors.blue[500],
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -440,7 +445,8 @@
       paints
         ..rrect(
             color: Colors.green[500],
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -747,7 +753,8 @@
       paints
         ..rrect(
             color: const Color(0x801e88e5),
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: Colors.orange[500])
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
@@ -765,7 +772,8 @@
       paints
         ..rrect(
             color: const Color(0x52000000),
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: Colors.orange[500])
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
@@ -783,7 +791,8 @@
       paints
         ..rrect(
             color: const Color(0x1f000000),
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -815,7 +824,7 @@
     await tester.pumpAndSettle();
     expect(
       Material.of(tester.element(find.byType(Switch))),
-      paints..circle(color: Colors.orange[500], radius: splashRadius)
+      paints..circle(color: Colors.orange[500], radius: splashRadius),
     );
   });
 
@@ -848,7 +857,8 @@
       paints
         ..rrect(
             color: const Color(0x801e88e5),
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -868,7 +878,8 @@
       paints
         ..rrect(
             color: const Color(0x801e88e5),
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: Colors.orange[500])
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
@@ -884,7 +895,8 @@
       paints
         ..rrect(
             color: const Color(0x1f000000),
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -1125,7 +1137,8 @@
       paints
         ..rrect(
             color: Colors.black12,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -1141,7 +1154,8 @@
       paints
         ..rrect(
             color: Colors.black12,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -1157,7 +1171,8 @@
       paints
         ..rrect(
             color: const Color(0x52000000), // Black with 32% opacity,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -1173,7 +1188,8 @@
       paints
         ..rrect(
             color: Colors.black12,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
@@ -1230,7 +1246,8 @@
       paints
         ..rrect(
             color: const Color(0x801e88e5),
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x1f000000))
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
@@ -1251,7 +1268,8 @@
       paints
         ..rrect(
             color: const Color(0x801e88e5),
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x1f000000))
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
@@ -1309,7 +1327,8 @@
       paints
         ..rrect(
             color: inactiveDisabledTrackColor,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0))),
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          ),
       reason: 'Inactive disabled switch track should use this value',
     );
 
@@ -1321,7 +1340,8 @@
       paints
         ..rrect(
             color: activeDisabledTrackColor,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0))),
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          ),
       reason: 'Active disabled switch should match these colors',
     );
 
@@ -1333,7 +1353,8 @@
       paints
         ..rrect(
             color: inactiveEnabledTrackColor,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0))),
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          ),
       reason: 'Inactive enabled switch should match these colors',
     );
 
@@ -1345,7 +1366,8 @@
       paints
         ..rrect(
             color: inactiveDisabledTrackColor,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0))),
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          ),
       reason: 'Inactive disabled switch should match these colors',
     );
   });
@@ -1398,7 +1420,8 @@
       paints
         ..rrect(
             color: focusedTrackColor,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0))),
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          ),
       reason: 'Inactive enabled switch should match these colors',
     );
 
@@ -1414,7 +1437,8 @@
       paints
         ..rrect(
             color: hoveredTrackColor,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0))),
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          ),
       reason: 'Inactive enabled switch should match these colors',
     );
   });
@@ -1464,7 +1488,8 @@
       paints
         ..rrect(
             color: Colors.black12,
-            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)))
+            rrect: RRect.fromLTRBR(13.0, 17.0, 46.0, 31.0, const Radius.circular(7.0)),
+          )
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))

diff --git a/packages/flutter/test/material/tab_bar_theme_test.dart b/packages/flutter/test/material/tab_bar_theme_test.dart
index 23b9def..728ea4a 100644
--- a/packages/flutter/test/material/tab_bar_theme_test.dart
+++ b/packages/flutter/test/material/tab_bar_theme_test.dart

@@ -45,7 +45,8 @@
 
 RenderParagraph _iconRenderObject(WidgetTester tester, IconData icon) {
   return tester.renderObject<RenderParagraph>(
-      find.descendant(of: find.byIcon(icon), matching: find.byType(RichText)));
+    find.descendant(of: find.byIcon(icon), matching: find.byType(RichText)),
+  );
 }
 
 void main() {

diff --git a/packages/flutter/test/material/tabs_test.dart b/packages/flutter/test/material/tabs_test.dart
index 414d211..0537b74 100644
--- a/packages/flutter/test/material/tabs_test.dart
+++ b/packages/flutter/test/material/tabs_test.dart

@@ -816,13 +816,13 @@
               builder: (BuildContext context) {
                 firstColor = IconTheme.of(context).color!;
                 return const Text('First');
-              }
+              },
             ),
             Builder(
               builder: (BuildContext context) {
                 secondColor = IconTheme.of(context).color!;
                 return const Text('Second');
-              }
+              },
             ),
           ],
         ),
@@ -1701,8 +1701,7 @@
           alignment: Alignment.topLeft,
           child: TabBar(
             indicator: indicator,
-            indicatorPadding: const EdgeInsetsDirectional.fromSTEB(
-              padStart, padTop, padEnd, padBottom),
+            indicatorPadding: const EdgeInsetsDirectional.fromSTEB(padStart, padTop, padEnd, padBottom),
             isScrollable: true,
             controller: controller,
             tabs: tabs,
@@ -1781,8 +1780,7 @@
           alignment: Alignment.topLeft,
           child: TabBar(
             indicator: indicator,
-            indicatorPadding: const EdgeInsetsDirectional.fromSTEB(
-              padStart, padTop, padEnd, padBottom),
+            indicatorPadding: const EdgeInsetsDirectional.fromSTEB(padStart, padTop, padEnd, padBottom),
             isScrollable: true,
             controller: controller,
             tabs: tabs,
@@ -2617,11 +2615,11 @@
             length: 1,
             child: TabBar(
               tabs: <Tab>[
-                Tab(text: 'A')
+                Tab(text: 'A'),
               ],
-            )
-          )
-        )
+            ),
+          ),
+        ),
       );
       await tester.tap(find.byType(InkWell), pointer: 1);
       await tester.pump(const Duration(seconds: 1));
@@ -2641,7 +2639,7 @@
             length: 1,
             child: TabBar(
               tabs: <Tab>[
-                Tab(text: 'A')
+                Tab(text: 'A'),
               ],
               enableFeedback: false,
             ),
@@ -2661,15 +2659,14 @@
   });
 
   group('Tab overlayColor affects ink response', () {
-    testWidgets('Tab\'s ink well changes color on hover with Tab overlayColor',
-    (WidgetTester tester) async {
+    testWidgets('Tab\'s ink well changes color on hover with Tab overlayColor', (WidgetTester tester) async {
       await tester.pumpWidget(
         boilerplate(
           child: DefaultTabController(
             length: 1,
             child: TabBar(
               tabs: const <Tab>[
-                Tab(text: 'A')
+                Tab(text: 'A'),
               ],
               overlayColor: MaterialStateProperty.resolveWith<Color>(
                 (Set<MaterialState> states) {
@@ -2678,11 +2675,11 @@
                   if (states.contains(MaterialState.pressed))
                     return const Color(0xf00fffff);
                   return const Color(0xffbadbad); // Shouldn't happen.
-                }
+                },
               ),
-            )
-          )
-        )
+            ),
+          ),
+        ),
       );
       final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
       await gesture.addPointer();
@@ -2693,38 +2690,40 @@
       expect(inkFeatures, paints..rect(rect: const Rect.fromLTRB(0.0, 276.0, 800.0, 324.0), color: const Color(0xff00ff00)));
     });
 
-  testWidgets('Tab\'s ink response splashColor matches resolved Tab overlayColor for MaterialState.pressed',
-  (WidgetTester tester) async {
-    const Color splashColor = Color(0xf00fffff);
-    await tester.pumpWidget(
-      boilerplate(
-        child: DefaultTabController(
-          length: 1,
-          child: TabBar(
-            tabs: const <Tab>[
-              Tab(text: 'A')
-            ],
-            overlayColor: MaterialStateProperty.resolveWith<Color>(
-              (Set<MaterialState> states) {
-                if (states.contains(MaterialState.hovered))
-                  return const Color(0xff00ff00);
-                if (states.contains(MaterialState.pressed))
-                  return splashColor;
-                return const Color(0xffbadbad); // Shouldn't happen.
-              }
+    testWidgets(
+      'Tab\'s ink response splashColor matches resolved Tab overlayColor for MaterialState.pressed',
+      (WidgetTester tester) async {
+        const Color splashColor = Color(0xf00fffff);
+        await tester.pumpWidget(
+          boilerplate(
+            child: DefaultTabController(
+              length: 1,
+              child: TabBar(
+                tabs: const <Tab>[
+                  Tab(text: 'A'),
+                ],
+                overlayColor: MaterialStateProperty.resolveWith<Color>(
+                  (Set<MaterialState> states) {
+                    if (states.contains(MaterialState.hovered))
+                      return const Color(0xff00ff00);
+                    if (states.contains(MaterialState.pressed))
+                      return splashColor;
+                    return const Color(0xffbadbad); // Shouldn't happen.
+                  },
+                ),
+              ),
             ),
-          )
-        )
-      )
+          ),
+        );
+        await tester.pumpAndSettle();
+        final TestGesture gesture = await tester.startGesture(tester.getRect(find.byType(InkWell)).center);
+        await tester.pump(const Duration(milliseconds: 200)); // unconfirmed splash is well underway
+        final RenderObject inkFeatures = tester.allRenderObjects.firstWhere((RenderObject object) => object.runtimeType.toString() == '_RenderInkFeatures');
+        expect(inkFeatures, paints..circle(x: 400, y: 24, color: splashColor));
+        await gesture.up();
+      },
     );
-    await tester.pumpAndSettle();
-    final TestGesture gesture = await tester.startGesture(tester.getRect(find.byType(InkWell)).center);
-    await tester.pump(const Duration(milliseconds: 200)); // unconfirmed splash is well underway
-    final RenderObject inkFeatures = tester.allRenderObjects.firstWhere((RenderObject object) => object.runtimeType.toString() == '_RenderInkFeatures');
-    expect(inkFeatures, paints..circle(x: 400, y: 24, color: splashColor));
-    await gesture.up();
   });
-});
   testWidgets('Skipping tabs with global key does not crash', (WidgetTester tester) async {
     // Regression test for https://github.com/flutter/flutter/issues/24660
     final List<String> tabs = <String>[
@@ -3029,7 +3028,7 @@
                 ),
                 body: tabTextContent.isNotEmpty
                   ? TabBarView(
-                      children: tabTextContent.map((String textContent) => Tab(text: "$textContent's view")).toList()
+                      children: tabTextContent.map((String textContent) => Tab(text: "$textContent's view")).toList(),
                     )
                   : const Center(child: Text('No tabs')),
                 bottomNavigationBar: BottomAppBar(
@@ -3173,7 +3172,7 @@
 
   testWidgets('Setting TabController index should make TabBar indicator immediately pop into the position', (WidgetTester tester) async {
     const List<Tab> tabs = <Tab>[
-      Tab(text: 'A'), Tab(text: 'B'), Tab(text: 'C')
+      Tab(text: 'A'), Tab(text: 'B'), Tab(text: 'C'),
     ];
     const Color indicatorColor = Color(0xFFFF0000);
     late TabController tabController;
@@ -3247,7 +3246,7 @@
             children: List<Widget>.generate(10, (int i) => Center(child: Text('index $i'))),
           ),
         ),
-      )
+      ),
     ));
 
     final PageView pageView = tester.widget<PageView>(find.byType(PageView));
@@ -3432,7 +3431,7 @@
                 body: TabBarView(
                   children: tabs.map<Widget>((String tab) => Tab(text: 'Tab child $tab')).toList(),
                 ),
-              )
+              ),
             );
           },
         ),

diff --git a/packages/flutter/test/material/text_button_test.dart b/packages/flutter/test/material/text_button_test.dart
index bdaa85d..fa5dc58 100644
--- a/packages/flutter/test/material/text_button_test.dart
+++ b/packages/flutter/test/material/text_button_test.dart

@@ -996,7 +996,7 @@
                   child: TextButton(
                     style: TextButton.styleFrom(padding: const EdgeInsets.all(22)),
                     onPressed: () {},
-                    child: const Text('TextButton')
+                    child: const Text('TextButton'),
                   ),
                 ),
               ),

diff --git a/packages/flutter/test/material/text_field_focus_test.dart b/packages/flutter/test/material/text_field_focus_test.dart
index 0b7cd15..4d6bfc4 100644
--- a/packages/flutter/test/material/text_field_focus_test.dart
+++ b/packages/flutter/test/material/text_field_focus_test.dart

@@ -217,7 +217,7 @@
         home: Material(
           child: Center(
             child: TextField(
-              decoration: null
+              decoration: null,
             ),
           ),
         ),
@@ -248,7 +248,7 @@
                 FocusScope(
                   node: focusScopeNode0,
                   child: Builder(
-                    builder: (BuildContext context) => TextField(key: textField0)
+                    builder: (BuildContext context) => TextField(key: textField0),
                   ),
                 ),
                 FocusScope(

diff --git a/packages/flutter/test/material/text_field_test.dart b/packages/flutter/test/material/text_field_test.dart
index 2975413..9f40e36 100644
--- a/packages/flutter/test/material/text_field_test.dart
+++ b/packages/flutter/test/material/text_field_test.dart

@@ -292,8 +292,10 @@
                       TestSemantics(
                         id: 4,
                         flags: <SemanticsFlag>[SemanticsFlag.isTextField],
-                        actions: <SemanticsAction>[SemanticsAction.tap,
-                          SemanticsAction.didGainAccessibilityFocus],
+                        actions: <SemanticsAction>[
+                          SemanticsAction.tap,
+                          SemanticsAction.didGainAccessibilityFocus,
+                        ],
                         textDirection: TextDirection.ltr,
                       ),
                     ],
@@ -642,9 +644,9 @@
 
     const String testValue = 'A B C';
     tester.testTextInput.updateEditingValue(
-        const TextEditingValue(
-          text: testValue
-        )
+      const TextEditingValue(
+        text: testValue,
+      ),
     );
     await tester.pump();
 
@@ -699,8 +701,7 @@
     // First tap moved the cursor.
     expect(
       controller.selection,
-      const TextSelection.collapsed(
-          offset: 8, affinity: TextAffinity.downstream),
+      const TextSelection.collapsed(offset: 8, affinity: TextAffinity.downstream),
     );
     await tester.tapAt(textfieldStart + const Offset(150.0, 9.0));
     await tester.pump();
@@ -817,38 +818,39 @@
     );
   });
 
-  testWidgets('text field toolbar options correctly changes options',
-      (WidgetTester tester) async {
-    final TextEditingController controller = TextEditingController(
-      text: 'Atwater Peel Sherbrooke Bonaventure',
-    );
-    await tester.pumpWidget(
-      MaterialApp(
-        home: Material(
-          child: Center(
-            child: TextField(
-              controller: controller,
-              toolbarOptions: const ToolbarOptions(copy: true),
+  testWidgets(
+    'text field toolbar options correctly changes options',
+    (WidgetTester tester) async {
+      final TextEditingController controller = TextEditingController(
+        text: 'Atwater Peel Sherbrooke Bonaventure',
+      );
+      await tester.pumpWidget(
+        MaterialApp(
+          home: Material(
+            child: Center(
+              child: TextField(
+                controller: controller,
+                toolbarOptions: const ToolbarOptions(copy: true),
+              ),
             ),
           ),
         ),
-      ),
-    );
+      );
 
-    final Offset textfieldStart = tester.getTopLeft(find.byType(TextField));
+      final Offset textfieldStart = tester.getTopLeft(find.byType(TextField));
 
-    await tester.tapAt(textfieldStart + const Offset(150.0, 9.0));
-    await tester.pump(const Duration(milliseconds: 50));
+      await tester.tapAt(textfieldStart + const Offset(150.0, 9.0));
+      await tester.pump(const Duration(milliseconds: 50));
 
-    await tester.tapAt(textfieldStart + const Offset(150.0, 9.0));
-    await tester.pump();
+      await tester.tapAt(textfieldStart + const Offset(150.0, 9.0));
+      await tester.pump();
 
-    // Selected text shows 'Copy', and not 'Paste', 'Cut', 'Select all'.
-    expect(find.text('Paste'), findsNothing);
-    expect(find.text('Copy'), findsOneWidget);
-    expect(find.text('Cut'), findsNothing);
-    expect(find.text('Select all'), findsNothing);
-  },
+      // Selected text shows 'Copy', and not 'Paste', 'Cut', 'Select all'.
+      expect(find.text('Paste'), findsNothing);
+      expect(find.text('Copy'), findsOneWidget);
+      expect(find.text('Cut'), findsNothing);
+      expect(find.text('Select all'), findsNothing);
+    },
     variant: const TargetPlatformVariant(<TargetPlatform>{
       TargetPlatform.android,
       TargetPlatform.fuchsia,
@@ -865,15 +867,15 @@
     final FocusNode focusNode = FocusNode();
     EditableText.debugDeterministicCursor = true;
     await tester.pumpWidget(
-        overlay(
-          child: RepaintBoundary(
-            child: TextField(
-              cursorWidth: 15.0,
-              controller: controller,
-              focusNode: focusNode,
-            ),
+      overlay(
+        child: RepaintBoundary(
+          child: TextField(
+            cursorWidth: 15.0,
+            controller: controller,
+            focusNode: focusNode,
           ),
-        )
+        ),
+      ),
     );
     focusNode.requestFocus();
     await tester.pump();
@@ -892,16 +894,16 @@
     final FocusNode focusNode = FocusNode();
     EditableText.debugDeterministicCursor = true;
     await tester.pumpWidget(
-        overlay(
-          child: RepaintBoundary(
-            child: TextField(
-              cursorWidth: 15.0,
-              cursorRadius: const Radius.circular(3.0),
-              controller: controller,
-              focusNode: focusNode,
-            ),
+      overlay(
+        child: RepaintBoundary(
+          child: TextField(
+            cursorWidth: 15.0,
+            cursorRadius: const Radius.circular(3.0),
+            controller: controller,
+            focusNode: focusNode,
           ),
-        )
+        ),
+      ),
     );
     focusNode.requestFocus();
     await tester.pump();
@@ -920,16 +922,16 @@
     final FocusNode focusNode = FocusNode();
     EditableText.debugDeterministicCursor = true;
     await tester.pumpWidget(
-        overlay(
-          child: RepaintBoundary(
-            child: TextField(
-              cursorWidth: 15.0,
-              cursorHeight: 30.0,
-              controller: controller,
-              focusNode: focusNode,
-            ),
+      overlay(
+        child: RepaintBoundary(
+          child: TextField(
+            cursorWidth: 15.0,
+            cursorHeight: 30.0,
+            controller: controller,
+            focusNode: focusNode,
           ),
-        )
+        ),
+      ),
     );
     focusNode.requestFocus();
     await tester.pump();
@@ -1307,9 +1309,14 @@
           TestSemantics(
             id: 1,
             flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.isFocused],
-            actions: <SemanticsAction>[SemanticsAction.tap,
-              SemanticsAction.moveCursorBackwardByCharacter, SemanticsAction.setSelection, SemanticsAction.paste,
-              SemanticsAction.setText, SemanticsAction.moveCursorBackwardByWord],
+            actions: <SemanticsAction>[
+              SemanticsAction.tap,
+              SemanticsAction.moveCursorBackwardByCharacter,
+              SemanticsAction.setSelection,
+              SemanticsAction.paste,
+              SemanticsAction.setText,
+              SemanticsAction.moveCursorBackwardByWord,
+            ],
             value: 'abcdefghi',
             textDirection: TextDirection.ltr,
             textSelection: const TextSelection.collapsed(offset: 9),
@@ -3375,7 +3382,7 @@
           builder: (BuildContext context, StateSetter setter) {
             setState = setter;
             return TextField(controller: currentController);
-          }
+          },
         ),
       ),
     );
@@ -6734,7 +6741,9 @@
 
       // But don't trigger the toolbar.
       expect(find.byType(CupertinoButton), findsNothing);
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }),
+  );
 
   testWidgets(
     'tap with a mouse does not move cursor to the edge of the word',
@@ -6769,7 +6778,9 @@
         controller.selection,
         const TextSelection.collapsed(offset: 3, affinity: TextAffinity.downstream),
       );
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }),
+  );
 
   testWidgets('tap moves cursor to the position tapped', (WidgetTester tester) async {
       final TextEditingController controller = TextEditingController(
@@ -6835,7 +6846,9 @@
 
       // No toolbar.
       expect(find.byType(CupertinoButton), findsNothing);
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }),
+  );
 
   testWidgets(
     'double tap selects word and first tap of double tap moves cursor',
@@ -6880,7 +6893,9 @@
 
       // Selected text shows 3 toolbar buttons.
       expect(find.byType(CupertinoButton), isContextMenuProvidedByPlatform ? findsNothing : findsNWidgets(3));
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }),
+  );
 
   testWidgets(
     'double tap selects word and first tap of double tap moves cursor and shows toolbar',
@@ -6925,9 +6940,13 @@
 
       // Selected text shows 4 toolbar buttons: cut, copy, paste, select all
       expect(find.byType(TextButton), isContextMenuProvidedByPlatform ? findsNothing : findsNWidgets(4));
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.android, TargetPlatform.fuchsia, TargetPlatform.linux, TargetPlatform.windows }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.android, TargetPlatform.fuchsia, TargetPlatform.linux, TargetPlatform.windows }),
+  );
 
-  testWidgets('Custom toolbar test - Android text selection controls', (WidgetTester tester) async {
+  testWidgets(
+    'Custom toolbar test - Android text selection controls',
+    (WidgetTester tester) async {
       final TextEditingController controller = TextEditingController(
         text: 'Atwater Peel Sherbrooke Bonaventure',
       );
@@ -6937,7 +6956,7 @@
             child: Center(
               child: TextField(
                 controller: controller,
-                selectionControls: materialTextSelectionControls
+                selectionControls: materialTextSelectionControls,
               ),
             ),
           ),
@@ -6954,7 +6973,10 @@
 
       // Selected text shows 4 toolbar buttons: cut, copy, paste, select all
       expect(find.byType(TextButton), findsNWidgets(4));
-  }, variant: TargetPlatformVariant.all(), skip: isContextMenuProvidedByPlatform);
+    },
+    variant: TargetPlatformVariant.all(),
+    skip: isContextMenuProvidedByPlatform,
+  );
 
   testWidgets(
     'Custom toolbar test - Cupertino text selection controls',
@@ -6985,10 +7007,12 @@
 
       // Selected text shows 3 toolbar buttons: cut, copy, paste
       expect(find.byType(CupertinoButton), findsNWidgets(3));
-  }, variant: TargetPlatformVariant.all(), skip: isContextMenuProvidedByPlatform);
+    },
+    variant: TargetPlatformVariant.all(),
+    skip: isContextMenuProvidedByPlatform,
+  );
 
-  testWidgets('selectionControls is passed to EditableText',
-      (WidgetTester tester) async {
+  testWidgets('selectionControls is passed to EditableText', (WidgetTester tester) async {
     await tester.pumpWidget(
       MaterialApp(
         home: Material(
@@ -7052,7 +7076,9 @@
 
       // Selected text shows 4 toolbar buttons: cut, copy, paste, select all
       expect(find.byType(TextButton), isContextMenuProvidedByPlatform ? findsNothing : findsNWidgets(4));
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.android, TargetPlatform.fuchsia, TargetPlatform.linux, TargetPlatform.windows }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.android, TargetPlatform.fuchsia, TargetPlatform.linux, TargetPlatform.windows }),
+  );
 
   testWidgets(
     'double double tap just shows the selection menu',
@@ -7227,7 +7253,9 @@
       );
       // The toolbar is still showing.
       expect(find.byType(CupertinoButton), isContextMenuProvidedByPlatform ? findsNothing : findsNWidgets(3));
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }),
+  );
 
   testWidgets(
     'tap after a double tap select is not affected',
@@ -7273,7 +7301,9 @@
 
       // No toolbar.
       expect(find.byType(CupertinoButton), findsNothing);
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }),
+  );
 
   testWidgets(
     'long press moves cursor to the exact long press position and shows toolbar',
@@ -7306,7 +7336,9 @@
 
       // Collapsed toolbar shows 2 buttons.
       expect(find.byType(CupertinoButton), isContextMenuProvidedByPlatform ? findsNothing : findsNWidgets(2));
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }),
+  );
 
   testWidgets(
     'long press selects word and shows toolbar',
@@ -7338,7 +7370,9 @@
 
       // Collapsed toolbar shows 4 buttons: cut, copy, paste, select all
       expect(find.byType(TextButton), isContextMenuProvidedByPlatform ? findsNothing : findsNWidgets(4));
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.android, TargetPlatform.fuchsia, TargetPlatform.linux, TargetPlatform.windows }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.android, TargetPlatform.fuchsia, TargetPlatform.linux, TargetPlatform.windows }),
+  );
 
   testWidgets(
     'long press tap cannot initiate a double tap',
@@ -7375,7 +7409,9 @@
 
       // Collapsed toolbar shows 2 buttons.
       expect(find.byType(CupertinoButton), findsNothing);
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }),
+  );
 
   testWidgets(
     'long press drag moves the cursor under the drag and shows toolbar on lift',
@@ -7441,7 +7477,9 @@
       );
       // The toolbar now shows up.
       expect(find.byType(CupertinoButton), isContextMenuProvidedByPlatform ? findsNothing : findsNWidgets(2));
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }),
+  );
 
   testWidgets('long press drag can edge scroll', (WidgetTester tester) async {
     final TextEditingController controller = TextEditingController(
@@ -7573,7 +7611,9 @@
 
       // Long press toolbar.
       expect(find.byType(CupertinoButton), isContextMenuProvidedByPlatform ? findsNothing : findsNWidgets(2));
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS,  TargetPlatform.macOS }),
+  );
 
   testWidgets(
     'double tap after a long tap is not affected',
@@ -7618,7 +7658,9 @@
         const TextSelection(baseOffset: 8, extentOffset: 12),
       );
       expect(find.byType(CupertinoButton), isContextMenuProvidedByPlatform ? findsNothing : findsNWidgets(3));
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS, TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS, TargetPlatform.macOS }),
+  );
 
   testWidgets(
     'double click after a click on Mac',
@@ -7676,9 +7718,13 @@
       );
       // The text selection toolbar isn't shown on Mac without a right click.
       expect(find.byType(CupertinoButton), findsNothing);
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.macOS, TargetPlatform.windows, TargetPlatform.linux }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.macOS, TargetPlatform.windows, TargetPlatform.linux }),
+  );
 
-  testWidgets('double tap chains work', (WidgetTester tester) async {
+  testWidgets(
+    'double tap chains work',
+    (WidgetTester tester) async {
       final TextEditingController controller = TextEditingController(
         text: 'Atwater Peel Sherbrooke Bonaventure',
       );
@@ -7740,9 +7786,13 @@
         const TextSelection(baseOffset: 8, extentOffset: 12),
       );
       expect(find.byType(CupertinoButton), isContextMenuProvidedByPlatform ? findsNothing : findsNWidgets(3));
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS, TargetPlatform.macOS }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.iOS, TargetPlatform.macOS }),
+  );
 
-  testWidgets('double click chains work', (WidgetTester tester) async {
+  testWidgets(
+    'double click chains work',
+    (WidgetTester tester) async {
       final TextEditingController controller = TextEditingController(
         text: 'Atwater Peel Sherbrooke Bonaventure',
       );
@@ -7825,7 +7875,9 @@
         const TextSelection(baseOffset: 8, extentOffset: 12),
       );
       expect(find.byType(CupertinoButton), findsNothing);
-  }, variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.macOS, TargetPlatform.windows, TargetPlatform.linux }));
+    },
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.macOS, TargetPlatform.windows, TargetPlatform.linux }),
+  );
 
   testWidgets('double tapping a space selects the previous word on iOS', (WidgetTester tester) async {
     final TextEditingController controller = TextEditingController(
@@ -9077,17 +9129,17 @@
                       TextField(
                         decoration: InputDecoration(
                           isDense: isDense,
-                        )
+                        ),
                       ),
                       Container(
                         height: 1000,
                       ),
                     ],
-                  )
-                )
+                  ),
+                ),
               ],
-            )
-          )
+            ),
+          ),
         );
       }
 
@@ -9135,32 +9187,32 @@
                 ),
               ),
               Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
-                    SizedBox(
-                      width: 100.0,
-                      child: TextField(
-                        controller: controller2,
-                        focusNode: focusNode2,
-                      ),
+                mainAxisAlignment: MainAxisAlignment.center,
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  SizedBox(
+                    width: 100.0,
+                    child: TextField(
+                      controller: controller2,
+                      focusNode: focusNode2,
                     ),
-                    SizedBox(
-                      width: 100.0,
-                      child: TextField(
-                        controller: controller3,
-                        focusNode: focusNode3,
-                      ),
+                  ),
+                  SizedBox(
+                    width: 100.0,
+                    child: TextField(
+                      controller: controller3,
+                      focusNode: focusNode3,
                     ),
-                    SizedBox(
-                      width: 100.0,
-                      child: TextField(
-                        controller: controller4,
-                        focusNode: focusNode4,
-                      ),
+                  ),
+                  SizedBox(
+                    width: 100.0,
+                    child: TextField(
+                      controller: controller4,
+                      focusNode: focusNode4,
                     ),
-                  ],
-                ),
+                  ),
+                ],
+              ),
               SizedBox(
                 width: 100.0,
                 child: TextField(
@@ -9286,7 +9338,7 @@
                           controller: controller,
                         ),
                       ),
-                    )
+                    ),
                   ],
                 ),
               ),
@@ -9439,7 +9491,7 @@
                 textDirection: TextDirection.rtl,
               ),
             );
-          }
+          },
         ),
       ),
     );

diff --git a/packages/flutter/test/material/text_form_field_test.dart b/packages/flutter/test/material/text_form_field_test.dart
index e8e4b4c..2be26c4 100644
--- a/packages/flutter/test/material/text_form_field_test.dart
+++ b/packages/flutter/test/material/text_form_field_test.dart

@@ -490,15 +490,15 @@
   // Regression test for https://github.com/flutter/flutter/issues/54472.
   testWidgets('reset resets the text fields value to the initialValue', (WidgetTester tester) async {
     await tester.pumpWidget(
-        MaterialApp(
-          home: Material(
-            child: Center(
-              child: TextFormField(
-                initialValue: 'initialValue',
-              ),
+      MaterialApp(
+        home: Material(
+          child: Center(
+            child: TextFormField(
+              initialValue: 'initialValue',
             ),
           ),
-        )
+        ),
+      ),
     );
 
     await tester.enterText(find.byType(TextFormField), 'changedValue');
@@ -513,15 +513,15 @@
   // Regression test for https://github.com/flutter/flutter/issues/34847.
   testWidgets('didChange resets the text field\'s value to empty when passed null', (WidgetTester tester) async {
     await tester.pumpWidget(
-        MaterialApp(
-          home: Material(
-            child: Center(
-              child: TextFormField(
-                initialValue: null,
-              ),
+      MaterialApp(
+        home: Material(
+          child: Center(
+            child: TextFormField(
+              initialValue: null,
             ),
           ),
-        )
+        ),
+      ),
     );
 
     await tester.enterText(find.byType(TextFormField), 'changedValue');
@@ -538,15 +538,15 @@
   // Regression test for https://github.com/flutter/flutter/issues/34847.
   testWidgets('reset resets the text field\'s value to empty when intialValue is null', (WidgetTester tester) async {
     await tester.pumpWidget(
-        MaterialApp(
-          home: Material(
-            child: Center(
-              child: TextFormField(
-                initialValue: null,
-              ),
+      MaterialApp(
+        home: Material(
+          child: Center(
+            child: TextFormField(
+              initialValue: null,
             ),
           ),
-        )
+        ),
+      ),
     );
 
     await tester.enterText(find.byType(TextFormField), 'changedValue');
@@ -571,7 +571,7 @@
             ),
           ),
         ),
-      )
+      ),
     );
 
     expect(find.text('initialValue'), findsOneWidget);

diff --git a/packages/flutter/test/material/text_selection_theme_test.dart b/packages/flutter/test/material/text_selection_theme_test.dart
index 36bbda3..b50f520 100644
--- a/packages/flutter/test/material/text_selection_theme_test.dart
+++ b/packages/flutter/test/material/text_selection_theme_test.dart

@@ -79,7 +79,9 @@
           child: Builder(
             builder: (BuildContext context) {
               return materialTextSelectionControls.buildHandle(
-                context, TextSelectionHandleType.left, 10.0
+                context,
+                TextSelectionHandleType.left,
+                10.0,
               );
             },
           ),
@@ -124,7 +126,9 @@
           child: Builder(
             builder: (BuildContext context) {
               return materialTextSelectionControls.buildHandle(
-                  context, TextSelectionHandleType.left, 10.0
+                context,
+                TextSelectionHandleType.left,
+                10.0,
               );
             },
           ),
@@ -179,7 +183,9 @@
             child: Builder(
               builder: (BuildContext context) {
                 return materialTextSelectionControls.buildHandle(
-                    context, TextSelectionHandleType.left, 10.0
+                  context,
+                  TextSelectionHandleType.left,
+                  10.0,
                 );
               },
             ),

diff --git a/packages/flutter/test/material/text_selection_toolbar_test.dart b/packages/flutter/test/material/text_selection_toolbar_test.dart
index 1284306..cefaa80 100644
--- a/packages/flutter/test/material/text_selection_toolbar_test.dart
+++ b/packages/flutter/test/material/text_selection_toolbar_test.dart

@@ -31,7 +31,7 @@
       : endpoints[0];
     final Offset anchorAbove = Offset(
       globalEditableRegion.left + selectionMidpoint.dx,
-      globalEditableRegion.top + startTextSelectionPoint.point.dy - textLineHeight - _kToolbarContentDistance
+      globalEditableRegion.top + startTextSelectionPoint.point.dy - textLineHeight - _kToolbarContentDistance,
     );
     final Offset anchorBelow = Offset(
       globalEditableRegion.left + selectionMidpoint.dx,

diff --git a/packages/flutter/test/material/theme_data_test.dart b/packages/flutter/test/material/theme_data_test.dart
index 8491bb6..82929fd 100644
--- a/packages/flutter/test/material/theme_data_test.dart
+++ b/packages/flutter/test/material/theme_data_test.dart

@@ -25,8 +25,11 @@
     for (final TargetPlatform platform in TargetPlatform.values) {
       final ThemeData theme = ThemeData(platform: platform);
       final Typography typography = Typography.material2018(platform: platform);
-      expect(theme.textTheme, typography.black.apply(decoration: TextDecoration.none),
-          reason: 'Not using default typography for $platform');
+      expect(
+        theme.textTheme,
+        typography.black.apply(decoration: TextDecoration.none),
+        reason: 'Not using default typography for $platform',
+      );
     }
   });
 

diff --git a/packages/flutter/test/material/theme_test.dart b/packages/flutter/test/material/theme_test.dart
index 8acf0a1..e2abd37 100644
--- a/packages/flutter/test/material/theme_test.dart
+++ b/packages/flutter/test/material/theme_test.dart

@@ -54,8 +54,8 @@
         builder: (BuildContext context) {
           capturedContext = context;
           return Container();
-        }
-      )
+        },
+      ),
     );
 
     expect(Theme.of(capturedContext), equals(ThemeData.localize(ThemeData.fallback(), defaultGeometryTheme)));
@@ -170,7 +170,7 @@
                     },
                     child: const Text('SHOW'),
                   );
-                }
+                },
               ),
             ),
           ),
@@ -205,7 +205,7 @@
                     },
                     child: const Text('SHOW'),
                   );
-                }
+                },
               ),
             ),
           ),
@@ -528,7 +528,8 @@
       expect(theme.primaryColor, Colors.orange);
     });
 
-    testWidgets("CupertinoThemeData does not override material theme's icon theme",
+    testWidgets(
+      "CupertinoThemeData does not override material theme's icon theme",
       (WidgetTester tester) async {
         const Color materialIconColor = Colors.blue;
         const Color cupertinoIconColor = Colors.black;
@@ -540,7 +541,8 @@
 
         expect(buildCount, 1);
         expect(actualIconTheme!.color, materialIconColor);
-    });
+      },
+    );
 
     testWidgets(
       'Changing cupertino theme override triggers rebuilds',

diff --git a/packages/flutter/test/material/time_picker_test.dart b/packages/flutter/test/material/time_picker_test.dart
index 44983ca..3858085 100644
--- a/packages/flutter/test/material/time_picker_test.dart
+++ b/packages/flutter/test/material/time_picker_test.dart

@@ -414,10 +414,16 @@
     await mediaQueryBoilerplate(tester, true);
 
     expect(semantics, isNot(includesNodeWith(label: ':')));
-    expect(semantics.nodesWith(value: 'Select minutes 00'), hasLength(1),
-        reason: '00 appears once in the header');
-    expect(semantics.nodesWith(value: 'Select hours 07'), hasLength(1),
-        reason: '07 appears once in the header');
+    expect(
+      semantics.nodesWith(value: 'Select minutes 00'),
+      hasLength(1),
+      reason: '00 appears once in the header',
+    );
+    expect(
+      semantics.nodesWith(value: 'Select hours 07'),
+      hasLength(1),
+      reason: '07 appears once in the header',
+    );
     expect(semantics, includesNodeWith(label: 'CANCEL'));
     expect(semantics, includesNodeWith(label: 'OK'));
 
@@ -715,26 +721,26 @@
     const String confirmText = 'Custom OK';
     const String helperText = 'Custom Help';
     await tester.pumpWidget(MaterialApp(
-        home: Material(
-          child: Center(
-            child: Builder(
-                builder: (BuildContext context) {
-                  return ElevatedButton(
-                    child: const Text('X'),
-                    onPressed: () async {
-                      await showTimePicker(
-                        context: context,
-                        initialTime: const TimeOfDay(hour: 7, minute: 0),
-                        cancelText: cancelText,
-                        confirmText: confirmText,
-                        helpText: helperText,
-                      );
-                    },
+      home: Material(
+        child: Center(
+          child: Builder(
+            builder: (BuildContext context) {
+              return ElevatedButton(
+                child: const Text('X'),
+                onPressed: () async {
+                  await showTimePicker(
+                    context: context,
+                    initialTime: const TimeOfDay(hour: 7, minute: 0),
+                    cancelText: cancelText,
+                    confirmText: confirmText,
+                    helpText: helperText,
                   );
-                }
-            ),
+                },
+              );
+            },
           ),
-        )
+        ),
+      ),
     ));
 
     // Open the picker.

diff --git a/packages/flutter/test/material/time_picker_theme_test.dart b/packages/flutter/test/material/time_picker_theme_test.dart
index 99d1b4c..85b6b6e 100644
--- a/packages/flutter/test/material/time_picker_theme_test.dart
+++ b/packages/flutter/test/material/time_picker_theme_test.dart

@@ -424,18 +424,18 @@
       home: Material(
         child: Center(
           child: Builder(
-              builder: (BuildContext context) {
-                return ElevatedButton(
-                  child: const Text('X'),
-                  onPressed: () async {
-                    await showTimePicker(
-                      context: context,
-                      initialEntryMode: entryMode,
-                      initialTime: const TimeOfDay(hour: 7, minute: 15),
-                    );
-                  },
-                );
-              }
+            builder: (BuildContext context) {
+              return ElevatedButton(
+                child: const Text('X'),
+                onPressed: () async {
+                  await showTimePicker(
+                    context: context,
+                    initialEntryMode: entryMode,
+                    initialTime: const TimeOfDay(hour: 7, minute: 15),
+                  );
+                },
+              );
+            },
           ),
         ),
       ),

diff --git a/packages/flutter/test/material/toggle_buttons_test.dart b/packages/flutter/test/material/toggle_buttons_test.dart
index 995fb80..d68fb2f 100644
--- a/packages/flutter/test/material/toggle_buttons_test.dart
+++ b/packages/flutter/test/material/toggle_buttons_test.dart

@@ -185,8 +185,10 @@
             ),
           ),
         );
-        fail('Should not be possible to create a toggle button with mismatching '
-            'children.length and isSelected.length.');
+        fail(
+          'Should not be possible to create a toggle button with mismatching '
+          'children.length and isSelected.length.',
+        );
       } on AssertionError catch (e) {
         expect(e.toString(), contains('children.length'));
         expect(e.toString(), contains('isSelected.length'));
@@ -1576,7 +1578,7 @@
       'borderRadius: BorderRadius.circular(7.0)',
       'borderWidth: 3.0',
       'direction: Axis.vertical',
-      'verticalDirection: VerticalDirection.up'
+      'verticalDirection: VerticalDirection.up',
     ]);
   });
 

diff --git a/packages/flutter/test/material/tooltip_test.dart b/packages/flutter/test/material/tooltip_test.dart
index 671b081..7f37413 100644
--- a/packages/flutter/test/material/tooltip_test.dart
+++ b/packages/flutter/test/material/tooltip_test.dart

@@ -1061,7 +1061,7 @@
                       ),
                     ),
                   );
-                }
+                },
               );
             },
           ),

diff --git a/packages/flutter/test/material/will_pop_test.dart b/packages/flutter/test/material/will_pop_test.dart
index f58eef1..ce9446e 100644
--- a/packages/flutter/test/material/will_pop_test.dart
+++ b/packages/flutter/test/material/will_pop_test.dart

@@ -257,7 +257,7 @@
                         return SampleForm(
                           callback: () => showYesNoAlert(context),
                         );
-                      }
+                      },
                     ));
                   },
                 ),
@@ -323,7 +323,7 @@
           builder: (BuildContext context, StateSetter setState) {
             contentsSetState = setState;
             return contentsEmpty ? Container() : SampleForm(key: UniqueKey(), callback: () async => false);
-          }
+          },
         );
       },
     );