diff --git a/dev/benchmarks/complex_layout/lib/main.dart b/dev/benchmarks/complex_layout/lib/main.dart
index c8ba78879ba..2d349aea536 100644
--- a/dev/benchmarks/complex_layout/lib/main.dart
+++ b/dev/benchmarks/complex_layout/lib/main.dart
@@ -71,7 +71,7 @@ class TileScrollLayout extends StatelessWidget {
               child: IconBar(),
             ),
           );
-        }
+        },
       ),
       drawer: const GalleryDrawer(),
     );
@@ -101,8 +101,8 @@ class ComplexLayoutState extends State<ComplexLayout> {
               print('Pressed search');
             },
           ),
-          TopBarMenu()
-        ]
+          TopBarMenu(),
+        ],
       ),
       body: Column(
         children: <Widget>[
@@ -115,7 +115,7 @@ class ComplexLayoutState extends State<ComplexLayout> {
                 else
                   return FancyGalleryItem(index, key: PageStorageKey<int>(index));
               },
-            )
+            ),
           ),
           BottomBar(),
         ],
@@ -133,45 +133,45 @@ class TopBarMenu extends StatelessWidget {
       itemBuilder: (BuildContext context) => <PopupMenuItem<String>>[
         const PopupMenuItem<String>(
           value: 'Friends',
-          child: MenuItemWithIcon(Icons.people, 'Friends', '5 new')
+          child: MenuItemWithIcon(Icons.people, 'Friends', '5 new'),
         ),
         const PopupMenuItem<String>(
           value: 'Events',
-          child: MenuItemWithIcon(Icons.event, 'Events', '12 upcoming')
+          child: MenuItemWithIcon(Icons.event, 'Events', '12 upcoming'),
         ),
         const PopupMenuItem<String>(
           value: 'Events',
-          child: MenuItemWithIcon(Icons.group, 'Groups', '14')
+          child: MenuItemWithIcon(Icons.group, 'Groups', '14'),
         ),
         const PopupMenuItem<String>(
           value: 'Events',
-          child: MenuItemWithIcon(Icons.image, 'Pictures', '12')
+          child: MenuItemWithIcon(Icons.image, 'Pictures', '12'),
         ),
         const PopupMenuItem<String>(
           value: 'Events',
-          child: MenuItemWithIcon(Icons.near_me, 'Nearby', '33')
+          child: MenuItemWithIcon(Icons.near_me, 'Nearby', '33'),
         ),
         const PopupMenuItem<String>(
           value: 'Friends',
-          child: MenuItemWithIcon(Icons.people, 'Friends', '5')
+          child: MenuItemWithIcon(Icons.people, 'Friends', '5'),
         ),
         const PopupMenuItem<String>(
           value: 'Events',
-          child: MenuItemWithIcon(Icons.event, 'Events', '12')
+          child: MenuItemWithIcon(Icons.event, 'Events', '12'),
         ),
         const PopupMenuItem<String>(
           value: 'Events',
-          child: MenuItemWithIcon(Icons.group, 'Groups', '14')
+          child: MenuItemWithIcon(Icons.group, 'Groups', '14'),
         ),
         const PopupMenuItem<String>(
           value: 'Events',
-          child: MenuItemWithIcon(Icons.image, 'Pictures', '12')
+          child: MenuItemWithIcon(Icons.image, 'Pictures', '12'),
         ),
         const PopupMenuItem<String>(
           value: 'Events',
-          child: MenuItemWithIcon(Icons.near_me, 'Nearby', '33')
-        )
-      ]
+          child: MenuItemWithIcon(Icons.near_me, 'Nearby', '33'),
+        ),
+      ],
     );
   }
 }
@@ -190,10 +190,10 @@ class MenuItemWithIcon extends StatelessWidget {
         Icon(icon),
         Padding(
           padding: const EdgeInsets.only(left: 8.0, right: 8.0),
-          child: Text(title)
+          child: Text(title),
         ),
-        Text(subtitle, style: Theme.of(context).textTheme.caption)
-      ]
+        Text(subtitle, style: Theme.of(context).textTheme.caption),
+      ],
     );
   }
 }
@@ -213,11 +213,11 @@ class FancyImageItem extends StatelessWidget {
         InfoBar(),
         const Padding(
           padding: EdgeInsets.symmetric(horizontal: 8.0),
-          child: Divider()
+          child: Divider(),
         ),
         IconBar(),
-        FatDivider()
-      ]
+        FatDivider(),
+      ],
     );
   }
 }
@@ -235,11 +235,11 @@ class FancyGalleryItem extends StatelessWidget {
         InfoBar(),
         const Padding(
           padding: EdgeInsets.symmetric(horizontal: 8.0),
-          child: Divider()
+          child: Divider(),
         ),
         IconBar(),
-        FatDivider()
-      ]
+        FatDivider(),
+      ],
     );
   }
 }
@@ -253,9 +253,9 @@ class InfoBar extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: <Widget>[
           const MiniIconWithText(Icons.thumb_up, '42'),
-          Text('3 Comments', style: Theme.of(context).textTheme.caption)
-        ]
-      )
+          Text('3 Comments', style: Theme.of(context).textTheme.caption),
+        ],
+      ),
     );
   }
 }
@@ -271,8 +271,8 @@ class IconBar extends StatelessWidget {
           IconWithText(Icons.thumb_up, 'Like'),
           IconWithText(Icons.comment, 'Comment'),
           IconWithText(Icons.share, 'Share'),
-        ]
-      )
+        ],
+      ),
     );
   }
 }
@@ -290,10 +290,10 @@ class IconWithText extends StatelessWidget {
       children: <Widget>[
         IconButton(
           icon: Icon(icon),
-          onPressed: () { print('Pressed $title button'); }
+          onPressed: () { print('Pressed $title button'); },
         ),
-        Text(title)
-      ]
+        Text(title),
+      ],
     );
   }
 }
@@ -316,13 +316,13 @@ class MiniIconWithText extends StatelessWidget {
             height: 16.0,
             decoration: BoxDecoration(
               color: Theme.of(context).primaryColor,
-              shape: BoxShape.circle
+              shape: BoxShape.circle,
             ),
-            child: Icon(icon, color: Colors.white, size: 12.0)
-          )
+            child: Icon(icon, color: Colors.white, size: 12.0),
+          ),
         ),
-        Text(title, style: Theme.of(context).textTheme.caption)
-      ]
+        Text(title, style: Theme.of(context).textTheme.caption),
+      ],
     );
   }
 }
@@ -354,8 +354,8 @@ class UserHeader extends StatelessWidget {
             child: Image(
               image: AssetImage('packages/flutter_gallery_assets/people/square/ali.png'),
               width: 32.0,
-              height: 32.0
-            )
+              height: 32.0,
+            ),
           ),
           Expanded(
             child: Column(
@@ -367,21 +367,21 @@ class UserHeader extends StatelessWidget {
                   children: <TextSpan>[
                     TextSpan(text: userName, style: const TextStyle(fontWeight: FontWeight.bold)),
                     const TextSpan(text: ' shared a new '),
-                    const TextSpan(text: 'photo', style: TextStyle(fontWeight: FontWeight.bold))
-                  ]
+                    const TextSpan(text: 'photo', style: TextStyle(fontWeight: FontWeight.bold)),
+                  ],
                 )),
                 Row(
                   children: <Widget>[
                     Text('Yesterday at 11:55 • ', style: Theme.of(context).textTheme.caption),
-                    Icon(Icons.people, size: 16.0, color: Theme.of(context).textTheme.caption.color)
-                  ]
-                )
-              ]
-            )
+                    Icon(Icons.people, size: 16.0, color: Theme.of(context).textTheme.caption.color),
+                  ],
+                ),
+              ],
+            ),
           ),
-          TopBarMenu()
-        ]
-      )
+          TopBarMenu(),
+        ],
+      ),
     );
   }
 }
@@ -391,7 +391,7 @@ class ItemDescription extends StatelessWidget {
   Widget build(BuildContext context) {
     return const Padding(
       padding: EdgeInsets.all(8.0),
-      child: Text('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.')
+      child: Text('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.'),
     );
   }
 }
@@ -411,7 +411,7 @@ class ItemImageBox extends StatelessWidget {
                   height: 230.0,
                   child: Image(
                     image: AssetImage('packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png')
-                  )
+                  ),
                 ),
                 Theme(
                   data: ThemeData.dark(),
@@ -420,14 +420,14 @@ class ItemImageBox extends StatelessWidget {
                     children: <Widget>[
                       IconButton(
                         icon: const Icon(Icons.edit),
-                        onPressed: () { print('Pressed edit button'); }
+                        onPressed: () { print('Pressed edit button'); },
                       ),
                       IconButton(
                         icon: const Icon(Icons.zoom_in),
-                        onPressed: () { print('Pressed zoom button'); }
+                        onPressed: () { print('Pressed zoom button'); },
                       ),
-                    ]
-                  )
+                    ],
+                  ),
                 ),
                 Positioned(
                   bottom: 4.0,
@@ -435,7 +435,7 @@ class ItemImageBox extends StatelessWidget {
                   child: Container(
                     decoration: BoxDecoration(
                       color: Colors.black54,
-                      borderRadius: BorderRadius.circular(2.0)
+                      borderRadius: BorderRadius.circular(2.0),
                     ),
                     padding: const EdgeInsets.all(4.0),
                     child: const RichText(
@@ -447,14 +447,14 @@ class ItemImageBox extends StatelessWidget {
                           ),
                           TextSpan(
                             style: TextStyle(fontWeight: FontWeight.bold),
-                            text: 'Chris Godley'
-                          )
-                        ]
-                      )
-                    )
-                  )
-                )
-              ]
+                            text: 'Chris Godley',
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ],
             )
             ,
             Padding(
@@ -464,13 +464,13 @@ class ItemImageBox extends StatelessWidget {
                 children: <Widget>[
                   Text('Artisans of Southern India', style: Theme.of(context).textTheme.body2),
                   Text('Silk Spinners', style: Theme.of(context).textTheme.body1),
-                  Text('Sivaganga, Tamil Nadu', style: Theme.of(context).textTheme.caption)
-                ]
-              )
-            )
-          ]
-        )
-      )
+                  Text('Sivaganga, Tamil Nadu', style: Theme.of(context).textTheme.caption),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
     );
   }
 }
@@ -483,7 +483,7 @@ class ItemGalleryBox extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final List<String> tabNames = <String>[
-      'A', 'B', 'C', 'D'
+      'A', 'B', 'C', 'D',
     ];
 
     return SizedBox(
@@ -507,8 +507,8 @@ class ItemGalleryBox extends StatelessWidget {
                                 color: Theme.of(context).primaryColor,
                                 child: Center(
                                   child: Text(tabName, style: Theme.of(context).textTheme.headline.copyWith(color: Colors.white)),
-                                )
-                              )
+                                ),
+                              ),
                             ),
                             Row(
                               children: <Widget>[
@@ -524,24 +524,24 @@ class ItemGalleryBox extends StatelessWidget {
                                   child: Padding(
                                     padding: const EdgeInsets.only(left: 8.0),
                                     child: Text('This is item $tabName'),
-                                  )
-                                )
-                              ]
-                            )
-                          ]
-                        )
-                      )
-                    )
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
                   );
-                }).toList()
-              )
+                }).toList(),
+              ),
             ),
             Container(
-              child: const TabPageSelector()
-            )
-          ]
-        )
-      )
+              child: const TabPageSelector(),
+            ),
+          ],
+        ),
+      ),
     );
   }
 }
@@ -554,9 +554,9 @@ class BottomBar extends StatelessWidget {
         border: Border(
           top: BorderSide(
             color: Theme.of(context).dividerColor,
-            width: 1.0
-          )
-        )
+            width: 1.0,
+          ),
+        ),
       ),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -586,11 +586,11 @@ class BottomBarButton extends StatelessWidget {
         children: <Widget>[
           IconButton(
             icon: Icon(icon),
-            onPressed: () { print('Pressed: $title'); }
+            onPressed: () { print('Pressed: $title'); },
           ),
-          Text(title, style: Theme.of(context).textTheme.caption)
-        ]
-      )
+          Text(title, style: Theme.of(context).textTheme.caption),
+        ],
+      ),
     );
   }
 }
@@ -625,7 +625,7 @@ class GalleryDrawer extends StatelessWidget {
               _changeScrollMode(context, currentMode == ScrollMode.complex ? ScrollMode.tile : ScrollMode.complex);
              Navigator.pop(context);
             },
-            trailing: Text(currentMode == ScrollMode.complex ? 'Tile' : 'Complex')
+            trailing: Text(currentMode == ScrollMode.complex ? 'Tile' : 'Complex'),
           ),
           ListTile(
             leading: const Icon(Icons.brightness_5),
@@ -635,7 +635,7 @@ class GalleryDrawer extends StatelessWidget {
             trailing: Radio<bool>(
               value: true,
               groupValue: ComplexLayoutApp.of(context).lightTheme,
-              onChanged: (bool value) { _changeTheme(context, value); }
+              onChanged: (bool value) { _changeTheme(context, value); },
             ),
           ),
           ListTile(
@@ -657,7 +657,7 @@ class GalleryDrawer extends StatelessWidget {
             onTap: () { ComplexLayoutApp.of(context).toggleAnimationSpeed(); },
             trailing: Checkbox(
               value: timeDilation != 1.0,
-              onChanged: (bool value) { ComplexLayoutApp.of(context).toggleAnimationSpeed(); }
+              onChanged: (bool value) { ComplexLayoutApp.of(context).toggleAnimationSpeed(); },
             ),
           ),
         ],
diff --git a/dev/benchmarks/macrobenchmarks/lib/main.dart b/dev/benchmarks/macrobenchmarks/lib/main.dart
index c9fb5f9b3f4..0b89ba0f5eb 100644
--- a/dev/benchmarks/macrobenchmarks/lib/main.dart
+++ b/dev/benchmarks/macrobenchmarks/lib/main.dart
@@ -47,7 +47,7 @@ class HomePage extends StatelessWidget {
             onPressed: (){
               Navigator.pushNamed(context, kCubicBezierRouteName);
             },
-          )
+          ),
         ],
       ),
     );
diff --git a/dev/benchmarks/macrobenchmarks/lib/src/cubic_bezier.dart b/dev/benchmarks/macrobenchmarks/lib/src/cubic_bezier.dart
index 48fca89f8da..a14b71cda8e 100644
--- a/dev/benchmarks/macrobenchmarks/lib/src/cubic_bezier.dart
+++ b/dev/benchmarks/macrobenchmarks/lib/src/cubic_bezier.dart
@@ -263,7 +263,7 @@ class AnimatedBezierState extends State<AnimatedBezier>
       PathDetail(bezier2Path, translate: <double>[29.45, 151.0], rotation: -1.5708),
       PathDetail(bezier3Path,
           translate: <double>[53.0, 200.48], rotation: -3.14159),
-      PathDetail(bezier4Path, translate: <double>[122.48, 77.0], rotation: -4.71239)
+      PathDetail(bezier4Path, translate: <double>[122.48, 77.0], rotation: -4.71239),
     ];
   }
 
diff --git a/dev/benchmarks/macrobenchmarks/test_driver/cull_opacity_perf_test.dart b/dev/benchmarks/macrobenchmarks/test_driver/cull_opacity_perf_test.dart
index c5b15bce58b..951f50c9501 100644
--- a/dev/benchmarks/macrobenchmarks/test_driver/cull_opacity_perf_test.dart
+++ b/dev/benchmarks/macrobenchmarks/test_driver/cull_opacity_perf_test.dart
@@ -11,6 +11,6 @@ void main() {
     'cull_opacity_perf',
     kCullOpacityRouteName,
     pageDelay: const Duration(seconds: 1),
-    duration: const Duration(seconds: 10)
+    duration: const Duration(seconds: 10),
   );
 }
diff --git a/dev/benchmarks/microbenchmarks/lib/gestures/data/velocity_tracker_data.dart b/dev/benchmarks/microbenchmarks/lib/gestures/data/velocity_tracker_data.dart
index 4cd9ff974e0..b0b1485f397 100644
--- a/dev/benchmarks/microbenchmarks/lib/gestures/data/velocity_tracker_data.dart
+++ b/dev/benchmarks/microbenchmarks/lib/gestures/data/velocity_tracker_data.dart
@@ -9,1531 +9,1531 @@ final List<PointerEvent> velocityEventData = <PointerEvent>[
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216690896),
     pointer: 1,
-    position: Offset(270.0, 538.2857055664062)
+    position: Offset(270.0, 538.2857055664062),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690906),
     pointer: 1,
-    position: Offset(270.0, 538.2857055664062)
+    position: Offset(270.0, 538.2857055664062),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690951),
     pointer: 1,
-    position: Offset(270.0, 530.8571166992188)
+    position: Offset(270.0, 530.8571166992188),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690959),
     pointer: 1,
-    position: Offset(270.0, 526.8571166992188)
+    position: Offset(270.0, 526.8571166992188),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690967),
     pointer: 1,
-    position: Offset(270.0, 521.4285888671875)
+    position: Offset(270.0, 521.4285888671875),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690975),
     pointer: 1,
-    position: Offset(270.0, 515.4285888671875)
+    position: Offset(270.0, 515.4285888671875),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690983),
     pointer: 1,
-    position: Offset(270.0, 506.8571472167969)
+    position: Offset(270.0, 506.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690991),
     pointer: 1,
-    position: Offset(268.8571472167969, 496.0)
+    position: Offset(268.8571472167969, 496.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690998),
     pointer: 1,
-    position: Offset(267.4285583496094, 483.1428527832031)
+    position: Offset(267.4285583496094, 483.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691006),
     pointer: 1,
-    position: Offset(266.28570556640625, 469.71429443359375)
+    position: Offset(266.28570556640625, 469.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691014),
     pointer: 1,
-    position: Offset(265.4285583496094, 456.8571472167969)
+    position: Offset(265.4285583496094, 456.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691021),
     pointer: 1,
-    position: Offset(264.28570556640625, 443.71429443359375)
+    position: Offset(264.28570556640625, 443.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691029),
     pointer: 1,
-    position: Offset(264.0, 431.71429443359375)
+    position: Offset(264.0, 431.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691036),
     pointer: 1,
-    position: Offset(263.4285583496094, 421.1428527832031)
+    position: Offset(263.4285583496094, 421.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691044),
     pointer: 1,
-    position: Offset(263.4285583496094, 412.5714416503906)
+    position: Offset(263.4285583496094, 412.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691052),
     pointer: 1,
-    position: Offset(263.4285583496094, 404.5714416503906)
+    position: Offset(263.4285583496094, 404.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691060),
     pointer: 1,
-    position: Offset(263.4285583496094, 396.5714416503906)
+    position: Offset(263.4285583496094, 396.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691068),
     pointer: 1,
-    position: Offset(264.5714416503906, 390.0)
+    position: Offset(264.5714416503906, 390.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691075),
     pointer: 1,
-    position: Offset(265.1428527832031, 384.8571472167969)
+    position: Offset(265.1428527832031, 384.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691083),
     pointer: 1,
-    position: Offset(266.0, 380.28570556640625)
+    position: Offset(266.0, 380.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691091),
     pointer: 1,
-    position: Offset(266.5714416503906, 376.28570556640625)
+    position: Offset(266.5714416503906, 376.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691098),
     pointer: 1,
-    position: Offset(267.1428527832031, 373.1428527832031)
+    position: Offset(267.1428527832031, 373.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691106),
     pointer: 1,
-    position: Offset(267.71429443359375, 370.28570556640625)
+    position: Offset(267.71429443359375, 370.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691114),
     pointer: 1,
-    position: Offset(268.28570556640625, 367.71429443359375)
+    position: Offset(268.28570556640625, 367.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691121),
     pointer: 1,
-    position: Offset(268.5714416503906, 366.0)
+    position: Offset(268.5714416503906, 366.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691130),
     pointer: 1,
-    position: Offset(268.8571472167969, 364.5714416503906)
+    position: Offset(268.8571472167969, 364.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691137),
     pointer: 1,
-    position: Offset(269.1428527832031, 363.71429443359375)
+    position: Offset(269.1428527832031, 363.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691145),
     pointer: 1,
-    position: Offset(269.1428527832031, 362.8571472167969)
+    position: Offset(269.1428527832031, 362.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691153),
     pointer: 1,
-    position: Offset(269.4285583496094, 362.8571472167969)
+    position: Offset(269.4285583496094, 362.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691168),
     pointer: 1,
-    position: Offset(268.5714416503906, 365.4285583496094)
+    position: Offset(268.5714416503906, 365.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691176),
     pointer: 1,
-    position: Offset(267.1428527832031, 370.28570556640625)
+    position: Offset(267.1428527832031, 370.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691183),
     pointer: 1,
-    position: Offset(265.4285583496094, 376.8571472167969)
+    position: Offset(265.4285583496094, 376.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691191),
     pointer: 1,
-    position: Offset(263.1428527832031, 385.71429443359375)
+    position: Offset(263.1428527832031, 385.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691199),
     pointer: 1,
-    position: Offset(261.4285583496094, 396.5714416503906)
+    position: Offset(261.4285583496094, 396.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691207),
     pointer: 1,
-    position: Offset(259.71429443359375, 408.5714416503906)
+    position: Offset(259.71429443359375, 408.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691215),
     pointer: 1,
-    position: Offset(258.28570556640625, 419.4285583496094)
+    position: Offset(258.28570556640625, 419.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691222),
     pointer: 1,
-    position: Offset(257.4285583496094, 428.5714416503906)
+    position: Offset(257.4285583496094, 428.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691230),
     pointer: 1,
-    position: Offset(256.28570556640625, 436.0)
+    position: Offset(256.28570556640625, 436.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691238),
     pointer: 1,
-    position: Offset(255.7142791748047, 442.0)
+    position: Offset(255.7142791748047, 442.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691245),
     pointer: 1,
-    position: Offset(255.14285278320312, 447.71429443359375)
+    position: Offset(255.14285278320312, 447.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691253),
     pointer: 1,
-    position: Offset(254.85714721679688, 453.1428527832031)
+    position: Offset(254.85714721679688, 453.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691261),
     pointer: 1,
-    position: Offset(254.57142639160156, 458.5714416503906)
+    position: Offset(254.57142639160156, 458.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691268),
     pointer: 1,
-    position: Offset(254.2857208251953, 463.71429443359375)
+    position: Offset(254.2857208251953, 463.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691276),
     pointer: 1,
-    position: Offset(254.2857208251953, 470.28570556640625)
+    position: Offset(254.2857208251953, 470.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691284),
     pointer: 1,
-    position: Offset(254.2857208251953, 477.71429443359375)
+    position: Offset(254.2857208251953, 477.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691292),
     pointer: 1,
-    position: Offset(255.7142791748047, 487.1428527832031)
+    position: Offset(255.7142791748047, 487.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691300),
     pointer: 1,
-    position: Offset(256.8571472167969, 498.5714416503906)
+    position: Offset(256.8571472167969, 498.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691307),
     pointer: 1,
-    position: Offset(258.28570556640625, 507.71429443359375)
+    position: Offset(258.28570556640625, 507.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691315),
     pointer: 1,
-    position: Offset(259.4285583496094, 516.0)
+    position: Offset(259.4285583496094, 516.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691323),
     pointer: 1,
-    position: Offset(260.28570556640625, 521.7142944335938)
+    position: Offset(260.28570556640625, 521.7142944335938),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216691338),
     pointer: 1,
-    position: Offset(260.28570556640625, 521.7142944335938)
+    position: Offset(260.28570556640625, 521.7142944335938),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216691573),
     pointer: 2,
-    position: Offset(266.0, 327.4285583496094)
+    position: Offset(266.0, 327.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691588),
     pointer: 2,
-    position: Offset(266.0, 327.4285583496094)
+    position: Offset(266.0, 327.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691626),
     pointer: 2,
-    position: Offset(261.1428527832031, 337.1428527832031)
+    position: Offset(261.1428527832031, 337.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691634),
     pointer: 2,
-    position: Offset(258.28570556640625, 343.1428527832031)
+    position: Offset(258.28570556640625, 343.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691642),
     pointer: 2,
-    position: Offset(254.57142639160156, 354.0)
+    position: Offset(254.57142639160156, 354.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691650),
     pointer: 2,
-    position: Offset(250.2857208251953, 368.28570556640625)
+    position: Offset(250.2857208251953, 368.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691657),
     pointer: 2,
-    position: Offset(247.42857360839844, 382.8571472167969)
+    position: Offset(247.42857360839844, 382.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691665),
     pointer: 2,
-    position: Offset(245.14285278320312, 397.4285583496094)
+    position: Offset(245.14285278320312, 397.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691673),
     pointer: 2,
-    position: Offset(243.14285278320312, 411.71429443359375)
+    position: Offset(243.14285278320312, 411.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691680),
     pointer: 2,
-    position: Offset(242.2857208251953, 426.28570556640625)
+    position: Offset(242.2857208251953, 426.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691688),
     pointer: 2,
-    position: Offset(241.7142791748047, 440.5714416503906)
+    position: Offset(241.7142791748047, 440.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691696),
     pointer: 2,
-    position: Offset(241.7142791748047, 454.5714416503906)
+    position: Offset(241.7142791748047, 454.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691703),
     pointer: 2,
-    position: Offset(242.57142639160156, 467.71429443359375)
+    position: Offset(242.57142639160156, 467.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691712),
     pointer: 2,
-    position: Offset(243.42857360839844, 477.4285583496094)
+    position: Offset(243.42857360839844, 477.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691720),
     pointer: 2,
-    position: Offset(244.85714721679688, 485.71429443359375)
+    position: Offset(244.85714721679688, 485.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691727),
     pointer: 2,
-    position: Offset(246.2857208251953, 493.1428527832031)
+    position: Offset(246.2857208251953, 493.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691735),
     pointer: 2,
-    position: Offset(248.0, 499.71429443359375)
+    position: Offset(248.0, 499.71429443359375),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216691750),
     pointer: 2,
-    position: Offset(248.0, 499.71429443359375)
+    position: Offset(248.0, 499.71429443359375),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216692255),
     pointer: 3,
-    position: Offset(249.42857360839844, 351.4285583496094)
+    position: Offset(249.42857360839844, 351.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692270),
     pointer: 3,
-    position: Offset(249.42857360839844, 351.4285583496094)
+    position: Offset(249.42857360839844, 351.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692309),
     pointer: 3,
-    position: Offset(246.2857208251953, 361.71429443359375)
+    position: Offset(246.2857208251953, 361.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692317),
     pointer: 3,
-    position: Offset(244.0, 368.5714416503906)
+    position: Offset(244.0, 368.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692325),
     pointer: 3,
-    position: Offset(241.42857360839844, 377.71429443359375)
+    position: Offset(241.42857360839844, 377.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692333),
     pointer: 3,
-    position: Offset(237.7142791748047, 391.71429443359375)
+    position: Offset(237.7142791748047, 391.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692340),
     pointer: 3,
-    position: Offset(235.14285278320312, 406.5714416503906)
+    position: Offset(235.14285278320312, 406.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692348),
     pointer: 3,
-    position: Offset(232.57142639160156, 421.4285583496094)
+    position: Offset(232.57142639160156, 421.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692356),
     pointer: 3,
-    position: Offset(230.2857208251953, 436.5714416503906)
+    position: Offset(230.2857208251953, 436.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692363),
     pointer: 3,
-    position: Offset(228.2857208251953, 451.71429443359375)
+    position: Offset(228.2857208251953, 451.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692371),
     pointer: 3,
-    position: Offset(227.42857360839844, 466.0)
+    position: Offset(227.42857360839844, 466.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692378),
     pointer: 3,
-    position: Offset(226.2857208251953, 479.71429443359375)
+    position: Offset(226.2857208251953, 479.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692387),
     pointer: 3,
-    position: Offset(225.7142791748047, 491.71429443359375)
+    position: Offset(225.7142791748047, 491.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692395),
     pointer: 3,
-    position: Offset(225.14285278320312, 501.71429443359375)
+    position: Offset(225.14285278320312, 501.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692402),
     pointer: 3,
-    position: Offset(224.85714721679688, 509.1428527832031)
+    position: Offset(224.85714721679688, 509.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692410),
     pointer: 3,
-    position: Offset(224.57142639160156, 514.8571166992188)
+    position: Offset(224.57142639160156, 514.8571166992188),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692418),
     pointer: 3,
-    position: Offset(224.2857208251953, 519.4285888671875)
+    position: Offset(224.2857208251953, 519.4285888671875),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692425),
     pointer: 3,
-    position: Offset(224.0, 523.4285888671875)
+    position: Offset(224.0, 523.4285888671875),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692433),
     pointer: 3,
-    position: Offset(224.0, 527.1428833007812)
+    position: Offset(224.0, 527.1428833007812),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692441),
     pointer: 3,
-    position: Offset(224.0, 530.5714111328125)
+    position: Offset(224.0, 530.5714111328125),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692448),
     pointer: 3,
-    position: Offset(224.0, 533.1428833007812)
+    position: Offset(224.0, 533.1428833007812),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692456),
     pointer: 3,
-    position: Offset(224.0, 535.4285888671875)
+    position: Offset(224.0, 535.4285888671875),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692464),
     pointer: 3,
-    position: Offset(223.7142791748047, 536.8571166992188)
+    position: Offset(223.7142791748047, 536.8571166992188),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692472),
     pointer: 3,
-    position: Offset(223.7142791748047, 538.2857055664062)
+    position: Offset(223.7142791748047, 538.2857055664062),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216692487),
     pointer: 3,
-    position: Offset(223.7142791748047, 538.2857055664062)
+    position: Offset(223.7142791748047, 538.2857055664062),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216692678),
     pointer: 4,
-    position: Offset(221.42857360839844, 526.2857055664062)
+    position: Offset(221.42857360839844, 526.2857055664062),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692701),
     pointer: 4,
-    position: Offset(220.57142639160156, 514.8571166992188)
+    position: Offset(220.57142639160156, 514.8571166992188),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692708),
     pointer: 4,
-    position: Offset(220.2857208251953, 508.0)
+    position: Offset(220.2857208251953, 508.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692716),
     pointer: 4,
-    position: Offset(220.2857208251953, 498.0)
+    position: Offset(220.2857208251953, 498.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692724),
     pointer: 4,
-    position: Offset(221.14285278320312, 484.28570556640625)
+    position: Offset(221.14285278320312, 484.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692732),
     pointer: 4,
-    position: Offset(221.7142791748047, 469.4285583496094)
+    position: Offset(221.7142791748047, 469.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692740),
     pointer: 4,
-    position: Offset(223.42857360839844, 453.1428527832031)
+    position: Offset(223.42857360839844, 453.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692748),
     pointer: 4,
-    position: Offset(225.7142791748047, 436.28570556640625)
+    position: Offset(225.7142791748047, 436.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692755),
     pointer: 4,
-    position: Offset(229.14285278320312, 418.28570556640625)
+    position: Offset(229.14285278320312, 418.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692763),
     pointer: 4,
-    position: Offset(232.85714721679688, 400.28570556640625)
+    position: Offset(232.85714721679688, 400.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692770),
     pointer: 4,
-    position: Offset(236.85714721679688, 382.5714416503906)
+    position: Offset(236.85714721679688, 382.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692778),
     pointer: 4,
-    position: Offset(241.14285278320312, 366.0)
+    position: Offset(241.14285278320312, 366.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692786),
     pointer: 4,
-    position: Offset(244.85714721679688, 350.28570556640625)
+    position: Offset(244.85714721679688, 350.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692793),
     pointer: 4,
-    position: Offset(249.14285278320312, 335.4285583496094)
+    position: Offset(249.14285278320312, 335.4285583496094),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216692809),
     pointer: 4,
-    position: Offset(249.14285278320312, 335.4285583496094)
+    position: Offset(249.14285278320312, 335.4285583496094),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216693222),
     pointer: 5,
-    position: Offset(224.0, 545.4285888671875)
+    position: Offset(224.0, 545.4285888671875),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693245),
     pointer: 5,
-    position: Offset(224.0, 545.4285888671875)
+    position: Offset(224.0, 545.4285888671875),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693275),
     pointer: 5,
-    position: Offset(222.85714721679688, 535.1428833007812)
+    position: Offset(222.85714721679688, 535.1428833007812),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693284),
     pointer: 5,
-    position: Offset(222.85714721679688, 528.8571166992188)
+    position: Offset(222.85714721679688, 528.8571166992188),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693291),
     pointer: 5,
-    position: Offset(222.2857208251953, 518.5714111328125)
+    position: Offset(222.2857208251953, 518.5714111328125),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693299),
     pointer: 5,
-    position: Offset(222.0, 503.4285583496094)
+    position: Offset(222.0, 503.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693307),
     pointer: 5,
-    position: Offset(222.0, 485.4285583496094)
+    position: Offset(222.0, 485.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693314),
     pointer: 5,
-    position: Offset(221.7142791748047, 464.0)
+    position: Offset(221.7142791748047, 464.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693322),
     pointer: 5,
-    position: Offset(222.2857208251953, 440.28570556640625)
+    position: Offset(222.2857208251953, 440.28570556640625),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216693337),
     pointer: 5,
-    position: Offset(222.2857208251953, 440.28570556640625)
+    position: Offset(222.2857208251953, 440.28570556640625),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216693985),
     pointer: 6,
-    position: Offset(208.0, 544.0)
+    position: Offset(208.0, 544.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694047),
     pointer: 6,
-    position: Offset(208.57142639160156, 532.2857055664062)
+    position: Offset(208.57142639160156, 532.2857055664062),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694054),
     pointer: 6,
-    position: Offset(208.85714721679688, 525.7142944335938)
+    position: Offset(208.85714721679688, 525.7142944335938),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694062),
     pointer: 6,
-    position: Offset(208.85714721679688, 515.1428833007812)
+    position: Offset(208.85714721679688, 515.1428833007812),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694070),
     pointer: 6,
-    position: Offset(208.0, 501.4285583496094)
+    position: Offset(208.0, 501.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694077),
     pointer: 6,
-    position: Offset(207.42857360839844, 487.1428527832031)
+    position: Offset(207.42857360839844, 487.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694085),
     pointer: 6,
-    position: Offset(206.57142639160156, 472.8571472167969)
+    position: Offset(206.57142639160156, 472.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694092),
     pointer: 6,
-    position: Offset(206.57142639160156, 458.8571472167969)
+    position: Offset(206.57142639160156, 458.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694100),
     pointer: 6,
-    position: Offset(206.57142639160156, 446.0)
+    position: Offset(206.57142639160156, 446.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694108),
     pointer: 6,
-    position: Offset(206.57142639160156, 434.28570556640625)
+    position: Offset(206.57142639160156, 434.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694116),
     pointer: 6,
-    position: Offset(207.14285278320312, 423.71429443359375)
+    position: Offset(207.14285278320312, 423.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694124),
     pointer: 6,
-    position: Offset(208.57142639160156, 412.8571472167969)
+    position: Offset(208.57142639160156, 412.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694131),
     pointer: 6,
-    position: Offset(209.7142791748047, 402.28570556640625)
+    position: Offset(209.7142791748047, 402.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694139),
     pointer: 6,
-    position: Offset(211.7142791748047, 393.1428527832031)
+    position: Offset(211.7142791748047, 393.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694147),
     pointer: 6,
-    position: Offset(213.42857360839844, 385.1428527832031)
+    position: Offset(213.42857360839844, 385.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694154),
     pointer: 6,
-    position: Offset(215.42857360839844, 378.28570556640625)
+    position: Offset(215.42857360839844, 378.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694162),
     pointer: 6,
-    position: Offset(217.42857360839844, 371.71429443359375)
+    position: Offset(217.42857360839844, 371.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694169),
     pointer: 6,
-    position: Offset(219.42857360839844, 366.0)
+    position: Offset(219.42857360839844, 366.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694177),
     pointer: 6,
-    position: Offset(221.42857360839844, 360.8571472167969)
+    position: Offset(221.42857360839844, 360.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694185),
     pointer: 6,
-    position: Offset(223.42857360839844, 356.5714416503906)
+    position: Offset(223.42857360839844, 356.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694193),
     pointer: 6,
-    position: Offset(225.14285278320312, 352.28570556640625)
+    position: Offset(225.14285278320312, 352.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694201),
     pointer: 6,
-    position: Offset(226.85714721679688, 348.5714416503906)
+    position: Offset(226.85714721679688, 348.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694209),
     pointer: 6,
-    position: Offset(228.2857208251953, 346.0)
+    position: Offset(228.2857208251953, 346.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694216),
     pointer: 6,
-    position: Offset(229.14285278320312, 343.71429443359375)
+    position: Offset(229.14285278320312, 343.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694224),
     pointer: 6,
-    position: Offset(230.0, 342.0)
+    position: Offset(230.0, 342.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694232),
     pointer: 6,
-    position: Offset(230.57142639160156, 340.5714416503906)
+    position: Offset(230.57142639160156, 340.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694239),
     pointer: 6,
-    position: Offset(230.85714721679688, 339.71429443359375)
+    position: Offset(230.85714721679688, 339.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694247),
     pointer: 6,
-    position: Offset(230.85714721679688, 339.4285583496094)
+    position: Offset(230.85714721679688, 339.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694262),
     pointer: 6,
-    position: Offset(230.2857208251953, 342.0)
+    position: Offset(230.2857208251953, 342.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694270),
     pointer: 6,
-    position: Offset(228.85714721679688, 346.28570556640625)
+    position: Offset(228.85714721679688, 346.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694278),
     pointer: 6,
-    position: Offset(227.14285278320312, 352.5714416503906)
+    position: Offset(227.14285278320312, 352.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694286),
     pointer: 6,
-    position: Offset(225.42857360839844, 359.4285583496094)
+    position: Offset(225.42857360839844, 359.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694294),
     pointer: 6,
-    position: Offset(223.7142791748047, 367.71429443359375)
+    position: Offset(223.7142791748047, 367.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694301),
     pointer: 6,
-    position: Offset(222.57142639160156, 376.0)
+    position: Offset(222.57142639160156, 376.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694309),
     pointer: 6,
-    position: Offset(221.42857360839844, 384.28570556640625)
+    position: Offset(221.42857360839844, 384.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694317),
     pointer: 6,
-    position: Offset(220.85714721679688, 392.28570556640625)
+    position: Offset(220.85714721679688, 392.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694324),
     pointer: 6,
-    position: Offset(220.0, 400.5714416503906)
+    position: Offset(220.0, 400.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694332),
     pointer: 6,
-    position: Offset(219.14285278320312, 409.71429443359375)
+    position: Offset(219.14285278320312, 409.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694339),
     pointer: 6,
-    position: Offset(218.85714721679688, 419.1428527832031)
+    position: Offset(218.85714721679688, 419.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694348),
     pointer: 6,
-    position: Offset(218.2857208251953, 428.8571472167969)
+    position: Offset(218.2857208251953, 428.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694356),
     pointer: 6,
-    position: Offset(218.2857208251953, 438.8571472167969)
+    position: Offset(218.2857208251953, 438.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694363),
     pointer: 6,
-    position: Offset(218.2857208251953, 447.71429443359375)
+    position: Offset(218.2857208251953, 447.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694371),
     pointer: 6,
-    position: Offset(218.2857208251953, 455.71429443359375)
+    position: Offset(218.2857208251953, 455.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694379),
     pointer: 6,
-    position: Offset(219.14285278320312, 462.8571472167969)
+    position: Offset(219.14285278320312, 462.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694386),
     pointer: 6,
-    position: Offset(220.0, 469.4285583496094)
+    position: Offset(220.0, 469.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694394),
     pointer: 6,
-    position: Offset(221.14285278320312, 475.4285583496094)
+    position: Offset(221.14285278320312, 475.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694401),
     pointer: 6,
-    position: Offset(222.0, 480.5714416503906)
+    position: Offset(222.0, 480.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694409),
     pointer: 6,
-    position: Offset(222.85714721679688, 485.4285583496094)
+    position: Offset(222.85714721679688, 485.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694417),
     pointer: 6,
-    position: Offset(224.0, 489.71429443359375)
+    position: Offset(224.0, 489.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694425),
     pointer: 6,
-    position: Offset(224.85714721679688, 492.8571472167969)
+    position: Offset(224.85714721679688, 492.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694433),
     pointer: 6,
-    position: Offset(225.42857360839844, 495.4285583496094)
+    position: Offset(225.42857360839844, 495.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694440),
     pointer: 6,
-    position: Offset(226.0, 497.1428527832031)
+    position: Offset(226.0, 497.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694448),
     pointer: 6,
-    position: Offset(226.2857208251953, 498.28570556640625)
+    position: Offset(226.2857208251953, 498.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694456),
     pointer: 6,
-    position: Offset(226.2857208251953, 498.8571472167969)
+    position: Offset(226.2857208251953, 498.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694471),
     pointer: 6,
-    position: Offset(226.2857208251953, 498.28570556640625)
+    position: Offset(226.2857208251953, 498.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694479),
     pointer: 6,
-    position: Offset(226.2857208251953, 496.5714416503906)
+    position: Offset(226.2857208251953, 496.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694486),
     pointer: 6,
-    position: Offset(226.2857208251953, 493.71429443359375)
+    position: Offset(226.2857208251953, 493.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694494),
     pointer: 6,
-    position: Offset(226.2857208251953, 490.0)
+    position: Offset(226.2857208251953, 490.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694502),
     pointer: 6,
-    position: Offset(226.2857208251953, 486.0)
+    position: Offset(226.2857208251953, 486.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694510),
     pointer: 6,
-    position: Offset(226.2857208251953, 480.5714416503906)
+    position: Offset(226.2857208251953, 480.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694518),
     pointer: 6,
-    position: Offset(226.2857208251953, 475.71429443359375)
+    position: Offset(226.2857208251953, 475.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694525),
     pointer: 6,
-    position: Offset(226.2857208251953, 468.8571472167969)
+    position: Offset(226.2857208251953, 468.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694533),
     pointer: 6,
-    position: Offset(226.2857208251953, 461.4285583496094)
+    position: Offset(226.2857208251953, 461.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694541),
     pointer: 6,
-    position: Offset(226.2857208251953, 452.5714416503906)
+    position: Offset(226.2857208251953, 452.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694548),
     pointer: 6,
-    position: Offset(226.57142639160156, 442.28570556640625)
+    position: Offset(226.57142639160156, 442.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694556),
     pointer: 6,
-    position: Offset(226.57142639160156, 432.28570556640625)
+    position: Offset(226.57142639160156, 432.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694564),
     pointer: 6,
-    position: Offset(226.85714721679688, 423.4285583496094)
+    position: Offset(226.85714721679688, 423.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694571),
     pointer: 6,
-    position: Offset(227.42857360839844, 416.0)
+    position: Offset(227.42857360839844, 416.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694580),
     pointer: 6,
-    position: Offset(227.7142791748047, 410.0)
+    position: Offset(227.7142791748047, 410.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694587),
     pointer: 6,
-    position: Offset(228.2857208251953, 404.28570556640625)
+    position: Offset(228.2857208251953, 404.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694595),
     pointer: 6,
-    position: Offset(228.85714721679688, 399.71429443359375)
+    position: Offset(228.85714721679688, 399.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694603),
     pointer: 6,
-    position: Offset(229.14285278320312, 395.4285583496094)
+    position: Offset(229.14285278320312, 395.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694610),
     pointer: 6,
-    position: Offset(229.42857360839844, 392.28570556640625)
+    position: Offset(229.42857360839844, 392.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694618),
     pointer: 6,
-    position: Offset(229.7142791748047, 390.0)
+    position: Offset(229.7142791748047, 390.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694625),
     pointer: 6,
-    position: Offset(229.7142791748047, 388.0)
+    position: Offset(229.7142791748047, 388.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694633),
     pointer: 6,
-    position: Offset(229.7142791748047, 386.8571472167969)
+    position: Offset(229.7142791748047, 386.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694641),
     pointer: 6,
-    position: Offset(229.7142791748047, 386.28570556640625)
+    position: Offset(229.7142791748047, 386.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694648),
     pointer: 6,
-    position: Offset(229.7142791748047, 386.0)
+    position: Offset(229.7142791748047, 386.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694657),
     pointer: 6,
-    position: Offset(228.85714721679688, 386.0)
+    position: Offset(228.85714721679688, 386.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694665),
     pointer: 6,
-    position: Offset(228.0, 388.0)
+    position: Offset(228.0, 388.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694672),
     pointer: 6,
-    position: Offset(226.0, 392.5714416503906)
+    position: Offset(226.0, 392.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694680),
     pointer: 6,
-    position: Offset(224.0, 397.71429443359375)
+    position: Offset(224.0, 397.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694688),
     pointer: 6,
-    position: Offset(222.0, 404.28570556640625)
+    position: Offset(222.0, 404.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694695),
     pointer: 6,
-    position: Offset(219.7142791748047, 411.1428527832031)
+    position: Offset(219.7142791748047, 411.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694703),
     pointer: 6,
-    position: Offset(218.2857208251953, 418.0)
+    position: Offset(218.2857208251953, 418.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694710),
     pointer: 6,
-    position: Offset(217.14285278320312, 425.4285583496094)
+    position: Offset(217.14285278320312, 425.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694718),
     pointer: 6,
-    position: Offset(215.7142791748047, 433.4285583496094)
+    position: Offset(215.7142791748047, 433.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694726),
     pointer: 6,
-    position: Offset(214.85714721679688, 442.28570556640625)
+    position: Offset(214.85714721679688, 442.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694734),
     pointer: 6,
-    position: Offset(214.0, 454.0)
+    position: Offset(214.0, 454.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694742),
     pointer: 6,
-    position: Offset(214.0, 469.4285583496094)
+    position: Offset(214.0, 469.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694749),
     pointer: 6,
-    position: Offset(215.42857360839844, 485.4285583496094)
+    position: Offset(215.42857360839844, 485.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694757),
     pointer: 6,
-    position: Offset(217.7142791748047, 502.8571472167969)
+    position: Offset(217.7142791748047, 502.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694765),
     pointer: 6,
-    position: Offset(221.14285278320312, 521.4285888671875)
+    position: Offset(221.14285278320312, 521.4285888671875),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694772),
     pointer: 6,
-    position: Offset(224.57142639160156, 541.1428833007812)
+    position: Offset(224.57142639160156, 541.1428833007812),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694780),
     pointer: 6,
-    position: Offset(229.14285278320312, 561.1428833007812)
+    position: Offset(229.14285278320312, 561.1428833007812),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694788),
     pointer: 6,
-    position: Offset(233.42857360839844, 578.8571166992188)
+    position: Offset(233.42857360839844, 578.8571166992188),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216694802),
     pointer: 6,
-    position: Offset(233.42857360839844, 578.8571166992188)
+    position: Offset(233.42857360839844, 578.8571166992188),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216695344),
     pointer: 7,
-    position: Offset(253.42857360839844, 310.5714416503906)
+    position: Offset(253.42857360839844, 310.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695352),
     pointer: 7,
-    position: Offset(253.42857360839844, 310.5714416503906)
+    position: Offset(253.42857360839844, 310.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695359),
     pointer: 7,
-    position: Offset(252.85714721679688, 318.0)
+    position: Offset(252.85714721679688, 318.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695367),
     pointer: 7,
-    position: Offset(251.14285278320312, 322.0)
+    position: Offset(251.14285278320312, 322.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695375),
     pointer: 7,
-    position: Offset(248.85714721679688, 327.1428527832031)
+    position: Offset(248.85714721679688, 327.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695382),
     pointer: 7,
-    position: Offset(246.0, 334.8571472167969)
+    position: Offset(246.0, 334.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695390),
     pointer: 7,
-    position: Offset(242.57142639160156, 344.5714416503906)
+    position: Offset(242.57142639160156, 344.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695397),
     pointer: 7,
-    position: Offset(238.85714721679688, 357.4285583496094)
+    position: Offset(238.85714721679688, 357.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695406),
     pointer: 7,
-    position: Offset(235.7142791748047, 371.71429443359375)
+    position: Offset(235.7142791748047, 371.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695414),
     pointer: 7,
-    position: Offset(232.2857208251953, 386.8571472167969)
+    position: Offset(232.2857208251953, 386.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695421),
     pointer: 7,
-    position: Offset(229.42857360839844, 402.0)
+    position: Offset(229.42857360839844, 402.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695429),
     pointer: 7,
-    position: Offset(227.42857360839844, 416.8571472167969)
+    position: Offset(227.42857360839844, 416.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695437),
     pointer: 7,
-    position: Offset(226.2857208251953, 431.4285583496094)
+    position: Offset(226.2857208251953, 431.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695444),
     pointer: 7,
-    position: Offset(226.2857208251953, 446.0)
+    position: Offset(226.2857208251953, 446.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695452),
     pointer: 7,
-    position: Offset(227.7142791748047, 460.28570556640625)
+    position: Offset(227.7142791748047, 460.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695459),
     pointer: 7,
-    position: Offset(230.0, 475.1428527832031)
+    position: Offset(230.0, 475.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695467),
     pointer: 7,
-    position: Offset(232.2857208251953, 489.71429443359375)
+    position: Offset(232.2857208251953, 489.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695475),
     pointer: 7,
-    position: Offset(235.7142791748047, 504.0)
+    position: Offset(235.7142791748047, 504.0),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216695490),
     pointer: 7,
-    position: Offset(235.7142791748047, 504.0)
+    position: Offset(235.7142791748047, 504.0),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216695885),
     pointer: 8,
-    position: Offset(238.85714721679688, 524.0)
+    position: Offset(238.85714721679688, 524.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695908),
     pointer: 8,
-    position: Offset(236.2857208251953, 515.7142944335938)
+    position: Offset(236.2857208251953, 515.7142944335938),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695916),
     pointer: 8,
-    position: Offset(234.85714721679688, 509.1428527832031)
+    position: Offset(234.85714721679688, 509.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695924),
     pointer: 8,
-    position: Offset(232.57142639160156, 498.5714416503906)
+    position: Offset(232.57142639160156, 498.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695931),
     pointer: 8,
-    position: Offset(230.57142639160156, 483.71429443359375)
+    position: Offset(230.57142639160156, 483.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695939),
     pointer: 8,
-    position: Offset(229.14285278320312, 466.5714416503906)
+    position: Offset(229.14285278320312, 466.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695947),
     pointer: 8,
-    position: Offset(229.14285278320312, 446.5714416503906)
+    position: Offset(229.14285278320312, 446.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695955),
     pointer: 8,
-    position: Offset(230.57142639160156, 424.8571472167969)
+    position: Offset(230.57142639160156, 424.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695963),
     pointer: 8,
-    position: Offset(232.57142639160156, 402.28570556640625)
+    position: Offset(232.57142639160156, 402.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695970),
     pointer: 8,
-    position: Offset(235.14285278320312, 380.0)
+    position: Offset(235.14285278320312, 380.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695978),
     pointer: 8,
-    position: Offset(238.57142639160156, 359.4285583496094)
+    position: Offset(238.57142639160156, 359.4285583496094),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216695993),
     pointer: 8,
-    position: Offset(238.57142639160156, 359.4285583496094)
+    position: Offset(238.57142639160156, 359.4285583496094),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216696429),
     pointer: 9,
-    position: Offset(238.2857208251953, 568.5714111328125)
+    position: Offset(238.2857208251953, 568.5714111328125),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696459),
     pointer: 9,
-    position: Offset(234.0, 560.0)
+    position: Offset(234.0, 560.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696467),
     pointer: 9,
-    position: Offset(231.42857360839844, 553.1428833007812)
+    position: Offset(231.42857360839844, 553.1428833007812),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696475),
     pointer: 9,
-    position: Offset(228.2857208251953, 543.1428833007812)
+    position: Offset(228.2857208251953, 543.1428833007812),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696483),
     pointer: 9,
-    position: Offset(225.42857360839844, 528.8571166992188)
+    position: Offset(225.42857360839844, 528.8571166992188),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696491),
     pointer: 9,
-    position: Offset(223.14285278320312, 512.2857055664062)
+    position: Offset(223.14285278320312, 512.2857055664062),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696498),
     pointer: 9,
-    position: Offset(222.0, 495.4285583496094)
+    position: Offset(222.0, 495.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696506),
     pointer: 9,
-    position: Offset(221.7142791748047, 477.4285583496094)
+    position: Offset(221.7142791748047, 477.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696514),
     pointer: 9,
-    position: Offset(221.7142791748047, 458.28570556640625)
+    position: Offset(221.7142791748047, 458.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696521),
     pointer: 9,
-    position: Offset(223.14285278320312, 438.0)
+    position: Offset(223.14285278320312, 438.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696529),
     pointer: 9,
-    position: Offset(224.2857208251953, 416.28570556640625)
+    position: Offset(224.2857208251953, 416.28570556640625),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216696544),
     pointer: 9,
-    position: Offset(224.2857208251953, 416.28570556640625)
+    position: Offset(224.2857208251953, 416.28570556640625),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216696974),
     pointer: 10,
-    position: Offset(218.57142639160156, 530.5714111328125)
+    position: Offset(218.57142639160156, 530.5714111328125),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697012),
     pointer: 10,
-    position: Offset(220.2857208251953, 522.0)
+    position: Offset(220.2857208251953, 522.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697020),
     pointer: 10,
-    position: Offset(221.14285278320312, 517.7142944335938)
+    position: Offset(221.14285278320312, 517.7142944335938),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697028),
     pointer: 10,
-    position: Offset(222.2857208251953, 511.71429443359375)
+    position: Offset(222.2857208251953, 511.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697036),
     pointer: 10,
-    position: Offset(224.0, 504.28570556640625)
+    position: Offset(224.0, 504.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697044),
     pointer: 10,
-    position: Offset(227.14285278320312, 490.5714416503906)
+    position: Offset(227.14285278320312, 490.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697052),
     pointer: 10,
-    position: Offset(229.42857360839844, 474.0)
+    position: Offset(229.42857360839844, 474.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697059),
     pointer: 10,
-    position: Offset(231.42857360839844, 454.5714416503906)
+    position: Offset(231.42857360839844, 454.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697067),
     pointer: 10,
-    position: Offset(233.7142791748047, 431.1428527832031)
+    position: Offset(233.7142791748047, 431.1428527832031),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216697082),
     pointer: 10,
-    position: Offset(233.7142791748047, 431.1428527832031)
+    position: Offset(233.7142791748047, 431.1428527832031),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216697435),
     pointer: 11,
-    position: Offset(257.1428527832031, 285.1428527832031)
+    position: Offset(257.1428527832031, 285.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697465),
     pointer: 11,
-    position: Offset(251.7142791748047, 296.8571472167969)
+    position: Offset(251.7142791748047, 296.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697473),
     pointer: 11,
-    position: Offset(248.2857208251953, 304.0)
+    position: Offset(248.2857208251953, 304.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697481),
     pointer: 11,
-    position: Offset(244.57142639160156, 314.8571472167969)
+    position: Offset(244.57142639160156, 314.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697489),
     pointer: 11,
-    position: Offset(240.2857208251953, 329.1428527832031)
+    position: Offset(240.2857208251953, 329.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697497),
     pointer: 11,
-    position: Offset(236.85714721679688, 345.1428527832031)
+    position: Offset(236.85714721679688, 345.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697505),
     pointer: 11,
-    position: Offset(233.7142791748047, 361.4285583496094)
+    position: Offset(233.7142791748047, 361.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697512),
     pointer: 11,
-    position: Offset(231.14285278320312, 378.28570556640625)
+    position: Offset(231.14285278320312, 378.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697520),
     pointer: 11,
-    position: Offset(229.42857360839844, 395.4285583496094)
+    position: Offset(229.42857360839844, 395.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697528),
     pointer: 11,
-    position: Offset(229.42857360839844, 412.8571472167969)
+    position: Offset(229.42857360839844, 412.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697535),
     pointer: 11,
-    position: Offset(230.85714721679688, 430.8571472167969)
+    position: Offset(230.85714721679688, 430.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697543),
     pointer: 11,
-    position: Offset(233.42857360839844, 449.71429443359375)
+    position: Offset(233.42857360839844, 449.71429443359375),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216697558),
     pointer: 11,
-    position: Offset(233.42857360839844, 449.71429443359375)
+    position: Offset(233.42857360839844, 449.71429443359375),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216697749),
     pointer: 12,
-    position: Offset(246.0, 311.4285583496094)
+    position: Offset(246.0, 311.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697780),
     pointer: 12,
-    position: Offset(244.57142639160156, 318.28570556640625)
+    position: Offset(244.57142639160156, 318.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697787),
     pointer: 12,
-    position: Offset(243.14285278320312, 325.4285583496094)
+    position: Offset(243.14285278320312, 325.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697795),
     pointer: 12,
-    position: Offset(241.42857360839844, 336.0)
+    position: Offset(241.42857360839844, 336.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697803),
     pointer: 12,
-    position: Offset(239.7142791748047, 351.1428527832031)
+    position: Offset(239.7142791748047, 351.1428527832031),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697811),
     pointer: 12,
-    position: Offset(238.2857208251953, 368.5714416503906)
+    position: Offset(238.2857208251953, 368.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697819),
     pointer: 12,
-    position: Offset(238.0, 389.4285583496094)
+    position: Offset(238.0, 389.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697826),
     pointer: 12,
-    position: Offset(239.14285278320312, 412.0)
+    position: Offset(239.14285278320312, 412.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697834),
     pointer: 12,
-    position: Offset(242.2857208251953, 438.0)
+    position: Offset(242.2857208251953, 438.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697842),
     pointer: 12,
-    position: Offset(247.42857360839844, 466.8571472167969)
+    position: Offset(247.42857360839844, 466.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697849),
     pointer: 12,
-    position: Offset(254.2857208251953, 497.71429443359375)
+    position: Offset(254.2857208251953, 497.71429443359375),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216697864),
     pointer: 12,
-    position: Offset(254.2857208251953, 497.71429443359375)
+    position: Offset(254.2857208251953, 497.71429443359375),
   ),
   const PointerDownEvent(
     timeStamp: Duration(milliseconds: 216698321),
     pointer: 13,
-    position: Offset(250.0, 306.0)
+    position: Offset(250.0, 306.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698328),
     pointer: 13,
-    position: Offset(250.0, 306.0)
+    position: Offset(250.0, 306.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698344),
     pointer: 13,
-    position: Offset(249.14285278320312, 314.0)
+    position: Offset(249.14285278320312, 314.0),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698351),
     pointer: 13,
-    position: Offset(247.42857360839844, 319.4285583496094)
+    position: Offset(247.42857360839844, 319.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698359),
     pointer: 13,
-    position: Offset(245.14285278320312, 326.8571472167969)
+    position: Offset(245.14285278320312, 326.8571472167969),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698366),
     pointer: 13,
-    position: Offset(241.7142791748047, 339.4285583496094)
+    position: Offset(241.7142791748047, 339.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698374),
     pointer: 13,
-    position: Offset(238.57142639160156, 355.71429443359375)
+    position: Offset(238.57142639160156, 355.71429443359375),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698382),
     pointer: 13,
-    position: Offset(236.2857208251953, 374.28570556640625)
+    position: Offset(236.2857208251953, 374.28570556640625),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698390),
     pointer: 13,
-    position: Offset(235.14285278320312, 396.5714416503906)
+    position: Offset(235.14285278320312, 396.5714416503906),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698398),
     pointer: 13,
-    position: Offset(236.57142639160156, 421.4285583496094)
+    position: Offset(236.57142639160156, 421.4285583496094),
   ),
   const PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698406),
     pointer: 13,
-    position: Offset(241.14285278320312, 451.4285583496094)
+    position: Offset(241.14285278320312, 451.4285583496094),
   ),
   const PointerUpEvent(
     timeStamp: Duration(milliseconds: 216698421),
     pointer: 13,
-    position: Offset(241.14285278320312, 451.4285583496094)
+    position: Offset(241.14285278320312, 451.4285583496094),
   ),
 ];
diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart
index 84cf80ce250..dd26179a6e8 100644
--- a/dev/bots/analyze.dart
+++ b/dev/bots/analyze.dart
@@ -236,7 +236,7 @@ Future<EvalResult> _evalCommand(String executable, List<String> arguments, {
 }
 
 Future<void> _runFlutterAnalyze(String workingDirectory, {
-  List<String> options = const <String>[]
+  List<String> options = const <String>[],
 }) {
   return runCommand(flutter, <String>['analyze', '--dartdocs']..addAll(options),
     workingDirectory: workingDirectory,
diff --git a/dev/bots/run_command.dart b/dev/bots/run_command.dart
index c996aae31fe..72382daf199 100644
--- a/dev/bots/run_command.dart
+++ b/dev/bots/run_command.dart
@@ -58,7 +58,7 @@ Future<void> runCommand(String executable, List<String> arguments, {
   if (printOutput) {
     await Future.wait<void>(<Future<void>>[
       stdout.addStream(process.stdout),
-      stderr.addStream(process.stderr)
+      stderr.addStream(process.stderr),
     ]);
   } else {
     savedStdout = process.stdout.toList();
diff --git a/dev/bots/test.dart b/dev/bots/test.dart
index a7536befbec..74e32e2fa0a 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -309,7 +309,7 @@ Future<void> _runCoverage() async {
 Future<void> _pubRunTest(
   String workingDirectory, {
   String testPath,
-  bool enableFlutterToolAsserts = false
+  bool enableFlutterToolAsserts = false,
 }) {
   final List<String> args = <String>['run', 'test', '-rcompact', '-j1'];
   if (!hasColor)
diff --git a/dev/bots/test/fake_process_manager.dart b/dev/bots/test/fake_process_manager.dart
index 35f024b4dcd..6a4136cedca 100644
--- a/dev/bots/test/fake_process_manager.dart
+++ b/dev/bots/test/fake_process_manager.dart
@@ -103,7 +103,7 @@ class FakeProcessManager extends Mock implements ProcessManager {
     when(runSync(
       any,
       environment: anyNamed('environment'),
-      workingDirectory: anyNamed('workingDirectory')
+      workingDirectory: anyNamed('workingDirectory'),
     )).thenAnswer(_nextResultSync);
 
     when(runSync(any)).thenAnswer(_nextResultSync);
diff --git a/dev/bots/test/fake_process_manager_test.dart b/dev/bots/test/fake_process_manager_test.dart
index 8dd8bd979ef..54472144e08 100644
--- a/dev/bots/test/fake_process_manager_test.dart
+++ b/dev/bots/test/fake_process_manager_test.dart
@@ -27,10 +27,10 @@ void main() {
     test('start works', () async {
       final Map<String, List<ProcessResult>> calls = <String, List<ProcessResult>>{
         'gsutil acl get gs://flutter_infra/releases/releases.json': <ProcessResult>[
-          ProcessResult(0, 0, 'output1', '')
+          ProcessResult(0, 0, 'output1', ''),
         ],
         'gsutil cat gs://flutter_infra/releases/releases.json': <ProcessResult>[
-          ProcessResult(0, 0, 'output2', '')
+          ProcessResult(0, 0, 'output2', ''),
         ],
       };
       processManager.fakeResults = calls;
@@ -49,10 +49,10 @@ void main() {
     test('run works', () async {
       final Map<String, List<ProcessResult>> calls = <String, List<ProcessResult>>{
         'gsutil acl get gs://flutter_infra/releases/releases.json': <ProcessResult>[
-          ProcessResult(0, 0, 'output1', '')
+          ProcessResult(0, 0, 'output1', ''),
         ],
         'gsutil cat gs://flutter_infra/releases/releases.json': <ProcessResult>[
-          ProcessResult(0, 0, 'output2', '')
+          ProcessResult(0, 0, 'output2', ''),
         ],
       };
       processManager.fakeResults = calls;
@@ -66,10 +66,10 @@ void main() {
     test('runSync works', () async {
       final Map<String, List<ProcessResult>> calls = <String, List<ProcessResult>>{
         'gsutil acl get gs://flutter_infra/releases/releases.json': <ProcessResult>[
-          ProcessResult(0, 0, 'output1', '')
+          ProcessResult(0, 0, 'output1', ''),
         ],
         'gsutil cat gs://flutter_infra/releases/releases.json': <ProcessResult>[
-          ProcessResult(0, 0, 'output2', '')
+          ProcessResult(0, 0, 'output2', ''),
         ],
       };
       processManager.fakeResults = calls;
@@ -83,10 +83,10 @@ void main() {
     test('captures stdin', () async {
       final Map<String, List<ProcessResult>> calls = <String, List<ProcessResult>>{
         'gsutil acl get gs://flutter_infra/releases/releases.json': <ProcessResult>[
-          ProcessResult(0, 0, 'output1', '')
+          ProcessResult(0, 0, 'output1', ''),
         ],
         'gsutil cat gs://flutter_infra/releases/releases.json': <ProcessResult>[
-          ProcessResult(0, 0, 'output2', '')
+          ProcessResult(0, 0, 'output2', ''),
         ],
       };
       processManager.fakeResults = calls;
diff --git a/dev/devicelab/bin/tasks/flutter_run_test.dart b/dev/devicelab/bin/tasks/flutter_run_test.dart
index bc76e627e8c..940e05b88c8 100644
--- a/dev/devicelab/bin/tasks/flutter_run_test.dart
+++ b/dev/devicelab/bin/tasks/flutter_run_test.dart
@@ -41,7 +41,7 @@ Future<TaskResult> createFlutterRunTask() async {
     startProcess(
       path.join(flutterDirectory.path, 'bin', 'flutter'),
       <String>['run']..addAll(options),
-      environment: null
+      environment: null,
     );
     final Completer<void> finished = Completer<void>();
     final StreamSubscription<void> subscription = device.logcat.listen((String line) {
diff --git a/dev/devicelab/bin/tasks/gradle_plugin_test.dart b/dev/devicelab/bin/tasks/gradle_plugin_test.dart
index bbb1db016b1..b3297cac052 100644
--- a/dev/devicelab/bin/tasks/gradle_plugin_test.dart
+++ b/dev/devicelab/bin/tasks/gradle_plugin_test.dart
@@ -276,7 +276,7 @@ Future<ProcessResult> _resultOfGradleTask({String workingDirectory, String task,
     './gradlew',
     args,
     workingDirectory: workingDirectory,
-    environment: <String, String>{ 'JAVA_HOME': javaHome }
+    environment: <String, String>{ 'JAVA_HOME': javaHome },
   );
 }
 
diff --git a/dev/devicelab/bin/tasks/module_test_ios.dart b/dev/devicelab/bin/tasks/module_test_ios.dart
index d78840fcafe..7e11f850749 100644
--- a/dev/devicelab/bin/tasks/module_test_ios.dart
+++ b/dev/devicelab/bin/tasks/module_test_ios.dart
@@ -26,7 +26,7 @@ Future<void> main() async {
             '--org',
             'io.flutter.devicelab',
             '--template=module',
-            'hello'
+            'hello',
           ],
         );
       });
diff --git a/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart b/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart
index ee8c86c3aeb..817fbad0078 100644
--- a/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart
+++ b/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart
@@ -100,7 +100,7 @@ void main() {
         final Map<String, dynamic> req = <String, dynamic>{
           'id': requestId,
           'method': method,
-          'params': params
+          'params': params,
         };
         final String jsonEncoded = json.encode(<Map<String, dynamic>>[req]);
         print('run:stdin: $jsonEncoded');
diff --git a/dev/devicelab/lib/framework/ios.dart b/dev/devicelab/lib/framework/ios.dart
index 2211cd385db..bb1c63560fd 100644
--- a/dev/devicelab/lib/framework/ios.dart
+++ b/dev/devicelab/lib/framework/ios.dart
@@ -40,7 +40,7 @@ Future<void> _patchXcconfigFilesIfNotPatched(String flutterProjectPath) async {
   final List<File> xcconfigFiles = <File>[
     _fs.file(path.join(flutterProjectPath, 'ios/Flutter/Flutter.xcconfig')),
     _fs.file(path.join(flutterProjectPath, 'ios/Flutter/Debug.xcconfig')),
-    _fs.file(path.join(flutterProjectPath, 'ios/Flutter/Release.xcconfig'))
+    _fs.file(path.join(flutterProjectPath, 'ios/Flutter/Release.xcconfig')),
   ];
 
   bool xcconfigFileExists = false;
diff --git a/dev/devicelab/lib/tasks/hot_mode_tests.dart b/dev/devicelab/lib/tasks/hot_mode_tests.dart
index 89801282755..10fa92488ed 100644
--- a/dev/devicelab/lib/tasks/hot_mode_tests.dart
+++ b/dev/devicelab/lib/tasks/hot_mode_tests.dart
@@ -23,7 +23,7 @@ TaskFunction createHotModeTest() {
     final File benchmarkFile = file(path.join(_editedFlutterGalleryDir.path, 'hot_benchmark.json'));
     rm(benchmarkFile);
     final List<String> options = <String>[
-      '--hot', '-d', device.deviceId, '--benchmark', '--verbose', '--resident'
+      '--hot', '-d', device.deviceId, '--benchmark', '--verbose', '--resident',
     ];
     setLocalEngineOptionIfNecessary(options);
     int hotReloadCount = 0;
@@ -40,7 +40,7 @@ TaskFunction createHotModeTest() {
           final Process process = await startProcess(
               path.join(flutterDirectory.path, 'bin', 'flutter'),
               <String>['run']..addAll(options),
-              environment: null
+              environment: null,
           );
 
           final Completer<void> stdoutDone = Completer<void>();
@@ -53,11 +53,11 @@ TaskFunction createHotModeTest() {
               if (hotReloadCount == 0) {
                 // Update the file and reload again.
                 final File appDartSource = file(path.join(
-                    _editedFlutterGalleryDir.path, 'lib/gallery/app.dart'
+                    _editedFlutterGalleryDir.path, 'lib/gallery/app.dart',
                 ));
                 appDartSource.writeAsStringSync(
                     appDartSource.readAsStringSync().replaceFirst(
-                        "'Flutter Gallery'", "'Updated Flutter Gallery'"
+                        "'Flutter Gallery'", "'Updated Flutter Gallery'",
                     )
                 );
                 process.stdin.writeln('r');
@@ -94,7 +94,7 @@ TaskFunction createHotModeTest() {
           final Process process = await startProcess(
               path.join(flutterDirectory.path, 'bin', 'flutter'),
               <String>['run']..addAll(options),
-              environment: null
+              environment: null,
           );
           final Completer<void> stdoutDone = Completer<void>();
           final Completer<void> stderrDone = Completer<void>();
@@ -156,7 +156,7 @@ TaskFunction createHotModeTest() {
         'hotReloadFlutterReassembleMillisecondsAfterChange',
         'hotReloadVMReloadMillisecondsAfterChange',
         'hotReloadInitialDevFSSyncAfterRelaunchMilliseconds',
-      ]
+      ],
     );
   };
 }
diff --git a/dev/devicelab/lib/tasks/integration_tests.dart b/dev/devicelab/lib/tasks/integration_tests.dart
index 334c2a06f13..e59337bc1e0 100644
--- a/dev/devicelab/lib/tasks/integration_tests.dart
+++ b/dev/devicelab/lib/tasks/integration_tests.dart
@@ -29,7 +29,7 @@ TaskFunction createFlavorsTest() {
   return DriverTest(
     '${flutterDirectory.path}/dev/integration_tests/flavors',
     'lib/main.dart',
-    extraOptions: <String>['--flavor', 'paid']
+    extraOptions: <String>['--flavor', 'paid'],
   );
 }
 
@@ -66,7 +66,7 @@ TaskFunction createCodegenerationIntegrationTest() {
     '${flutterDirectory.path}/dev/integration_tests/codegen',
     'lib/main.dart',
     environment: <String, String>{
-      'FLUTTER_EXPERIMENTAL_BUILD': 'true'
+      'FLUTTER_EXPERIMENTAL_BUILD': 'true',
     },
   );
 }
diff --git a/dev/devicelab/lib/tasks/plugin_tests.dart b/dev/devicelab/lib/tasks/plugin_tests.dart
index 6c2789b9cf3..cc9e7b28490 100644
--- a/dev/devicelab/lib/tasks/plugin_tests.dart
+++ b/dev/devicelab/lib/tasks/plugin_tests.dart
@@ -65,7 +65,7 @@ class FlutterProject {
     await inDirectory(directory, () async {
       await flutter(
         'create',
-        options: <String>['--template=app', '--org', 'io.flutter.devicelab']..addAll(options)..add('plugintest')
+        options: <String>['--template=app', '--org', 'io.flutter.devicelab']..addAll(options)..add('plugintest'),
       );
     });
     return FlutterProject(directory, 'plugintest');
diff --git a/dev/devicelab/test/manifest_test.dart b/dev/devicelab/test/manifest_test.dart
index 4fad8a7fe17..c26a9a6927d 100644
--- a/dev/devicelab/test/manifest_test.dart
+++ b/dev/devicelab/test/manifest_test.dart
@@ -80,7 +80,7 @@ tasks:
       tasks:
         - a
         - b
-      '''
+      ''',
     );
 
     testManifestError(
@@ -89,7 +89,7 @@ tasks:
       '''
       tasks:
         1: 2
-      '''
+      ''',
     );
 
     testManifestError(
@@ -98,7 +98,7 @@ tasks:
       '''
       tasks:
         foo: 2
-      '''
+      ''',
     );
 
     testManifestError(
@@ -108,7 +108,7 @@ tasks:
       tasks:
         foo:
           bar: 2
-      '''
+      ''',
     );
 
     testManifestError(
@@ -118,7 +118,7 @@ tasks:
       tasks:
         foo:
           required_agent_capabilities: 1
-      '''
+      ''',
     );
 
     testManifestError(
@@ -128,7 +128,7 @@ tasks:
       tasks:
         foo:
           required_agent_capabilities: [1]
-      '''
+      ''',
     );
 
     testManifestError(
@@ -138,7 +138,7 @@ tasks:
       tasks:
         foo:
           required_agent_capabilities: ["a"]
-      '''
+      ''',
     );
 
     testManifestError(
@@ -149,7 +149,7 @@ tasks:
         foo:
           description: b
           required_agent_capabilities: ["a"]
-      '''
+      ''',
     );
 
     testManifestError(
@@ -161,7 +161,7 @@ tasks:
           description: b
           stage: c
           required_agent_capabilities: []
-      '''
+      ''',
     );
 
     testManifestError(
@@ -174,7 +174,7 @@ tasks:
           stage: c
           required_agent_capabilities: ["a"]
           flaky: not-a-boolean
-      '''
+      ''',
     );
 
     test('accepts boolean flaky option', () {
diff --git a/dev/integration_tests/android_views/lib/main.dart b/dev/integration_tests/android_views/lib/main.dart
index 64250171f0f..74b1ea592d0 100644
--- a/dev/integration_tests/android_views/lib/main.dart
+++ b/dev/integration_tests/android_views/lib/main.dart
@@ -109,9 +109,9 @@ class PlatformViewState extends State<PlatformViewPage> {
               key: const ValueKey<String>('play'),
               child: const Text('PLAY FILE'),
               onPressed: () { playEventsFile(); },
-            )
+            ),
           ],
-        )
+        ),
       ],
     );
   }
diff --git a/dev/integration_tests/android_views/lib/motion_event_diff.dart b/dev/integration_tests/android_views/lib/motion_event_diff.dart
index 2c31f859ed2..21f2bb54a13 100644
--- a/dev/integration_tests/android_views/lib/motion_event_diff.dart
+++ b/dev/integration_tests/android_views/lib/motion_event_diff.dart
@@ -10,7 +10,7 @@ const List<int> kPointerActions = <int>[
   0, // DOWN
   1, // UP
   5, // POINTER_DOWN
-  6 // POINTER_UP
+  6, // POINTER_UP
 ];
 
 const double kDoubleErrorMargin = 0.0001;
@@ -152,7 +152,7 @@ String getActionName(int actionMasked, int action) {
     'HOVER_ENTER',
     'HOVER_EXIT',
     'BUTTON_PRESS',
-    'BUTTON_RELEASE'
+    'BUTTON_RELEASE',
   ];
   if (actionMasked < actionNames.length)
     return '${actionNames[actionMasked]}($action)';
diff --git a/dev/integration_tests/channels/lib/main.dart b/dev/integration_tests/channels/lib/main.dart
index 8dd4896e317..c7d0b3e518b 100644
--- a/dev/integration_tests/channels/lib/main.dart
+++ b/dev/integration_tests/channels/lib/main.dart
@@ -31,7 +31,7 @@ class _TestAppState extends State<TestApp> {
     0.0,
     'hello',
     <dynamic>[
-      <String, dynamic>{'key': 42}
+      <String, dynamic>{'key': 42},
     ],
   ];
   static final Map<String, dynamic> aMap = <String, dynamic>{
@@ -40,7 +40,7 @@ class _TestAppState extends State<TestApp> {
     'c': 0.0,
     'd': 'hello',
     'e': <dynamic>[
-      <String, dynamic>{'key': 42}
+      <String, dynamic>{'key': 42},
     ],
   };
   static final Uint8List someUint8s = Uint8List.fromList(<int>[
diff --git a/dev/manual_tests/lib/card_collection.dart b/dev/manual_tests/lib/card_collection.dart
index 896ec524d3d..3c06421a063 100644
--- a/dev/manual_tests/lib/card_collection.dart
+++ b/dev/manual_tests/lib/card_collection.dart
@@ -56,14 +56,14 @@ class CardCollectionState extends State<CardCollection> {
       (int i) {
         _cardModels[i].height = _editable ? max(_cardHeights[i], 60.0) : _cardHeights[i];
         return _cardModels[i];
-      }
+      },
     );
   }
 
   void _initVariableSizedCardModels() {
     _cardModels = List<CardModel>.generate(
       _cardHeights.length,
-      (int i) => CardModel(i, _editable ? max(_cardHeights[i], 60.0) : _cardHeights[i])
+      (int i) => CardModel(i, _editable ? max(_cardHeights[i], 60.0) : _cardHeights[i]),
     );
   }
 
@@ -234,7 +234,7 @@ class CardCollectionState extends State<CardCollection> {
   Widget _buildAppBar(BuildContext context) {
     return AppBar(
       actions: <Widget>[
-        Text(_dismissDirectionText(_dismissDirection))
+        Text(_dismissDirectionText(_dismissDirection)),
       ],
       flexibleSpace: Container(
         padding: const EdgeInsets.only(left: 72.0),
diff --git a/dev/manual_tests/lib/drag_and_drop.dart b/dev/manual_tests/lib/drag_and_drop.dart
index cc27bf7d8cb..d825c52a104 100644
--- a/dev/manual_tests/lib/drag_and_drop.dart
+++ b/dev/manual_tests/lib/drag_and_drop.dart
@@ -32,11 +32,11 @@ class ExampleDragTargetState extends State<ExampleDragTarget> {
             color: data.isEmpty ? _color : Colors.grey.shade200,
             border: Border.all(
               width: 3.0,
-              color: data.isEmpty ? Colors.white : Colors.blue
+              color: data.isEmpty ? Colors.white : Colors.blue,
             ),
-          )
+          ),
         );
-      }
+      },
     );
   }
 }
@@ -65,10 +65,10 @@ class DotState extends State<Dot> {
         decoration: BoxDecoration(
           color: widget.color,
           border: Border.all(width: taps.toDouble()),
-          shape: BoxShape.circle
+          shape: BoxShape.circle,
         ),
-        child: widget.child
-      )
+        child: widget.child,
+      ),
     );
   }
 }
@@ -79,7 +79,7 @@ class ExampleDragSource extends StatelessWidget {
     this.color,
     this.heavy = false,
     this.under = true,
-    this.child
+    this.child,
   }) : super(key: key);
 
   final Color color;
@@ -103,13 +103,13 @@ class ExampleDragSource extends StatelessWidget {
       child: Dot(
         color: color,
         size: size,
-        child: Center(child: child)
-      )
+        child: Center(child: child),
+      ),
     );
 
     Widget feedback = Opacity(
       opacity: 0.75,
-      child: contents
+      child: contents,
     );
 
     Offset feedbackOffset;
@@ -118,7 +118,7 @@ class ExampleDragSource extends StatelessWidget {
       feedback = Transform(
         transform: Matrix4.identity()
                      ..translate(-size / 2.0, -(size / 2.0 + kFingerSize)),
-        child: feedback
+        child: feedback,
       );
       feedbackOffset = const Offset(0.0, -kFingerSize);
       anchor = DragAnchor.pointer;
@@ -133,7 +133,7 @@ class ExampleDragSource extends StatelessWidget {
         child: contents,
         feedback: feedback,
         feedbackOffset: feedbackOffset,
-        dragAnchor: anchor
+        dragAnchor: anchor,
       );
     } else {
       return Draggable<Color>(
@@ -141,7 +141,7 @@ class ExampleDragSource extends StatelessWidget {
         child: contents,
         feedback: feedback,
         feedbackOffset: feedbackOffset,
-        dragAnchor: anchor
+        dragAnchor: anchor,
       );
     }
   }
@@ -193,15 +193,15 @@ class MovableBall extends StatelessWidget {
         color: Colors.blue.shade700,
         size: kBallSize,
         tappable: true,
-        child: const Center(child: Text('BALL'))
-      )
+        child: const Center(child: Text('BALL')),
+      ),
     );
     final Widget dashedBall = Container(
       width: kBallSize,
       height: kBallSize,
       child: const CustomPaint(
         painter: DashOutlineCirclePainter()
-      )
+      ),
     );
     if (position == ballPosition) {
       return Draggable<bool>(
@@ -209,14 +209,14 @@ class MovableBall extends StatelessWidget {
         child: ball,
         childWhenDragging: dashedBall,
         feedback: ball,
-        maxSimultaneousDrags: 1
+        maxSimultaneousDrags: 1,
       );
     } else {
       return DragTarget<bool>(
         onAccept: (bool data) { callback(position); },
         builder: (BuildContext context, List<bool> accepted, List<dynamic> rejected) {
           return dashedBall;
-        }
+        },
       );
     }
   }
@@ -238,7 +238,7 @@ class DragAndDropAppState extends State<DragAndDropApp> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: const Text('Drag and Drop Flutter Demo')
+        title: const Text('Drag and Drop Flutter Demo'),
       ),
       body: Column(
         children: <Widget>[
@@ -251,22 +251,22 @@ class DragAndDropAppState extends State<DragAndDropApp> {
                   color: Colors.yellow.shade300,
                   under: true,
                   heavy: false,
-                  child: const Text('under')
+                  child: const Text('under'),
                 ),
                 ExampleDragSource(
                   color: Colors.green.shade300,
                   under: false,
                   heavy: true,
-                  child: const Text('long-press above')
+                  child: const Text('long-press above'),
                 ),
                 ExampleDragSource(
                   color: Colors.indigo.shade300,
                   under: false,
                   heavy: false,
-                  child: const Text('above')
+                  child: const Text('above'),
                 ),
               ],
-            )
+            ),
           ),
           Expanded(
             child: Row(
@@ -275,8 +275,8 @@ class DragAndDropAppState extends State<DragAndDropApp> {
                 Expanded(child: ExampleDragTarget()),
                 Expanded(child: ExampleDragTarget()),
                 Expanded(child: ExampleDragTarget()),
-              ]
-            )
+              ],
+            ),
           ),
           Expanded(
             child: Row(
@@ -286,10 +286,10 @@ class DragAndDropAppState extends State<DragAndDropApp> {
                 MovableBall(2, position, moveBall),
                 MovableBall(3, position, moveBall),
               ],
-            )
+            ),
           ),
-        ]
-      )
+        ],
+      ),
     );
   }
 }
@@ -297,6 +297,6 @@ class DragAndDropAppState extends State<DragAndDropApp> {
 void main() {
   runApp(MaterialApp(
     title: 'Drag and Drop Flutter Demo',
-    home: DragAndDropApp()
+    home: DragAndDropApp(),
   ));
 }
diff --git a/dev/manual_tests/lib/material_arc.dart b/dev/manual_tests/lib/material_arc.dart
index 23fae24befc..5e16d6479cc 100644
--- a/dev/manual_tests/lib/material_arc.dart
+++ b/dev/manual_tests/lib/material_arc.dart
@@ -48,7 +48,7 @@ class _IgnoreDrag extends Drag {
 class _PointDemoPainter extends CustomPainter {
   _PointDemoPainter({
     Animation<double> repaint,
-    this.arc
+    this.arc,
   }) : _repaint = repaint, super(repaint: repaint);
 
   final MaterialPointArcTween arc;
@@ -202,7 +202,7 @@ class _PointDemoState extends State<_PointDemo> {
           key: _painterKey,
           foregroundPainter: _PointDemoPainter(
             repaint: _animation,
-            arc: arc
+            arc: arc,
           ),
           // Watch out: if this IgnorePointer is left out, then gestures that
           // fail _PointDemoPainter.hitTest() will still be recognized because
@@ -213,12 +213,12 @@ class _PointDemoState extends State<_PointDemo> {
               child: Text(
                 'Tap the refresh button to run the animation. Drag the green '
                 "and red points to change the animation's path.",
-                style: Theme.of(context).textTheme.caption.copyWith(fontSize: 16.0)
-              )
-            )
-          )
-        )
-      )
+                style: Theme.of(context).textTheme.caption.copyWith(fontSize: 16.0),
+              ),
+            ),
+          ),
+        ),
+      ),
     );
   }
 }
@@ -226,7 +226,7 @@ class _PointDemoState extends State<_PointDemo> {
 class _RectangleDemoPainter extends CustomPainter {
   _RectangleDemoPainter({
     Animation<double> repaint,
-    this.arc
+    this.arc,
   }) : _repaint = repaint, super(repaint: repaint);
 
   final MaterialRectArcTween arc;
@@ -350,11 +350,11 @@ class _RectangleDemoState extends State<_RectangleDemo> {
       _screenSize = screenSize;
       _begin = Rect.fromLTWH(
         screenSize.width * 0.5, screenSize.height * 0.2,
-        screenSize.width * 0.4, screenSize.height * 0.2
+        screenSize.width * 0.4, screenSize.height * 0.2,
       );
       _end = Rect.fromLTWH(
         screenSize.width * 0.1, screenSize.height * 0.4,
-        screenSize.width * 0.3, screenSize.height * 0.3
+        screenSize.width * 0.3, screenSize.height * 0.3,
       );
     }
 
@@ -375,7 +375,7 @@ class _RectangleDemoState extends State<_RectangleDemo> {
           key: _painterKey,
           foregroundPainter: _RectangleDemoPainter(
             repaint: _animation,
-            arc: arc
+            arc: arc,
           ),
           // Watch out: if this IgnorePointer is left out, then gestures that
           // fail _RectDemoPainter.hitTest() will still be recognized because
@@ -386,12 +386,12 @@ class _RectangleDemoState extends State<_RectangleDemo> {
               child: Text(
                 'Tap the refresh button to run the animation. Drag the rectangles '
                 "to change the animation's path.",
-                style: Theme.of(context).textTheme.caption.copyWith(fontSize: 16.0)
-              )
-            )
-          )
-        )
-      )
+                style: Theme.of(context).textTheme.caption.copyWith(fontSize: 16.0),
+              ),
+            ),
+          ),
+        ),
+      ),
     );
   }
 }
@@ -426,13 +426,13 @@ class _AnimationDemoState extends State<AnimationDemo> with TickerProviderStateM
       _ArcDemo('POINT', (_ArcDemo demo) {
         return _PointDemo(
           key: demo.key,
-          controller: demo.controller
+          controller: demo.controller,
         );
       }, this),
       _ArcDemo('RECTANGLE', (_ArcDemo demo) {
         return _RectangleDemo(
           key: demo.key,
-          controller: demo.controller
+          controller: demo.controller,
         );
       }, this),
     ];
@@ -466,9 +466,9 @@ class _AnimationDemoState extends State<AnimationDemo> with TickerProviderStateM
           },
         ),
         body: TabBarView(
-          children: _allDemos.map<Widget>((_ArcDemo demo) => demo.builder(demo)).toList()
-        )
-      )
+          children: _allDemos.map<Widget>((_ArcDemo demo) => demo.builder(demo)).toList(),
+        ),
+      ),
     );
   }
 }
diff --git a/dev/manual_tests/lib/text.dart b/dev/manual_tests/lib/text.dart
index 0244f3e6c05..d6309bfd3d7 100644
--- a/dev/manual_tests/lib/text.dart
+++ b/dev/manual_tests/lib/text.dart
@@ -515,7 +515,7 @@ class _FuzzerState extends State<Fuzzer> with SingleTickerProviderStateMixin {
                     debugPrint(_textSpan.toStringDeep());
                   }
                 });
-              }
+              },
             ),
           ),
         ],
@@ -573,7 +573,7 @@ class _UnderlinesState extends State<Underlines> {
                 ),
                 child: ListBody(
                   children: lines,
-                )
+                ),
               ),
             ),
           ),
@@ -668,7 +668,7 @@ class _FallbackState extends State<Fallback> {
                     child: ListBody(
                       children: lines,
                     ),
-                  )
+                  ),
                 ),
               ),
             ),
diff --git a/dev/snippets/lib/main.dart b/dev/snippets/lib/main.dart
index 9c25637fee5..786833d161b 100644
--- a/dev/snippets/lib/main.dart
+++ b/dev/snippets/lib/main.dart
@@ -39,7 +39,7 @@ void main(List<String> argList) {
           'application template.',
       getEnumName(SnippetType.sample):
           'Produce a nicely formatted piece of sample code. Does not embed the '
-          'sample into an application template.'
+          'sample into an application template.',
     },
     help: 'The type of snippet to produce.',
   );
diff --git a/dev/tools/vitool/lib/vitool.dart b/dev/tools/vitool/lib/vitool.dart
index a20b05ceb00..9951797ef74 100644
--- a/dev/tools/vitool/lib/vitool.dart
+++ b/dev/tools/vitool/lib/vitool.dart
@@ -222,7 +222,7 @@ List<SvgPath> _interpretSvgGroup(List<XmlNode> children, _Transform transform) {
 
       final _Transform subtreeTransform = _Transform(
         transformMatrix: transformMatrix,
-        opacity: opacity
+        opacity: opacity,
       );
       paths.addAll(_interpretSvgGroup(element.children, subtreeTransform));
     }
@@ -252,7 +252,7 @@ List<Point<double>> parsePoints(String points) {
     final Match m = _pointMatcher.firstMatch(unParsed);
     result.add(Point<double>(
         double.parse(m.group(1)),
-        double.parse(m.group(2))
+        double.parse(m.group(2)),
     ));
     unParsed = m.group(3);
   }
diff --git a/examples/catalog/lib/animated_list.dart b/examples/catalog/lib/animated_list.dart
index 4aab2a4a6c0..e9c3084b674 100644
--- a/examples/catalog/lib/animated_list.dart
+++ b/examples/catalog/lib/animated_list.dart
@@ -157,7 +157,7 @@ class CardItem extends StatelessWidget {
     @required this.animation,
     this.onTap,
     @required this.item,
-    this.selected = false
+    this.selected = false,
   }) : assert(animation != null),
        assert(item != null && item >= 0),
        assert(selected != null),
diff --git a/examples/catalog/lib/custom_semantics.dart b/examples/catalog/lib/custom_semantics.dart
index e8bd86cb42a..0cb7a45d3af 100644
--- a/examples/catalog/lib/custom_semantics.dart
+++ b/examples/catalog/lib/custom_semantics.dart
@@ -58,7 +58,7 @@ class AdjustableDropdownListTile extends StatelessWidget {
             }).toList(),
           ),
         ),
-      )
+      ),
     );
   }
 
@@ -91,7 +91,7 @@ class AdjustableDropdownExampleState extends State<AdjustableDropdownExample> {
     '5 seconds',
     '15 seconds',
     '30 seconds',
-    '1 minute'
+    '1 minute',
   ];
   String timeout;
 
diff --git a/examples/flutter_gallery/lib/demo/animation/home.dart b/examples/flutter_gallery/lib/demo/animation/home.dart
index ae7a34e065c..bfeaecaec65 100644
--- a/examples/flutter_gallery/lib/demo/animation/home.dart
+++ b/examples/flutter_gallery/lib/demo/animation/home.dart
@@ -509,7 +509,7 @@ class _AnimationDemoHomeState extends State<AnimationDemoHome> {
             setState(() {
               _maybeScroll(midScrollOffset, index, xOffset);
             });
-          }
+          },
         ),
       ));
     }
@@ -614,7 +614,7 @@ class _AnimationDemoHomeState extends State<AnimationDemoHome> {
                   tooltip: 'Back',
                   onPressed: () {
                     _handleBackButton(appBarMidScrollOffset);
-                  }
+                  },
                 ),
               ),
             ),
diff --git a/examples/flutter_gallery/lib/demo/calculator/home.dart b/examples/flutter_gallery/lib/demo/calculator/home.dart
index 2be02ecdbd1..84250f616e1 100644
--- a/examples/flutter_gallery/lib/demo/calculator/home.dart
+++ b/examples/flutter_gallery/lib/demo/calculator/home.dart
@@ -116,7 +116,7 @@ class _CalculatorState extends State<Calculator> {
     return Scaffold(
       appBar: AppBar(
         backgroundColor: Theme.of(context).canvasColor,
-        elevation: 0.0
+        elevation: 0.0,
       ),
       body: Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -124,15 +124,15 @@ class _CalculatorState extends State<Calculator> {
           // Give the key-pad 3/5 of the vertical space and the display 2/5.
           Expanded(
             flex: 2,
-            child: CalcDisplay(content: _expression.toString())
+            child: CalcDisplay(content: _expression.toString()),
           ),
           const Divider(height: 1.0),
           Expanded(
             flex: 3,
-            child: KeyPad(calcState: this)
-          )
-        ]
-      )
+            child: KeyPad(calcState: this),
+          ),
+        ],
+      ),
     );
   }
 }
@@ -147,8 +147,8 @@ class CalcDisplay extends StatelessWidget {
     return Center(
       child: Text(
         content,
-        style: const TextStyle(fontSize: 24.0)
-      )
+        style: const TextStyle(fontSize: 24.0),
+      ),
     );
   }
 }
@@ -180,25 +180,25 @@ class KeyPad extends StatelessWidget {
                   KeyRow(<Widget>[
                     NumberKey(7, calcState),
                     NumberKey(8, calcState),
-                    NumberKey(9, calcState)
+                    NumberKey(9, calcState),
                   ]),
                   KeyRow(<Widget>[
                     NumberKey(4, calcState),
                     NumberKey(5, calcState),
-                    NumberKey(6, calcState)
+                    NumberKey(6, calcState),
                   ]),
                   KeyRow(<Widget>[
                     NumberKey(1, calcState),
                     NumberKey(2, calcState),
-                    NumberKey(3, calcState)
+                    NumberKey(3, calcState),
                   ]),
                   KeyRow(<Widget>[
                     CalcKey('.', calcState.handlePointTap),
                     NumberKey(0, calcState),
                     CalcKey('=', calcState.handleEqualsTap),
-                  ])
-                ]
-              )
+                  ]),
+                ],
+              ),
             ),
             Expanded(
               child: Material(
@@ -209,14 +209,14 @@ class KeyPad extends StatelessWidget {
                     CalcKey('\u00F7', calcState.handleDivTap),
                     CalcKey('\u00D7', calcState.handleMultTap),
                     CalcKey('-', calcState.handleMinusTap),
-                    CalcKey('+', calcState.handlePlusTap)
-                  ]
-                )
-              )
+                    CalcKey('+', calcState.handlePlusTap),
+                  ],
+                ),
+              ),
             ),
-          ]
-        )
-      )
+          ],
+        ),
+      ),
     );
   }
 }
@@ -231,8 +231,8 @@ class KeyRow extends StatelessWidget {
     return Expanded(
       child: Row(
         mainAxisAlignment: MainAxisAlignment.center,
-        children: keys
-      )
+        children: keys,
+      ),
     );
   }
 }
@@ -254,10 +254,10 @@ class CalcKey extends StatelessWidget {
             text,
             style: TextStyle(
               fontSize: (orientation == Orientation.portrait) ? 32.0 : 24.0
-            )
-          )
-        )
-      )
+            ),
+          ),
+        ),
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/contacts_demo.dart b/examples/flutter_gallery/lib/demo/contacts_demo.dart
index 5566f8c25aa..66403efcc7f 100644
--- a/examples/flutter_gallery/lib/demo/contacts_demo.dart
+++ b/examples/flutter_gallery/lib/demo/contacts_demo.dart
@@ -30,9 +30,9 @@ class _ContactCategory extends StatelessWidget {
               Container(
                 padding: const EdgeInsets.symmetric(vertical: 24.0),
                 width: 72.0,
-                child: Icon(icon, color: themeData.primaryColor)
+                child: Icon(icon, color: themeData.primaryColor),
               ),
-              Expanded(child: Column(children: children))
+              Expanded(child: Column(children: children)),
             ],
           ),
         ),
@@ -61,9 +61,9 @@ class _ContactItem extends StatelessWidget {
       Expanded(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
-          children: columnChildren
-        )
-      )
+          children: columnChildren,
+        ),
+      ),
     ];
     if (icon != null) {
       rowChildren.add(SizedBox(
@@ -71,8 +71,8 @@ class _ContactItem extends StatelessWidget {
         child: IconButton(
           icon: Icon(icon),
           color: themeData.primaryColor,
-          onPressed: onPressed
-        )
+          onPressed: onPressed,
+        ),
       ));
     }
     return MergeSemantics(
@@ -80,8 +80,8 @@ class _ContactItem extends StatelessWidget {
         padding: const EdgeInsets.symmetric(vertical: 16.0),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: rowChildren
-        )
+          children: rowChildren,
+        ),
       ),
     );
   }
@@ -125,7 +125,7 @@ class ContactsDemoState extends State<ContactsDemo> {
                   tooltip: 'Edit',
                   onPressed: () {
                     _scaffoldKey.currentState.showSnackBar(const SnackBar(
-                      content: Text("Editing isn't supported in this screen.")
+                      content: Text("Editing isn't supported in this screen."),
                     ));
                   },
                 ),
@@ -138,19 +138,19 @@ class ContactsDemoState extends State<ContactsDemo> {
                   itemBuilder: (BuildContext context) => <PopupMenuItem<AppBarBehavior>>[
                     const PopupMenuItem<AppBarBehavior>(
                       value: AppBarBehavior.normal,
-                      child: Text('App bar scrolls away')
+                      child: Text('App bar scrolls away'),
                     ),
                     const PopupMenuItem<AppBarBehavior>(
                       value: AppBarBehavior.pinned,
-                      child: Text('App bar stays put')
+                      child: Text('App bar stays put'),
                     ),
                     const PopupMenuItem<AppBarBehavior>(
                       value: AppBarBehavior.floating,
-                      child: Text('App bar floats')
+                      child: Text('App bar floats'),
                     ),
                     const PopupMenuItem<AppBarBehavior>(
                       value: AppBarBehavior.snapping,
-                      child: Text('App bar snaps')
+                      child: Text('App bar snaps'),
                     ),
                   ],
                 ),
@@ -193,7 +193,7 @@ class ContactsDemoState extends State<ContactsDemo> {
                         tooltip: 'Send message',
                         onPressed: () {
                           _scaffoldKey.currentState.showSnackBar(const SnackBar(
-                            content: Text('Pretend that this opened your SMS application.')
+                            content: Text('Pretend that this opened your SMS application.'),
                           ));
                         },
                         lines: const <String>[
@@ -206,7 +206,7 @@ class ContactsDemoState extends State<ContactsDemo> {
                         tooltip: 'Send message',
                         onPressed: () {
                           _scaffoldKey.currentState.showSnackBar(const SnackBar(
-                            content: Text('A messaging app appears.')
+                            content: Text('A messaging app appears.'),
                           ));
                         },
                         lines: const <String>[
@@ -219,7 +219,7 @@ class ContactsDemoState extends State<ContactsDemo> {
                         tooltip: 'Send message',
                         onPressed: () {
                           _scaffoldKey.currentState.showSnackBar(const SnackBar(
-                            content: Text('Imagine if you will, a messaging application.')
+                            content: Text('Imagine if you will, a messaging application.'),
                           ));
                         },
                         lines: const <String>[
@@ -238,7 +238,7 @@ class ContactsDemoState extends State<ContactsDemo> {
                       tooltip: 'Send personal e-mail',
                       onPressed: () {
                         _scaffoldKey.currentState.showSnackBar(const SnackBar(
-                          content: Text('Here, your e-mail application would open.')
+                          content: Text('Here, your e-mail application would open.'),
                         ));
                       },
                       lines: const <String>[
@@ -251,7 +251,7 @@ class ContactsDemoState extends State<ContactsDemo> {
                       tooltip: 'Send work e-mail',
                       onPressed: () {
                         _scaffoldKey.currentState.showSnackBar(const SnackBar(
-                          content: Text('Summon your favorite e-mail application here.')
+                          content: Text('Summon your favorite e-mail application here.'),
                         ));
                       },
                       lines: const <String>[
@@ -269,7 +269,7 @@ class ContactsDemoState extends State<ContactsDemo> {
                       tooltip: 'Open map',
                       onPressed: () {
                         _scaffoldKey.currentState.showSnackBar(const SnackBar(
-                          content: Text('This would show a map of San Francisco.')
+                          content: Text('This would show a map of San Francisco.'),
                         ));
                       },
                       lines: const <String>[
@@ -283,7 +283,7 @@ class ContactsDemoState extends State<ContactsDemo> {
                       tooltip: 'Open map',
                       onPressed: () {
                         _scaffoldKey.currentState.showSnackBar(const SnackBar(
-                          content: Text('This would show a map of Mountain View.')
+                          content: Text('This would show a map of Mountain View.'),
                         ));
                       },
                       lines: const <String>[
@@ -297,7 +297,7 @@ class ContactsDemoState extends State<ContactsDemo> {
                       tooltip: 'Open map',
                       onPressed: () {
                         _scaffoldKey.currentState.showSnackBar(const SnackBar(
-                          content: Text('This would also show a map, if this was not a demo.')
+                          content: Text('This would also show a map, if this was not a demo.'),
                         ));
                       },
                       lines: const <String>[
diff --git a/examples/flutter_gallery/lib/demo/cupertino/cupertino_alert_demo.dart b/examples/flutter_gallery/lib/demo/cupertino/cupertino_alert_demo.dart
index c8051f27476..17fc4cc6d82 100644
--- a/examples/flutter_gallery/lib/demo/cupertino/cupertino_alert_demo.dart
+++ b/examples/flutter_gallery/lib/demo/cupertino/cupertino_alert_demo.dart
@@ -178,7 +178,7 @@ class _CupertinoAlertDemoState extends State<CupertinoAlertDemo> {
                             onPressed: () {
                               Navigator.pop(context, 'Cancel');
                             },
-                          )
+                          ),
                         ),
                       );
                     },
diff --git a/examples/flutter_gallery/lib/demo/cupertino/cupertino_buttons_demo.dart b/examples/flutter_gallery/lib/demo/cupertino/cupertino_buttons_demo.dart
index 9ec85800465..8bddc8c6af8 100644
--- a/examples/flutter_gallery/lib/demo/cupertino/cupertino_buttons_demo.dart
+++ b/examples/flutter_gallery/lib/demo/cupertino/cupertino_buttons_demo.dart
@@ -56,7 +56,7 @@ class _CupertinoButtonDemoState extends State<CupertinoButtonsDemo> {
                             child: const Text('Cupertino Button'),
                             onPressed: () {
                               setState(() { _pressedCount += 1; });
-                            }
+                            },
                           ),
                           const CupertinoButton(
                             child: Text('Disabled'),
@@ -70,7 +70,7 @@ class _CupertinoButtonDemoState extends State<CupertinoButtonsDemo> {
                       child: const Text('With Background'),
                       onPressed: () {
                         setState(() { _pressedCount += 1; });
-                      }
+                      },
                     ),
                     const Padding(padding: EdgeInsets.all(12.0)),
                     const CupertinoButton.filled(
@@ -83,7 +83,7 @@ class _CupertinoButtonDemoState extends State<CupertinoButtonsDemo> {
             ],
           ),
         ),
-      )
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/cupertino/cupertino_navigation_demo.dart b/examples/flutter_gallery/lib/demo/cupertino/cupertino_navigation_demo.dart
index f6e0263909d..2655bee93d4 100644
--- a/examples/flutter_gallery/lib/demo/cupertino/cupertino_navigation_demo.dart
+++ b/examples/flutter_gallery/lib/demo/cupertino/cupertino_navigation_demo.dart
@@ -78,7 +78,7 @@ class CupertinoNavigationDemo extends StatelessWidget {
                   builder: (BuildContext context) {
                     return CupertinoDemoTab1(
                       colorItems: colorItems,
-                      colorNameItems: colorNameItems
+                      colorNameItems: colorNameItems,
                     );
                   },
                   defaultTitle: 'Colors',
@@ -750,7 +750,7 @@ class CupertinoDemoTab3 extends StatelessWidget {
                         Text(
                           'Sign in',
                           style: TextStyle(color: CupertinoTheme.of(context).primaryColor),
-                        )
+                        ),
                       ],
                     ),
                   ),
diff --git a/examples/flutter_gallery/lib/demo/cupertino/cupertino_refresh_demo.dart b/examples/flutter_gallery/lib/demo/cupertino/cupertino_refresh_demo.dart
index 4ca14fb3a20..a3a73858746 100644
--- a/examples/flutter_gallery/lib/demo/cupertino/cupertino_refresh_demo.dart
+++ b/examples/flutter_gallery/lib/demo/cupertino/cupertino_refresh_demo.dart
@@ -32,7 +32,7 @@ class _CupertinoRefreshControlDemoState extends State<CupertinoRefreshControlDem
         return contacts[random.nextInt(contacts.length)]
             // Randomly adds a telephone icon next to the contact or not.
             ..add(random.nextBool().toString());
-      }
+      },
     );
   }
 
diff --git a/examples/flutter_gallery/lib/demo/cupertino/cupertino_slider_demo.dart b/examples/flutter_gallery/lib/demo/cupertino/cupertino_slider_demo.dart
index e643dafc0a4..bce7687f3de 100644
--- a/examples/flutter_gallery/lib/demo/cupertino/cupertino_slider_demo.dart
+++ b/examples/flutter_gallery/lib/demo/cupertino/cupertino_slider_demo.dart
@@ -46,10 +46,10 @@ class _CupertinoSliderDemoState extends State<CupertinoSliderDemo> {
                         setState(() {
                           _value = value;
                         });
-                      }
+                      },
                     ),
                     Text('Cupertino Continuous: ${_value.toStringAsFixed(1)}'),
-                  ]
+                  ],
                 ),
                 Column(
                   mainAxisSize: MainAxisSize.min,
@@ -63,10 +63,10 @@ class _CupertinoSliderDemoState extends State<CupertinoSliderDemo> {
                         setState(() {
                           _discreteValue = value;
                         });
-                      }
+                      },
                     ),
                     Text('Cupertino Discrete: $_discreteValue'),
-                  ]
+                  ],
                 ),
               ],
             ),
diff --git a/examples/flutter_gallery/lib/demo/fortnightly/fortnightly.dart b/examples/flutter_gallery/lib/demo/fortnightly/fortnightly.dart
index 28a4f3cf83f..f8dcde8a972 100644
--- a/examples/flutter_gallery/lib/demo/fortnightly/fortnightly.dart
+++ b/examples/flutter_gallery/lib/demo/fortnightly/fortnightly.dart
@@ -116,7 +116,7 @@ class FruitPage extends StatelessWidget {
                         Text(
                           ' ¬ ',
                           // TODO(larche): Replace textTheme.display3.color with a ColorScheme value when known.
-                          style: textTheme.overline.apply(color: textTheme.display3.color)
+                          style: textTheme.overline.apply(color: textTheme.display3.color),
                         ),
                         Text(
                           'CULTURE',
@@ -160,7 +160,7 @@ class FruitPage extends StatelessWidget {
                               fontWeight: FontWeight.w500,
                               color: Colors.black,
                             ),
-                          )
+                          ),
                         ],
                       ),
                     ),
@@ -170,7 +170,7 @@ class FruitPage extends StatelessWidget {
                     ),
                   ],
                 ),
-              )
+              ),
             ],
           ),
         ),
diff --git a/examples/flutter_gallery/lib/demo/images_demo.dart b/examples/flutter_gallery/lib/demo/images_demo.dart
index c214d2a3f7a..9863a2bc80e 100644
--- a/examples/flutter_gallery/lib/demo/images_demo.dart
+++ b/examples/flutter_gallery/lib/demo/images_demo.dart
@@ -34,7 +34,7 @@ class ImagesDemo extends StatelessWidget {
             ),
           ),
         ),
-      ]
+      ],
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/material/bottom_app_bar_demo.dart b/examples/flutter_gallery/lib/demo/material/bottom_app_bar_demo.dart
index 0baef794761..71d89bcce3c 100644
--- a/examples/flutter_gallery/lib/demo/material/bottom_app_bar_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/bottom_app_bar_demo.dart
@@ -256,7 +256,7 @@ class _RadioItem<T> extends StatelessWidget {
                 ),
               ),
             ),
-          ]
+          ],
         ),
       ),
     );
@@ -333,7 +333,7 @@ class _DemoBottomAppBar extends StatelessWidget {
   const _DemoBottomAppBar({
     this.color,
     this.fabLocation,
-    this.shape
+    this.shape,
   });
 
   final Color color;
diff --git a/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart b/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart
index a23e5f0013d..bbec6c6e624 100644
--- a/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart
@@ -96,7 +96,7 @@ class CustomInactiveIcon extends StatelessWidget {
       height: iconTheme.size - 8.0,
       decoration: BoxDecoration(
         border: Border.all(color: iconTheme.color, width: 2.0),
-      )
+      ),
     );
   }
 }
@@ -150,7 +150,7 @@ class _BottomNavigationDemoState extends State<BottomNavigationDemo>
         title: 'Event',
         color: Colors.pink,
         vsync: this,
-      )
+      ),
     ];
 
     _navigationViews[_currentIndex].controller.value = 1.0;
@@ -218,13 +218,13 @@ class _BottomNavigationDemoState extends State<BottomNavigationDemo>
               const PopupMenuItem<BottomNavigationBarType>(
                 value: BottomNavigationBarType.shifting,
                 child: Text('Shifting'),
-              )
+              ),
             ],
-          )
+          ),
         ],
       ),
       body: Center(
-        child: _buildTransitionsStack()
+        child: _buildTransitionsStack(),
       ),
       bottomNavigationBar: botNavBar,
     );
diff --git a/examples/flutter_gallery/lib/demo/material/buttons_demo.dart b/examples/flutter_gallery/lib/demo/material/buttons_demo.dart
index 4b5f079a37e..7ae4ff405d8 100644
--- a/examples/flutter_gallery/lib/demo/material/buttons_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/buttons_demo.dart
@@ -323,7 +323,7 @@ class _ButtonsDemoState extends State<ButtonsDemo> {
               },
               items: <String>[
                   'One', 'Two', 'Free', 'Four', 'Can', 'I', 'Have', 'A', 'Little',
-                  'Bit', 'More', 'Five', 'Six', 'Seven', 'Eight', 'Nine', 'Ten'
+                  'Bit', 'More', 'Five', 'Six', 'Seven', 'Eight', 'Nine', 'Ten',
                  ]
                 .map<DropdownMenuItem<String>>((String value) {
                   return DropdownMenuItem<String>(
@@ -363,7 +363,7 @@ class _ButtonsDemoState extends State<ButtonsDemo> {
               semanticLabel: 'Thumbs not up',
             ),
             onPressed: null,
-          )
+          ),
         ]
         .map<Widget>((Widget button) => SizedBox(width: 64.0, height: 64.0, child: button))
         .toList(),
diff --git a/examples/flutter_gallery/lib/demo/material/cards_demo.dart b/examples/flutter_gallery/lib/demo/material/cards_demo.dart
index 427851d2578..dfc03f3c2f6 100644
--- a/examples/flutter_gallery/lib/demo/material/cards_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/cards_demo.dart
@@ -66,7 +66,7 @@ const List<TravelDestination> destinations = <TravelDestination>[
     city: 'Thanjavur',
     location: 'Thanjavur, Tamil Nadu',
     type: CardDemoType.selectable,
-  )
+  ),
 ];
 
 class TravelDestinationItem extends StatelessWidget {
@@ -215,7 +215,7 @@ class _SelectableTravelDestinationItemState extends State<SelectableTravelDestin
                             Icons.check_circle,
                             color: _isSelected ? colorScheme.primary : Colors.transparent,
                           ),
-                        )
+                        ),
                       ),
                     ],
                   ),
@@ -232,7 +232,7 @@ class _SelectableTravelDestinationItemState extends State<SelectableTravelDestin
 class SectionTitle extends StatelessWidget {
   const SectionTitle({
     Key key,
-    this.title
+    this.title,
   }) : super(key: key);
 
   final String title;
@@ -277,7 +277,7 @@ class TravelDestinationContent extends StatelessWidget {
                 image: AssetImage(destination.assetName, package: destination.assetPackage),
                 fit: BoxFit.cover,
                 child: Container(),
-              )
+              ),
             ),
             Positioned(
               bottom: 16.0,
@@ -408,8 +408,8 @@ class _CardsDemoState extends State<CardsDemo> {
             margin: const EdgeInsets.only(bottom: 8.0),
             child: child,
           );
-        }).toList()
-      )
+        }).toList(),
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/material/chip_demo.dart b/examples/flutter_gallery/lib/demo/material/chip_demo.dart
index 3590c0295c9..39c3e15abdf 100644
--- a/examples/flutter_gallery/lib/demo/material/chip_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/chip_demo.dart
@@ -117,7 +117,7 @@ class _ChipsTile extends StatelessWidget {
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: cardChildren,
-      )
+      ),
     );
   }
 }
@@ -313,7 +313,7 @@ class _ChipDemoState extends State<ChipDemo> {
               });
             },
             icon: const Icon(Icons.vignette, semanticLabel: 'Update border shape'),
-          )
+          ),
         ],
       ),
       body: ChipTheme(
diff --git a/examples/flutter_gallery/lib/demo/material/data_table_demo.dart b/examples/flutter_gallery/lib/demo/material/data_table_demo.dart
index 26342b2f784..5c0454ade4c 100644
--- a/examples/flutter_gallery/lib/demo/material/data_table_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/data_table_demo.dart
@@ -121,7 +121,7 @@ class DessertDataSource extends DataTableSource {
         DataCell(Text('${dessert.sodium}')),
         DataCell(Text('${dessert.calcium}%')),
         DataCell(Text('${dessert.iron}%')),
-      ]
+      ],
     );
   }
 
@@ -185,50 +185,50 @@ class _DataTableDemoState extends State<DataTableDemo> {
             columns: <DataColumn>[
               DataColumn(
                 label: const Text('Dessert (100g serving)'),
-                onSort: (int columnIndex, bool ascending) => _sort<String>((Dessert d) => d.name, columnIndex, ascending)
+                onSort: (int columnIndex, bool ascending) => _sort<String>((Dessert d) => d.name, columnIndex, ascending),
               ),
               DataColumn(
                 label: const Text('Calories'),
                 tooltip: 'The total amount of food energy in the given serving size.',
                 numeric: true,
-                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.calories, columnIndex, ascending)
+                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.calories, columnIndex, ascending),
               ),
               DataColumn(
                 label: const Text('Fat (g)'),
                 numeric: true,
-                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.fat, columnIndex, ascending)
+                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.fat, columnIndex, ascending),
               ),
               DataColumn(
                 label: const Text('Carbs (g)'),
                 numeric: true,
-                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.carbs, columnIndex, ascending)
+                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.carbs, columnIndex, ascending),
               ),
               DataColumn(
                 label: const Text('Protein (g)'),
                 numeric: true,
-                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.protein, columnIndex, ascending)
+                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.protein, columnIndex, ascending),
               ),
               DataColumn(
                 label: const Text('Sodium (mg)'),
                 numeric: true,
-                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.sodium, columnIndex, ascending)
+                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.sodium, columnIndex, ascending),
               ),
               DataColumn(
                 label: const Text('Calcium (%)'),
                 tooltip: 'The amount of calcium as a percentage of the recommended daily amount.',
                 numeric: true,
-                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.calcium, columnIndex, ascending)
+                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.calcium, columnIndex, ascending),
               ),
               DataColumn(
                 label: const Text('Iron (%)'),
                 numeric: true,
-                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.iron, columnIndex, ascending)
+                onSort: (int columnIndex, bool ascending) => _sort<num>((Dessert d) => d.iron, columnIndex, ascending),
               ),
             ],
-            source: _dessertsDataSource
-          )
-        ]
-      )
+            source: _dessertsDataSource,
+          ),
+        ],
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/material/date_and_time_picker_demo.dart b/examples/flutter_gallery/lib/demo/material/date_and_time_picker_demo.dart
index ab9763e9640..e2b465124b2 100644
--- a/examples/flutter_gallery/lib/demo/material/date_and_time_picker_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/date_and_time_picker_demo.dart
@@ -39,7 +39,7 @@ class _InputDropdown extends StatelessWidget {
           children: <Widget>[
             Text(valueText, style: valueStyle),
             Icon(Icons.arrow_drop_down,
-              color: Theme.of(context).brightness == Brightness.light ? Colors.grey.shade700 : Colors.white70
+              color: Theme.of(context).brightness == Brightness.light ? Colors.grey.shade700 : Colors.white70,
             ),
           ],
         ),
@@ -55,7 +55,7 @@ class _DateTimePicker extends StatelessWidget {
     this.selectedDate,
     this.selectedTime,
     this.selectDate,
-    this.selectTime
+    this.selectTime,
   }) : super(key: key);
 
   final String labelText;
@@ -69,7 +69,7 @@ class _DateTimePicker extends StatelessWidget {
       context: context,
       initialDate: selectedDate,
       firstDate: DateTime(2015, 8),
-      lastDate: DateTime(2101)
+      lastDate: DateTime(2101),
     );
     if (picked != null && picked != selectedDate)
       selectDate(picked);
@@ -78,7 +78,7 @@ class _DateTimePicker extends StatelessWidget {
   Future<void> _selectTime(BuildContext context) async {
     final TimeOfDay picked = await showTimePicker(
       context: context,
-      initialTime: selectedTime
+      initialTime: selectedTime,
     );
     if (picked != null && picked != selectedTime)
       selectTime(picked);
diff --git a/examples/flutter_gallery/lib/demo/material/dialog_demo.dart b/examples/flutter_gallery/lib/demo/material/dialog_demo.dart
index 73c5e83da54..6f4116eb1eb 100644
--- a/examples/flutter_gallery/lib/demo/material/dialog_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/dialog_demo.dart
@@ -74,7 +74,7 @@ class DialogDemoState extends State<DialogDemo> {
     .then<void>((T value) { // The value passed to Navigator.pop() or null.
       if (value != null) {
         _scaffoldKey.currentState.showSnackBar(SnackBar(
-          content: Text('You selected: $value')
+          content: Text('You selected: $value'),
         ));
       }
     });
@@ -102,21 +102,21 @@ class DialogDemoState extends State<DialogDemo> {
                 child: AlertDialog(
                   content: Text(
                     _alertWithoutTitleText,
-                    style: dialogTextStyle
+                    style: dialogTextStyle,
                   ),
                   actions: <Widget>[
                     FlatButton(
                       child: const Text('CANCEL'),
-                      onPressed: () { Navigator.pop(context, DialogDemoAction.cancel); }
+                      onPressed: () { Navigator.pop(context, DialogDemoAction.cancel); },
                     ),
                     FlatButton(
                       child: const Text('DISCARD'),
-                      onPressed: () { Navigator.pop(context, DialogDemoAction.discard); }
-                    )
-                  ]
-                )
+                      onPressed: () { Navigator.pop(context, DialogDemoAction.discard); },
+                    ),
+                  ],
+                ),
               );
-            }
+            },
           ),
           RaisedButton(
             child: const Text('ALERT WITH TITLE'),
@@ -127,21 +127,21 @@ class DialogDemoState extends State<DialogDemo> {
                   title: const Text('Use Google\'s location service?'),
                   content: Text(
                     _alertWithTitleText,
-                    style: dialogTextStyle
+                    style: dialogTextStyle,
                   ),
                   actions: <Widget>[
                     FlatButton(
                       child: const Text('DISAGREE'),
-                      onPressed: () { Navigator.pop(context, DialogDemoAction.disagree); }
+                      onPressed: () { Navigator.pop(context, DialogDemoAction.disagree); },
                     ),
                     FlatButton(
                       child: const Text('AGREE'),
-                      onPressed: () { Navigator.pop(context, DialogDemoAction.agree); }
-                    )
-                  ]
-                )
+                      onPressed: () { Navigator.pop(context, DialogDemoAction.agree); },
+                    ),
+                  ],
+                ),
               );
-            }
+            },
           ),
           RaisedButton(
             child: const Text('SIMPLE'),
@@ -155,40 +155,40 @@ class DialogDemoState extends State<DialogDemo> {
                       icon: Icons.account_circle,
                       color: theme.primaryColor,
                       text: 'username@gmail.com',
-                      onPressed: () { Navigator.pop(context, 'username@gmail.com'); }
+                      onPressed: () { Navigator.pop(context, 'username@gmail.com'); },
                     ),
                     DialogDemoItem(
                       icon: Icons.account_circle,
                       color: theme.primaryColor,
                       text: 'user02@gmail.com',
-                      onPressed: () { Navigator.pop(context, 'user02@gmail.com'); }
+                      onPressed: () { Navigator.pop(context, 'user02@gmail.com'); },
                     ),
                     DialogDemoItem(
                       icon: Icons.add_circle,
                       text: 'add account',
-                      color: theme.disabledColor
-                    )
-                  ]
-                )
+                      color: theme.disabledColor,
+                    ),
+                  ],
+                ),
               );
-            }
+            },
           ),
           RaisedButton(
             child: const Text('CONFIRMATION'),
             onPressed: () {
               showTimePicker(
                 context: context,
-                initialTime: _selectedTime
+                initialTime: _selectedTime,
               )
               .then<void>((TimeOfDay value) {
                 if (value != null && value != _selectedTime) {
                   _selectedTime = value;
                   _scaffoldKey.currentState.showSnackBar(SnackBar(
-                    content: Text('You selected: ${value.format(context)}')
+                    content: Text('You selected: ${value.format(context)}'),
                   ));
                 }
               });
-            }
+            },
           ),
           RaisedButton(
             child: const Text('FULLSCREEN'),
@@ -197,18 +197,18 @@ class DialogDemoState extends State<DialogDemo> {
                 builder: (BuildContext context) => FullScreenDialogDemo(),
                 fullscreenDialog: true,
               ));
-            }
+            },
           ),
         ]
         // Add a little space between the buttons
         .map<Widget>((Widget button) {
           return Container(
             padding: const EdgeInsets.symmetric(vertical: 8.0),
-            child: button
+            child: button,
           );
         })
-        .toList()
-      )
+        .toList(),
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/material/drawer_demo.dart b/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
index a97819910f8..417b8c93b94 100644
--- a/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
@@ -73,7 +73,7 @@ class _DrawerDemoState extends State<DrawerDemo> with TickerProviderStateMixin {
   void _showNotImplementedMessage() {
     Navigator.pop(context); // Dismiss the drawer.
     _scaffoldKey.currentState.showSnackBar(const SnackBar(
-      content: Text("The drawer's items don't do anything")
+      content: Text("The drawer's items don't do anything"),
     ));
   }
 
diff --git a/examples/flutter_gallery/lib/demo/material/elevation_demo.dart b/examples/flutter_gallery/lib/demo/material/elevation_demo.dart
index c2500a4ddd0..f8898082a6d 100644
--- a/examples/flutter_gallery/lib/demo/material/elevation_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/elevation_demo.dart
@@ -54,7 +54,7 @@ class _ElevationDemoState extends State<ElevationDemo> {
             onPressed: () {
               setState(() => _showElevation = !_showElevation);
             },
-          )
+          ),
         ],
       ),
       body: ListView(
diff --git a/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart b/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart
index 1eb7b620e36..fb84c4f6e3e 100644
--- a/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart
@@ -21,7 +21,7 @@ class DualHeaderWithHint extends StatelessWidget {
     this.name,
     this.value,
     this.hint,
-    this.showHint
+    this.showHint,
   });
 
   final String name;
@@ -69,11 +69,11 @@ class DualHeaderWithHint extends StatelessWidget {
             child: _crossFade(
               Text(value, style: textTheme.caption.copyWith(fontSize: 15.0)),
               Text(hint, style: textTheme.caption.copyWith(fontSize: 15.0)),
-              showHint
-            )
-          )
-        )
-      ]
+              showHint,
+            ),
+          ),
+        ),
+      ],
     );
   }
 }
@@ -83,7 +83,7 @@ class CollapsibleBody extends StatelessWidget {
     this.margin = EdgeInsets.zero,
     this.child,
     this.onSave,
-    this.onCancel
+    this.onCancel,
   });
 
   final EdgeInsets margin;
@@ -102,14 +102,14 @@ class CollapsibleBody extends StatelessWidget {
           margin: const EdgeInsets.only(
             left: 24.0,
             right: 24.0,
-            bottom: 24.0
+            bottom: 24.0,
           ) - margin,
           child: Center(
             child: DefaultTextStyle(
               style: textTheme.caption.copyWith(fontSize: 15.0),
-              child: child
-            )
-          )
+              child: child,
+            ),
+          ),
         ),
         const Divider(height: 1.0),
         Container(
@@ -124,22 +124,22 @@ class CollapsibleBody extends StatelessWidget {
                   child: const Text('CANCEL', style: TextStyle(
                     color: Colors.black54,
                     fontSize: 15.0,
-                    fontWeight: FontWeight.w500
-                  ))
-                )
+                    fontWeight: FontWeight.w500,
+                  )),
+                ),
               ),
               Container(
                 margin: const EdgeInsets.only(right: 8.0),
                 child: FlatButton(
                   onPressed: onSave,
                   textTheme: ButtonTextTheme.accent,
-                  child: const Text('SAVE')
-                )
-              )
-            ]
-          )
-        )
-      ]
+                  child: const Text('SAVE'),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ],
     );
   }
 }
@@ -150,7 +150,7 @@ class DemoItem<T> {
     this.value,
     this.hint,
     this.builder,
-    this.valueToString
+    this.valueToString,
   }) : textController = TextEditingController(text: valueToString(value));
 
   final String name;
@@ -167,7 +167,7 @@ class DemoItem<T> {
         name: name,
         value: valueToString(value),
         hint: hint,
-        showHint: isExpanded
+        showHint: isExpanded,
       );
     };
   }
@@ -269,15 +269,15 @@ class _ExpansionPanelsDemoState extends State<ExpansionPanelsDemo> {
                             groupValue: field.value,
                             onChanged: field.didChange,
                           ),
-                        ]
+                        ],
                       );
-                    }
+                    },
                   ),
                 );
               }
-            )
+            ),
           );
-        }
+        },
       ),
       DemoItem<double>(
         name: 'Sun',
@@ -314,10 +314,10 @@ class _ExpansionPanelsDemoState extends State<ExpansionPanelsDemo> {
                   ),
                 );
               }
-            )
+            ),
           );
-        }
-      )
+        },
+      ),
     ];
   }
 
@@ -346,9 +346,9 @@ class _ExpansionPanelsDemoState extends State<ExpansionPanelsDemo> {
                 return ExpansionPanel(
                   isExpanded: item.isExpanded,
                   headerBuilder: item.headerBuilder,
-                  body: item.build()
+                  body: item.build(),
                 );
-              }).toList()
+              }).toList(),
             ),
           ),
         ),
diff --git a/examples/flutter_gallery/lib/demo/material/expansion_tile_list_demo.dart b/examples/flutter_gallery/lib/demo/material/expansion_tile_list_demo.dart
index b4338d2e7ed..9011e80395b 100644
--- a/examples/flutter_gallery/lib/demo/material/expansion_tile_list_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/expansion_tile_list_demo.dart
@@ -27,12 +27,12 @@ class ExpansionTileListDemo extends StatelessWidget {
                ListTile(title: Text('Two')),
                // https://en.wikipedia.org/wiki/Free_Four
                ListTile(title: Text('Free')),
-               ListTile(title: Text('Four'))
-             ]
+               ListTile(title: Text('Four')),
+             ],
           ),
-           const ListTile(title: Text('Bottom'))
-        ]
-      )
+           const ListTile(title: Text('Bottom')),
+        ],
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart b/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart
index 7d715ae581c..c29e6ef05ca 100644
--- a/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart
@@ -47,7 +47,7 @@ class DateTimeItem extends StatelessWidget {
                     context: context,
                     initialDate: date,
                     firstDate: date.subtract(const Duration(days: 30)),
-                    lastDate: date.add(const Duration(days: 30))
+                    lastDate: date.add(const Duration(days: 30)),
                   )
                   .then<void>((DateTime value) {
                     if (value != null)
@@ -59,10 +59,10 @@ class DateTimeItem extends StatelessWidget {
                   children: <Widget>[
                     Text(DateFormat('EEE, MMM d yyyy').format(date)),
                     const Icon(Icons.arrow_drop_down, color: Colors.black54),
-                  ]
-                )
-              )
-            )
+                  ],
+                ),
+              ),
+            ),
           ),
           Container(
             margin: const EdgeInsets.only(left: 8.0),
@@ -74,7 +74,7 @@ class DateTimeItem extends StatelessWidget {
               onTap: () {
                 showTimePicker(
                   context: context,
-                  initialTime: time
+                  initialTime: time,
                 )
                 .then<void>((TimeOfDay value) {
                   if (value != null)
@@ -85,12 +85,12 @@ class DateTimeItem extends StatelessWidget {
                 children: <Widget>[
                   Text('${time.format(context)}'),
                   const Icon(Icons.arrow_drop_down, color: Colors.black54),
-                ]
-              )
-            )
-          )
-        ]
-      )
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }
@@ -123,21 +123,21 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
         return AlertDialog(
           content: Text(
             'Discard new event?',
-            style: dialogTextStyle
+            style: dialogTextStyle,
           ),
           actions: <Widget>[
             FlatButton(
               child: const Text('CANCEL'),
               onPressed: () {
                 Navigator.of(context).pop(false); // Pops the confirmation dialog but not the page.
-              }
+              },
             ),
             FlatButton(
               child: const Text('DISCARD'),
               onPressed: () {
                 Navigator.of(context).pop(true); // Returning true to _onWillPop will pop again.
-              }
-            )
+              },
+            ),
           ],
         );
       },
@@ -156,9 +156,9 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
             child: Text('SAVE', style: theme.textTheme.body1.copyWith(color: Colors.white)),
             onPressed: () {
               Navigator.pop(context, DismissDialogAction.save);
-            }
-          )
-        ]
+            },
+          ),
+        ],
       ),
       body: Form(
         onWillPop: _onWillPop,
@@ -171,7 +171,7 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
               child: TextField(
                 decoration: const InputDecoration(
                   labelText: 'Event name',
-                  filled: true
+                  filled: true,
                 ),
                 style: theme.textTheme.headline,
                 onChanged: (String value) {
@@ -181,8 +181,8 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
                       _eventName = value;
                     }
                   });
-                }
-              )
+                },
+              ),
             ),
             Container(
               padding: const EdgeInsets.symmetric(vertical: 8.0),
@@ -191,14 +191,14 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
                 decoration: const InputDecoration(
                   labelText: 'Location',
                   hintText: 'Where is the event?',
-                  filled: true
+                  filled: true,
                 ),
                 onChanged: (String value) {
                   setState(() {
                     _hasLocation = value.isNotEmpty;
                   });
-                }
-              )
+                },
+              ),
             ),
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -211,9 +211,9 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
                       _fromDateTime = value;
                       _saveNeeded = true;
                     });
-                  }
-                )
-              ]
+                  },
+                ),
+              ],
             ),
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -226,10 +226,10 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
                       _toDateTime = value;
                       _saveNeeded = true;
                     });
-                  }
+                  },
                 ),
                 const Text('All-day'),
-              ]
+              ],
             ),
             Container(
               decoration: BoxDecoration(
@@ -244,22 +244,22 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
                         _allDayValue = value;
                         _saveNeeded = true;
                       });
-                    }
+                    },
                   ),
                   const Text('All-day'),
-                ]
-              )
-            )
+                ],
+              ),
+            ),
           ]
           .map<Widget>((Widget child) {
             return Container(
               padding: const EdgeInsets.symmetric(vertical: 8.0),
               height: 96.0,
-              child: child
+              child: child,
             );
           })
-          .toList()
-        )
+          .toList(),
+        ),
       ),
     );
   }
diff --git a/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart b/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
index eaa72b39181..2267606cd29 100644
--- a/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
@@ -121,7 +121,7 @@ class _GridPhotoViewerState extends State<GridPhotoViewer> with SingleTickerProv
     final double distance = (Offset.zero & context.size).shortestSide;
     _flingAnimation = _controller.drive(Tween<Offset>(
       begin: _offset,
-      end: _clampOffset(_offset + direction * distance)
+      end: _clampOffset(_offset + direction * distance),
     ));
     _controller
       ..value = 0.0
@@ -155,7 +155,7 @@ class GridDemoPhotoItem extends StatelessWidget {
     Key key,
     @required this.photo,
     @required this.tileStyle,
-    @required this.onBannerTap
+    @required this.onBannerTap,
   }) : assert(photo != null && photo.isValid),
        assert(tileStyle != null),
        assert(onBannerTap != null),
@@ -170,7 +170,7 @@ class GridDemoPhotoItem extends StatelessWidget {
       builder: (BuildContext context) {
         return Scaffold(
           appBar: AppBar(
-            title: Text(photo.title)
+            title: Text(photo.title),
           ),
           body: SizedBox.expand(
             child: Hero(
@@ -194,8 +194,8 @@ class GridDemoPhotoItem extends StatelessWidget {
           photo.assetName,
           package: photo.assetPackage,
           fit: BoxFit.cover,
-        )
-      )
+        ),
+      ),
     );
 
     final IconData icon = photo.isFavorite ? Icons.star : Icons.star_border;
@@ -382,7 +382,7 @@ class GridListDemoState extends State<GridListDemo> {
                       setState(() {
                         photo.isFavorite = !photo.isFavorite;
                       });
-                    }
+                    },
                   );
                 }).toList(),
               ),
diff --git a/examples/flutter_gallery/lib/demo/material/icons_demo.dart b/examples/flutter_gallery/lib/demo/material/icons_demo.dart
index ba452ae5981..21e3f1f6cc3 100644
--- a/examples/flutter_gallery/lib/demo/material/icons_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/icons_demo.dart
@@ -83,7 +83,7 @@ class _IconsDemoCard extends StatelessWidget {
       icon: Icon(icon),
       iconSize: iconSize,
       tooltip: "${enabled ? 'Enabled' : 'Disabled'} icon button",
-      onPressed: enabled ? handleIconButtonPress : null
+      onPressed: enabled ? handleIconButtonPress : null,
     );
   }
 
diff --git a/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart b/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart
index c723baf9206..cb0dff826ec 100644
--- a/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart
@@ -51,7 +51,7 @@ class LeaveBehindDemoState extends State<LeaveBehindDemo> {
         index: index,
         name: 'Item $index Sender',
         subject: 'Subject: $index',
-        body: "[$index] first line of the message's body..."
+        body: "[$index] first line of the message's body...",
       );
     });
   }
@@ -96,8 +96,8 @@ class LeaveBehindDemoState extends State<LeaveBehindDemo> {
       content: Text('You archived item ${item.index}'),
       action: SnackBarAction(
         label: 'UNDO',
-        onPressed: () { handleUndo(item); }
-      )
+        onPressed: () { handleUndo(item); },
+      ),
     ));
   }
 
@@ -109,8 +109,8 @@ class LeaveBehindDemoState extends State<LeaveBehindDemo> {
       content: Text('You deleted item ${item.index}'),
       action: SnackBarAction(
         label: 'UNDO',
-        onPressed: () { handleUndo(item); }
-      )
+        onPressed: () { handleUndo(item); },
+      ),
     ));
   }
 
@@ -133,7 +133,7 @@ class LeaveBehindDemoState extends State<LeaveBehindDemo> {
             onDelete: _handleDelete,
             dismissDirection: _dismissDirection,
           );
-        }).toList()
+        }).toList(),
       );
     }
 
@@ -148,27 +148,27 @@ class LeaveBehindDemoState extends State<LeaveBehindDemo> {
             itemBuilder: (BuildContext context) => <PopupMenuEntry<LeaveBehindDemoAction>>[
               const PopupMenuItem<LeaveBehindDemoAction>(
                 value: LeaveBehindDemoAction.reset,
-                child: Text('Reset the list')
+                child: Text('Reset the list'),
               ),
               const PopupMenuDivider(),
               CheckedPopupMenuItem<LeaveBehindDemoAction>(
                 value: LeaveBehindDemoAction.horizontalSwipe,
                 checked: _dismissDirection == DismissDirection.horizontal,
-                child: const Text('Horizontal swipe')
+                child: const Text('Horizontal swipe'),
               ),
               CheckedPopupMenuItem<LeaveBehindDemoAction>(
                 value: LeaveBehindDemoAction.leftSwipe,
                 checked: _dismissDirection == DismissDirection.endToStart,
-                child: const Text('Only swipe left')
+                child: const Text('Only swipe left'),
               ),
               CheckedPopupMenuItem<LeaveBehindDemoAction>(
                 value: LeaveBehindDemoAction.rightSwipe,
                 checked: _dismissDirection == DismissDirection.startToEnd,
-                child: const Text('Only swipe right')
-              )
-            ]
-          )
-        ]
+                child: const Text('Only swipe right'),
+              ),
+            ],
+          ),
+        ],
       ),
       body: body,
     );
@@ -217,24 +217,24 @@ class _LeaveBehindListItem extends StatelessWidget {
         background: Container(
           color: theme.primaryColor,
           child: const ListTile(
-            leading: Icon(Icons.delete, color: Colors.white, size: 36.0)
-          )
+            leading: Icon(Icons.delete, color: Colors.white, size: 36.0),
+          ),
         ),
         secondaryBackground: Container(
           color: theme.primaryColor,
           child: const ListTile(
-            trailing: Icon(Icons.archive, color: Colors.white, size: 36.0)
-          )
+            trailing: Icon(Icons.archive, color: Colors.white, size: 36.0),
+          ),
         ),
         child: Container(
           decoration: BoxDecoration(
             color: theme.canvasColor,
-            border: Border(bottom: BorderSide(color: theme.dividerColor))
+            border: Border(bottom: BorderSide(color: theme.dividerColor)),
           ),
           child: ListTile(
             title: Text(item.name),
             subtitle: Text('${item.subject}\n${item.body}'),
-            isThreeLine: true
+            isThreeLine: true,
           ),
         ),
       ),
diff --git a/examples/flutter_gallery/lib/demo/material/list_demo.dart b/examples/flutter_gallery/lib/demo/material/list_demo.dart
index d47c226a84f..0e90ef69f23 100644
--- a/examples/flutter_gallery/lib/demo/material/list_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/list_demo.dart
@@ -68,7 +68,7 @@ class _ListDemoState extends State<ListDemo> {
                   value: _showAvatars ? _MaterialListType.oneLineWithAvatar : _MaterialListType.oneLine,
                   groupValue: _itemType,
                   onChanged: changeItemType,
-                )
+                ),
               ),
             ),
             MergeSemantics(
@@ -79,7 +79,7 @@ class _ListDemoState extends State<ListDemo> {
                   value: _MaterialListType.twoLine,
                   groupValue: _itemType,
                   onChanged: changeItemType,
-                )
+                ),
               ),
             ),
             MergeSemantics(
diff --git a/examples/flutter_gallery/lib/demo/material/menu_demo.dart b/examples/flutter_gallery/lib/demo/material/menu_demo.dart
index 20b55dad917..2434b4de573 100644
--- a/examples/flutter_gallery/lib/demo/material/menu_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/menu_demo.dart
@@ -38,7 +38,7 @@ class MenuDemoState extends State<MenuDemo> {
 
   void showInSnackBar(String value) {
     _scaffoldKey.currentState.showSnackBar(SnackBar(
-     content: Text(value)
+     content: Text(value),
     ));
   }
 
@@ -72,15 +72,15 @@ class MenuDemoState extends State<MenuDemo> {
             itemBuilder: (BuildContext context) => <PopupMenuItem<String>>[
               const PopupMenuItem<String>(
                 value: 'Toolbar menu',
-                child: Text('Toolbar menu')
+                child: Text('Toolbar menu'),
               ),
               const PopupMenuItem<String>(
                 value: 'Right here',
-                child: Text('Right here')
+                child: Text('Right here'),
               ),
               const PopupMenuItem<String>(
                 value: 'Hooray!',
-                child: Text('Hooray!')
+                child: Text('Hooray!'),
               ),
             ],
           ),
@@ -100,18 +100,18 @@ class MenuDemoState extends State<MenuDemo> {
               itemBuilder: (BuildContext context) => <PopupMenuItem<String>>[
                 PopupMenuItem<String>(
                   value: _simpleValue1,
-                  child: const Text('Context menu item one')
+                  child: const Text('Context menu item one'),
                 ),
                 const PopupMenuItem<String>(
                   enabled: false,
-                  child: Text('A disabled menu item')
+                  child: Text('A disabled menu item'),
                 ),
                 PopupMenuItem<String>(
                   value: _simpleValue3,
-                  child: const Text('Context menu item three')
+                  child: const Text('Context menu item three'),
                 ),
-              ]
-            )
+              ],
+            ),
           ),
           // Pressing the PopupMenuButton on the right of this item shows
           // a menu whose items have text labels and icons and a divider
@@ -126,33 +126,33 @@ class MenuDemoState extends State<MenuDemo> {
                   value: 'Preview',
                   child: ListTile(
                     leading: Icon(Icons.visibility),
-                    title: Text('Preview')
-                  )
+                    title: Text('Preview'),
+                  ),
                 ),
                 const PopupMenuItem<String>(
                   value: 'Share',
                   child: ListTile(
                     leading: Icon(Icons.person_add),
-                    title: Text('Share')
-                  )
+                    title: Text('Share'),
+                  ),
                 ),
                 const PopupMenuItem<String>(
                   value: 'Get Link',
                   child: ListTile(
                     leading: Icon(Icons.link),
-                    title: Text('Get link')
-                  )
+                    title: Text('Get link'),
+                  ),
                 ),
                 const PopupMenuDivider(),
                 const PopupMenuItem<String>(
                   value: 'Remove',
                   child: ListTile(
                     leading: Icon(Icons.delete),
-                    title: Text('Remove')
-                  )
-                )
-              ]
-            )
+                    title: Text('Remove'),
+                  ),
+                ),
+              ],
+            ),
           ),
           // This entire list item is a PopupMenuButton. Tapping anywhere shows
           // a menu whose current value is highlighted and aligned over the
@@ -163,22 +163,22 @@ class MenuDemoState extends State<MenuDemo> {
             onSelected: showMenuSelection,
             child: ListTile(
               title: const Text('An item with a simple menu'),
-              subtitle: Text(_simpleValue)
+              subtitle: Text(_simpleValue),
             ),
             itemBuilder: (BuildContext context) => <PopupMenuItem<String>>[
               PopupMenuItem<String>(
                 value: _simpleValue1,
-                child: Text(_simpleValue1)
+                child: Text(_simpleValue1),
               ),
               PopupMenuItem<String>(
                 value: _simpleValue2,
-                child: Text(_simpleValue2)
+                child: Text(_simpleValue2),
               ),
               PopupMenuItem<String>(
                 value: _simpleValue3,
-                child: Text(_simpleValue3)
-              )
-            ]
+                child: Text(_simpleValue3),
+              ),
+            ],
           ),
           // Pressing the PopupMenuButton on the right of this item shows a menu
           // whose items have checked icons that reflect this app's state.
@@ -191,29 +191,29 @@ class MenuDemoState extends State<MenuDemo> {
                 CheckedPopupMenuItem<String>(
                   value: _checkedValue1,
                   checked: isChecked(_checkedValue1),
-                  child: Text(_checkedValue1)
+                  child: Text(_checkedValue1),
                 ),
                 CheckedPopupMenuItem<String>(
                   value: _checkedValue2,
                   enabled: false,
                   checked: isChecked(_checkedValue2),
-                  child: Text(_checkedValue2)
+                  child: Text(_checkedValue2),
                 ),
                 CheckedPopupMenuItem<String>(
                   value: _checkedValue3,
                   checked: isChecked(_checkedValue3),
-                  child: Text(_checkedValue3)
+                  child: Text(_checkedValue3),
                 ),
                 CheckedPopupMenuItem<String>(
                   value: _checkedValue4,
                   checked: isChecked(_checkedValue4),
-                  child: Text(_checkedValue4)
-                )
-              ]
-            )
-          )
-        ]
-      )
+                  child: Text(_checkedValue4),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/material/modal_bottom_sheet_demo.dart b/examples/flutter_gallery/lib/demo/material/modal_bottom_sheet_demo.dart
index 127eba5f281..29a0647aac3 100644
--- a/examples/flutter_gallery/lib/demo/material/modal_bottom_sheet_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/modal_bottom_sheet_demo.dart
@@ -28,15 +28,15 @@ class ModalBottomSheetDemo extends StatelessWidget {
                     textAlign: TextAlign.center,
                     style: TextStyle(
                       color: Theme.of(context).accentColor,
-                      fontSize: 24.0
-                    )
-                  )
-                )
+                      fontSize: 24.0,
+                    ),
+                  ),
+                ),
               );
             });
-          }
-        )
-      )
+          },
+        ),
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/material/overscroll_demo.dart b/examples/flutter_gallery/lib/demo/material/overscroll_demo.dart
index 028b1fc2a93..8450a50de47 100644
--- a/examples/flutter_gallery/lib/demo/material/overscroll_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/overscroll_demo.dart
@@ -23,7 +23,7 @@ class OverscrollDemoState extends State<OverscrollDemo> {
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
   final GlobalKey<RefreshIndicatorState> _refreshIndicatorKey = GlobalKey<RefreshIndicatorState>();
   static final List<String> _items = <String>[
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N'
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
   ];
 
   Future<void> _handleRefresh() {
@@ -36,8 +36,8 @@ class OverscrollDemoState extends State<OverscrollDemo> {
            label: 'RETRY',
            onPressed: () {
              _refreshIndicatorKey.currentState.show();
-           }
-         )
+           },
+         ),
        ));
     });
   }
@@ -55,9 +55,9 @@ class OverscrollDemoState extends State<OverscrollDemo> {
             tooltip: 'Refresh',
             onPressed: () {
               _refreshIndicatorKey.currentState.show();
-            }
+            },
           ),
-        ]
+        ],
       ),
       body: RefreshIndicator(
         key: _refreshIndicatorKey,
diff --git a/examples/flutter_gallery/lib/demo/material/page_selector_demo.dart b/examples/flutter_gallery/lib/demo/material/page_selector_demo.dart
index 4a7dfe570e8..f18d1d9219f 100644
--- a/examples/flutter_gallery/lib/demo/material/page_selector_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/page_selector_demo.dart
@@ -34,18 +34,18 @@ class _PageSelector extends StatelessWidget {
                   icon: const Icon(Icons.chevron_left),
                   color: color,
                   onPressed: () { _handleArrowButtonPress(context, -1); },
-                  tooltip: 'Page back'
+                  tooltip: 'Page back',
                 ),
                 TabPageSelector(controller: controller),
                 IconButton(
                   icon: const Icon(Icons.chevron_right),
                   color: color,
                   onPressed: () { _handleArrowButtonPress(context, 1); },
-                  tooltip: 'Page forward'
-                )
+                  tooltip: 'Page forward',
+                ),
               ],
-              mainAxisAlignment: MainAxisAlignment.spaceBetween
-            )
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            ),
           ),
           Expanded(
             child: IconTheme(
@@ -63,7 +63,7 @@ class _PageSelector extends StatelessWidget {
                       ),
                     ),
                   );
-                }).toList()
+                }).toList(),
               ),
             ),
           ),
diff --git a/examples/flutter_gallery/lib/demo/material/persistent_bottom_sheet_demo.dart b/examples/flutter_gallery/lib/demo/material/persistent_bottom_sheet_demo.dart
index 40ac5895f0c..7771c9d4fbe 100644
--- a/examples/flutter_gallery/lib/demo/material/persistent_bottom_sheet_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/persistent_bottom_sheet_demo.dart
@@ -40,10 +40,10 @@ class _PersistentBottomSheetDemoState extends State<PersistentBottomSheetDemo> {
             textAlign: TextAlign.center,
             style: TextStyle(
               color: themeData.accentColor,
-              fontSize: 24.0
-            )
-          )
-        )
+              fontSize: 24.0,
+            ),
+          ),
+        ),
       );
     })
     .closed.whenComplete(() {
@@ -66,8 +66,8 @@ class _PersistentBottomSheetDemoState extends State<PersistentBottomSheetDemo> {
               onPressed: () {
                 Navigator.pop(context);
               },
-              child: const Text('OK')
-            )
+              child: const Text('OK'),
+            ),
           ],
         );
       },
@@ -95,9 +95,9 @@ class _PersistentBottomSheetDemoState extends State<PersistentBottomSheetDemo> {
       body: Center(
         child: RaisedButton(
           onPressed: _showBottomSheetCallback,
-          child: const Text('SHOW BOTTOM SHEET')
-        )
-      )
+          child: const Text('SHOW BOTTOM SHEET'),
+        ),
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/material/progress_indicator_demo.dart b/examples/flutter_gallery/lib/demo/material/progress_indicator_demo.dart
index edfa5496e4a..ae80842f225 100644
--- a/examples/flutter_gallery/lib/demo/material/progress_indicator_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/progress_indicator_demo.dart
@@ -29,7 +29,7 @@ class _ProgressIndicatorDemoState extends State<ProgressIndicatorDemo> with Sing
     _animation = CurvedAnimation(
       parent: _controller,
       curve: const Interval(0.0, 0.9, curve: Curves.fastOutSlowIn),
-      reverseCurve: Curves.fastOutSlowIn
+      reverseCurve: Curves.fastOutSlowIn,
     )..addStatusListener((AnimationStatus status) {
       if (status == AnimationStatus.dismissed)
         _controller.forward();
@@ -68,7 +68,7 @@ class _ProgressIndicatorDemoState extends State<ProgressIndicatorDemo> with Sing
     final List<Widget> indicators = <Widget>[
       const SizedBox(
         width: 200.0,
-        child: LinearProgressIndicator()
+        child: LinearProgressIndicator(),
       ),
       const LinearProgressIndicator(),
       const LinearProgressIndicator(),
@@ -80,13 +80,13 @@ class _ProgressIndicatorDemoState extends State<ProgressIndicatorDemo> with Sing
           SizedBox(
               width: 20.0,
               height: 20.0,
-              child: CircularProgressIndicator(value: _animation.value)
+              child: CircularProgressIndicator(value: _animation.value),
           ),
           SizedBox(
             width: 100.0,
             height: 20.0,
             child: Text('${(_animation.value * 100.0).toStringAsFixed(1)}%',
-              textAlign: TextAlign.right
+              textAlign: TextAlign.right,
             ),
           ),
         ],
@@ -120,7 +120,7 @@ class _ProgressIndicatorDemoState extends State<ProgressIndicatorDemo> with Sing
                   padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 8.0),
                   child: AnimatedBuilder(
                     animation: _animation,
-                    builder: _buildIndicators
+                    builder: _buildIndicators,
                   ),
                 ),
               ),
diff --git a/examples/flutter_gallery/lib/demo/material/scrollable_tabs_demo.dart b/examples/flutter_gallery/lib/demo/material/scrollable_tabs_demo.dart
index 0135c30e357..7e32cb15f93 100644
--- a/examples/flutter_gallery/lib/demo/material/scrollable_tabs_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/scrollable_tabs_demo.dart
@@ -141,15 +141,15 @@ class ScrollableTabsDemoState extends State<ScrollableTabsDemo> with SingleTicke
             itemBuilder: (BuildContext context) => <PopupMenuItem<TabsDemoStyle>>[
               const PopupMenuItem<TabsDemoStyle>(
                 value: TabsDemoStyle.iconsAndText,
-                child: Text('Icons and text')
+                child: Text('Icons and text'),
               ),
               const PopupMenuItem<TabsDemoStyle>(
                 value: TabsDemoStyle.iconsOnly,
-                child: Text('Icons only')
+                child: Text('Icons only'),
               ),
               const PopupMenuItem<TabsDemoStyle>(
                 value: TabsDemoStyle.textOnly,
-                child: Text('Text only')
+                child: Text('Text only'),
               ),
             ],
           ),
@@ -193,7 +193,7 @@ class ScrollableTabsDemoState extends State<ScrollableTabsDemo> with SingleTicke
               ),
             ),
           );
-        }).toList()
+        }).toList(),
       ),
     );
   }
diff --git a/examples/flutter_gallery/lib/demo/material/search_demo.dart b/examples/flutter_gallery/lib/demo/material/search_demo.dart
index e1be3ea94eb..5987a256962 100644
--- a/examples/flutter_gallery/lib/demo/material/search_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/search_demo.dart
@@ -91,7 +91,7 @@ class _SearchDemoState extends State<SearchDemo> {
               ),
             ),
             const SizedBox(height: 64.0),
-            Text('Last selected integer: ${_lastIntegerSelected ?? 'NONE' }.')
+            Text('Last selected integer: ${_lastIntegerSelected ?? 'NONE' }.'),
           ],
         ),
       ),
@@ -219,7 +219,7 @@ class _SearchDemoSearchDelegate extends SearchDelegate<int> {
                 query = '';
                 showSuggestions(context);
               },
-            )
+            ),
     ];
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/material/selection_controls_demo.dart b/examples/flutter_gallery/lib/demo/material/selection_controls_demo.dart
index c115ec06ddd..531ca2924cd 100644
--- a/examples/flutter_gallery/lib/demo/material/selection_controls_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/selection_controls_demo.dart
@@ -58,12 +58,12 @@ class _SelectionControlsDemoState extends State<SelectionControlsDemo> {
         demoWidget: buildSwitch(),
         exampleCodeTag: _switchCode,
         documentationUrl: 'https://docs.flutter.io/flutter/material/Switch-class.html',
-      )
+      ),
     ];
 
     return TabbedComponentDemoScaffold(
       title: 'Selection controls',
-      demos: demos
+      demos: demos,
     );
   }
 
@@ -122,10 +122,10 @@ class _SelectionControlsDemoState extends State<SelectionControlsDemo> {
               Checkbox(value: true, onChanged: null),
               Checkbox(value: false, onChanged: null),
               Checkbox(value: null, tristate: true, onChanged: null),
-            ]
-          )
-        ]
-      )
+            ],
+          ),
+        ],
+      ),
     );
   }
 
@@ -141,19 +141,19 @@ class _SelectionControlsDemoState extends State<SelectionControlsDemo> {
               Radio<int>(
                 value: 0,
                 groupValue: radioValue,
-                onChanged: handleRadioValueChanged
+                onChanged: handleRadioValueChanged,
               ),
               Radio<int>(
                 value: 1,
                 groupValue: radioValue,
-                onChanged: handleRadioValueChanged
+                onChanged: handleRadioValueChanged,
               ),
               Radio<int>(
                 value: 2,
                 groupValue: radioValue,
-                onChanged: handleRadioValueChanged
-              )
-            ]
+                onChanged: handleRadioValueChanged,
+              ),
+            ],
           ),
           // Disabled radio buttons
           Row(
@@ -162,22 +162,22 @@ class _SelectionControlsDemoState extends State<SelectionControlsDemo> {
               Radio<int>(
                 value: 0,
                 groupValue: 0,
-                onChanged: null
+                onChanged: null,
               ),
               Radio<int>(
                 value: 1,
                 groupValue: 0,
-                onChanged: null
+                onChanged: null,
               ),
               Radio<int>(
                 value: 2,
                 groupValue: 0,
-                onChanged: null
-              )
-            ]
-          )
-        ]
-      )
+                onChanged: null,
+              ),
+            ],
+          ),
+        ],
+      ),
     );
   }
 
@@ -193,7 +193,7 @@ class _SelectionControlsDemoState extends State<SelectionControlsDemo> {
               setState(() {
                 switchValue = value;
               });
-            }
+            },
           ),
           // Disabled switches
           const Switch.adaptive(value: true, onChanged: null),
diff --git a/examples/flutter_gallery/lib/demo/material/snack_bar_demo.dart b/examples/flutter_gallery/lib/demo/material/snack_bar_demo.dart
index 6f135bf0966..5dbe97671f8 100644
--- a/examples/flutter_gallery/lib/demo/material/snack_bar_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/snack_bar_demo.dart
@@ -50,12 +50,12 @@ class _SnackBarDemoState extends State<SnackBarDemo> {
                     label: 'ACTION',
                     onPressed: () {
                       Scaffold.of(context).showSnackBar(SnackBar(
-                        content: Text('You pressed snackbar $thisSnackBarIndex\'s action.')
+                        content: Text('You pressed snackbar $thisSnackBarIndex\'s action.'),
                       ));
-                    }
+                    },
                   ),
                 ));
-              }
+              },
             ),
           ),
           const Text(_text3),
@@ -63,10 +63,10 @@ class _SnackBarDemoState extends State<SnackBarDemo> {
         .map<Widget>((Widget child) {
           return Container(
             margin: const EdgeInsets.symmetric(vertical: 12.0),
-            child: child
+            child: child,
           );
         })
-        .toList()
+        .toList(),
       ),
     );
   }
@@ -82,7 +82,7 @@ class _SnackBarDemoState extends State<SnackBarDemo> {
         // Create an inner BuildContext so that the snackBar onPressed methods
         // can refer to the Scaffold with Scaffold.of().
         builder: buildBody
-      )
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/material/tabs_fab_demo.dart b/examples/flutter_gallery/lib/demo/material/tabs_fab_demo.dart
index b24daf71b5a..51a2e2fb834 100644
--- a/examples/flutter_gallery/lib/demo/material/tabs_fab_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/tabs_fab_demo.dart
@@ -76,8 +76,8 @@ class _TabsFabDemoState extends State<TabsFabDemo> with SingleTickerProviderStat
         ),
         child: Padding(
           padding: const EdgeInsets.all(32.0),
-          child: Text(_explanatoryText, style: Theme.of(context).textTheme.subhead)
-        )
+          child: Text(_explanatoryText, style: Theme.of(context).textTheme.subhead),
+        ),
       );
     });
   }
@@ -93,12 +93,12 @@ class _TabsFabDemoState extends State<TabsFabDemo> with SingleTickerProviderStat
               child: Text(page.label,
                 style: TextStyle(
                   color: page.labelColor,
-                  fontSize: 32.0
+                  fontSize: 32.0,
                 ),
-                textAlign: TextAlign.center
-              )
-            )
-          )
+                textAlign: TextAlign.center,
+              ),
+            ),
+          ),
         );
       }
     );
@@ -115,7 +115,7 @@ class _TabsFabDemoState extends State<TabsFabDemo> with SingleTickerProviderStat
         backgroundColor: page.fabColor,
         icon: page.fabIcon,
         label: Text(page.label.toUpperCase()),
-        onPressed: _showExplanatoryText
+        onPressed: _showExplanatoryText,
       );
     }
 
@@ -124,7 +124,7 @@ class _TabsFabDemoState extends State<TabsFabDemo> with SingleTickerProviderStat
       tooltip: 'Show explanation',
       backgroundColor: page.fabColor,
       child: page.fabIcon,
-      onPressed: _showExplanatoryText
+      onPressed: _showExplanatoryText,
     );
   }
 
@@ -153,7 +153,7 @@ class _TabsFabDemoState extends State<TabsFabDemo> with SingleTickerProviderStat
       floatingActionButton: buildFloatingActionButton(_selectedPage),
       body: TabBarView(
         controller: _controller,
-        children: _allPages.map<Widget>(buildTabView).toList()
+        children: _allPages.map<Widget>(buildTabView).toList(),
       ),
     );
   }
diff --git a/examples/flutter_gallery/lib/demo/material/text_form_field_demo.dart b/examples/flutter_gallery/lib/demo/material/text_form_field_demo.dart
index 4deab75ab49..2ffe124fc2e 100644
--- a/examples/flutter_gallery/lib/demo/material/text_form_field_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/text_form_field_demo.dart
@@ -91,7 +91,7 @@ class TextFormFieldDemoState extends State<TextFormFieldDemo> {
 
   void showInSnackBar(String value) {
     _scaffoldKey.currentState.showSnackBar(SnackBar(
-      content: Text(value)
+      content: Text(value),
     ));
   }
 
@@ -251,7 +251,7 @@ class TextFormFieldDemoState extends State<TextFormFieldDemo> {
                     labelText: 'Salary',
                     prefixText: '\$',
                     suffixText: 'USD',
-                    suffixStyle: TextStyle(color: Colors.green)
+                    suffixStyle: TextStyle(color: Colors.green),
                   ),
                   maxLines: 1,
                 ),
@@ -288,7 +288,7 @@ class TextFormFieldDemoState extends State<TextFormFieldDemo> {
                 const SizedBox(height: 24.0),
                 Text(
                   '* indicates required field',
-                  style: Theme.of(context).textTheme.caption
+                  style: Theme.of(context).textTheme.caption,
                 ),
                 const SizedBox(height: 24.0),
               ],
@@ -305,7 +305,7 @@ class _UsNumberTextInputFormatter extends TextInputFormatter {
   @override
   TextEditingValue formatEditUpdate(
     TextEditingValue oldValue,
-    TextEditingValue newValue
+    TextEditingValue newValue,
   ) {
     final int newTextLength = newValue.text.length;
     int selectionIndex = newValue.selection.end;
diff --git a/examples/flutter_gallery/lib/demo/material/tooltip_demo.dart b/examples/flutter_gallery/lib/demo/material/tooltip_demo.dart
index 20707a3801d..40974a176f7 100644
--- a/examples/flutter_gallery/lib/demo/material/tooltip_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/tooltip_demo.dart
@@ -39,11 +39,11 @@ class TooltipDemo extends StatelessWidget {
                       child: Icon(
                         Icons.call,
                         size: 18.0,
-                        color: theme.iconTheme.color
-                      )
+                        color: theme.iconTheme.color,
+                      ),
                     ),
-                    Text(' icon.', style: theme.textTheme.subhead)
-                  ]
+                    Text(' icon.', style: theme.textTheme.subhead),
+                  ],
                 ),
                 Center(
                   child: IconButton(
@@ -53,23 +53,23 @@ class TooltipDemo extends StatelessWidget {
                     tooltip: 'Place a phone call',
                     onPressed: () {
                       Scaffold.of(context).showSnackBar(const SnackBar(
-                         content: Text('That was an ordinary tap.')
+                         content: Text('That was an ordinary tap.'),
                       ));
-                    }
-                  )
-                )
+                    },
+                  ),
+                ),
               ]
               .map<Widget>((Widget widget) {
                 return Padding(
                   padding: const EdgeInsets.only(top: 16.0, left: 16.0, right: 16.0),
-                  child: widget
+                  child: widget,
                 );
               })
-              .toList()
+              .toList(),
             ),
           );
         }
-      )
+      ),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/demo/pesto_demo.dart b/examples/flutter_gallery/lib/demo/pesto_demo.dart
index 0f2e4f1c71a..c6e0e745d16 100644
--- a/examples/flutter_gallery/lib/demo/pesto_demo.dart
+++ b/examples/flutter_gallery/lib/demo/pesto_demo.dart
@@ -129,7 +129,7 @@ class _RecipeGridPageState extends State<RecipeGridPage> {
               bottom: extraPadding,
             ),
             child: Center(
-              child: PestoLogo(height: logoHeight, t: t.clamp(0.0, 1.0))
+              child: PestoLogo(height: logoHeight, t: t.clamp(0.0, 1.0)),
             ),
           );
         },
@@ -143,7 +143,7 @@ class _RecipeGridPageState extends State<RecipeGridPage> {
       top: 8.0,
       left: 8.0 + mediaPadding.left,
       right: 8.0 + mediaPadding.right,
-      bottom: 8.0
+      bottom: 8.0,
     );
     return SliverPadding(
       padding: padding,
@@ -206,7 +206,7 @@ class _PestoLogoState extends State<PestoLogo> {
   final TextStyle titleStyle = const PestoStyle(fontSize: kTextHeight, fontWeight: FontWeight.w900, color: Colors.white, letterSpacing: 3.0);
   final RectTween _textRectTween = RectTween(
     begin: Rect.fromLTWH(0.0, kLogoHeight, kLogoWidth, kTextHeight),
-    end: Rect.fromLTWH(0.0, kImageHeight, kLogoWidth, kTextHeight)
+    end: Rect.fromLTWH(0.0, kImageHeight, kLogoWidth, kTextHeight),
   );
   final Curve _textOpacity = const Interval(0.4, 1.0, curve: Curves.easeInOut);
   final RectTween _imageRectTween = RectTween(
@@ -398,7 +398,7 @@ class _RecipePageState extends State<RecipePage> {
                       ),
                     ),
                   ],
-                )
+                ),
               ),
             ],
           ),
@@ -413,7 +413,7 @@ class _RecipePageState extends State<RecipePage> {
         children: <Widget>[
           Padding(
             padding: const EdgeInsets.only(right: 24.0),
-            child: Icon(icon, color: Colors.black54)
+            child: Icon(icon, color: Colors.black54),
           ),
           Text(label, style: menuItemStyle),
         ],
@@ -453,7 +453,7 @@ class RecipeSheet extends StatelessWidget {
           padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 40.0),
           child: Table(
             columnWidths: const <int, TableColumnWidth>{
-              0: FixedColumnWidth(64.0)
+              0: FixedColumnWidth(64.0),
             },
             children: <TableRow>[
               TableRow(
@@ -466,12 +466,12 @@ class RecipeSheet extends StatelessWidget {
                       width: 32.0,
                       height: 32.0,
                       alignment: Alignment.centerLeft,
-                      fit: BoxFit.scaleDown
-                    )
+                      fit: BoxFit.scaleDown,
+                    ),
                   ),
                   TableCell(
                     verticalAlignment: TableCellVerticalAlignment.middle,
-                    child: Text(recipe.name, style: titleStyle)
+                    child: Text(recipe.name, style: titleStyle),
                   ),
                 ]
               ),
@@ -480,7 +480,7 @@ class RecipeSheet extends StatelessWidget {
                   const SizedBox(),
                   Padding(
                     padding: const EdgeInsets.only(top: 8.0, bottom: 4.0),
-                    child: Text(recipe.description, style: descriptionStyle)
+                    child: Text(recipe.description, style: descriptionStyle),
                   ),
                 ]
               ),
@@ -489,7 +489,7 @@ class RecipeSheet extends StatelessWidget {
                   const SizedBox(),
                   Padding(
                     padding: const EdgeInsets.only(top: 24.0, bottom: 4.0),
-                    child: Text('Ingredients', style: headingStyle)
+                    child: Text('Ingredients', style: headingStyle),
                   ),
                 ]
               ),
@@ -503,7 +503,7 @@ class RecipeSheet extends StatelessWidget {
                   const SizedBox(),
                   Padding(
                     padding: const EdgeInsets.only(top: 24.0, bottom: 4.0),
-                    child: Text('Steps', style: headingStyle)
+                    child: Text('Steps', style: headingStyle),
                   ),
                 ]
               )
@@ -544,7 +544,7 @@ class Recipe {
     this.ingredientsImagePath,
     this.ingredientsImagePackage,
     this.ingredients,
-    this.steps
+    this.steps,
   });
 
   final String name;
@@ -689,7 +689,7 @@ const List<Recipe> kPestoRecipes = <Recipe>[
     steps: <RecipeStep>[
       RecipeStep(duration: '10 min', description: 'Prep vegetables'),
       RecipeStep(duration: '5 min', description: 'Stir'),
-      RecipeStep(duration: '1 hr 10 min', description: 'Cook')
+      RecipeStep(duration: '1 hr 10 min', description: 'Cook'),
     ],
   ),
   Recipe(
@@ -712,7 +712,7 @@ const List<Recipe> kPestoRecipes = <Recipe>[
       RecipeStep(duration: '5 min', description: 'Sauté vegetables'),
       RecipeStep(duration: '3 min', description: 'Stir vegetables and other filling ingredients'),
       RecipeStep(duration: '10 min', description: 'Fill phyllo squares half-full with filling and fold.'),
-      RecipeStep(duration: '40 min', description: 'Bake')
+      RecipeStep(duration: '40 min', description: 'Bake'),
     ],
   ),
 ];
diff --git a/examples/flutter_gallery/lib/demo/shrine/backdrop.dart b/examples/flutter_gallery/lib/demo/shrine/backdrop.dart
index 2e79fae755e..69071be805e 100644
--- a/examples/flutter_gallery/lib/demo/shrine/backdrop.dart
+++ b/examples/flutter_gallery/lib/demo/shrine/backdrop.dart
@@ -103,7 +103,7 @@ class _BackdropTitle extends AnimatedWidget {
                   end: const Offset(1.0, 0.0),
                 ).evaluate(animation),
                 child: const ImageIcon(AssetImage('packages/shrine_images/diamond.png')),
-              )
+              ),
             ]),
           ),
         ),
@@ -138,7 +138,7 @@ class _BackdropTitle extends AnimatedWidget {
               ),
             ),
           ],
-        )
+        ),
       ]),
     );
   }
diff --git a/examples/flutter_gallery/lib/demo/shrine/expanding_bottom_sheet.dart b/examples/flutter_gallery/lib/demo/shrine/expanding_bottom_sheet.dart
index b74d632e081..3290a22e099 100644
--- a/examples/flutter_gallery/lib/demo/shrine/expanding_bottom_sheet.dart
+++ b/examples/flutter_gallery/lib/demo/shrine/expanding_bottom_sheet.dart
@@ -609,7 +609,7 @@ class _ListModel {
   _ListModel({
     @required this.listKey,
     @required this.removedItemBuilder,
-    Iterable<int> initialItems
+    Iterable<int> initialItems,
   }) : assert(listKey != null),
        assert(removedItemBuilder != null),
        _items = List<int>.from(initialItems ?? <int>[]);
diff --git a/examples/flutter_gallery/lib/demo/shrine/home.dart b/examples/flutter_gallery/lib/demo/shrine/home.dart
index 33131e237cc..f213480fa35 100644
--- a/examples/flutter_gallery/lib/demo/shrine/home.dart
+++ b/examples/flutter_gallery/lib/demo/shrine/home.dart
@@ -50,7 +50,7 @@ class HomePage extends StatelessWidget {
     return Stack(
       children: <Widget>[
         backdrop,
-        Align(child: expandingBottomSheet, alignment: Alignment.bottomRight)
+        Align(child: expandingBottomSheet, alignment: Alignment.bottomRight),
       ],
     );
   }
diff --git a/examples/flutter_gallery/lib/demo/shrine/login.dart b/examples/flutter_gallery/lib/demo/shrine/login.dart
index b6259082e38..b249f708926 100644
--- a/examples/flutter_gallery/lib/demo/shrine/login.dart
+++ b/examples/flutter_gallery/lib/demo/shrine/login.dart
@@ -40,7 +40,7 @@ class _LoginPageState extends State<LoginPage> {
             // home screen using onGenerateRoute and so rootNavigator must be
             // set to true in order to get out of Shrine completely.
             Navigator.of(context, rootNavigator: true).pop();
-          }
+          },
         ),
       ),
       body: SafeArea(
diff --git a/examples/flutter_gallery/lib/demo/typography_demo.dart b/examples/flutter_gallery/lib/demo/typography_demo.dart
index a1e03141519..5f9c58bf919 100644
--- a/examples/flutter_gallery/lib/demo/typography_demo.dart
+++ b/examples/flutter_gallery/lib/demo/typography_demo.dart
@@ -30,13 +30,13 @@ class TextStyleItem extends StatelessWidget {
         children: <Widget>[
           SizedBox(
             width: 72.0,
-            child: Text(name, style: nameStyle)
+            child: Text(name, style: nameStyle),
           ),
           Expanded(
-            child: Text(text, style: style.copyWith(height: 1.0))
-          )
-        ]
-      )
+            child: Text(text, style: style.copyWith(height: 1.0)),
+          ),
+        ],
+      ),
     );
   }
 }
@@ -64,7 +64,7 @@ class TypographyDemo extends StatelessWidget {
       styleItems.insert(0, TextStyleItem(
         name: 'Display 4',
         style: textTheme.display4,
-        text: 'Light 112sp'
+        text: 'Light 112sp',
       ));
     }
 
diff --git a/examples/flutter_gallery/lib/gallery/about.dart b/examples/flutter_gallery/lib/gallery/about.dart
index d4fcace540b..2e8b4517153 100644
--- a/examples/flutter_gallery/lib/gallery/about.dart
+++ b/examples/flutter_gallery/lib/gallery/about.dart
@@ -55,7 +55,7 @@ void showGalleryAboutDialog(BuildContext context) {
                       '${defaultTargetPlatform == TargetPlatform.iOS ? 'multiple platforms' : 'iOS and Android'} '
                       'from a single codebase. This design lab is a playground '
                       "and showcase of Flutter's many widgets, behaviors, "
-                      'animations, layouts, and more. Learn more about Flutter at '
+                      'animations, layouts, and more. Learn more about Flutter at ',
               ),
               _LinkTextSpan(
                 style: linkStyle,
diff --git a/examples/flutter_gallery/lib/gallery/backdrop.dart b/examples/flutter_gallery/lib/gallery/backdrop.dart
index 171d5c3fdc7..fdfacbd8b55 100644
--- a/examples/flutter_gallery/lib/gallery/backdrop.dart
+++ b/examples/flutter_gallery/lib/gallery/backdrop.dart
@@ -282,7 +282,7 @@ class _BackdropState extends State<Backdrop> with SingleTickerProviderStateMixin
               child: widget.backLayer,
               visible: _controller.status != AnimationStatus.completed,
               maintainState: true,
-            )
+            ),
           ),
         ],
       ),
diff --git a/examples/flutter_gallery/lib/gallery/demo.dart b/examples/flutter_gallery/lib/gallery/demo.dart
index 25a13b70871..48d4fbfe871 100644
--- a/examples/flutter_gallery/lib/gallery/demo.dart
+++ b/examples/flutter_gallery/lib/gallery/demo.dart
@@ -91,7 +91,7 @@ class TabbedComponentDemoScaffold extends StatelessWidget {
                     onPressed: () => _showExampleCode(context),
                   );
                 },
-              )
+              ),
             ],
           ),
           bottom: TabBar(
@@ -109,10 +109,10 @@ class TabbedComponentDemoScaffold extends StatelessWidget {
                   Padding(
                     padding: const EdgeInsets.all(16.0),
                     child: Text(demo.description,
-                      style: Theme.of(context).textTheme.subhead
-                    )
+                      style: Theme.of(context).textTheme.subhead,
+                    ),
                   ),
-                  Expanded(child: demo.demoWidget)
+                  Expanded(child: demo.demoWidget),
                 ],
               ),
             );
@@ -157,7 +157,7 @@ class FullScreenCodeDialogState extends State<FullScreenCodeDialog> {
     Widget body;
     if (_exampleCode == null) {
       body = const Center(
-        child: CircularProgressIndicator()
+        child: CircularProgressIndicator(),
       );
     } else {
       body = SingleChildScrollView(
@@ -167,11 +167,11 @@ class FullScreenCodeDialogState extends State<FullScreenCodeDialog> {
             text: TextSpan(
               style: const TextStyle(fontFamily: 'monospace', fontSize: 10.0),
               children: <TextSpan>[
-                DartSyntaxHighlighter(style).format(_exampleCode)
-              ]
-            )
-          )
-        )
+                DartSyntaxHighlighter(style).format(_exampleCode),
+              ],
+            ),
+          ),
+        ),
       );
     }
 
@@ -182,11 +182,11 @@ class FullScreenCodeDialogState extends State<FullScreenCodeDialog> {
             Icons.clear,
             semanticLabel: 'Close',
           ),
-          onPressed: () { Navigator.pop(context); }
+          onPressed: () { Navigator.pop(context); },
         ),
-        title: const Text('Example code')
+        title: const Text('Example code'),
       ),
-      body: body
+      body: body,
     );
   }
 }
@@ -207,7 +207,7 @@ class MaterialDemoDocumentationButton extends StatelessWidget {
     return IconButton(
       icon: const Icon(Icons.library_books),
       tooltip: 'API documentation',
-      onPressed: () => launch(documentationUrl, forceWebView: true)
+      onPressed: () => launch(documentationUrl, forceWebView: true),
     );
   }
 }
@@ -231,7 +231,7 @@ class CupertinoDemoDocumentationButton extends StatelessWidget {
         label: 'API documentation',
         child: const Icon(CupertinoIcons.book),
       ),
-      onPressed: () => launch(documentationUrl, forceWebView: true)
+      onPressed: () => launch(documentationUrl, forceWebView: true),
     );
   }
 }
diff --git a/examples/flutter_gallery/lib/gallery/example_code.dart b/examples/flutter_gallery/lib/gallery/example_code.dart
index 96969393dbe..c20be2e1a7e 100644
--- a/examples/flutter_gallery/lib/gallery/example_code.dart
+++ b/examples/flutter_gallery/lib/gallery/example_code.dart
@@ -19,7 +19,7 @@ RaisedButton(
   child: const Text('BUTTON TITLE'),
   onPressed: () {
     // Perform some action
-  }
+  },
 );
 
 // Create a disabled button.
@@ -27,7 +27,7 @@ RaisedButton(
 // specified or is null.
 const RaisedButton(
   child: Text('BUTTON TITLE'),
-  onPressed: null
+  onPressed: null,
 );
 
 // Create a button with an icon and a
@@ -47,7 +47,7 @@ OutlineButton(
   child: const Text('BUTTON TITLE'),
   onPressed: () {
     // Perform some action
-  }
+  },
 );
 
 // Create a disabled button.
@@ -55,7 +55,7 @@ OutlineButton(
 // specified or is null.
 const OutlineButton(
   child: Text('BUTTON TITLE'),
-  onPressed: null
+  onPressed: null,
 );
 
 // Create a button with an icon and a
@@ -75,7 +75,7 @@ FlatButton(
   child: const Text('BUTTON TITLE'),
   onPressed: () {
     // Perform some action
-  }
+  },
 );
 
 // Create a disabled button.
@@ -83,7 +83,7 @@ FlatButton(
 // specified or is null.
 const FlatButton(
   child: Text('BUTTON TITLE'),
-  onPressed: null
+  onPressed: null,
 );
 // END
 
@@ -109,7 +109,7 @@ DropdownButton<String>(
         value: value,
         child: Text(value));
     })
-    .toList()
+    .toList(),
 );
 // END
 
@@ -124,7 +124,7 @@ IconButton(
   onPressed: () {
     setState(() => value = !value);
   },
-  color: value ? Theme.of(context).primaryColor : null
+  color: value ? Theme.of(context).primaryColor : null,
 );
 // END
 
@@ -133,12 +133,12 @@ IconButton(
 // Floating action button in Scaffold.
 Scaffold(
   appBar: AppBar(
-    title: const Text('Demo')
+    title: const Text('Demo'),
   ),
   floatingActionButton: const FloatingActionButton(
     child: Icon(Icons.add),
-    onPressed: null
-  )
+    onPressed: null,
+  ),
 );
 // END
   }
@@ -199,26 +199,26 @@ Row(
     Radio<int>(
       value: 0,
       groupValue: radioValue,
-      onChanged: handleRadioValueChanged
+      onChanged: handleRadioValueChanged,
     ),
     Radio<int>(
       value: 1,
       groupValue: radioValue,
-      onChanged: handleRadioValueChanged
+      onChanged: handleRadioValueChanged,
     ),
     Radio<int>(
       value: 2,
       groupValue: radioValue,
-      onChanged: handleRadioValueChanged
-    )
-  ]
+      onChanged: handleRadioValueChanged,
+    ),
+  ],
 );
 
 // Creates a disabled radio button.
 const Radio<int>(
   value: 0,
   groupValue: 0,
-  onChanged: null
+  onChanged: null,
 );
 // END
 
@@ -262,13 +262,13 @@ GridView.count(
     'https://example.com/image-1.jpg',
     'https://example.com/image-2.jpg',
     '...',
-    'https://example.com/image-n.jpg'
+    'https://example.com/image-n.jpg',
   ].map<Widget>((String url) {
     return GridTile(
       footer: GridTileBar(
-        title: Text(url)
+        title: Text(url),
       ),
-      child: Image.network(url, fit: BoxFit.cover)
+      child: Image.network(url, fit: BoxFit.cover),
     );
   }).toList(),
 );
diff --git a/examples/flutter_gallery/lib/gallery/home.dart b/examples/flutter_gallery/lib/gallery/home.dart
index 762656dc1f3..705e85b5ded 100644
--- a/examples/flutter_gallery/lib/gallery/home.dart
+++ b/examples/flutter_gallery/lib/gallery/home.dart
@@ -400,14 +400,14 @@ class _GalleryHomeState extends State<GalleryHome> with SingleTickerProviderStat
             child: const Banner(
               message: 'PREVIEW',
               location: BannerLocation.topEnd,
-            )
+            ),
           ),
-        ]
+        ],
       );
     }
     home = AnnotatedRegion<SystemUiOverlayStyle>(
       child: home,
-      value: SystemUiOverlayStyle.light
+      value: SystemUiOverlayStyle.light,
     );
 
     return home;
diff --git a/examples/flutter_gallery/lib/gallery/options.dart b/examples/flutter_gallery/lib/gallery/options.dart
index d40b31a0d6e..c9aadb3049d 100644
--- a/examples/flutter_gallery/lib/gallery/options.dart
+++ b/examples/flutter_gallery/lib/gallery/options.dart
@@ -408,7 +408,7 @@ class GalleryOptionsPage extends StatelessWidget {
           options.showOffscreenLayersCheckerboard,
           (bool value) {
             onOptionsChanged(options.copyWith(showOffscreenLayersCheckerboard: value));
-          }
+          },
         ),
       );
     }
diff --git a/examples/flutter_gallery/lib/gallery/syntax_highlighter.dart b/examples/flutter_gallery/lib/gallery/syntax_highlighter.dart
index 8b9246e2d22..7d4e7d6efd6 100644
--- a/examples/flutter_gallery/lib/gallery/syntax_highlighter.dart
+++ b/examples/flutter_gallery/lib/gallery/syntax_highlighter.dart
@@ -14,7 +14,7 @@ class SyntaxHighlighterStyle {
     this.stringStyle,
     this.punctuationStyle,
     this.classStyle,
-    this.constantStyle
+    this.constantStyle,
   });
 
   static SyntaxHighlighterStyle lightThemeStyle() {
@@ -26,7 +26,7 @@ class SyntaxHighlighterStyle {
       stringStyle: const TextStyle(color: Color(0xFF43A047)),
       punctuationStyle: const TextStyle(color: Color(0xFF000000)),
       classStyle: const TextStyle(color: Color(0xFF512DA8)),
-      constantStyle: const TextStyle(color: Color(0xFF795548))
+      constantStyle: const TextStyle(color: Color(0xFF795548)),
     );
   }
 
@@ -39,7 +39,7 @@ class SyntaxHighlighterStyle {
       stringStyle: const TextStyle(color: Color(0xFF009688)),
       punctuationStyle: const TextStyle(color: Color(0xFFFFFFFF)),
       classStyle: const TextStyle(color: Color(0xFF009688)),
-      constantStyle: const TextStyle(color: Color(0xFF795548))
+      constantStyle: const TextStyle(color: Color(0xFF795548)),
     );
   }
 
@@ -72,11 +72,11 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
     'finally', 'for', 'get', 'if', 'implements', 'import', 'in', 'is', 'library',
     'new', 'null', 'operator', 'part', 'rethrow', 'return', 'set', 'static',
     'super', 'switch', 'sync', 'this', 'throw', 'true', 'try', 'typedef', 'var',
-    'void', 'while', 'with', 'yield'
+    'void', 'while', 'with', 'yield',
   ];
 
   static const List<String> _builtInTypes = <String>[
-    'int', 'double', 'num', 'bool'
+    'int', 'double', 'num', 'bool',
   ];
 
   String _src;
@@ -125,7 +125,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.comment,
           _scanner.lastMatch.start,
-          _scanner.lastMatch.end
+          _scanner.lastMatch.end,
         ));
         continue;
       }
@@ -146,7 +146,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.comment,
           startComment,
-          endComment
+          endComment,
         ));
 
         if (eof)
@@ -160,7 +160,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.string,
           _scanner.lastMatch.start,
-          _scanner.lastMatch.end
+          _scanner.lastMatch.end,
         ));
         continue;
       }
@@ -170,7 +170,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.string,
           _scanner.lastMatch.start,
-          _scanner.lastMatch.end
+          _scanner.lastMatch.end,
         ));
         continue;
       }
@@ -180,7 +180,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.string,
           _scanner.lastMatch.start,
-          _scanner.lastMatch.end
+          _scanner.lastMatch.end,
         ));
         continue;
       }
@@ -190,7 +190,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.string,
           _scanner.lastMatch.start,
-          _scanner.lastMatch.end
+          _scanner.lastMatch.end,
         ));
         continue;
       }
@@ -200,7 +200,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.string,
           _scanner.lastMatch.start,
-          _scanner.lastMatch.end
+          _scanner.lastMatch.end,
         ));
         continue;
       }
@@ -210,7 +210,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.string,
           _scanner.lastMatch.start,
-          _scanner.lastMatch.end
+          _scanner.lastMatch.end,
         ));
         continue;
       }
@@ -220,7 +220,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.number,
           _scanner.lastMatch.start,
-          _scanner.lastMatch.end
+          _scanner.lastMatch.end,
         ));
         continue;
       }
@@ -240,7 +240,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.punctuation,
           _scanner.lastMatch.start,
-          _scanner.lastMatch.end
+          _scanner.lastMatch.end,
         ));
         continue;
       }
@@ -250,7 +250,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans.add(_HighlightSpan(
           _HighlightType.keyword,
           _scanner.lastMatch.start,
-          _scanner.lastMatch.end
+          _scanner.lastMatch.end,
         ));
         continue;
       }
@@ -276,7 +276,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
           _spans.add(_HighlightSpan(
             type,
             _scanner.lastMatch.start,
-            _scanner.lastMatch.end
+            _scanner.lastMatch.end,
           ));
         }
       }
@@ -299,7 +299,7 @@ class DartSyntaxHighlighter extends SyntaxHighlighter {
         _spans[i] = _HighlightSpan(
           _spans[i].type,
           _spans[i].start,
-          _spans[i + 1].end
+          _spans[i + 1].end,
         );
         _spans.removeAt(i + 1);
       }
diff --git a/examples/flutter_gallery/test/pesto_test.dart b/examples/flutter_gallery/test/pesto_test.dart
index 86ce9d98011..b0150349d75 100644
--- a/examples/flutter_gallery/test/pesto_test.dart
+++ b/examples/flutter_gallery/test/pesto_test.dart
@@ -19,8 +19,8 @@ void main() {
         child: SizedBox(
           width: 450.0,
           height: 800.0,
-          child: GalleryApp(testMode: true)
-        )
+          child: GalleryApp(testMode: true),
+        ),
       )
     );
     await tester.pump(); // see https://github.com/flutter/flutter/issues/1865
diff --git a/examples/flutter_gallery/test/update_test.dart b/examples/flutter_gallery/test/update_test.dart
index c7e756826fb..76448e09e40 100644
--- a/examples/flutter_gallery/test/update_test.dart
+++ b/examples/flutter_gallery/test/update_test.dart
@@ -20,7 +20,7 @@ void main() {
     await tester.pumpWidget(
       const GalleryApp(
         testMode: true,
-        updateUrlFetcher: mockUpdateUrlFetcher
+        updateUrlFetcher: mockUpdateUrlFetcher,
       )
     );
     await tester.pump(); // see https://github.com/flutter/flutter/issues/1865
diff --git a/examples/flutter_view/lib/main.dart b/examples/flutter_view/lib/main.dart
index 6e03a8387ac..c669113f7ab 100644
--- a/examples/flutter_view/lib/main.dart
+++ b/examples/flutter_view/lib/main.dart
@@ -65,7 +65,7 @@ class _MyHomePageState extends State<MyHomePage> {
             child: Center(
               child: Text(
                 'Platform button tapped $_counter time${ _counter == 1 ? '' : 's' }.',
-                style: const TextStyle(fontSize: 17.0))
+                style: const TextStyle(fontSize: 17.0)),
             ),
           ),
           Container(
diff --git a/examples/layers/raw/hello_world.dart b/examples/layers/raw/hello_world.dart
index 7a9294ab2f7..230bc67f7ff 100644
--- a/examples/layers/raw/hello_world.dart
+++ b/examples/layers/raw/hello_world.dart
@@ -24,7 +24,7 @@ void beginFrame(Duration timeStamp) {
   canvas.scale(devicePixelRatio, devicePixelRatio);
   canvas.drawParagraph(paragraph, ui.Offset(
     (logicalSize.width - paragraph.maxIntrinsicWidth) / 2.0,
-    (logicalSize.height - paragraph.height) / 2.0
+    (logicalSize.height - paragraph.height) / 2.0,
   ));
   final ui.Picture picture = recorder.endRecording();
 
diff --git a/examples/layers/raw/touch_input.dart b/examples/layers/raw/touch_input.dart
index 52932b104d3..25984d54148 100644
--- a/examples/layers/raw/touch_input.dart
+++ b/examples/layers/raw/touch_input.dart
@@ -28,7 +28,7 @@ ui.Picture paint(ui.Rect paintBounds) {
   canvas.drawCircle(
     size.center(ui.Offset.zero),
     size.shortestSide * 0.45,
-    ui.Paint()..color = color
+    ui.Paint()..color = color,
   );
 
   // When we're done issuing painting commands, we end the recording an receive
diff --git a/examples/layers/rendering/hello_world.dart b/examples/layers/rendering/hello_world.dart
index 1f49ca71c4b..f6164d03aed 100644
--- a/examples/layers/rendering/hello_world.dart
+++ b/examples/layers/rendering/hello_world.dart
@@ -24,6 +24,6 @@ void main() {
         // particular text direction.
         textDirection: TextDirection.ltr,
       ),
-    )
+    ),
   );
 }
diff --git a/examples/layers/rendering/spinning_square.dart b/examples/layers/rendering/spinning_square.dart
index 52f6afb80ce..9d6d1f029bc 100644
--- a/examples/layers/rendering/spinning_square.dart
+++ b/examples/layers/rendering/spinning_square.dart
@@ -26,7 +26,7 @@ void main() {
   // to have a specific size.
   final RenderBox square = RenderConstrainedBox(
     additionalConstraints: const BoxConstraints.tightFor(width: 200.0, height: 200.0),
-    child: green
+    child: green,
   );
   // Third, we wrap the sized green square in a render object that applies rotation
   // transform before painting its child. Each frame of the animation, we'll
@@ -35,12 +35,12 @@ void main() {
   final RenderTransform spin = RenderTransform(
     transform: Matrix4.identity(),
     alignment: Alignment.center,
-    child: square
+    child: square,
   );
   // Finally, we center the spinning green square...
   final RenderBox root = RenderPositionedBox(
     alignment: Alignment.center,
-    child: spin
+    child: spin,
   );
   // and attach it to the window.
   RenderingFlutterBinding(root: root);
diff --git a/examples/layers/rendering/src/sector_layout.dart b/examples/layers/rendering/src/sector_layout.dart
index 0cbf1237261..a9e288e10db 100644
--- a/examples/layers/rendering/src/sector_layout.dart
+++ b/examples/layers/rendering/src/sector_layout.dart
@@ -14,7 +14,7 @@ class SectorConstraints extends Constraints {
     this.minDeltaRadius = 0.0,
     this.maxDeltaRadius = double.infinity,
     this.minDeltaTheta = 0.0,
-    this.maxDeltaTheta = kTwoPi
+    this.maxDeltaTheta = kTwoPi,
   }) : assert(maxDeltaRadius >= minDeltaRadius),
        assert(maxDeltaTheta >= minDeltaTheta);
 
@@ -46,7 +46,7 @@ class SectorConstraints extends Constraints {
   @override
   bool debugAssertIsValid({
     bool isAppliedConstraint = false,
-    InformationCollector informationCollector
+    InformationCollector informationCollector,
   }) {
     assert(isNormalized);
     return isNormalized;
@@ -58,11 +58,11 @@ class SectorDimensions {
 
   factory SectorDimensions.withConstraints(
     SectorConstraints constraints,
-    { double deltaRadius = 0.0, double deltaTheta = 0.0 }
+    { double deltaRadius = 0.0, double deltaTheta = 0.0, }
   ) {
     return SectorDimensions(
       deltaRadius: constraints.constrainDeltaRadius(deltaRadius),
-      deltaTheta: constraints.constrainDeltaTheta(deltaTheta)
+      deltaTheta: constraints.constrainDeltaTheta(deltaTheta),
     );
   }
 
@@ -216,7 +216,7 @@ class RenderSectorRing extends RenderSectorWithChildren {
   RenderSectorRing({
     BoxDecoration decoration,
     double deltaRadius = double.infinity,
-    double padding = 0.0
+    double padding = 0.0,
   }) : _padding = padding,
        assert(deltaRadius >= 0.0),
        _desiredDeltaRadius = deltaRadius,
@@ -263,7 +263,7 @@ class RenderSectorRing extends RenderSectorWithChildren {
     while (child != null) {
       final SectorConstraints innerConstraints = SectorConstraints(
         maxDeltaRadius: innerDeltaRadius,
-        maxDeltaTheta: remainingDeltaTheta
+        maxDeltaTheta: remainingDeltaTheta,
       );
       final SectorDimensions childDimensions = child.getIntrinsicDimensions(innerConstraints, childRadius);
       innerTheta += childDimensions.deltaTheta;
@@ -294,7 +294,7 @@ class RenderSectorRing extends RenderSectorWithChildren {
     while (child != null) {
       final SectorConstraints innerConstraints = SectorConstraints(
         maxDeltaRadius: innerDeltaRadius,
-        maxDeltaTheta: remainingDeltaTheta
+        maxDeltaTheta: remainingDeltaTheta,
       );
       assert(child.parentData is SectorParentData);
       child.parentData.theta = innerTheta;
@@ -334,7 +334,7 @@ class RenderSectorSlice extends RenderSectorWithChildren {
   RenderSectorSlice({
     BoxDecoration decoration,
     double deltaTheta = kTwoPi,
-    double padding = 0.0
+    double padding = 0.0,
   }) : _padding = padding, _desiredDeltaTheta = deltaTheta, super(decoration);
 
   double _desiredDeltaTheta;
@@ -377,7 +377,7 @@ class RenderSectorSlice extends RenderSectorWithChildren {
     while (child != null) {
       final SectorConstraints innerConstraints = SectorConstraints(
         maxDeltaRadius: remainingDeltaRadius,
-        maxDeltaTheta: innerDeltaTheta
+        maxDeltaTheta: innerDeltaTheta,
       );
       final SectorDimensions childDimensions = child.getIntrinsicDimensions(innerConstraints, childRadius);
       childRadius += childDimensions.deltaRadius;
@@ -406,7 +406,7 @@ class RenderSectorSlice extends RenderSectorWithChildren {
     while (child != null) {
       final SectorConstraints innerConstraints = SectorConstraints(
         maxDeltaRadius: remainingDeltaRadius,
-        maxDeltaTheta: innerDeltaTheta
+        maxDeltaTheta: innerDeltaTheta,
       );
       child.parentData.theta = innerTheta;
       child.parentData.radius = childRadius;
@@ -488,7 +488,7 @@ class RenderBoxToRenderSectorAdapter extends RenderBox with RenderObjectWithChil
 
   Size getIntrinsicDimensions({
     double width = double.infinity,
-    double height = double.infinity
+    double height = double.infinity,
   }) {
     assert(child is RenderSector);
     assert(child.parentData is SectorParentData);
@@ -556,7 +556,7 @@ class RenderBoxToRenderSectorAdapter extends RenderBox with RenderObjectWithChil
 class RenderSolidColor extends RenderDecoratedSector {
   RenderSolidColor(this.backgroundColor, {
     this.desiredDeltaRadius = double.infinity,
-    this.desiredDeltaTheta = kTwoPi
+    this.desiredDeltaTheta = kTwoPi,
   }) : super(BoxDecoration(color: backgroundColor));
 
   double desiredDeltaRadius;
diff --git a/examples/layers/services/isolate.dart b/examples/layers/services/isolate.dart
index 5c689d62aea..a48958c2ca2 100644
--- a/examples/layers/services/isolate.dart
+++ b/examples/layers/services/isolate.dart
@@ -183,7 +183,7 @@ class CalculationManager {
         sender.send(<double>[ completed, total ]);
       },
       onResultListener: sender.send,
-      data: message.data
+      data: message.data,
     );
     calculator.run();
   }
@@ -221,7 +221,7 @@ class IsolateExampleState extends State<StatefulWidget> with SingleTickerProvide
     )..repeat();
     _calculationManager = CalculationManager(
       onProgressListener: _handleProgressUpdate,
-      onResultListener: _handleResult
+      onResultListener: _handleResult,
     );
   }
 
@@ -243,24 +243,24 @@ class IsolateExampleState extends State<StatefulWidget> with SingleTickerProvide
               width: 120.0,
               height: 120.0,
               color: const Color(0xFF882222),
-            )
+            ),
           ),
           Opacity(
             opacity: _calculationManager.isRunning ? 1.0 : 0.0,
             child: CircularProgressIndicator(
               value: _progress
-            )
+            ),
           ),
           Text(_status),
           Center(
             child: RaisedButton(
               child: Text(_label),
-              onPressed: _handleButtonPressed
-            )
+              onPressed: _handleButtonPressed,
+            ),
           ),
-          Text(_result)
-        ]
-      )
+          Text(_result),
+        ],
+      ),
     );
   }
 
diff --git a/examples/layers/widgets/gestures.dart b/examples/layers/widgets/gestures.dart
index 1e884a90615..6dc63ef1bc4 100644
--- a/examples/layers/widgets/gestures.dart
+++ b/examples/layers/widgets/gestures.dart
@@ -13,7 +13,7 @@ class _GesturePainter extends CustomPainter {
     this.scaleEnabled,
     this.tapEnabled,
     this.doubleTapEnabled,
-    this.longPressEnabled
+    this.longPressEnabled,
   });
 
   final double zoom;
@@ -159,9 +159,9 @@ class GestureDemoState extends State<GestureDemo> {
               scaleEnabled: _scaleEnabled,
               tapEnabled: _tapEnabled,
               doubleTapEnabled: _doubleTapEnabled,
-              longPressEnabled: _longPressEnabled
-            )
-          )
+              longPressEnabled: _longPressEnabled,
+            ),
+          ),
         ),
         Positioned(
           bottom: 0.0,
@@ -175,45 +175,45 @@ class GestureDemoState extends State<GestureDemo> {
                     children: <Widget>[
                       Checkbox(
                         value: _scaleEnabled,
-                        onChanged: (bool value) { setState(() { _scaleEnabled = value; }); }
+                        onChanged: (bool value) { setState(() { _scaleEnabled = value; }); },
                       ),
                       const Text('Scale'),
-                    ]
+                    ],
                   ),
                   Row(
                     children: <Widget>[
                       Checkbox(
                         value: _tapEnabled,
-                        onChanged: (bool value) { setState(() { _tapEnabled = value; }); }
+                        onChanged: (bool value) { setState(() { _tapEnabled = value; }); },
                       ),
                       const Text('Tap'),
-                    ]
+                    ],
                   ),
                   Row(
                     children: <Widget>[
                       Checkbox(
                         value: _doubleTapEnabled,
-                        onChanged: (bool value) { setState(() { _doubleTapEnabled = value; }); }
+                        onChanged: (bool value) { setState(() { _doubleTapEnabled = value; }); },
                       ),
                       const Text('Double Tap'),
-                    ]
+                    ],
                   ),
                   Row(
                     children: <Widget>[
                       Checkbox(
                         value: _longPressEnabled,
-                        onChanged: (bool value) { setState(() { _longPressEnabled = value; }); }
+                        onChanged: (bool value) { setState(() { _longPressEnabled = value; }); },
                       ),
                       const Text('Long Press'),
-                    ]
+                    ],
                   ),
                 ],
-                crossAxisAlignment: CrossAxisAlignment.start
-              )
-            )
-          )
+                crossAxisAlignment: CrossAxisAlignment.start,
+              ),
+            ),
+          ),
         ),
-      ]
+      ],
     );
   }
 }
@@ -223,7 +223,7 @@ void main() {
     theme: ThemeData.dark(),
     home: Scaffold(
       appBar: AppBar(title: const Text('Gestures Demo')),
-      body: GestureDemo()
-    )
+      body: GestureDemo(),
+    ),
   ));
 }
diff --git a/examples/layers/widgets/media_query.dart b/examples/layers/widgets/media_query.dart
index 091fadb9c1c..4ef26874e0f 100644
--- a/examples/layers/widgets/media_query.dart
+++ b/examples/layers/widgets/media_query.dart
@@ -19,8 +19,8 @@ class AdaptedListItem extends StatelessWidget {
           margin: const EdgeInsets.all(8.0),
           color: Colors.lightBlueAccent.shade100,
         ),
-        Text(name)
-      ]
+        Text(name),
+      ],
     );
   }
 }
@@ -38,24 +38,24 @@ class AdaptedGridItem extends StatelessWidget {
           Expanded(
             child: Container(
               color: Colors.lightBlueAccent.shade100,
-            )
+            ),
           ),
           Container(
             margin: const EdgeInsets.only(left: 8.0),
             child: Row(
               children: <Widget>[
                 Expanded(
-                  child: Text(name)
+                  child: Text(name),
                 ),
                 const IconButton(
                   icon: Icon(Icons.more_vert),
-                  onPressed: null
-                )
-              ]
-            )
-          )
-        ]
-      )
+                  onPressed: null,
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
     );
   }
 }
@@ -99,9 +99,9 @@ void main() {
     title: 'Media Query Example',
     home: Scaffold(
       appBar: AppBar(
-        title: const Text('Media Query Example')
+        title: const Text('Media Query Example'),
       ),
-      body: Material(child: AdaptiveContainer(names: _kNames))
-    )
+      body: Material(child: AdaptiveContainer(names: _kNames)),
+    ),
   ));
 }
diff --git a/examples/layers/widgets/sectors.dart b/examples/layers/widgets/sectors.dart
index 553e8af668e..2b64e99a321 100644
--- a/examples/layers/widgets/sectors.dart
+++ b/examples/layers/widgets/sectors.dart
@@ -12,7 +12,7 @@ import '../rendering/src/sector_layout.dart';
 RenderBox initCircle() {
   return RenderBoxToRenderSectorAdapter(
     innerRadius: 25.0,
-    child: RenderSectorRing(padding: 0.0)
+    child: RenderSectorRing(padding: 0.0),
   );
 }
 
@@ -74,7 +74,7 @@ class SectorAppState extends State<SectorApp> {
     ring.add(RenderSolidColor(color, desiredDeltaTheta: kTwoPi * 0.2));
     return RenderBoxToRenderSectorAdapter(
       innerRadius: 5.0,
-      child: ring
+      child: ring,
     );
   }
   RenderBoxToRenderSectorAdapter sectorAddIcon = initSector(const Color(0xFF00DD00));
@@ -104,12 +104,12 @@ class SectorAppState extends State<SectorApp> {
                       Container(
                         padding: const EdgeInsets.all(4.0),
                         margin: const EdgeInsets.only(right: 10.0),
-                        child: WidgetToRenderBoxAdapter(renderBox: sectorAddIcon)
+                        child: WidgetToRenderBoxAdapter(renderBox: sectorAddIcon),
                       ),
                       const Text('ADD SECTOR'),
-                    ]
-                  )
-                )
+                    ],
+                  ),
+                ),
               ),
               RaisedButton(
                 onPressed: _enabledRemove ? removeSector : null,
@@ -119,16 +119,16 @@ class SectorAppState extends State<SectorApp> {
                       Container(
                         padding: const EdgeInsets.all(4.0),
                         margin: const EdgeInsets.only(right: 10.0),
-                        child: WidgetToRenderBoxAdapter(renderBox: sectorRemoveIcon)
+                        child: WidgetToRenderBoxAdapter(renderBox: sectorRemoveIcon),
                       ),
                       const Text('REMOVE SECTOR'),
-                    ]
-                  )
-                )
+                    ],
+                  ),
+                ),
               ),
             ],
-            mainAxisAlignment: MainAxisAlignment.spaceAround
-          )
+            mainAxisAlignment: MainAxisAlignment.spaceAround,
+          ),
         ),
         Expanded(
           child: Container(
@@ -139,12 +139,12 @@ class SectorAppState extends State<SectorApp> {
             padding: const EdgeInsets.all(8.0),
             child: WidgetToRenderBoxAdapter(
               renderBox: sectors,
-              onBuild: doUpdates
-            )
-          )
+              onBuild: doUpdates,
+            ),
+          ),
         ),
       ],
-      mainAxisAlignment: MainAxisAlignment.spaceBetween
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
     );
   }
 
@@ -155,10 +155,10 @@ class SectorAppState extends State<SectorApp> {
       title: 'Sector Layout',
       home: Scaffold(
         appBar: AppBar(
-          title: const Text('Sector Layout in a Widget Tree')
+          title: const Text('Sector Layout in a Widget Tree'),
         ),
-        body: buildBody()
-      )
+        body: buildBody(),
+      ),
     );
   }
 }
diff --git a/examples/layers/widgets/spinning_mixed.dart b/examples/layers/widgets/spinning_mixed.dart
index 4801ac7dd4a..b9f4d1cb3a8 100644
--- a/examples/layers/widgets/spinning_mixed.dart
+++ b/examples/layers/widgets/spinning_mixed.dart
@@ -26,7 +26,7 @@ class Rectangle extends StatelessWidget {
     return Expanded(
       child: Container(
         color: color,
-      )
+      ),
     );
   }
 }
diff --git a/examples/layers/widgets/spinning_square.dart b/examples/layers/widgets/spinning_square.dart
index 6539ffc3a4a..efaae8c3cca 100644
--- a/examples/layers/widgets/spinning_square.dart
+++ b/examples/layers/widgets/spinning_square.dart
@@ -38,7 +38,7 @@ class _SpinningSquareState extends State<SpinningSquare> with SingleTickerProvid
         width: 200.0,
         height: 200.0,
         color: const Color(0xFF00FF00),
-      )
+      ),
     );
   }
 }
diff --git a/examples/layers/widgets/styled_text.dart b/examples/layers/widgets/styled_text.dart
index 633d55e7220..ffabd253b64 100644
--- a/examples/layers/widgets/styled_text.dart
+++ b/examples/layers/widgets/styled_text.dart
@@ -29,7 +29,7 @@ const TextStyle _kBold = TextStyle(fontWeight: FontWeight.bold);
 const TextStyle _kUnderline = TextStyle(
   decoration: TextDecoration.underline,
   decorationColor: Color(0xFF000000),
-  decorationStyle: TextDecorationStyle.wavy
+  decorationStyle: TextDecorationStyle.wavy,
 );
 
 Widget toStyledText(String name, String text) {
@@ -44,14 +44,14 @@ Widget toStyledText(String name, String text) {
           children: <TextSpan>[
             TextSpan(
               style: _kUnderline,
-              text: name
+              text: name,
             ),
-            const TextSpan(text: ':')
-          ]
+            const TextSpan(text: ':'),
+          ],
         ),
-        TextSpan(text: text)
-      ]
-    )
+        TextSpan(text: text),
+      ],
+    ),
   );
 }
 
@@ -67,7 +67,7 @@ class SpeakerSeparator extends StatelessWidget {
         border: Border(
           bottom: BorderSide(color: Color.fromARGB(24, 0, 0, 0))
         )
-      )
+      ),
     );
   }
 }
@@ -112,9 +112,9 @@ class _StyledTextDemoState extends State<StyledTextDemo> {
         child: Column(
           children: children,
           mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.start
-        )
-      )
+          crossAxisAlignment: CrossAxisAlignment.start,
+        ),
+      ),
     );
   }
 }
@@ -124,12 +124,12 @@ void main() {
     theme: ThemeData.light(),
     home: Scaffold(
       appBar: AppBar(
-        title: const Text('Hal and Dave')
+        title: const Text('Hal and Dave'),
       ),
       body: Material(
         color: Colors.grey.shade50,
-        child: StyledTextDemo()
-      )
-    )
+        child: StyledTextDemo(),
+      ),
+    ),
   ));
 }
diff --git a/examples/stocks/lib/i18n/stock_messages_en.dart b/examples/stocks/lib/i18n/stock_messages_en.dart
index 04eb511a6a7..258504d4f51 100644
--- a/examples/stocks/lib/i18n/stock_messages_en.dart
+++ b/examples/stocks/lib/i18n/stock_messages_en.dart
@@ -21,6 +21,6 @@ class MessageLookup extends MessageLookupByLibrary {
   static _notInlinedMessages(_) => <String, Function> {
     "market" : MessageLookupByLibrary.simpleMessage("MARKET"),
     "portfolio" : MessageLookupByLibrary.simpleMessage("PORTFOLIO"),
-    "title" : MessageLookupByLibrary.simpleMessage("Stocks")
+    "title" : MessageLookupByLibrary.simpleMessage("Stocks"),
   };
 }
diff --git a/examples/stocks/lib/i18n/stock_messages_es.dart b/examples/stocks/lib/i18n/stock_messages_es.dart
index 0d8943f2467..136be0bde58 100644
--- a/examples/stocks/lib/i18n/stock_messages_es.dart
+++ b/examples/stocks/lib/i18n/stock_messages_es.dart
@@ -21,6 +21,6 @@ class MessageLookup extends MessageLookupByLibrary {
   static _notInlinedMessages(_) => <String, Function> {
     "market" : MessageLookupByLibrary.simpleMessage("MERCADO"),
     "portfolio" : MessageLookupByLibrary.simpleMessage("CARTERA"),
-    "title" : MessageLookupByLibrary.simpleMessage("Acciones")
+    "title" : MessageLookupByLibrary.simpleMessage("Acciones"),
   };
 }
diff --git a/examples/stocks/lib/main.dart b/examples/stocks/lib/main.dart
index 5ee32aa2885..94877e12ff7 100644
--- a/examples/stocks/lib/main.dart
+++ b/examples/stocks/lib/main.dart
@@ -51,7 +51,7 @@ class StocksAppState extends State<StocksApp> {
     debugShowPointers: false,
     debugShowRainbow: false,
     showPerformanceOverlay: false,
-    showSemanticsDebugger: false
+    showSemanticsDebugger: false,
   );
 
   @override
@@ -71,12 +71,12 @@ class StocksAppState extends State<StocksApp> {
       case StockMode.optimistic:
         return ThemeData(
           brightness: Brightness.light,
-          primarySwatch: Colors.purple
+          primarySwatch: Colors.purple,
         );
       case StockMode.pessimistic:
         return ThemeData(
           brightness: Brightness.dark,
-          accentColor: Colors.redAccent
+          accentColor: Colors.redAccent,
         );
     }
     assert(_configuration.stockMode != null);
@@ -122,7 +122,7 @@ class StocksAppState extends State<StocksApp> {
       showSemanticsDebugger: _configuration.showSemanticsDebugger,
       routes: <String, WidgetBuilder>{
          '/':         (BuildContext context) => StockHome(stocks, _configuration, configurationUpdater),
-         '/settings': (BuildContext context) => StockSettings(_configuration, configurationUpdater)
+         '/settings': (BuildContext context) => StockSettings(_configuration, configurationUpdater),
       },
       onGenerateRoute: _getRoute,
     );
diff --git a/examples/stocks/lib/stock_arrow.dart b/examples/stocks/lib/stock_arrow.dart
index cbd78f09da1..1a8c0b042a6 100644
--- a/examples/stocks/lib/stock_arrow.dart
+++ b/examples/stocks/lib/stock_arrow.dart
@@ -79,9 +79,9 @@ class StockArrow extends StatelessWidget {
         painter: StockArrowPainter(
           // TODO(jackson): This should change colors with the theme
           color: _colorForPercentChange(percentChange),
-          percentChange: percentChange
-        )
-      )
+          percentChange: percentChange,
+        ),
+      ),
     );
   }
 }
diff --git a/examples/stocks/lib/stock_list.dart b/examples/stocks/lib/stock_list.dart
index d61c0c34217..5acc8e5ecd4 100644
--- a/examples/stocks/lib/stock_list.dart
+++ b/examples/stocks/lib/stock_list.dart
@@ -26,7 +26,7 @@ class StockList extends StatelessWidget {
           stock: stocks[index],
           onPressed: onOpen,
           onDoubleTap: onShow,
-          onLongPressed: onAction
+          onLongPressed: onAction,
         );
       },
     );
diff --git a/examples/stocks/lib/stock_row.dart b/examples/stocks/lib/stock_row.dart
index 3ced34ac317..99c6c962511 100644
--- a/examples/stocks/lib/stock_row.dart
+++ b/examples/stocks/lib/stock_row.dart
@@ -14,7 +14,7 @@ class StockRow extends StatelessWidget {
     this.stock,
     this.onPressed,
     this.onDoubleTap,
-    this.onLongPressed
+    this.onLongPressed,
   }) : super(key: ObjectKey(stock));
 
   final Stock stock;
@@ -51,8 +51,8 @@ class StockRow extends StatelessWidget {
               margin: const EdgeInsets.only(right: 5.0),
               child: Hero(
                 tag: stock,
-                child: StockArrow(percentChange: stock.percentChange)
-              )
+                child: StockArrow(percentChange: stock.percentChange),
+              ),
             ),
             Expanded(
               child: Row(
@@ -61,28 +61,28 @@ class StockRow extends StatelessWidget {
                     flex: 2,
                     child: Text(
                       stock.symbol
-                    )
+                    ),
                   ),
                   Expanded(
                     child: Text(
                       lastSale,
-                      textAlign: TextAlign.right
-                    )
+                      textAlign: TextAlign.right,
+                    ),
                   ),
                   Expanded(
                     child: Text(
                       changeInPrice,
-                      textAlign: TextAlign.right
-                    )
+                      textAlign: TextAlign.right,
+                    ),
                   ),
                 ],
                 crossAxisAlignment: CrossAxisAlignment.baseline,
-                textBaseline: DefaultTextStyle.of(context).style.textBaseline
-              )
+                textBaseline: DefaultTextStyle.of(context).style.textBaseline,
+              ),
             ),
-          ]
-        )
-      )
+          ],
+        ),
+      ),
     );
   }
 }
diff --git a/examples/stocks/lib/stock_settings.dart b/examples/stocks/lib/stock_settings.dart
index 3919096e05e..68d77d288cc 100644
--- a/examples/stocks/lib/stock_settings.dart
+++ b/examples/stocks/lib/stock_settings.dart
@@ -76,13 +76,13 @@ class StockSettingsState extends State<StockSettings> {
                   child: const Text('NO THANKS'),
                   onPressed: () {
                     Navigator.pop(context, false);
-                  }
+                  },
                 ),
                 FlatButton(
                   child: const Text('AGREE'),
                   onPressed: () {
                     Navigator.pop(context, true);
-                  }
+                  },
                 ),
               ],
             );
@@ -99,7 +99,7 @@ class StockSettingsState extends State<StockSettings> {
 
   Widget buildAppBar(BuildContext context) {
     return AppBar(
-      title: const Text('Settings')
+      title: const Text('Settings'),
     );
   }
 
@@ -212,7 +212,7 @@ class StockSettingsState extends State<StockSettings> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: buildAppBar(context),
-      body: buildSettingsPane(context)
+      body: buildSettingsPane(context),
     );
   }
 }
diff --git a/examples/stocks/lib/stock_symbol_viewer.dart b/examples/stocks/lib/stock_symbol_viewer.dart
index e1f069c0a77..b5ce65111d4 100644
--- a/examples/stocks/lib/stock_symbol_viewer.dart
+++ b/examples/stocks/lib/stock_symbol_viewer.dart
@@ -30,11 +30,11 @@ class _StockSymbolView extends StatelessWidget {
             children: <Widget>[
               Text(
                 '${stock.symbol}',
-                style: Theme.of(context).textTheme.display2
+                style: Theme.of(context).textTheme.display2,
               ),
               arrow,
             ],
-            mainAxisAlignment: MainAxisAlignment.spaceBetween
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
           ),
           Text('Last Sale', style: headings),
           Text('$lastSale ($changeInPrice)'),
@@ -53,12 +53,12 @@ class _StockSymbolView extends StatelessWidget {
               children: const <TextSpan>[
                 TextSpan(text: 'several', style: TextStyle(fontStyle: FontStyle.italic)),
                 TextSpan(text: ' years.'),
-              ]
-            )
+              ],
+            ),
           ),
         ],
-        mainAxisSize: MainAxisSize.min
-      )
+        mainAxisSize: MainAxisSize.min,
+      ),
     );
   }
 }
@@ -77,7 +77,7 @@ class StockSymbolPage extends StatelessWidget {
         final Stock stock = stocks[symbol];
         return Scaffold(
           appBar: AppBar(
-            title: Text(stock?.name ?? symbol)
+            title: Text(stock?.name ?? symbol),
           ),
           body: SingleChildScrollView(
             child: Container(
@@ -102,9 +102,9 @@ class StockSymbolPage extends StatelessWidget {
                     ),
                   crossFadeState: stock == null && stocks.loading ? CrossFadeState.showFirst : CrossFadeState.showSecond,
                 ),
-              )
-            )
-          )
+              ),
+            ),
+          ),
         );
       },
     );
@@ -125,8 +125,8 @@ class StockSymbolBottomSheet extends StatelessWidget {
       ),
       child: _StockSymbolView(
         stock: stock,
-        arrow: StockArrow(percentChange: stock.percentChange)
-      )
+        arrow: StockArrow(percentChange: stock.percentChange),
+      ),
    );
   }
 }
diff --git a/examples/stocks/lib/stock_types.dart b/examples/stocks/lib/stock_types.dart
index 7ffe63e3432..7868674e4ab 100644
--- a/examples/stocks/lib/stock_types.dart
+++ b/examples/stocks/lib/stock_types.dart
@@ -18,7 +18,7 @@ class StockConfiguration {
     @required this.debugShowPointers,
     @required this.debugShowRainbow,
     @required this.showPerformanceOverlay,
-    @required this.showSemanticsDebugger
+    @required this.showSemanticsDebugger,
   }) : assert(stockMode != null),
        assert(backupMode != null),
        assert(debugShowGrid != null),
@@ -51,7 +51,7 @@ class StockConfiguration {
     bool debugShowPointers,
     bool debugShowRainbow,
     bool showPerformanceOverlay,
-    bool showSemanticsDebugger
+    bool showSemanticsDebugger,
   }) {
     return StockConfiguration(
       stockMode: stockMode ?? this.stockMode,
@@ -63,7 +63,7 @@ class StockConfiguration {
       debugShowPointers: debugShowPointers ?? this.debugShowPointers,
       debugShowRainbow: debugShowRainbow ?? this.debugShowRainbow,
       showPerformanceOverlay: showPerformanceOverlay ?? this.showPerformanceOverlay,
-      showSemanticsDebugger: showSemanticsDebugger ?? this.showSemanticsDebugger
+      showSemanticsDebugger: showSemanticsDebugger ?? this.showSemanticsDebugger,
     );
   }
 }
diff --git a/packages/flutter/lib/src/animation/animations.dart b/packages/flutter/lib/src/animation/animations.dart
index 21872197432..80cc60eecb2 100644
--- a/packages/flutter/lib/src/animation/animations.dart
+++ b/packages/flutter/lib/src/animation/animations.dart
@@ -373,7 +373,7 @@ class CurvedAnimation extends Animation<double> with AnimationWithParentMixin<do
   CurvedAnimation({
     @required this.parent,
     @required this.curve,
-    this.reverseCurve
+    this.reverseCurve,
   }) : assert(parent != null),
        assert(curve != null) {
     _updateCurveDirection(parent.status);
diff --git a/packages/flutter/lib/src/animation/listener_helpers.dart b/packages/flutter/lib/src/animation/listener_helpers.dart
index 906a70b3d50..751f5c98dfa 100644
--- a/packages/flutter/lib/src/animation/listener_helpers.dart
+++ b/packages/flutter/lib/src/animation/listener_helpers.dart
@@ -133,7 +133,7 @@ mixin AnimationLocalListenersMixin {
           informationCollector: (StringBuffer information) {
             information.writeln('The $runtimeType notifying listeners was:');
             information.write('  $this');
-          }
+          },
         ));
       }
     }
@@ -199,7 +199,7 @@ mixin AnimationLocalStatusListenersMixin {
           informationCollector: (StringBuffer information) {
             information.writeln('The $runtimeType notifying status listeners was:');
             information.write('  $this');
-          }
+          },
         ));
       }
     }
diff --git a/packages/flutter/lib/src/cupertino/activity_indicator.dart b/packages/flutter/lib/src/cupertino/activity_indicator.dart
index 5482aa9f0f7..878106caa31 100644
--- a/packages/flutter/lib/src/cupertino/activity_indicator.dart
+++ b/packages/flutter/lib/src/cupertino/activity_indicator.dart
@@ -104,7 +104,7 @@ class _CupertinoActivityIndicatorPainter extends CustomPainter {
            -radius / 2.0,
            -1.0 * radius / _kDefaultIndicatorRadius,
            1.0,
-           1.0
+           1.0,
        ),
        super(repaint: position);
 
diff --git a/packages/flutter/lib/src/cupertino/bottom_tab_bar.dart b/packages/flutter/lib/src/cupertino/bottom_tab_bar.dart
index 34ae20feed1..fb820e7747e 100644
--- a/packages/flutter/lib/src/cupertino/bottom_tab_bar.dart
+++ b/packages/flutter/lib/src/cupertino/bottom_tab_bar.dart
@@ -208,7 +208,7 @@ class CupertinoTabBar extends StatelessWidget implements PreferredSizeWidget {
     final List<Widget> components = <Widget>[
       Expanded(
         child: Center(child: active ? item.activeIcon : item.icon),
-      )
+      ),
     ];
 
     if (item.title != null) {
diff --git a/packages/flutter/lib/src/cupertino/nav_bar.dart b/packages/flutter/lib/src/cupertino/nav_bar.dart
index e7029dd596c..361589c1f34 100644
--- a/packages/flutter/lib/src/cupertino/nav_bar.dart
+++ b/packages/flutter/lib/src/cupertino/nav_bar.dart
@@ -1676,7 +1676,7 @@ class _NavigationBarComponentsTransition {
           ancestor: toNavBarBox,
         ).translate(
           0.0,
-          - fromBox.size.height / 2 + toBox.size.height / 2
+          - fromBox.size.height / 2 + toBox.size.height / 2,
         ) & fromBox.size; // Keep the from render object's size.
 
     if (forwardDirection < 0) {
diff --git a/packages/flutter/lib/src/cupertino/picker.dart b/packages/flutter/lib/src/cupertino/picker.dart
index 1c6707abb74..0426341e41c 100644
--- a/packages/flutter/lib/src/cupertino/picker.dart
+++ b/packages/flutter/lib/src/cupertino/picker.dart
@@ -267,7 +267,7 @@ class _CupertinoPickerState extends State<CupertinoPicker> {
               border: Border(
                 top: BorderSide(width: 0.0, color: _kHighlighterBorder),
                 bottom: BorderSide(width: 0.0, color: _kHighlighterBorder),
-              )
+              ),
             ),
             constraints: BoxConstraints.expand(
                 height: widget.itemExtent * widget.magnification,
@@ -343,7 +343,7 @@ class _CupertinoPickerState extends State<CupertinoPicker> {
         children: <Widget> [
           _buildUnderMagnifierScreen(),
           _addBackgroundToChild(result),
-        ]
+        ],
       );
     } else {
       result = _addBackgroundToChild(result);
diff --git a/packages/flutter/lib/src/cupertino/refresh.dart b/packages/flutter/lib/src/cupertino/refresh.dart
index 1a65ad48a22..d5721a37c61 100644
--- a/packages/flutter/lib/src/cupertino/refresh.dart
+++ b/packages/flutter/lib/src/cupertino/refresh.dart
@@ -532,7 +532,7 @@ class _CupertinoSliverRefreshControlState extends State<CupertinoSliverRefreshCo
           }
           return Container();
         },
-      )
+      ),
     );
   }
 }
diff --git a/packages/flutter/lib/src/cupertino/route.dart b/packages/flutter/lib/src/cupertino/route.dart
index e203df4ea87..f7f6c3cdf69 100644
--- a/packages/flutter/lib/src/cupertino/route.dart
+++ b/packages/flutter/lib/src/cupertino/route.dart
@@ -61,7 +61,7 @@ final DecorationTween _kGradientShadowTween = DecorationTween(
         Color(0x00000000),
         Color(0x04000000),
         Color(0x12000000),
-        Color(0x38000000)
+        Color(0x38000000),
       ],
       stops: <double>[0.0, 0.3, 0.6, 1.0],
     ),
diff --git a/packages/flutter/lib/src/cupertino/scrollbar.dart b/packages/flutter/lib/src/cupertino/scrollbar.dart
index 90173d86368..09721754beb 100644
--- a/packages/flutter/lib/src/cupertino/scrollbar.dart
+++ b/packages/flutter/lib/src/cupertino/scrollbar.dart
@@ -68,7 +68,7 @@ class _CupertinoScrollbarState extends State<CupertinoScrollbar> with TickerProv
     );
     _fadeoutOpacityAnimation = CurvedAnimation(
       parent: _fadeoutAnimationController,
-      curve: Curves.fastOutSlowIn
+      curve: Curves.fastOutSlowIn,
     );
   }
 
diff --git a/packages/flutter/lib/src/cupertino/switch.dart b/packages/flutter/lib/src/cupertino/switch.dart
index 56414a443ab..82ee261bac6 100644
--- a/packages/flutter/lib/src/cupertino/switch.dart
+++ b/packages/flutter/lib/src/cupertino/switch.dart
@@ -165,7 +165,7 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget {
       onChanged: onChanged,
       textDirection: Directionality.of(context),
       vsync: vsync,
-      dragStartBehavior: dragStartBehavior
+      dragStartBehavior: dragStartBehavior,
     );
   }
 
@@ -477,7 +477,7 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox {
         offset.dx + (size.width - _kTrackWidth) / 2.0,
         offset.dy + (size.height - _kTrackHeight) / 2.0,
         _kTrackWidth,
-        _kTrackHeight
+        _kTrackHeight,
     );
     final RRect outerRRect = RRect.fromRectAndRadius(trackRect, const Radius.circular(_kTrackRadius));
     final RRect innerRRect = RRect.fromRectAndRadius(trackRect.deflate(borderThickness), const Radius.circular(_kTrackRadius));
diff --git a/packages/flutter/lib/src/cupertino/tab_scaffold.dart b/packages/flutter/lib/src/cupertino/tab_scaffold.dart
index 4e56f5a8713..043fda3b094 100644
--- a/packages/flutter/lib/src/cupertino/tab_scaffold.dart
+++ b/packages/flutter/lib/src/cupertino/tab_scaffold.dart
@@ -255,7 +255,7 @@ class _CupertinoTabScaffoldState extends State<CupertinoTabScaffold> {
             // Chain the user's original callback.
             if (widget.tabBar.onTap != null)
               widget.tabBar.onTap(newIndex);
-          }
+          },
         ),
       ));
     }
diff --git a/packages/flutter/lib/src/cupertino/text_selection.dart b/packages/flutter/lib/src/cupertino/text_selection.dart
index df4d46152ee..f2b8ac6fee1 100644
--- a/packages/flutter/lib/src/cupertino/text_selection.dart
+++ b/packages/flutter/lib/src/cupertino/text_selection.dart
@@ -107,7 +107,7 @@ class _TextSelectionToolbar extends StatelessWidget {
       size: _kToolbarTriangleSize,
       child: CustomPaint(
         painter: _TextSelectionToolbarNotchPainter(),
-      )
+      ),
     );
 
     return Column(
@@ -252,7 +252,7 @@ class _CupertinoTextSelectionControls extends TextSelectionControls {
           handlePaste: canPaste(delegate) ? () => handlePaste(delegate) : null,
           handleSelectAll: canSelectAll(delegate) ? () => handleSelectAll(delegate) : null,
         ),
-      )
+      ),
     );
   }
 
@@ -263,7 +263,7 @@ class _CupertinoTextSelectionControls extends TextSelectionControls {
     // padding in every direction that will constitute the selection drag area.
     final Size desiredSize = Size(
       2.0 * _kHandlesPadding,
-      textLineHeight + 2.0 * _kHandlesPadding
+      textLineHeight + 2.0 * _kHandlesPadding,
     );
 
     final Widget handle = SizedBox.fromSize(
@@ -288,16 +288,16 @@ class _CupertinoTextSelectionControls extends TextSelectionControls {
         return Transform(
           transform: Matrix4.rotationZ(math.pi)
               ..translate(-_kHandlesPadding, -_kHandlesPadding),
-          child: handle
+          child: handle,
         );
       case TextSelectionHandleType.right:
         return Transform(
           transform: Matrix4.translationValues(
             -_kHandlesPadding,
             -(textLineHeight + _kHandlesPadding),
-            0.0
+            0.0,
           ),
-          child: handle
+          child: handle,
         );
       case TextSelectionHandleType.collapsed: // iOS doesn't draw anything for collapsed selections.
         return Container();
diff --git a/packages/flutter/lib/src/foundation/assertions.dart b/packages/flutter/lib/src/foundation/assertions.dart
index 0d88801e06f..14998557e37 100644
--- a/packages/flutter/lib/src/foundation/assertions.dart
+++ b/packages/flutter/lib/src/foundation/assertions.dart
@@ -32,7 +32,7 @@ class FlutterErrorDetails {
     this.context,
     this.stackFilter,
     this.informationCollector,
-    this.silent = false
+    this.silent = false,
   });
 
   /// The exception. Often this will be an [AssertionError], maybe specifically
diff --git a/packages/flutter/lib/src/foundation/binding.dart b/packages/flutter/lib/src/foundation/binding.dart
index 88f21c289a6..aaca66d6ba5 100644
--- a/packages/flutter/lib/src/foundation/binding.dart
+++ b/packages/flutter/lib/src/foundation/binding.dart
@@ -143,7 +143,7 @@ abstract class BindingBase {
           return <String, dynamic> {
             'value': ui.saveCompilationTrace(),
           };
-        }
+        },
       );
     }
 
@@ -178,7 +178,7 @@ abstract class BindingBase {
                      .toString()
                      .substring('$TargetPlatform.'.length),
           };
-        }
+        },
       );
       return true;
     }());
@@ -280,7 +280,7 @@ abstract class BindingBase {
   @protected
   void registerSignalServiceExtension({
     @required String name,
-    @required AsyncCallback callback
+    @required AsyncCallback callback,
   }) {
     assert(name != null);
     assert(callback != null);
@@ -289,7 +289,7 @@ abstract class BindingBase {
       callback: (Map<String, String> parameters) async {
         await callback();
         return <String, dynamic>{};
-      }
+      },
     );
   }
 
@@ -311,7 +311,7 @@ abstract class BindingBase {
   void registerBoolServiceExtension({
     @required String name,
     @required AsyncValueGetter<bool> getter,
-    @required AsyncValueSetter<bool> setter
+    @required AsyncValueSetter<bool> setter,
   }) {
     assert(name != null);
     assert(getter != null);
@@ -324,7 +324,7 @@ abstract class BindingBase {
           _postExtensionStateChangedEvent(name, await getter() ? 'true' : 'false');
         }
         return <String, dynamic>{ 'enabled': await getter() ? 'true' : 'false' };
-      }
+      },
     );
   }
 
@@ -345,7 +345,7 @@ abstract class BindingBase {
   void registerNumericServiceExtension({
     @required String name,
     @required AsyncValueGetter<double> getter,
-    @required AsyncValueSetter<double> setter
+    @required AsyncValueSetter<double> setter,
   }) {
     assert(name != null);
     assert(getter != null);
@@ -358,7 +358,7 @@ abstract class BindingBase {
           _postExtensionStateChangedEvent(name, (await getter()).toString());
         }
         return <String, dynamic>{ name: (await getter()).toString() };
-      }
+      },
     );
   }
 
@@ -407,7 +407,7 @@ abstract class BindingBase {
   void registerStringServiceExtension({
     @required String name,
     @required AsyncValueGetter<String> getter,
-    @required AsyncValueSetter<String> setter
+    @required AsyncValueSetter<String> setter,
   }) {
     assert(name != null);
     assert(getter != null);
@@ -420,7 +420,7 @@ abstract class BindingBase {
           _postExtensionStateChangedEvent(name, await getter());
         }
         return <String, dynamic>{ 'value': await getter() };
-      }
+      },
     );
   }
 
@@ -478,7 +478,7 @@ abstract class BindingBase {
   @protected
   void registerServiceExtension({
     @required String name,
-    @required ServiceExtensionCallback callback
+    @required ServiceExtensionCallback callback,
   }) {
     assert(name != null);
     assert(callback != null);
@@ -522,7 +522,7 @@ abstract class BindingBase {
         FlutterError.reportError(FlutterErrorDetails(
           exception: caughtException,
           stack: caughtStack,
-          context: 'during a service extension callback for "$method"'
+          context: 'during a service extension callback for "$method"',
         ));
         return developer.ServiceExtensionResponse.error(
           developer.ServiceExtensionResponse.extensionError,
@@ -530,7 +530,7 @@ abstract class BindingBase {
             'exception': caughtException.toString(),
             'stack': caughtStack.toString(),
             'method': method,
-          })
+          }),
         );
       }
     });
diff --git a/packages/flutter/lib/src/foundation/change_notifier.dart b/packages/flutter/lib/src/foundation/change_notifier.dart
index 7a53b0e07f8..8a27022affe 100644
--- a/packages/flutter/lib/src/foundation/change_notifier.dart
+++ b/packages/flutter/lib/src/foundation/change_notifier.dart
@@ -213,7 +213,7 @@ class ChangeNotifier implements Listenable {
             informationCollector: (StringBuffer information) {
               information.writeln('The $runtimeType sending notification was:');
               information.write('  $this');
-            }
+            },
           ));
         }
       }
diff --git a/packages/flutter/lib/src/foundation/debug.dart b/packages/flutter/lib/src/foundation/debug.dart
index ba56ff05301..f955377f616 100644
--- a/packages/flutter/lib/src/foundation/debug.dart
+++ b/packages/flutter/lib/src/foundation/debug.dart
@@ -71,5 +71,5 @@ Future<T> debugInstrumentAction<T>(String description, Future<T> action()) {
 ///  * [Timeline.startSync], which typically takes this value as its `arguments`
 ///    argument.
 const Map<String, String> timelineWhitelistArguments = <String, String>{
-  'mode': 'basic'
+  'mode': 'basic',
 };
diff --git a/packages/flutter/lib/src/gestures/binding.dart b/packages/flutter/lib/src/gestures/binding.dart
index 56ea434e1ee..796d33c653c 100644
--- a/packages/flutter/lib/src/gestures/binding.dart
+++ b/packages/flutter/lib/src/gestures/binding.dart
@@ -239,7 +239,7 @@ class FlutterErrorDetailsForPointerEventDispatcher extends FlutterErrorDetails {
     this.event,
     this.hitTestEntry,
     InformationCollector informationCollector,
-    bool silent = false
+    bool silent = false,
   }) : super(
     exception: exception,
     stack: stack,
diff --git a/packages/flutter/lib/src/gestures/converter.dart b/packages/flutter/lib/src/gestures/converter.dart
index 7b166504c1c..ddb7321fa08 100644
--- a/packages/flutter/lib/src/gestures/converter.dart
+++ b/packages/flutter/lib/src/gestures/converter.dart
@@ -61,7 +61,7 @@ class PointerEventConverter {
   static _PointerState _ensureStateForPointer(ui.PointerData datum, Offset position) {
     return _pointers.putIfAbsent(
       datum.device,
-      () => _PointerState(position)
+      () => _PointerState(position),
     );
   }
 
@@ -100,7 +100,7 @@ class PointerEventConverter {
             radiusMin: radiusMin,
             radiusMax: radiusMax,
             orientation: datum.orientation,
-            tilt: datum.tilt
+            tilt: datum.tilt,
           );
           break;
         case ui.PointerChange.hover:
@@ -122,7 +122,7 @@ class PointerEventConverter {
               radiusMin: radiusMin,
               radiusMax: radiusMax,
               orientation: datum.orientation,
-              tilt: datum.tilt
+              tilt: datum.tilt,
             );
           }
           final Offset offset = position - state.lastPosition;
@@ -145,7 +145,7 @@ class PointerEventConverter {
             radiusMin: radiusMin,
             radiusMax: radiusMax,
             orientation: datum.orientation,
-            tilt: datum.tilt
+            tilt: datum.tilt,
           );
           state.lastPosition = position;
           break;
@@ -168,7 +168,7 @@ class PointerEventConverter {
               radiusMin: radiusMin,
               radiusMax: radiusMax,
               orientation: datum.orientation,
-              tilt: datum.tilt
+              tilt: datum.tilt,
             );
           }
           if (state.lastPosition != position) {
@@ -220,7 +220,7 @@ class PointerEventConverter {
             radiusMin: radiusMin,
             radiusMax: radiusMax,
             orientation: datum.orientation,
-            tilt: datum.tilt
+            tilt: datum.tilt,
           );
           break;
         case ui.PointerChange.move:
@@ -314,7 +314,7 @@ class PointerEventConverter {
               radiusMin: radiusMin,
               radiusMax: radiusMax,
               orientation: datum.orientation,
-              tilt: datum.tilt
+              tilt: datum.tilt,
             );
           } else {
             yield PointerCancelEvent(
@@ -335,7 +335,7 @@ class PointerEventConverter {
               radiusMin: radiusMin,
               radiusMax: radiusMax,
               orientation: datum.orientation,
-              tilt: datum.tilt
+              tilt: datum.tilt,
             );
           }
           break;
@@ -361,7 +361,7 @@ class PointerEventConverter {
               radiusMin: radiusMin,
               radiusMax: radiusMax,
               orientation: datum.orientation,
-              tilt: datum.tilt
+              tilt: datum.tilt,
             );
           }
           _pointers.remove(datum.device);
@@ -374,7 +374,7 @@ class PointerEventConverter {
             pressureMax: datum.pressureMax,
             distanceMax: datum.distanceMax,
             radiusMin: radiusMin,
-            radiusMax: radiusMax
+            radiusMax: radiusMax,
           );
           break;
       }
diff --git a/packages/flutter/lib/src/gestures/drag_details.dart b/packages/flutter/lib/src/gestures/drag_details.dart
index eebf316f42f..9d2665bff68 100644
--- a/packages/flutter/lib/src/gestures/drag_details.dart
+++ b/packages/flutter/lib/src/gestures/drag_details.dart
@@ -103,7 +103,7 @@ class DragUpdateDetails {
     this.sourceTimeStamp,
     this.delta = Offset.zero,
     this.primaryDelta,
-    @required this.globalPosition
+    @required this.globalPosition,
   }) : assert(delta != null),
        assert(primaryDelta == null
            || (primaryDelta == delta.dx && delta.dy == 0.0)
diff --git a/packages/flutter/lib/src/gestures/events.dart b/packages/flutter/lib/src/gestures/events.dart
index f2de126fdfa..099ef69fff0 100644
--- a/packages/flutter/lib/src/gestures/events.dart
+++ b/packages/flutter/lib/src/gestures/events.dart
@@ -344,7 +344,7 @@ class PointerAddedEvent extends PointerEvent {
     double radiusMin = 0.0,
     double radiusMax = 0.0,
     double orientation = 0.0,
-    double tilt = 0.0
+    double tilt = 0.0,
   }) : super(
     timeStamp: timeStamp,
     kind: kind,
@@ -381,7 +381,7 @@ class PointerRemovedEvent extends PointerEvent {
     double pressureMax = 1.0,
     double distanceMax = 0.0,
     double radiusMin = 0.0,
-    double radiusMax = 0.0
+    double radiusMax = 0.0,
   }) : super(
     timeStamp: timeStamp,
     kind: kind,
@@ -656,7 +656,7 @@ class PointerDownEvent extends PointerEvent {
     double radiusMin = 0.0,
     double radiusMax = 0.0,
     double orientation = 0.0,
-    double tilt = 0.0
+    double tilt = 0.0,
   }) : super(
     timeStamp: timeStamp,
     pointer: pointer,
@@ -765,7 +765,7 @@ class PointerUpEvent extends PointerEvent {
     double radiusMin = 0.0,
     double radiusMax = 0.0,
     double orientation = 0.0,
-    double tilt = 0.0
+    double tilt = 0.0,
   }) : super(
     timeStamp: timeStamp,
     pointer: pointer,
@@ -814,7 +814,7 @@ class PointerCancelEvent extends PointerEvent {
     double radiusMin = 0.0,
     double radiusMax = 0.0,
     double orientation = 0.0,
-    double tilt = 0.0
+    double tilt = 0.0,
   }) : super(
     timeStamp: timeStamp,
     pointer: pointer,
diff --git a/packages/flutter/lib/src/gestures/lsq_solver.dart b/packages/flutter/lib/src/gestures/lsq_solver.dart
index 509d7ea697e..599aa6a531c 100644
--- a/packages/flutter/lib/src/gestures/lsq_solver.dart
+++ b/packages/flutter/lib/src/gestures/lsq_solver.dart
@@ -55,7 +55,7 @@ class _Matrix {
   _Vector getRow(int row) => _Vector.fromVOL(
     _elements,
     row * _columns,
-    _columns
+    _columns,
   );
 }
 
diff --git a/packages/flutter/lib/src/gestures/multitap.dart b/packages/flutter/lib/src/gestures/multitap.dart
index ab34379b950..be2b1a5dd3b 100644
--- a/packages/flutter/lib/src/gestures/multitap.dart
+++ b/packages/flutter/lib/src/gestures/multitap.dart
@@ -108,7 +108,7 @@ class DoubleTapGestureRecognizer extends GestureRecognizer {
     _stopDoubleTapTimer();
     final _TapTracker tracker = _TapTracker(
       event: event,
-      entry: GestureBinding.instance.gestureArena.add(event.pointer, this)
+      entry: GestureBinding.instance.gestureArena.add(event.pointer, this),
     );
     _trackers[event.pointer] = tracker;
     tracker.startTrackingPointer(_handleEvent);
@@ -230,7 +230,7 @@ class _TapGesture extends _TapTracker {
   _TapGesture({
     this.gestureRecognizer,
     PointerEvent event,
-    Duration longTapDelay
+    Duration longTapDelay,
   }) : _lastPosition = event.position,
        super(
     event: event,
@@ -350,7 +350,7 @@ class MultiTapGestureRecognizer extends GestureRecognizer {
     _gestureMap[event.pointer] = _TapGesture(
       gestureRecognizer: this,
       event: event,
-      longTapDelay: longTapDelay
+      longTapDelay: longTapDelay,
     );
     if (onTapDown != null)
       invokeCallback<void>('onTapDown', () => onTapDown(event.pointer, TapDownDetails(globalPosition: event.position)));
diff --git a/packages/flutter/lib/src/gestures/pointer_router.dart b/packages/flutter/lib/src/gestures/pointer_router.dart
index fc252d755db..5240dac2d8d 100644
--- a/packages/flutter/lib/src/gestures/pointer_router.dart
+++ b/packages/flutter/lib/src/gestures/pointer_router.dart
@@ -83,7 +83,7 @@ class PointerRouter {
         informationCollector: (StringBuffer information) {
           information.writeln('Event:');
           information.write('  $event');
-        }
+        },
       ));
     }
   }
@@ -128,7 +128,7 @@ class FlutterErrorDetailsForPointerRouter extends FlutterErrorDetails {
     this.route,
     this.event,
     InformationCollector informationCollector,
-    bool silent = false
+    bool silent = false,
   }) : super(
     exception: exception,
     stack: stack,
diff --git a/packages/flutter/lib/src/gestures/recognizer.dart b/packages/flutter/lib/src/gestures/recognizer.dart
index 79504841098..3f01c4c03e9 100644
--- a/packages/flutter/lib/src/gestures/recognizer.dart
+++ b/packages/flutter/lib/src/gestures/recognizer.dart
@@ -128,7 +128,7 @@ abstract class GestureRecognizer extends GestureArenaMember with DiagnosticableT
           information.writeln('Handler: $name');
           information.writeln('Recognizer:');
           information.writeln('  $this');
-        }
+        },
       ));
     }
     return result;
diff --git a/packages/flutter/lib/src/gestures/scale.dart b/packages/flutter/lib/src/gestures/scale.dart
index 320dd5c9a67..34da3b93e98 100644
--- a/packages/flutter/lib/src/gestures/scale.dart
+++ b/packages/flutter/lib/src/gestures/scale.dart
@@ -158,7 +158,7 @@ class _LineBetweenPointers{
     this.pointerStartLocation = Offset.zero,
     this.pointerStartId = 0,
     this.pointerEndLocation = Offset.zero,
-    this.pointerEndId = 1
+    this.pointerEndId = 1,
   }) : assert(pointerStartLocation != null && pointerEndLocation != null),
        assert(pointerStartId != null && pointerEndId != null),
        assert(pointerStartId != pointerEndId);
@@ -327,7 +327,7 @@ class ScaleGestureRecognizer extends OneSequenceGestureRecognizer {
         pointerStartId: _pointerQueue[0],
         pointerStartLocation: _pointerLocations[_pointerQueue[0]],
         pointerEndId: _pointerQueue[1],
-        pointerEndLocation: _pointerLocations[_pointerQueue[1]]
+        pointerEndLocation: _pointerLocations[_pointerQueue[1]],
       );
     } else {
       /// A new rotation process is on the way, set the [_initialLine]
@@ -335,7 +335,7 @@ class ScaleGestureRecognizer extends OneSequenceGestureRecognizer {
         pointerStartId: _pointerQueue[0],
         pointerStartLocation: _pointerLocations[_pointerQueue[0]],
         pointerEndId: _pointerQueue[1],
-        pointerEndLocation: _pointerLocations[_pointerQueue[1]]
+        pointerEndLocation: _pointerLocations[_pointerQueue[1]],
       );
       _currentLine = null;
     }
diff --git a/packages/flutter/lib/src/material/about.dart b/packages/flutter/lib/src/material/about.dart
index e9a1e3a3343..31a5d6c2c35 100644
--- a/packages/flutter/lib/src/material/about.dart
+++ b/packages/flutter/lib/src/material/about.dart
@@ -47,7 +47,7 @@ class AboutListTile extends StatelessWidget {
     this.applicationVersion,
     this.applicationIcon,
     this.applicationLegalese,
-    this.aboutBoxChildren
+    this.aboutBoxChildren,
   }) : super(key: key);
 
   /// The icon to show for this drawer item.
@@ -121,9 +121,9 @@ class AboutListTile extends StatelessWidget {
           applicationVersion: applicationVersion,
           applicationIcon: applicationIcon,
           applicationLegalese: applicationLegalese,
-          children: aboutBoxChildren
+          children: aboutBoxChildren,
         );
-      }
+      },
     );
   }
 }
@@ -163,7 +163,7 @@ void showAboutDialog({
         applicationLegalese: applicationLegalese,
         children: children,
       );
-    }
+    },
   );
 }
 
@@ -185,14 +185,14 @@ void showLicensePage({
   String applicationName,
   String applicationVersion,
   Widget applicationIcon,
-  String applicationLegalese
+  String applicationLegalese,
 }) {
   assert(context != null);
   Navigator.push(context, MaterialPageRoute<void>(
     builder: (BuildContext context) => LicensePage(
       applicationName: applicationName,
       applicationVersion: applicationVersion,
-      applicationLegalese: applicationLegalese
+      applicationLegalese: applicationLegalese,
     )
   ));
 }
@@ -279,15 +279,15 @@ class AboutDialog extends StatelessWidget {
             Text(name, style: Theme.of(context).textTheme.headline),
             Text(version, style: Theme.of(context).textTheme.body1),
             Container(height: 18.0),
-            Text(applicationLegalese ?? '', style: Theme.of(context).textTheme.caption)
-          ]
-        )
-      )
+            Text(applicationLegalese ?? '', style: Theme.of(context).textTheme.caption),
+          ],
+        ),
+      ),
     ));
     body = <Widget>[
       Row(
         crossAxisAlignment: CrossAxisAlignment.start,
-        children: body
+        children: body,
       ),
     ];
     if (children != null)
@@ -305,17 +305,17 @@ class AboutDialog extends StatelessWidget {
               applicationName: applicationName,
               applicationVersion: applicationVersion,
               applicationIcon: applicationIcon,
-              applicationLegalese: applicationLegalese
+              applicationLegalese: applicationLegalese,
             );
-          }
+          },
         ),
         FlatButton(
           child: Text(MaterialLocalizations.of(context).closeButtonLabel),
           onPressed: () {
             Navigator.pop(context);
-          }
+          },
         ),
-      ]
+      ],
     );
   }
 }
@@ -342,7 +342,7 @@ class LicensePage extends StatefulWidget {
     Key key,
     this.applicationName,
     this.applicationVersion,
-    this.applicationLegalese
+    this.applicationLegalese,
   }) : super(key: key);
 
   /// The name of the application.
@@ -398,8 +398,8 @@ class _LicensePageState extends State<LicensePage> {
           padding: EdgeInsets.symmetric(vertical: 18.0),
           child: Text(
             '🍀‬', // That's U+1F340. Could also use U+2766 (❦) if U+1F340 doesn't work everywhere.
-            textAlign: TextAlign.center
-          )
+            textAlign: TextAlign.center,
+          ),
         ));
         _licenses.add(Container(
           decoration: const BoxDecoration(
@@ -408,8 +408,8 @@ class _LicensePageState extends State<LicensePage> {
           child: Text(
             license.packages.join(', '),
             style: const TextStyle(fontWeight: FontWeight.bold),
-            textAlign: TextAlign.center
-          )
+            textAlign: TextAlign.center,
+          ),
         ));
         for (LicenseParagraph paragraph in paragraphs) {
           if (paragraph.indent == LicenseParagraph.centeredIndent) {
@@ -418,14 +418,14 @@ class _LicensePageState extends State<LicensePage> {
               child: Text(
                 paragraph.text,
                 style: const TextStyle(fontWeight: FontWeight.bold),
-                textAlign: TextAlign.center
-              )
+                textAlign: TextAlign.center,
+              ),
             ));
           } else {
             assert(paragraph.indent >= 0);
             _licenses.add(Padding(
               padding: EdgeInsetsDirectional.only(top: 8.0, start: 16.0 * paragraph.indent),
-              child: Text(paragraph.text)
+              child: Text(paragraph.text),
             ));
           }
         }
@@ -457,8 +457,8 @@ class _LicensePageState extends State<LicensePage> {
       contents.add(const Padding(
         padding: EdgeInsets.symmetric(vertical: 24.0),
         child: Center(
-          child: CircularProgressIndicator()
-        )
+          child: CircularProgressIndicator(),
+        ),
       ));
     }
     return Scaffold(
diff --git a/packages/flutter/lib/src/material/animated_icons/animated_icons.dart b/packages/flutter/lib/src/material/animated_icons/animated_icons.dart
index 15286d08b39..cd14e3b7518 100644
--- a/packages/flutter/lib/src/material/animated_icons/animated_icons.dart
+++ b/packages/flutter/lib/src/material/animated_icons/animated_icons.dart
@@ -189,7 +189,7 @@ class _AnimatedIconPainter extends CustomPainter {
 class _PathFrames {
   const _PathFrames({
     @required this.commands,
-    @required this.opacities
+    @required this.opacities,
   });
 
   final List<_PathCommand> commands;
@@ -248,7 +248,7 @@ class _PathCubicTo extends _PathCommand {
     path.cubicTo(
       controlPoint1.dx, controlPoint1.dy,
       controlPoint2.dx, controlPoint2.dy,
-      targetPoint.dx, targetPoint.dy
+      targetPoint.dx, targetPoint.dy,
     );
   }
 }
diff --git a/packages/flutter/lib/src/material/arc.dart b/packages/flutter/lib/src/material/arc.dart
index edaf96f986e..99d24fa8ab8 100644
--- a/packages/flutter/lib/src/material/arc.dart
+++ b/packages/flutter/lib/src/material/arc.dart
@@ -248,11 +248,11 @@ class MaterialRectArcTween extends RectTween {
     final _Diagonal diagonal = _maxBy<_Diagonal>(_allDiagonals, (_Diagonal d) => _diagonalSupport(centersVector, d));
     _beginArc = MaterialPointArcTween(
       begin: _cornerFor(begin, diagonal.beginId),
-      end: _cornerFor(end, diagonal.beginId)
+      end: _cornerFor(end, diagonal.beginId),
     );
     _endArc = MaterialPointArcTween(
       begin: _cornerFor(begin, diagonal.endId),
-      end: _cornerFor(end, diagonal.endId)
+      end: _cornerFor(end, diagonal.endId),
     );
     _dirty = false;
   }
diff --git a/packages/flutter/lib/src/material/back_button.dart b/packages/flutter/lib/src/material/back_button.dart
index 31504b5eecf..0c16f496237 100644
--- a/packages/flutter/lib/src/material/back_button.dart
+++ b/packages/flutter/lib/src/material/back_button.dart
@@ -89,7 +89,7 @@ class BackButton extends StatelessWidget {
       tooltip: MaterialLocalizations.of(context).backButtonTooltip,
       onPressed: () {
         Navigator.maybePop(context);
-      }
+      },
     );
   }
 }
diff --git a/packages/flutter/lib/src/material/bottom_navigation_bar.dart b/packages/flutter/lib/src/material/bottom_navigation_bar.dart
index fb6cb59297a..7458be9032b 100644
--- a/packages/flutter/lib/src/material/bottom_navigation_bar.dart
+++ b/packages/flutter/lib/src/material/bottom_navigation_bar.dart
@@ -411,7 +411,7 @@ class _BottomNavigationTile extends StatelessWidget {
             ),
             Semantics(
               label: indexLabel,
-            )
+            ),
           ],
         ),
       ),
diff --git a/packages/flutter/lib/src/material/bottom_sheet.dart b/packages/flutter/lib/src/material/bottom_sheet.dart
index 0f0a8daa9ff..ae837ca82d8 100644
--- a/packages/flutter/lib/src/material/bottom_sheet.dart
+++ b/packages/flutter/lib/src/material/bottom_sheet.dart
@@ -57,7 +57,7 @@ class BottomSheet extends StatefulWidget {
     this.enableDrag = true,
     this.elevation = 0.0,
     @required this.onClosing,
-    @required this.builder
+    @required this.builder,
   }) : assert(enableDrag != null),
        assert(onClosing != null),
        assert(builder != null),
@@ -178,7 +178,7 @@ class _ModalBottomSheetLayout extends SingleChildLayoutDelegate {
       minWidth: constraints.maxWidth,
       maxWidth: constraints.maxWidth,
       minHeight: 0.0,
-      maxHeight: constraints.maxHeight * 9.0 / 16.0
+      maxHeight: constraints.maxHeight * 9.0 / 16.0,
     );
   }
 
@@ -243,8 +243,8 @@ class _ModalBottomSheetState<T> extends State<_ModalBottomSheet<T>> {
               ),
             ),
           );
-        }
-      )
+        },
+      ),
     );
   }
 }
diff --git a/packages/flutter/lib/src/material/button_bar.dart b/packages/flutter/lib/src/material/button_bar.dart
index c1476d9e1ba..2e4ed41021d 100644
--- a/packages/flutter/lib/src/material/button_bar.dart
+++ b/packages/flutter/lib/src/material/button_bar.dart
@@ -60,16 +60,16 @@ class ButtonBar extends StatelessWidget {
       children: children.map<Widget>((Widget child) {
         return Padding(
           padding: EdgeInsets.symmetric(horizontal: paddingUnit),
-          child: child
+          child: child,
         );
-      }).toList()
+      }).toList(),
     );
     switch (buttonTheme.layoutBehavior) {
       case ButtonBarLayoutBehavior.padded:
         return Padding(
           padding: EdgeInsets.symmetric(
             vertical: 2.0 * paddingUnit,
-            horizontal: paddingUnit
+            horizontal: paddingUnit,
           ),
           child: child,
         );
diff --git a/packages/flutter/lib/src/material/data_table.dart b/packages/flutter/lib/src/material/data_table.dart
index 00a4cdcfa01..0fa9ebac9eb 100644
--- a/packages/flutter/lib/src/material/data_table.dart
+++ b/packages/flutter/lib/src/material/data_table.dart
@@ -362,7 +362,7 @@ class DataTable extends StatelessWidget {
     Color color,
     bool checked,
     VoidCallback onRowTap,
-    ValueChanged<bool> onCheckboxChanged
+    ValueChanged<bool> onCheckboxChanged,
   }) {
     Widget contents = Semantics(
       container: true,
@@ -481,8 +481,8 @@ class DataTable extends StatelessWidget {
             color: isLightTheme ? Colors.black54 : Colors.white70,
           ),
           child: DropdownButtonHideUnderline(child: label),
-        )
-      )
+        ),
+      ),
     );
     if (onTap != null) {
       label = InkWell(
@@ -523,7 +523,7 @@ class DataTable extends StatelessWidget {
           key: index == 0 ? _headingRowKey : rows[index - 1].key,
           decoration: index > 0 && rows[index - 1].selected ? _kSelectedDecoration
                                                             : _kUnselectedDecoration,
-          children: List<Widget>(tableColumns.length)
+          children: List<Widget>(tableColumns.length),
         );
       },
     );
@@ -705,7 +705,7 @@ class _SortArrowState extends State<_SortArrow> with TickerProviderStateMixin {
         duration: widget.duration,
         vsync: this,
       ),
-      curve: Curves.fastOutSlowIn
+      curve: Curves.fastOutSlowIn,
     )
     ..addListener(_rebuild);
     _opacityController.value = widget.visible ? 1.0 : 0.0;
diff --git a/packages/flutter/lib/src/material/date_picker.dart b/packages/flutter/lib/src/material/date_picker.dart
index 8ba509d5ebb..d038f8e5891 100644
--- a/packages/flutter/lib/src/material/date_picker.dart
+++ b/packages/flutter/lib/src/material/date_picker.dart
@@ -431,7 +431,7 @@ class DayPicker extends StatelessWidget {
           itemStyle = themeData.accentTextTheme.body2;
           decoration = BoxDecoration(
             color: themeData.accentColor,
-            shape: BoxShape.circle
+            shape: BoxShape.circle,
           );
         } else if (disabled) {
           itemStyle = themeData.textTheme.body1.copyWith(color: themeData.disabledColor);
@@ -573,7 +573,7 @@ class _MonthPickerState extends State<MonthPicker> with SingleTickerProviderStat
 
     // Setup the fade animation for chevrons
     _chevronOpacityController = AnimationController(
-      duration: const Duration(milliseconds: 250), vsync: this
+      duration: const Duration(milliseconds: 250), vsync: this,
     );
     _chevronOpacityAnimation = _chevronOpacityController.drive(_chevronOpacityTween);
   }
@@ -1072,7 +1072,7 @@ class _DatePickerDialogState extends State<_DatePickerDialog> {
           }
           return null;
         }
-      )
+      ),
     );
 
     return Theme(
diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart
index 01c1cadb701..642d0f0918e 100644
--- a/packages/flutter/lib/src/material/dialog.dart
+++ b/packages/flutter/lib/src/material/dialog.dart
@@ -361,7 +361,7 @@ class AlertDialog extends StatelessWidget {
       dialogChild = Semantics(
         namesRoute: true,
         label: label,
-        child: dialogChild
+        child: dialogChild,
       );
 
     return Dialog(
@@ -430,7 +430,7 @@ class SimpleDialogOption extends StatelessWidget {
       onTap: onPressed,
       child: Padding(
         padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24.0),
-        child: child
+        child: child,
       ),
     );
   }
@@ -595,7 +595,7 @@ class SimpleDialog extends StatelessWidget {
         child: DefaultTextStyle(
           style: Theme.of(context).textTheme.title,
           child: Semantics(namesRoute: true, child: title),
-        )
+        ),
       ));
     } else {
       switch (defaultTargetPlatform) {
@@ -613,7 +613,7 @@ class SimpleDialog extends StatelessWidget {
         child: SingleChildScrollView(
           padding: contentPadding,
           child: ListBody(children: children),
-        )
+        ),
       ));
     }
 
diff --git a/packages/flutter/lib/src/material/dialog_theme.dart b/packages/flutter/lib/src/material/dialog_theme.dart
index 3f2431128e9..3fd0b79ef33 100644
--- a/packages/flutter/lib/src/material/dialog_theme.dart
+++ b/packages/flutter/lib/src/material/dialog_theme.dart
@@ -96,7 +96,7 @@ class DialogTheme extends Diagnosticable {
       elevation: lerpDouble(a?.elevation, b?.elevation, t),
       shape: ShapeBorder.lerp(a?.shape, b?.shape, t),
       titleTextStyle: TextStyle.lerp(a?.titleTextStyle, b?.titleTextStyle, t),
-      contentTextStyle: TextStyle.lerp(a?.contentTextStyle, b?.contentTextStyle, t)
+      contentTextStyle: TextStyle.lerp(a?.contentTextStyle, b?.contentTextStyle, t),
     );
   }
 
diff --git a/packages/flutter/lib/src/material/divider.dart b/packages/flutter/lib/src/material/divider.dart
index ba57fcdb2be..74ac02a8418 100644
--- a/packages/flutter/lib/src/material/divider.dart
+++ b/packages/flutter/lib/src/material/divider.dart
@@ -36,7 +36,7 @@ class Divider extends StatelessWidget {
     Key key,
     this.height = 16.0,
     this.indent = 0.0,
-    this.color
+    this.color,
   }) : assert(height >= 0.0),
        super(key: key);
 
@@ -145,7 +145,7 @@ class VerticalDivider extends StatelessWidget {
     Key key,
     this.width = 16.0,
     this.indent = 0.0,
-    this.color
+    this.color,
   }) : assert(width >= 0.0),
        super(key: key);
 
diff --git a/packages/flutter/lib/src/material/dropdown.dart b/packages/flutter/lib/src/material/dropdown.dart
index f1c4f155623..5da068a138d 100644
--- a/packages/flutter/lib/src/material/dropdown.dart
+++ b/packages/flutter/lib/src/material/dropdown.dart
@@ -40,7 +40,7 @@ class _DropdownMenuPainter extends CustomPainter {
          // of onChanged callback here.
          color: color,
          borderRadius: BorderRadius.circular(2.0),
-         boxShadow: kElevationToShadow[elevation]
+         boxShadow: kElevationToShadow[elevation],
        ).createBoxPainter(),
        super(repaint: resize);
 
@@ -871,7 +871,7 @@ class _DropdownButtonState<T> extends State<DropdownButton<T>> with WidgetsBindi
       child: GestureDetector(
         onTap: _enabled ? _handleTap : null,
         behavior: HitTestBehavior.opaque,
-        child: result
+        child: result,
       ),
     );
   }
diff --git a/packages/flutter/lib/src/material/expand_icon.dart b/packages/flutter/lib/src/material/expand_icon.dart
index ec884ac8e19..7eac3fe8d80 100644
--- a/packages/flutter/lib/src/material/expand_icon.dart
+++ b/packages/flutter/lib/src/material/expand_icon.dart
@@ -30,7 +30,7 @@ class ExpandIcon extends StatefulWidget {
     this.isExpanded = false,
     this.size = 24.0,
     @required this.onPressed,
-    this.padding = const EdgeInsets.all(8.0)
+    this.padding = const EdgeInsets.all(8.0),
   }) : assert(isExpanded != null),
        assert(size != null),
        assert(padding != null),
@@ -120,7 +120,7 @@ class _ExpandIconState extends State<ExpandIcon> with SingleTickerProviderStateM
         onPressed: widget.onPressed == null ? null : _handlePressed,
         icon: RotationTransition(
           turns: _iconTurns,
-          child: const Icon(Icons.expand_more)
+          child: const Icon(Icons.expand_more),
         ),
       ),
     );
diff --git a/packages/flutter/lib/src/material/expansion_panel.dart b/packages/flutter/lib/src/material/expansion_panel.dart
index a81753619b6..e3cd7d837c9 100644
--- a/packages/flutter/lib/src/material/expansion_panel.dart
+++ b/packages/flutter/lib/src/material/expansion_panel.dart
@@ -67,7 +67,7 @@ class ExpansionPanel {
   ExpansionPanel({
     @required this.headerBuilder,
     @required this.body,
-    this.isExpanded = false
+    this.isExpanded = false,
   }) : assert(headerBuilder != null),
        assert(body != null),
        assert(isExpanded != null);
diff --git a/packages/flutter/lib/src/material/expansion_tile.dart b/packages/flutter/lib/src/material/expansion_tile.dart
index 5e9778f0435..4eaed6ae43c 100644
--- a/packages/flutter/lib/src/material/expansion_tile.dart
+++ b/packages/flutter/lib/src/material/expansion_tile.dart
@@ -149,7 +149,7 @@ class _ExpansionTileState extends State<ExpansionTile> with SingleTickerProvider
         border: Border(
           top: BorderSide(color: borderSideColor),
           bottom: BorderSide(color: borderSideColor),
-        )
+        ),
       ),
       child: Column(
         mainAxisSize: MainAxisSize.min,
diff --git a/packages/flutter/lib/src/material/flexible_space_bar.dart b/packages/flutter/lib/src/material/flexible_space_bar.dart
index 7476f88992d..cbef1093764 100644
--- a/packages/flutter/lib/src/material/flexible_space_bar.dart
+++ b/packages/flutter/lib/src/material/flexible_space_bar.dart
@@ -48,7 +48,7 @@ class FlexibleSpaceBar extends StatefulWidget {
     this.background,
     this.centerTitle,
     this.titlePadding,
-    this.collapseMode = CollapseMode.parallax
+    this.collapseMode = CollapseMode.parallax,
   }) : assert(collapseMode != null),
        super(key: key);
 
@@ -192,8 +192,8 @@ class _FlexibleSpaceBarState extends State<FlexibleSpaceBar> {
           height: settings.maxExtent,
           child: Opacity(
             opacity: opacity,
-            child: widget.background
-          )
+            child: widget.background,
+          ),
         ));
       }
     }
@@ -223,7 +223,7 @@ class _FlexibleSpaceBarState extends State<FlexibleSpaceBar> {
         final EdgeInsetsGeometry padding = widget.titlePadding ??
           EdgeInsetsDirectional.only(
             start: effectiveCenterTitle ? 0.0 : 72.0,
-            bottom: 16.0
+            bottom: 16.0,
           );
         final double scaleValue = Tween<double>(begin: 1.5, end: 1.0).transform(t);
         final Matrix4 scaleTransform = Matrix4.identity()
@@ -239,9 +239,9 @@ class _FlexibleSpaceBarState extends State<FlexibleSpaceBar> {
               child: DefaultTextStyle(
                 style: titleStyle,
                 child: title,
-              )
-            )
-          )
+              ),
+            ),
+          ),
         ));
       }
     }
diff --git a/packages/flutter/lib/src/material/grid_tile_bar.dart b/packages/flutter/lib/src/material/grid_tile_bar.dart
index 2500b118320..1df0ae889e3 100644
--- a/packages/flutter/lib/src/material/grid_tile_bar.dart
+++ b/packages/flutter/lib/src/material/grid_tile_bar.dart
@@ -28,7 +28,7 @@ class GridTileBar extends StatelessWidget {
     this.leading,
     this.title,
     this.subtitle,
-    this.trailing
+    this.trailing,
   }) : super(key: key);
 
   /// The color to paint behind the child widgets.
@@ -75,7 +75,7 @@ class GridTileBar extends StatelessWidget {
     final ThemeData darkTheme = ThemeData(
       brightness: Brightness.dark,
       accentColor: theme.accentColor,
-      accentColorBrightness: theme.accentColorBrightness
+      accentColorBrightness: theme.accentColorBrightness,
     );
     if (title != null && subtitle != null) {
       children.add(
@@ -88,16 +88,16 @@ class GridTileBar extends StatelessWidget {
                 style: darkTheme.textTheme.subhead,
                 softWrap: false,
                 overflow: TextOverflow.ellipsis,
-                child: title
+                child: title,
               ),
               DefaultTextStyle(
                 style: darkTheme.textTheme.caption,
                 softWrap: false,
                 overflow: TextOverflow.ellipsis,
-                child: subtitle
-              )
-            ]
-          )
+                child: subtitle,
+              ),
+            ],
+          ),
         )
       );
     } else if (title != null || subtitle != null) {
@@ -107,8 +107,8 @@ class GridTileBar extends StatelessWidget {
             style: darkTheme.textTheme.subhead,
             softWrap: false,
             overflow: TextOverflow.ellipsis,
-            child: title ?? subtitle
-          )
+            child: title ?? subtitle,
+          ),
         )
       );
     }
@@ -126,10 +126,10 @@ class GridTileBar extends StatelessWidget {
           data: const IconThemeData(color: Colors.white),
           child: Row(
             crossAxisAlignment: CrossAxisAlignment.center,
-            children: children
-          )
-        )
-      )
+            children: children,
+          ),
+        ),
+      ),
     );
   }
 }
diff --git a/packages/flutter/lib/src/material/icon_button.dart b/packages/flutter/lib/src/material/icon_button.dart
index 3c1dd4dbc8a..23b26f2ccc1 100644
--- a/packages/flutter/lib/src/material/icon_button.dart
+++ b/packages/flutter/lib/src/material/icon_button.dart
@@ -146,7 +146,7 @@ class IconButton extends StatelessWidget {
     this.splashColor,
     this.disabledColor,
     @required this.onPressed,
-    this.tooltip
+    this.tooltip,
   }) : assert(iconSize != null),
        assert(padding != null),
        assert(alignment != null),
@@ -272,9 +272,9 @@ class IconButton extends StatelessWidget {
               child: IconTheme.merge(
                 data: IconThemeData(
                   size: iconSize,
-                  color: currentColor
+                  color: currentColor,
                 ),
-                child: icon
+                child: icon,
               ),
             ),
           ),
@@ -285,7 +285,7 @@ class IconButton extends StatelessWidget {
     if (tooltip != null) {
       result = Tooltip(
         message: tooltip,
-        child: result
+        child: result,
       );
     }
     return InkResponse(
diff --git a/packages/flutter/lib/src/material/input_decorator.dart b/packages/flutter/lib/src/material/input_decorator.dart
index a8eedd4019e..580d4568d7f 100644
--- a/packages/flutter/lib/src/material/input_decorator.dart
+++ b/packages/flutter/lib/src/material/input_decorator.dart
@@ -1408,7 +1408,7 @@ class _AffixText extends StatelessWidget {
     this.labelIsFloating,
     this.text,
     this.style,
-    this.child
+    this.child,
   });
 
   final bool labelIsFloating;
diff --git a/packages/flutter/lib/src/material/list_tile.dart b/packages/flutter/lib/src/material/list_tile.dart
index bce2c08848c..94ce0ae7170 100644
--- a/packages/flutter/lib/src/material/list_tile.dart
+++ b/packages/flutter/lib/src/material/list_tile.dart
@@ -444,7 +444,7 @@ class ListTile extends StatelessWidget {
     final Widget titleText = AnimatedDefaultTextStyle(
       style: titleStyle,
       duration: kThemeChangeDuration,
-      child: title ?? const SizedBox()
+      child: title ?? const SizedBox(),
     );
 
     Widget subtitleText;
@@ -883,7 +883,7 @@ class _RenderListTile extends RenderBox {
   double computeMinIntrinsicHeight(double width) {
     return math.max(
       _defaultTileHeight,
-      title.getMinIntrinsicHeight(width) + (subtitle?.getMinIntrinsicHeight(width) ?? 0.0)
+      title.getMinIntrinsicHeight(width) + (subtitle?.getMinIntrinsicHeight(width) ?? 0.0),
     );
   }
 
diff --git a/packages/flutter/lib/src/material/material.dart b/packages/flutter/lib/src/material/material.dart
index 00c1ed83056..a5c7f2740be 100644
--- a/packages/flutter/lib/src/material/material.dart
+++ b/packages/flutter/lib/src/material/material.dart
@@ -326,7 +326,7 @@ class _MaterialState extends State<Material> with TickerProviderStateMixin {
       contents = AnimatedDefaultTextStyle(
         style: widget.textStyle ?? Theme.of(context).textTheme.body1,
         duration: widget.animationDuration,
-        child: contents
+        child: contents,
       );
     }
     contents = NotificationListener<LayoutChangedNotification>(
@@ -340,7 +340,7 @@ class _MaterialState extends State<Material> with TickerProviderStateMixin {
         color: backgroundColor,
         child: contents,
         vsync: this,
-      )
+      ),
     );
 
     // PhysicalModel has a temporary workaround for a performance issue that
@@ -713,7 +713,7 @@ class _MaterialInteriorState extends AnimatedWidgetBaseState<_MaterialInterior>
       ),
       clipper: ShapeBorderClipper(
         shape: shape,
-        textDirection: Directionality.of(context)
+        textDirection: Directionality.of(context),
       ),
       clipBehavior: widget.clipBehavior,
       elevation: _elevation.evaluate(animation),
diff --git a/packages/flutter/lib/src/material/mergeable_material.dart b/packages/flutter/lib/src/material/mergeable_material.dart
index 757b6d31ccc..9bab283a51d 100644
--- a/packages/flutter/lib/src/material/mergeable_material.dart
+++ b/packages/flutter/lib/src/material/mergeable_material.dart
@@ -62,7 +62,7 @@ class MaterialGap extends MergeableMaterialItem {
   /// Creates a Material gap with a given size.
   const MaterialGap({
     @required LocalKey key,
-    this.size = 16.0
+    this.size = 16.0,
   }) : assert(key != null),
        super(key);
 
@@ -104,7 +104,7 @@ class MergeableMaterial extends StatefulWidget {
     this.mainAxis = Axis.vertical,
     this.elevation = 2,
     this.hasDividers = false,
-    this.children = const <MergeableMaterialItem>[]
+    this.children = const <MergeableMaterialItem>[],
   }) : super(key: key);
 
   /// The children of the [MergeableMaterial].
@@ -140,7 +140,7 @@ class _AnimationTuple {
     this.startAnimation,
     this.endAnimation,
     this.gapAnimation,
-    this.gapStart = 0.0
+    this.gapStart = 0.0,
   });
 
   final AnimationController controller;
@@ -177,15 +177,15 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
 
     final CurvedAnimation startAnimation = CurvedAnimation(
       parent: controller,
-      curve: Curves.fastOutSlowIn
+      curve: Curves.fastOutSlowIn,
     );
     final CurvedAnimation endAnimation = CurvedAnimation(
       parent: controller,
-      curve: Curves.fastOutSlowIn
+      curve: Curves.fastOutSlowIn,
     );
     final CurvedAnimation gapAnimation = CurvedAnimation(
       parent: controller,
-      curve: Curves.fastOutSlowIn
+      curve: Curves.fastOutSlowIn,
     );
 
     controller.addListener(_handleTick);
@@ -194,7 +194,7 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
       controller: controller,
       startAnimation: startAnimation,
       endAnimation: endAnimation,
-      gapAnimation: gapAnimation
+      gapAnimation: gapAnimation,
     );
   }
 
@@ -413,7 +413,7 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
             if (gapSizeSum != 0.0) {
               final MaterialGap gap = MaterialGap(
                 key: UniqueKey(),
-                size: gapSizeSum
+                size: gapSizeSum,
               );
               _insertChild(startOld, gap);
               _animationTuples[gap.key].gapStart = 0.0;
@@ -470,26 +470,26 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
       startRadius = Radius.lerp(
         Radius.zero,
         cardRadius,
-        _animationTuples[_children[index - 1].key].startAnimation.value
+        _animationTuples[_children[index - 1].key].startAnimation.value,
       );
     }
     if (index < _children.length - 2 && _children[index + 1] is MaterialGap) {
       endRadius = Radius.lerp(
         Radius.zero,
         cardRadius,
-        _animationTuples[_children[index + 1].key].endAnimation.value
+        _animationTuples[_children[index + 1].key].endAnimation.value,
       );
     }
 
     if (widget.mainAxis == Axis.vertical) {
       return BorderRadius.vertical(
         top: start ? cardRadius : startRadius,
-        bottom: end ? cardRadius : endRadius
+        bottom: end ? cardRadius : endRadius,
       );
     } else {
       return BorderRadius.horizontal(
         left: start ? cardRadius : startRadius,
-        right: end ? cardRadius : endRadius
+        right: end ? cardRadius : endRadius,
       );
     }
   }
@@ -500,7 +500,7 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
     return lerpDouble(
       _animationTuples[gap.key].gapStart,
       gap.size,
-      _animationTuples[gap.key].gapAnimation.value
+      _animationTuples[gap.key].gapAnimation.value,
     );
   }
 
@@ -528,12 +528,12 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
             decoration: BoxDecoration(
               color: Theme.of(context).cardColor,
               borderRadius: _borderRadius(i - 1, widgets.isEmpty, false),
-              shape: BoxShape.rectangle
+              shape: BoxShape.rectangle,
             ),
             child: ListBody(
               mainAxis: widget.mainAxis,
-              children: slices
-            )
+              children: slices,
+            ),
           )
         );
         slices = <Widget>[];
@@ -541,7 +541,7 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
         widgets.add(
           SizedBox(
             width: widget.mainAxis == Axis.horizontal ? _getGapSize(i) : null,
-            height: widget.mainAxis == Axis.vertical ? _getGapSize(i) : null
+            height: widget.mainAxis == Axis.vertical ? _getGapSize(i) : null,
           )
         );
       } else {
@@ -569,7 +569,7 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
           } else {
             border = Border(
               top: hasTopDivider ? divider : BorderSide.none,
-              bottom: hasBottomDivider ? divider : BorderSide.none
+              bottom: hasBottomDivider ? divider : BorderSide.none,
             );
           }
 
@@ -580,14 +580,14 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
             decoration: BoxDecoration(border: border),
             duration: kThemeAnimationDuration,
             curve: Curves.fastOutSlowIn,
-            child: child
+            child: child,
           );
         }
 
         slices.add(
           Material(
             type: MaterialType.transparency,
-            child: child
+            child: child,
           )
         );
       }
@@ -599,12 +599,12 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
           decoration: BoxDecoration(
             color: Theme.of(context).cardColor,
             borderRadius: _borderRadius(i - 1, widgets.isEmpty, true),
-            shape: BoxShape.rectangle
+            shape: BoxShape.rectangle,
           ),
           child: ListBody(
             mainAxis: widget.mainAxis,
-            children: slices
-          )
+            children: slices,
+          ),
         )
       );
       slices = <Widget>[];
@@ -614,7 +614,7 @@ class _MergeableMaterialState extends State<MergeableMaterial> with TickerProvid
       mainAxis: widget.mainAxis,
       boxShadows: kElevationToShadow[widget.elevation],
       items: _children,
-      children: widgets
+      children: widgets,
     );
   }
 }
@@ -648,7 +648,7 @@ class _MergeableMaterialListBody extends ListBody {
     List<Widget> children,
     Axis mainAxis = Axis.vertical,
     this.items,
-    this.boxShadows
+    this.boxShadows,
   }) : super(children: children, mainAxis: mainAxis);
 
   final List<MergeableMaterialItem> items;
@@ -679,7 +679,7 @@ class _RenderMergeableMaterialListBody extends RenderListBody {
   _RenderMergeableMaterialListBody({
     List<RenderBox> children,
     AxisDirection axisDirection = AxisDirection.down,
-    this.boxShadows
+    this.boxShadows,
   }) : super(children: children, axisDirection: axisDirection);
 
   List<BoxShadow> boxShadows;
diff --git a/packages/flutter/lib/src/material/outline_button.dart b/packages/flutter/lib/src/material/outline_button.dart
index 8437954f088..e8450224c26 100644
--- a/packages/flutter/lib/src/material/outline_button.dart
+++ b/packages/flutter/lib/src/material/outline_button.dart
@@ -303,7 +303,7 @@ class _OutlineButtonState extends State<_OutlineButton> with SingleTickerProvide
 
     _controller = AnimationController(
       duration: _kPressDuration,
-      vsync: this
+      vsync: this,
     );
     _fillAnimation = CurvedAnimation(
       parent: _controller,
diff --git a/packages/flutter/lib/src/material/page_transitions_theme.dart b/packages/flutter/lib/src/material/page_transitions_theme.dart
index a99634415fc..3f4ee280673 100644
--- a/packages/flutter/lib/src/material/page_transitions_theme.dart
+++ b/packages/flutter/lib/src/material/page_transitions_theme.dart
@@ -348,7 +348,7 @@ class PageTransitionsTheme extends Diagnosticable {
       DiagnosticsProperty<Map<TargetPlatform, PageTransitionsBuilder>>(
         'builders',
         builders,
-        defaultValue: PageTransitionsTheme._defaultBuilders
+        defaultValue: PageTransitionsTheme._defaultBuilders,
       ),
     );
   }
diff --git a/packages/flutter/lib/src/material/paginated_data_table.dart b/packages/flutter/lib/src/material/paginated_data_table.dart
index 162e8db5019..46fa1348f1c 100644
--- a/packages/flutter/lib/src/material/paginated_data_table.dart
+++ b/packages/flutter/lib/src/material/paginated_data_table.dart
@@ -76,7 +76,7 @@ class PaginatedDataTable extends StatefulWidget {
     this.availableRowsPerPage = const <int>[defaultRowsPerPage, defaultRowsPerPage * 2, defaultRowsPerPage * 5, defaultRowsPerPage * 10],
     this.onRowsPerPageChanged,
     this.dragStartBehavior = DragStartBehavior.start,
-    @required this.source
+    @required this.source,
   }) : assert(header != null),
        assert(columns != null),
        assert(dragStartBehavior != null),
@@ -238,7 +238,7 @@ class PaginatedDataTableState extends State<PaginatedDataTable> {
   DataRow _getBlankRowFor(int index) {
     return DataRow.byIndex(
       index: index,
-      cells: widget.columns.map<DataCell>((DataColumn column) => DataCell.empty).toList()
+      cells: widget.columns.map<DataCell>((DataColumn column) => DataCell.empty).toList(),
     );
   }
 
@@ -257,7 +257,7 @@ class PaginatedDataTableState extends State<PaginatedDataTable> {
     }
     return DataRow.byIndex(
       index: index,
-      cells: cells
+      cells: cells,
     );
   }
 
@@ -336,7 +336,7 @@ class PaginatedDataTableState extends State<PaginatedDataTable> {
         .map<DropdownMenuItem<int>>((int value) {
           return DropdownMenuItem<int>(
             value: value,
-            child: Text('$value')
+            child: Text('$value'),
           );
         })
         .toList();
@@ -367,7 +367,7 @@ class PaginatedDataTableState extends State<PaginatedDataTable> {
           _firstRowIndex + 1,
           _firstRowIndex + widget.rowsPerPage,
           _rowCount,
-          _rowCountApproximate
+          _rowCountApproximate,
         )
       ),
       Container(width: 32.0),
@@ -375,14 +375,14 @@ class PaginatedDataTableState extends State<PaginatedDataTable> {
         icon: const Icon(Icons.chevron_left),
         padding: EdgeInsets.zero,
         tooltip: localizations.previousPageTooltip,
-        onPressed: _firstRowIndex <= 0 ? null : _handlePrevious
+        onPressed: _firstRowIndex <= 0 ? null : _handlePrevious,
       ),
       Container(width: 24.0),
       IconButton(
         icon: const Icon(Icons.chevron_right),
         padding: EdgeInsets.zero,
         tooltip: localizations.nextPageTooltip,
-        onPressed: (!_rowCountApproximate && (_firstRowIndex + widget.rowsPerPage >= _rowCount)) ? null : _handleNext
+        onPressed: (!_rowCountApproximate && (_firstRowIndex + widget.rowsPerPage >= _rowCount)) ? null : _handleNext,
       ),
       Container(width: 14.0),
     ]);
@@ -413,7 +413,7 @@ class PaginatedDataTableState extends State<PaginatedDataTable> {
                       padding: EdgeInsetsDirectional.only(start: startPadding, end: 14.0),
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.end,
-                        children: headerWidgets
+                        children: headerWidgets,
                       ),
                     ),
                   ),
@@ -430,8 +430,8 @@ class PaginatedDataTableState extends State<PaginatedDataTable> {
               sortColumnIndex: widget.sortColumnIndex,
               sortAscending: widget.sortAscending,
               onSelectAll: widget.onSelectAll,
-              rows: _getRows(_firstRowIndex, widget.rowsPerPage)
-            )
+              rows: _getRows(_firstRowIndex, widget.rowsPerPage),
+            ),
           ),
           DefaultTextStyle(
             style: footerTextStyle,
diff --git a/packages/flutter/lib/src/material/popup_menu.dart b/packages/flutter/lib/src/material/popup_menu.dart
index a9eca72b88a..b1b47fc950c 100644
--- a/packages/flutter/lib/src/material/popup_menu.dart
+++ b/packages/flutter/lib/src/material/popup_menu.dart
@@ -256,7 +256,7 @@ class PopupMenuItemState<T, W extends PopupMenuItem<T>> extends State<W> {
         baseline: widget.height - _kBaselineOffsetFromBottom,
         baselineType: style.textBaseline,
         child: buildChild(),
-      )
+      ),
     );
     if (!widget.enabled) {
       final bool isDark = theme.brightness == Brightness.dark;
@@ -412,7 +412,7 @@ class _CheckedPopupMenuItemState<T> extends PopupMenuItemState<T, CheckedPopupMe
       enabled: widget.enabled,
       leading: FadeTransition(
         opacity: _opacity,
-        child: Icon(_controller.isDismissed ? null : Icons.done)
+        child: Icon(_controller.isDismissed ? null : Icons.done),
       ),
       title: widget.child,
     );
@@ -439,7 +439,7 @@ class _PopupMenu<T> extends StatelessWidget {
       final double end = (start + 1.5 * unit).clamp(0.0, 1.0);
       final CurvedAnimation opacity = CurvedAnimation(
         parent: route.animation,
-        curve: Interval(start, end)
+        curve: Interval(start, end),
       );
       Widget item = route.items[i];
       if (route.initialValue != null && route.items[i].represents(route.initialValue)) {
@@ -605,7 +605,7 @@ class _PopupMenuRoute<T> extends PopupRoute<T> {
     return CurvedAnimation(
       parent: super.createAnimation(),
       curve: Curves.linear,
-      reverseCurve: const Interval(0.0, _kMenuCloseIntervalEnd)
+      reverseCurve: const Interval(0.0, _kMenuCloseIntervalEnd),
     );
   }
 
diff --git a/packages/flutter/lib/src/material/refresh_indicator.dart b/packages/flutter/lib/src/material/refresh_indicator.dart
index 98ddb651075..b2b95ada37f 100644
--- a/packages/flutter/lib/src/material/refresh_indicator.dart
+++ b/packages/flutter/lib/src/material/refresh_indicator.dart
@@ -189,7 +189,7 @@ class RefreshIndicatorState extends State<RefreshIndicator> with TickerProviderS
     _valueColor = _positionController.drive(
       ColorTween(
         begin: (widget.color ?? theme.accentColor).withOpacity(0.0),
-        end: (widget.color ?? theme.accentColor).withOpacity(1.0)
+        end: (widget.color ?? theme.accentColor).withOpacity(1.0),
       ).chain(CurveTween(
         curve: const Interval(0.0, 1.0 / _kDragSizeFactorLimit)
       )),
diff --git a/packages/flutter/lib/src/material/reorderable_list.dart b/packages/flutter/lib/src/material/reorderable_list.dart
index 3890f4f599e..7127695858f 100644
--- a/packages/flutter/lib/src/material/reorderable_list.dart
+++ b/packages/flutter/lib/src/material/reorderable_list.dart
@@ -492,7 +492,7 @@ class _ReorderableListContentState extends State<_ReorderableListContent> with T
           SizeTransition(
             sizeFactor: _entranceController,
             axis: widget.scrollDirection,
-            child: spacing
+            child: spacing,
           ),
           child,
         ]);
diff --git a/packages/flutter/lib/src/material/scaffold.dart b/packages/flutter/lib/src/material/scaffold.dart
index fe134eaccc9..3c5b4a8154d 100644
--- a/packages/flutter/lib/src/material/scaffold.dart
+++ b/packages/flutter/lib/src/material/scaffold.dart
@@ -220,7 +220,7 @@ class ScaffoldGeometry {
     final Rect scaledButton = Rect.lerp(
       floatingActionButtonArea.center & Size.zero,
       floatingActionButtonArea,
-      scaleFactor
+      scaleFactor,
     );
     return copyWith(floatingActionButtonArea: scaledButton);
   }
@@ -1368,7 +1368,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin {
         assert(_snackBars.first == controller);
         hideCurrentSnackBar(reason: SnackBarClosedReason.hide);
       },
-      null // SnackBar doesn't use a builder function so setState() wouldn't rebuild it
+      null, // SnackBar doesn't use a builder function so setState() wouldn't rebuild it
     );
     setState(() {
       _snackBars.addLast(controller);
@@ -1503,7 +1503,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin {
           });
         }
       },
-      builder: builder
+      builder: builder,
     );
 
     if (isLocalHistoryEntry)
@@ -1855,7 +1855,7 @@ class ScaffoldState extends State<Scaffold> with TickerProviderStateMixin {
               child: SafeArea(
                 top: false,
                 child: ButtonBar(
-                  children: widget.persistentFooterButtons
+                  children: widget.persistentFooterButtons,
                 ),
               ),
             ),
@@ -2008,7 +2008,7 @@ class _PersistentBottomSheet extends StatefulWidget {
     this.enableDrag = true,
     this.onClosing,
     this.onDismissed,
-    this.builder
+    this.builder,
   }) : super(key: key);
 
   final AnimationController animationController; // we control it, but it must be disposed by whoever created it
@@ -2053,7 +2053,7 @@ class _PersistentBottomSheetState extends State<_PersistentBottomSheet> {
         return Align(
           alignment: AlignmentDirectional.topStart,
           heightFactor: widget.animationController.value,
-          child: child
+          child: child,
         );
       },
       child: Semantics(
@@ -2066,9 +2066,9 @@ class _PersistentBottomSheetState extends State<_PersistentBottomSheet> {
           animationController: widget.animationController,
           enableDrag: widget.enableDrag,
           onClosing: widget.onClosing,
-          builder: widget.builder
-        )
-      )
+          builder: widget.builder,
+        ),
+      ),
     );
   }
 
diff --git a/packages/flutter/lib/src/material/scrollbar.dart b/packages/flutter/lib/src/material/scrollbar.dart
index 7b03fb8c461..d91048b6e6d 100644
--- a/packages/flutter/lib/src/material/scrollbar.dart
+++ b/packages/flutter/lib/src/material/scrollbar.dart
@@ -70,7 +70,7 @@ class _ScrollbarState extends State<Scrollbar> with TickerProviderStateMixin {
     );
     _fadeoutOpacityAnimation = CurvedAnimation(
       parent: _fadeoutAnimationController,
-      curve: Curves.fastOutSlowIn
+      curve: Curves.fastOutSlowIn,
     );
   }
 
diff --git a/packages/flutter/lib/src/material/slider.dart b/packages/flutter/lib/src/material/slider.dart
index 50f12cc91b7..19263a6bfe6 100644
--- a/packages/flutter/lib/src/material/slider.dart
+++ b/packages/flutter/lib/src/material/slider.dart
@@ -967,7 +967,7 @@ class _RenderSlider extends RenderBox {
       parentBox: this,
       offset: offset,
       sliderTheme: _sliderTheme,
-      isDiscrete: isDiscrete
+      isDiscrete: isDiscrete,
     );
     final Offset thumbCenter = Offset(trackRect.left + visualPosition * trackRect.width, trackRect.center.dy);
 
@@ -980,7 +980,7 @@ class _RenderSlider extends RenderBox {
       textDirection: _textDirection,
       thumbCenter: thumbCenter,
       isDiscrete: isDiscrete,
-      isEnabled: isInteractive
+      isEnabled: isInteractive,
     );
 
     // TODO(closkmith): Move this to paint after the thumb.
diff --git a/packages/flutter/lib/src/material/slider_theme.dart b/packages/flutter/lib/src/material/slider_theme.dart
index c4e0b07793f..4a731cdc334 100644
--- a/packages/flutter/lib/src/material/slider_theme.dart
+++ b/packages/flutter/lib/src/material/slider_theme.dart
@@ -1040,7 +1040,7 @@ class RectangularSliderTrackShape extends SliderTrackShape {
         offset: offset,
         sliderTheme: sliderTheme,
         isEnabled: isEnabled,
-        isDiscrete: isDiscrete
+        isDiscrete: isDiscrete,
     );
     final Rect leftTrackSegment = Rect.fromLTRB(trackRect.left, trackRect.top, thumbCenter.dx - horizontalAdjustment, trackRect.bottom);
     context.canvas.drawRect(leftTrackSegment, leftTrackPaint);
@@ -1136,7 +1136,7 @@ class RoundSliderThumbShape extends SliderComponentShape {
   // TODO(clocksmith): This needs to be changed to 10 according to spec.
   const RoundSliderThumbShape({
     this.enabledThumbRadius = 6.0,
-    this.disabledThumbRadius
+    this.disabledThumbRadius,
   });
 
   /// The preferred radius of the round thumb shape when the slider is enabled.
diff --git a/packages/flutter/lib/src/material/stepper.dart b/packages/flutter/lib/src/material/stepper.dart
index 76641866f6b..3764e0bf98c 100644
--- a/packages/flutter/lib/src/material/stepper.dart
+++ b/packages/flutter/lib/src/material/stepper.dart
@@ -505,7 +505,7 @@ class _StepperState extends State<Stepper> with TickerProviderStateMixin {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       mainAxisSize: MainAxisSize.min,
-      children: children
+      children: children,
     );
   }
 
@@ -521,14 +521,14 @@ class _StepperState extends State<Stepper> with TickerProviderStateMixin {
               _buildLine(!_isFirst(index)),
               _buildIcon(index),
               _buildLine(!_isLast(index)),
-            ]
+            ],
           ),
           Container(
             margin: const EdgeInsetsDirectional.only(start: 12.0),
-            child: _buildHeaderText(index)
-          )
-        ]
-      )
+            child: _buildHeaderText(index),
+          ),
+        ],
+      ),
     );
   }
 
@@ -597,10 +597,10 @@ class _StepperState extends State<Stepper> with TickerProviderStateMixin {
                 if (widget.onStepTapped != null)
                   widget.onStepTapped(i);
               } : null,
-              child: _buildVerticalHeader(i)
+              child: _buildVerticalHeader(i),
             ),
-            _buildVerticalBody(i)
-          ]
+            _buildVerticalBody(i),
+          ],
         )
       );
     }
@@ -709,7 +709,7 @@ class _StepperState extends State<Stepper> with TickerProviderStateMixin {
 // top vertex the middle of its top.
 class _TrianglePainter extends CustomPainter {
   _TrianglePainter({
-    this.color
+    this.color,
   });
 
   final Color color;
diff --git a/packages/flutter/lib/src/material/switch.dart b/packages/flutter/lib/src/material/switch.dart
index 65fc7987cda..bad1185f701 100644
--- a/packages/flutter/lib/src/material/switch.dart
+++ b/packages/flutter/lib/src/material/switch.dart
@@ -508,7 +508,7 @@ class _RenderSwitch extends RenderToggleable {
       color: color,
       image: image == null ? null : DecorationImage(image: image),
       shape: BoxShape.circle,
-      boxShadow: kElevationToShadow[1]
+      boxShadow: kElevationToShadow[1],
     );
   }
 
@@ -565,14 +565,14 @@ class _RenderSwitch extends RenderToggleable {
       offset.dx + trackHorizontalPadding,
       offset.dy + (size.height - _kTrackHeight) / 2.0,
       size.width - 2.0 * trackHorizontalPadding,
-      _kTrackHeight
+      _kTrackHeight,
     );
     final RRect trackRRect = RRect.fromRectAndRadius(trackRect, const Radius.circular(_kTrackRadius));
     canvas.drawRRect(trackRRect, paint);
 
     final Offset thumbPosition = Offset(
       kRadialReactionRadius + visualPosition * _trackInnerLength,
-      size.height / 2.0
+      size.height / 2.0,
     );
 
     paintRadialReaction(canvas, offset, thumbPosition);
@@ -593,7 +593,7 @@ class _RenderSwitch extends RenderToggleable {
       thumbPainter.paint(
         canvas,
         thumbPosition + offset - Offset(radius, radius),
-        configuration.copyWith(size: Size.fromRadius(radius))
+        configuration.copyWith(size: Size.fromRadius(radius)),
       );
     } finally {
       _isPainting = false;
diff --git a/packages/flutter/lib/src/material/tab_controller.dart b/packages/flutter/lib/src/material/tab_controller.dart
index 9c40c88c8a5..986cfc363f5 100644
--- a/packages/flutter/lib/src/material/tab_controller.dart
+++ b/packages/flutter/lib/src/material/tab_controller.dart
@@ -86,7 +86,7 @@ class TabController extends ChangeNotifier {
       _animationController = length < 2 ? null : AnimationController(
         value: initialIndex.toDouble(),
         upperBound: (length - 1).toDouble(),
-        vsync: vsync
+        vsync: vsync,
       );
 
   /// An animation whose value represents the current position of the [TabBar]'s
@@ -193,7 +193,7 @@ class _TabControllerScope extends InheritedWidget {
     Key key,
     this.controller,
     this.enabled,
-    Widget child
+    Widget child,
   }) : super(key: key, child: child);
 
   final TabController controller;
diff --git a/packages/flutter/lib/src/material/tabs.dart b/packages/flutter/lib/src/material/tabs.dart
index 5a6ac3f7a90..005a6eab57e 100644
--- a/packages/flutter/lib/src/material/tabs.dart
+++ b/packages/flutter/lib/src/material/tabs.dart
@@ -108,8 +108,8 @@ class Tab extends StatelessWidget {
             child: icon,
             margin: const EdgeInsets.only(bottom: 10.0),
           ),
-          _buildLabelText()
-        ]
+          _buildLabelText(),
+        ],
       );
     }
 
@@ -1005,7 +1005,7 @@ class _TabBarState extends State<TabBar> {
                 selected: index == _currentIndex,
                 label: localizations.tabLabel(tabIndex: index + 1, tabCount: tabCount),
               ),
-            ]
+            ],
           ),
         ),
       );
@@ -1388,7 +1388,7 @@ class TabPageSelector extends StatelessWidget {
             }).toList(),
           ),
         );
-      }
+      },
     );
   }
 }
diff --git a/packages/flutter/lib/src/material/text_field.dart b/packages/flutter/lib/src/material/text_field.dart
index fabe631fa3d..083665b908b 100644
--- a/packages/flutter/lib/src/material/text_field.dart
+++ b/packages/flutter/lib/src/material/text_field.dart
@@ -495,7 +495,7 @@ class _TextFieldState extends State<TextField> with AutomaticKeepAliveClientMixi
       .applyDefaults(themeData.inputDecorationTheme)
       .copyWith(
         enabled: widget.enabled,
-        hintMaxLines: widget.decoration?.hintMaxLines ?? widget.maxLines
+        hintMaxLines: widget.decoration?.hintMaxLines ?? widget.maxLines,
       );
 
     // No need to build anything if counter or counterText were given directly.
diff --git a/packages/flutter/lib/src/material/text_selection.dart b/packages/flutter/lib/src/material/text_selection.dart
index 5f0ee5fda9a..9024b5ae772 100644
--- a/packages/flutter/lib/src/material/text_selection.dart
+++ b/packages/flutter/lib/src/material/text_selection.dart
@@ -51,8 +51,8 @@ class _TextSelectionToolbar extends StatelessWidget {
       elevation: 1.0,
       child: Container(
         height: 44.0,
-        child: Row(mainAxisSize: MainAxisSize.min, children: items)
-      )
+        child: Row(mainAxisSize: MainAxisSize.min, children: items),
+      ),
     );
   }
 }
@@ -147,7 +147,7 @@ class _MaterialTextSelectionControls extends TextSelectionControls {
           handlePaste: canPaste(delegate) ? () => handlePaste(delegate) : null,
           handleSelectAll: canSelectAll(delegate) ? () => handleSelectAll(delegate) : null,
         ),
-      )
+      ),
     );
   }
 
@@ -174,14 +174,14 @@ class _MaterialTextSelectionControls extends TextSelectionControls {
       case TextSelectionHandleType.left: // points up-right
         return Transform(
           transform: Matrix4.rotationZ(math.pi / 2.0),
-          child: handle
+          child: handle,
         );
       case TextSelectionHandleType.right: // points up-left
         return handle;
       case TextSelectionHandleType.collapsed: // points up
         return Transform(
           transform: Matrix4.rotationZ(math.pi / 4.0),
-          child: handle
+          child: handle,
         );
     }
     assert(type != null);
diff --git a/packages/flutter/lib/src/material/theme.dart b/packages/flutter/lib/src/material/theme.dart
index 1170478ea90..cb62caeea4d 100644
--- a/packages/flutter/lib/src/material/theme.dart
+++ b/packages/flutter/lib/src/material/theme.dart
@@ -168,7 +168,7 @@ class _InheritedTheme extends InheritedWidget {
   const _InheritedTheme({
     Key key,
     @required this.theme,
-    @required Widget child
+    @required Widget child,
   }) : assert(theme != null),
        super(key: key, child: child);
 
@@ -256,7 +256,7 @@ class _AnimatedThemeState extends AnimatedWidgetBaseState<AnimatedTheme> {
     return Theme(
       isMaterialAppTheme: widget.isMaterialAppTheme,
       child: widget.child,
-      data: _data.evaluate(animation)
+      data: _data.evaluate(animation),
     );
   }
 
diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart
index 4abb7ed9490..8caa644c043 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -160,7 +160,7 @@ class ThemeData extends Diagnosticable {
     ColorScheme colorScheme,
     DialogTheme dialogTheme,
     Typography typography,
-    CupertinoThemeData cupertinoOverrideTheme
+    CupertinoThemeData cupertinoOverrideTheme,
   }) {
     brightness ??= Brightness.light;
     final bool isDark = brightness == Brightness.dark;
diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart
index 8a2952dd5cc..077d6b3f085 100644
--- a/packages/flutter/lib/src/material/time_picker.dart
+++ b/packages/flutter/lib/src/material/time_picker.dart
@@ -792,7 +792,7 @@ class _TimePickerHeader extends StatelessWidget {
             );
           })
           .toList(),
-      )
+      ),
     );
   }
 }
@@ -895,7 +895,7 @@ class _DialPainter extends CustomPainter {
     canvas.drawLine(centerPoint, focusedPoint, selectorPaint);
 
     final Rect focusedRect = Rect.fromCircle(
-      center: focusedPoint, radius: focusedRadius
+      center: focusedPoint, radius: focusedRadius,
     );
     canvas
       ..save()
@@ -999,7 +999,7 @@ class _Dial extends StatefulWidget {
     @required this.selectedTime,
     @required this.mode,
     @required this.use24HourDials,
-    @required this.onChanged
+    @required this.onChanged,
   }) : assert(selectedTime != null);
 
   final TimeOfDay selectedTime;
@@ -1408,7 +1408,7 @@ class _DialState extends State<_Dial> with SingleTickerProviderStateMixin {
           activeRing: _activeRing,
           textDirection: Directionality.of(context),
         ),
-      )
+      ),
     );
   }
 }
@@ -1425,7 +1425,7 @@ class _TimePickerDialog extends StatefulWidget {
   /// [initialTime] must not be null.
   const _TimePickerDialog({
     Key key,
-    @required this.initialTime
+    @required this.initialTime,
   }) : assert(initialTime != null),
        super(key: key);
 
@@ -1547,8 +1547,8 @@ class _TimePickerDialogState extends State<_TimePickerDialog> {
           use24HourDials: use24HourDials,
           selectedTime: _selectedTime,
           onChanged: _handleTimeChanged,
-        )
-      )
+        ),
+      ),
     );
 
     final Widget actions = ButtonTheme.bar(
@@ -1556,14 +1556,14 @@ class _TimePickerDialogState extends State<_TimePickerDialog> {
         children: <Widget>[
           FlatButton(
             child: Text(localizations.cancelButtonLabel),
-            onPressed: _handleCancel
+            onPressed: _handleCancel,
           ),
           FlatButton(
             child: Text(localizations.okButtonLabel),
-            onPressed: _handleOk
+            onPressed: _handleOk,
           ),
-        ]
-      )
+        ],
+      ),
     );
 
     final Dialog dialog = Dialog(
@@ -1616,8 +1616,8 @@ class _TimePickerDialogState extends State<_TimePickerDialog> {
                     Expanded(
                       child: pickerAndActions,
                     ),
-                  ]
-                )
+                  ],
+                ),
               );
             case Orientation.landscape:
               return SizedBox(
@@ -1631,13 +1631,13 @@ class _TimePickerDialogState extends State<_TimePickerDialog> {
                     Flexible(
                       child: pickerAndActions,
                     ),
-                  ]
-                )
+                  ],
+                ),
               );
           }
           return null;
         }
-      )
+      ),
     );
 
     return Theme(
diff --git a/packages/flutter/lib/src/material/tooltip.dart b/packages/flutter/lib/src/material/tooltip.dart
index 3953586a8b3..8341b24f35a 100644
--- a/packages/flutter/lib/src/material/tooltip.dart
+++ b/packages/flutter/lib/src/material/tooltip.dart
@@ -137,11 +137,11 @@ class _TooltipState extends State<Tooltip> with SingleTickerProviderStateMixin {
       padding: widget.padding,
       animation: CurvedAnimation(
         parent: _controller,
-        curve: Curves.fastOutSlowIn
+        curve: Curves.fastOutSlowIn,
       ),
       target: target,
       verticalOffset: widget.verticalOffset,
-      preferBelow: widget.preferBelow
+      preferBelow: widget.preferBelow,
     );
     _entry = OverlayEntry(builder: (BuildContext context) => overlay);
     Overlay.of(context, debugRequiredFor: widget).insert(_entry);
diff --git a/packages/flutter/lib/src/material/user_accounts_drawer_header.dart b/packages/flutter/lib/src/material/user_accounts_drawer_header.dart
index f9a608b6d80..0efde2baeff 100644
--- a/packages/flutter/lib/src/material/user_accounts_drawer_header.dart
+++ b/packages/flutter/lib/src/material/user_accounts_drawer_header.dart
@@ -44,7 +44,7 @@ class _AccountPictures extends StatelessWidget {
                     height: 48.0,
                     child: picture,
                  ),
-                )
+                ),
               );
             }).toList(),
           ),
@@ -56,7 +56,7 @@ class _AccountPictures extends StatelessWidget {
             child: SizedBox(
               width: 72.0,
               height: 72.0,
-              child: currentAccountPicture
+              child: currentAccountPicture,
             ),
           ),
         ),
@@ -309,7 +309,7 @@ class UserAccountsDrawerHeader extends StatefulWidget {
     this.otherAccountsPictures,
     @required this.accountName,
     @required this.accountEmail,
-    this.onDetailsPressed
+    this.onDetailsPressed,
   }) : super(key: key);
 
   /// The header's background. If decoration is null then a [BoxDecoration]
@@ -379,7 +379,7 @@ class _UserAccountsDrawerHeaderState extends State<UserAccountsDrawerHeader> {
                     currentAccountPicture: widget.currentAccountPicture,
                     otherAccountsPictures: widget.otherAccountsPictures,
                   ),
-                )
+                ),
               ),
               _AccountDetails(
                 accountName: widget.accountName,
diff --git a/packages/flutter/lib/src/painting/borders.dart b/packages/flutter/lib/src/painting/borders.dart
index b944a44dfa6..150d03dd49f 100644
--- a/packages/flutter/lib/src/painting/borders.dart
+++ b/packages/flutter/lib/src/painting/borders.dart
@@ -121,7 +121,7 @@ class BorderSide {
   BorderSide copyWith({
     Color color,
     double width,
-    BorderStyle style
+    BorderStyle style,
   }) {
     assert(width == null || width >= 0.0);
     return BorderSide(
diff --git a/packages/flutter/lib/src/painting/box_shadow.dart b/packages/flutter/lib/src/painting/box_shadow.dart
index f0cb4467288..1b2715bd427 100644
--- a/packages/flutter/lib/src/painting/box_shadow.dart
+++ b/packages/flutter/lib/src/painting/box_shadow.dart
@@ -33,7 +33,7 @@ class BoxShadow extends ui.Shadow {
     Color color = const Color(0xFF000000),
     Offset offset = Offset.zero,
     double blurRadius = 0.0,
-    this.spreadRadius = 0.0
+    this.spreadRadius = 0.0,
   }) : super(color: color, offset: offset, blurRadius: blurRadius);
 
   /// The amount the box should be inflated prior to applying the blur.
@@ -65,7 +65,7 @@ class BoxShadow extends ui.Shadow {
       color: color,
       offset: offset * factor,
       blurRadius: blurRadius * factor,
-      spreadRadius: spreadRadius * factor
+      spreadRadius: spreadRadius * factor,
     );
   }
 
diff --git a/packages/flutter/lib/src/painting/decoration_image.dart b/packages/flutter/lib/src/painting/decoration_image.dart
index 18462ea799f..b3bdc09ffe5 100644
--- a/packages/flutter/lib/src/painting/decoration_image.dart
+++ b/packages/flutter/lib/src/painting/decoration_image.dart
@@ -261,7 +261,7 @@ class DecorationImagePainter {
       centerSlice: _details.centerSlice,
       repeat: _details.repeat,
       flipHorizontally: flipHorizontally,
-      filterQuality: FilterQuality.low
+      filterQuality: FilterQuality.low,
     );
 
     if (clipPath != null)
@@ -373,7 +373,7 @@ void paintImage({
   ImageRepeat repeat = ImageRepeat.noRepeat,
   bool flipHorizontally = false,
   bool invertColors = false,
-  FilterQuality filterQuality = FilterQuality.low
+  FilterQuality filterQuality = FilterQuality.low,
 }) {
   assert(canvas != null);
   assert(image != null);
@@ -388,7 +388,7 @@ void paintImage({
   if (centerSlice != null) {
     sliceBorder = Offset(
       centerSlice.left + inputSize.width - centerSlice.right,
-      centerSlice.top + inputSize.height - centerSlice.bottom
+      centerSlice.top + inputSize.height - centerSlice.bottom,
     );
     outputSize -= sliceBorder;
     inputSize -= sliceBorder;
@@ -436,7 +436,7 @@ void paintImage({
   }
   if (centerSlice == null) {
     final Rect sourceRect = alignment.inscribe(
-      sourceSize, Offset.zero & inputSize
+      sourceSize, Offset.zero & inputSize,
     );
     for (Rect tileRect in _generateImageTileRects(rect, destinationRect, repeat))
       canvas.drawImageRect(image, sourceRect, tileRect, paint);
diff --git a/packages/flutter/lib/src/painting/edge_insets.dart b/packages/flutter/lib/src/painting/edge_insets.dart
index 4c16dcd30b0..dbafafefc4b 100644
--- a/packages/flutter/lib/src/painting/edge_insets.dart
+++ b/packages/flutter/lib/src/painting/edge_insets.dart
@@ -349,7 +349,7 @@ class EdgeInsets extends EdgeInsetsGeometry {
     this.left = 0.0,
     this.top = 0.0,
     this.right = 0.0,
-    this.bottom = 0.0
+    this.bottom = 0.0,
   });
 
   /// Creates insets with symmetrical vertical and horizontal offsets.
@@ -627,7 +627,7 @@ class EdgeInsetsDirectional extends EdgeInsetsGeometry {
     this.start = 0.0,
     this.top = 0.0,
     this.end = 0.0,
-    this.bottom = 0.0
+    this.bottom = 0.0,
   });
 
   /// An [EdgeInsetsDirectional] with zero offsets in each direction.
diff --git a/packages/flutter/lib/src/painting/flutter_logo.dart b/packages/flutter/lib/src/painting/flutter_logo.dart
index 8811f7004ac..46733358919 100644
--- a/packages/flutter/lib/src/painting/flutter_logo.dart
+++ b/packages/flutter/lib/src/painting/flutter_logo.dart
@@ -228,7 +228,7 @@ class FlutterLogoDecoration extends Decoration {
       darkColor,
       textColor,
       _position,
-      _opacity
+      _opacity,
     );
   }
 
@@ -418,7 +418,7 @@ class _FlutterLogoPainter extends BoxPainter {
       offset.dx + (canvasSize.width - centerSquareHeight) / 2.0,
       offset.dy + (canvasSize.height - centerSquareHeight) / 2.0,
       centerSquareHeight,
-      centerSquareHeight
+      centerSquareHeight,
     );
 
     Rect logoTargetSquare;
@@ -432,7 +432,7 @@ class _FlutterLogoPainter extends BoxPainter {
         rect.left + (rect.width - logoHeight) / 2.0,
         rect.top,
         logoHeight,
-        logoHeight
+        logoHeight,
       );
     } else {
       // only the mark
@@ -447,7 +447,7 @@ class _FlutterLogoPainter extends BoxPainter {
           ..colorFilter = ColorFilter.mode(
             const Color(0xFFFFFFFF).withOpacity(_config._opacity),
             BlendMode.modulate,
-          )
+          ),
       );
     }
     if (_config._position != 0.0) {
@@ -462,7 +462,7 @@ class _FlutterLogoPainter extends BoxPainter {
           rect.width / 2.0 - _textBoundingRect.width * scale;
         final Offset textOffset = Offset(
           rect.left + ui.lerpDouble(initialLeftTextPosition, finalLeftTextPosition, _config._position),
-          rect.top + (rect.height - _textBoundingRect.height * scale) / 2.0
+          rect.top + (rect.height - _textBoundingRect.height * scale) / 2.0,
         );
         canvas.save();
         if (_config._position < 1.0) {
@@ -490,7 +490,7 @@ class _FlutterLogoPainter extends BoxPainter {
         }
         canvas.translate(
           logoTargetSquare.center.dx - (_textBoundingRect.width * scale / 2.0),
-          logoTargetSquare.bottom
+          logoTargetSquare.bottom,
         );
         canvas.scale(scale, scale);
         _textPainter.paint(canvas, Offset.zero);
@@ -502,7 +502,7 @@ class _FlutterLogoPainter extends BoxPainter {
               Offset(_textBoundingRect.width * 1.5, 0.0),
               <Color>[const Color(0xFFFFFFFF), const Color(0xFFFFFFFF), const Color(0x00FFFFFF), const Color(0x00FFFFFF)],
               <double>[ 0.0, math.max(0.0, _config._position.abs() - 0.1), math.min(_config._position.abs() + 0.1, 1.0), 1.0 ],
-            )
+            ),
           );
         }
         canvas.restore();
diff --git a/packages/flutter/lib/src/painting/gradient.dart b/packages/flutter/lib/src/painting/gradient.dart
index 9dd4784479a..cba3411ee07 100644
--- a/packages/flutter/lib/src/painting/gradient.dart
+++ b/packages/flutter/lib/src/painting/gradient.dart
@@ -32,7 +32,7 @@ Color _sample(List<Color> colors, List<double> stops, double t) {
   assert(index != -1);
   return Color.lerp(
       colors[index], colors[index + 1],
-      (t - stops[index]) / (stops[index + 1] - stops[index])
+      (t - stops[index]) / (stops[index + 1] - stops[index]),
   );
 }
 
@@ -532,7 +532,7 @@ class RadialGradient extends Gradient {
     List<double> stops,
     this.tileMode = TileMode.clamp,
     this.focal,
-    this.focalRadius = 0.0
+    this.focalRadius = 0.0,
   }) : assert(center != null),
        assert(radius != null),
        assert(tileMode != null),
@@ -624,7 +624,7 @@ class RadialGradient extends Gradient {
       stops: stops,
       tileMode: tileMode,
       focal: focal,
-      focalRadius: focalRadius
+      focalRadius: focalRadius,
     );
   }
 
diff --git a/packages/flutter/lib/src/painting/image_provider.dart b/packages/flutter/lib/src/painting/image_provider.dart
index 4c27b26ac8b..4d7ec575312 100644
--- a/packages/flutter/lib/src/painting/image_provider.dart
+++ b/packages/flutter/lib/src/painting/image_provider.dart
@@ -277,7 +277,7 @@ abstract class ImageProvider<T> {
           if (obtainedKey != null) {
             information.writeln('Image key: $obtainedKey');
           }
-        }
+        },
       );
     }
 
@@ -381,7 +381,7 @@ class AssetBundleImageKey {
   const AssetBundleImageKey({
     @required this.bundle,
     @required this.name,
-    @required this.scale
+    @required this.scale,
   }) : assert(bundle != null),
        assert(name != null),
        assert(scale != null);
@@ -435,7 +435,7 @@ abstract class AssetBundleImageProvider extends ImageProvider<AssetBundleImageKe
       informationCollector: (StringBuffer information) {
         information.writeln('Image provider: $this');
         information.write('Image key: $key');
-      }
+      },
     );
   }
 
@@ -492,7 +492,7 @@ class NetworkImage extends ImageProvider<NetworkImage> {
       informationCollector: (StringBuffer information) {
         information.writeln('Image provider: $this');
         information.write('Image key: $key');
-      }
+      },
     );
   }
 
@@ -565,7 +565,7 @@ class FileImage extends ImageProvider<FileImage> {
       scale: key.scale,
       informationCollector: (StringBuffer information) {
         information.writeln('Path: ${file?.path}');
-      }
+      },
     );
   }
 
@@ -630,7 +630,7 @@ class MemoryImage extends ImageProvider<MemoryImage> {
   ImageStreamCompleter load(MemoryImage key) {
     return MultiFrameImageStreamCompleter(
       codec: _loadAsync(key),
-      scale: key.scale
+      scale: key.scale,
     );
   }
 
@@ -772,7 +772,7 @@ class ExactAssetImage extends AssetBundleImageProvider {
     return SynchronousFuture<AssetBundleImageKey>(AssetBundleImageKey(
       bundle: bundle ?? configuration.bundle ?? rootBundle,
       name: keyName,
-      scale: scale
+      scale: scale,
     ));
   }
 
diff --git a/packages/flutter/lib/src/painting/image_resolution.dart b/packages/flutter/lib/src/painting/image_resolution.dart
index 73f38e0876b..7d2d59a21c6 100644
--- a/packages/flutter/lib/src/painting/image_resolution.dart
+++ b/packages/flutter/lib/src/painting/image_resolution.dart
@@ -176,13 +176,13 @@ class AssetImage extends AssetBundleImageProvider {
         final String chosenName = _chooseVariant(
           keyName,
           configuration,
-          manifest == null ? null : manifest[keyName]
+          manifest == null ? null : manifest[keyName],
         );
         final double chosenScale = _parseScale(chosenName);
         final AssetBundleImageKey key = AssetBundleImageKey(
           bundle: chosenBundle,
           name: chosenName,
-          scale: chosenScale
+          scale: chosenScale,
         );
         if (completer != null) {
           // We already returned from this function, which means we are in the
diff --git a/packages/flutter/lib/src/painting/image_stream.dart b/packages/flutter/lib/src/painting/image_stream.dart
index 72d837e46e4..792852a189c 100644
--- a/packages/flutter/lib/src/painting/image_stream.dart
+++ b/packages/flutter/lib/src/painting/image_stream.dart
@@ -505,7 +505,7 @@ class MultiFrameImageStreamCompleter extends ImageStreamCompleter {
   MultiFrameImageStreamCompleter({
     @required Future<ui.Codec> codec,
     @required double scale,
-    InformationCollector informationCollector
+    InformationCollector informationCollector,
   }) : assert(codec != null),
        _informationCollector = informationCollector,
        _scale = scale,
diff --git a/packages/flutter/lib/src/painting/matrix_utils.dart b/packages/flutter/lib/src/painting/matrix_utils.dart
index 8700781825a..31164ac0e64 100644
--- a/packages/flutter/lib/src/painting/matrix_utils.dart
+++ b/packages/flutter/lib/src/painting/matrix_utils.dart
@@ -144,7 +144,7 @@ class MatrixUtils {
         _min4(point1.dx, point2.dx, point3.dx, point4.dx),
         _min4(point1.dy, point2.dy, point3.dy, point4.dy),
         _max4(point1.dx, point2.dx, point3.dx, point4.dx),
-        _max4(point1.dy, point2.dy, point3.dy, point4.dy)
+        _max4(point1.dy, point2.dy, point3.dy, point4.dy),
     );
   }
 
diff --git a/packages/flutter/lib/src/painting/shader_warm_up.dart b/packages/flutter/lib/src/painting/shader_warm_up.dart
index 03051e64265..d52d030946d 100644
--- a/packages/flutter/lib/src/painting/shader_warm_up.dart
+++ b/packages/flutter/lib/src/painting/shader_warm_up.dart
@@ -153,7 +153,7 @@ class DefaultShaderWarmUp extends ShaderWarmUp {
       ui.Paint()
         ..isAntiAlias = true
         ..style = ui.PaintingStyle.stroke
-        ..strokeWidth = 0.1  // hairline
+        ..strokeWidth = 0.1,  // hairline
     ];
 
     // Warm up path stroke and fill shaders.
diff --git a/packages/flutter/lib/src/painting/stadium_border.dart b/packages/flutter/lib/src/painting/stadium_border.dart
index ab6d0076967..e4a308ac9e6 100644
--- a/packages/flutter/lib/src/painting/stadium_border.dart
+++ b/packages/flutter/lib/src/painting/stadium_border.dart
@@ -363,7 +363,7 @@ class _StadiumToRoundedRectangleBorder extends ShapeBorder {
     return BorderRadius.lerp(
       borderRadius,
       BorderRadius.all(Radius.circular(rect.shortestSide / 2.0)),
-      1.0 - rectness
+      1.0 - rectness,
     );
   }
 
diff --git a/packages/flutter/lib/src/painting/text_style.dart b/packages/flutter/lib/src/painting/text_style.dart
index 667e11e3902..4444ac65644 100644
--- a/packages/flutter/lib/src/painting/text_style.dart
+++ b/packages/flutter/lib/src/painting/text_style.dart
@@ -990,7 +990,7 @@ class TextStyle extends Diagnosticable {
       decoration,
       decorationColor,
       decorationStyle,
-      shadows
+      shadows,
     );
   }
 
diff --git a/packages/flutter/lib/src/physics/clamped_simulation.dart b/packages/flutter/lib/src/physics/clamped_simulation.dart
index d9224101cde..69f51472314 100644
--- a/packages/flutter/lib/src/physics/clamped_simulation.dart
+++ b/packages/flutter/lib/src/physics/clamped_simulation.dart
@@ -25,7 +25,7 @@ class ClampedSimulation extends Simulation {
     this.xMin = double.negativeInfinity,
     this.xMax = double.infinity,
     this.dxMin = double.negativeInfinity,
-    this.dxMax = double.infinity
+    this.dxMax = double.infinity,
   }) : assert(simulation != null),
        assert(xMax >= xMin),
        assert(dxMax >= dxMin);
diff --git a/packages/flutter/lib/src/physics/friction_simulation.dart b/packages/flutter/lib/src/physics/friction_simulation.dart
index 8403d36a4e2..10125a42c46 100644
--- a/packages/flutter/lib/src/physics/friction_simulation.dart
+++ b/packages/flutter/lib/src/physics/friction_simulation.dart
@@ -104,7 +104,7 @@ class BoundedFrictionSimulation extends FrictionSimulation {
     double position,
     double velocity,
     this._minX,
-    this._maxX
+    this._maxX,
   ) : assert(position.clamp(_minX, _maxX) == position),
       super(drag, position, velocity);
 
diff --git a/packages/flutter/lib/src/physics/gravity_simulation.dart b/packages/flutter/lib/src/physics/gravity_simulation.dart
index 0128d2a8c59..3c3ee4ba273 100644
--- a/packages/flutter/lib/src/physics/gravity_simulation.dart
+++ b/packages/flutter/lib/src/physics/gravity_simulation.dart
@@ -55,7 +55,7 @@ class GravitySimulation extends Simulation {
     double acceleration,
     double distance,
     double endDistance,
-    double velocity
+    double velocity,
   ) : assert(acceleration != null),
       assert(distance != null),
       assert(velocity != null),
diff --git a/packages/flutter/lib/src/physics/spring_simulation.dart b/packages/flutter/lib/src/physics/spring_simulation.dart
index f6622813dd9..660394f3905 100644
--- a/packages/flutter/lib/src/physics/spring_simulation.dart
+++ b/packages/flutter/lib/src/physics/spring_simulation.dart
@@ -18,7 +18,7 @@ class SpringDescription {
   const SpringDescription({
     this.mass,
     this.stiffness,
-    this.damping
+    this.damping,
   });
 
   /// Creates a spring given the mass (m), stiffness (k), and damping ratio (ζ).
@@ -31,7 +31,7 @@ class SpringDescription {
   SpringDescription.withDampingRatio({
     this.mass,
     this.stiffness,
-    double ratio = 1.0
+    double ratio = 1.0,
   }) : damping = ratio * 2.0 * math.sqrt(mass * stiffness);
 
   /// The mass of the spring (m). The units are arbitrary, but all springs
@@ -149,7 +149,7 @@ abstract class _SpringSolution {
   factory _SpringSolution(
     SpringDescription spring,
     double initialPosition,
-    double initialVelocity
+    double initialVelocity,
   ) {
     assert(spring != null);
     assert(spring.mass != null);
@@ -174,7 +174,7 @@ class _CriticalSolution implements _SpringSolution {
   factory _CriticalSolution(
     SpringDescription spring,
     double distance,
-    double velocity
+    double velocity,
   ) {
     final double r = -spring.damping / (2.0 * spring.mass);
     final double c1 = distance;
@@ -208,7 +208,7 @@ class _OverdampedSolution implements _SpringSolution {
   factory _OverdampedSolution(
     SpringDescription spring,
     double distance,
-    double velocity
+    double velocity,
   ) {
     final double cmk = spring.damping * spring.damping - 4 * spring.mass * spring.stiffness;
     final double r1 = (-spring.damping - math.sqrt(cmk)) / (2.0 * spring.mass);
@@ -246,7 +246,7 @@ class _UnderdampedSolution implements _SpringSolution {
   factory _UnderdampedSolution(
     SpringDescription spring,
     double distance,
-    double velocity
+    double velocity,
   ) {
     final double w = math.sqrt(4.0 * spring.mass * spring.stiffness -
                      spring.damping * spring.damping) / (2.0 * spring.mass);
diff --git a/packages/flutter/lib/src/physics/tolerance.dart b/packages/flutter/lib/src/physics/tolerance.dart
index 1ec77a9d7d5..056c83dceab 100644
--- a/packages/flutter/lib/src/physics/tolerance.dart
+++ b/packages/flutter/lib/src/physics/tolerance.dart
@@ -12,7 +12,7 @@ class Tolerance {
   const Tolerance({
     this.distance = _epsilonDefault,
     this.time = _epsilonDefault,
-    this.velocity = _epsilonDefault
+    this.velocity = _epsilonDefault,
   });
 
   static const double _epsilonDefault = 1e-3;
diff --git a/packages/flutter/lib/src/rendering/animated_size.dart b/packages/flutter/lib/src/rendering/animated_size.dart
index 3e161ee6fab..c9456b8fff9 100644
--- a/packages/flutter/lib/src/rendering/animated_size.dart
+++ b/packages/flutter/lib/src/rendering/animated_size.dart
@@ -94,7 +94,7 @@ class RenderAnimatedSize extends RenderAligningShiftedBox {
     });
     _animation = CurvedAnimation(
       parent: _controller,
-      curve: curve
+      curve: curve,
     );
   }
 
diff --git a/packages/flutter/lib/src/rendering/box.dart b/packages/flutter/lib/src/rendering/box.dart
index f6f9bcd40ed..eb4d494c1d1 100644
--- a/packages/flutter/lib/src/rendering/box.dart
+++ b/packages/flutter/lib/src/rendering/box.dart
@@ -89,7 +89,7 @@ class BoxConstraints extends Constraints {
     this.minWidth = 0.0,
     this.maxWidth = double.infinity,
     this.minHeight = 0.0,
-    this.maxHeight = double.infinity
+    this.maxHeight = double.infinity,
   });
 
   /// Creates box constraints that is respected only by the given size.
@@ -108,7 +108,7 @@ class BoxConstraints extends Constraints {
   ///    infinite.
   const BoxConstraints.tightFor({
     double width,
-    double height
+    double height,
   }) : minWidth = width != null ? width : 0.0,
        maxWidth = width != null ? width : double.infinity,
        minHeight = height != null ? height : 0.0,
@@ -123,7 +123,7 @@ class BoxConstraints extends Constraints {
   ///    tight if the value is not infinite, is tight if the value is non-null.
   const BoxConstraints.tightForFinite({
     double width = double.infinity,
-    double height = double.infinity
+    double height = double.infinity,
   }) : minWidth = width != double.infinity ? width : 0.0,
        maxWidth = width != double.infinity ? width : double.infinity,
        minHeight = height != double.infinity ? height : 0.0,
@@ -142,7 +142,7 @@ class BoxConstraints extends Constraints {
   /// given value in the given dimension.
   const BoxConstraints.expand({
     double width,
-    double height
+    double height,
   }) : minWidth = width != null ? width : double.infinity,
        maxWidth = width != null ? width : double.infinity,
        minHeight = height != null ? height : double.infinity,
@@ -169,13 +169,13 @@ class BoxConstraints extends Constraints {
     double minWidth,
     double maxWidth,
     double minHeight,
-    double maxHeight
+    double maxHeight,
   }) {
     return BoxConstraints(
       minWidth: minWidth ?? this.minWidth,
       maxWidth: maxWidth ?? this.maxWidth,
       minHeight: minHeight ?? this.minHeight,
-      maxHeight: maxHeight ?? this.maxHeight
+      maxHeight: maxHeight ?? this.maxHeight,
     );
   }
 
@@ -191,7 +191,7 @@ class BoxConstraints extends Constraints {
       minWidth: deflatedMinWidth,
       maxWidth: math.max(deflatedMinWidth, maxWidth - horizontal),
       minHeight: deflatedMinHeight,
-      maxHeight: math.max(deflatedMinHeight, maxHeight - vertical)
+      maxHeight: math.max(deflatedMinHeight, maxHeight - vertical),
     );
   }
 
@@ -202,7 +202,7 @@ class BoxConstraints extends Constraints {
       minWidth: 0.0,
       maxWidth: maxWidth,
       minHeight: 0.0,
-      maxHeight: maxHeight
+      maxHeight: maxHeight,
     );
   }
 
@@ -213,7 +213,7 @@ class BoxConstraints extends Constraints {
       minWidth: minWidth.clamp(constraints.minWidth, constraints.maxWidth),
       maxWidth: maxWidth.clamp(constraints.minWidth, constraints.maxWidth),
       minHeight: minHeight.clamp(constraints.minHeight, constraints.maxHeight),
-      maxHeight: maxHeight.clamp(constraints.minHeight, constraints.maxHeight)
+      maxHeight: maxHeight.clamp(constraints.minHeight, constraints.maxHeight),
     );
   }
 
@@ -233,7 +233,7 @@ class BoxConstraints extends Constraints {
       minWidth: minHeight,
       maxWidth: maxHeight,
       minHeight: minWidth,
-      maxHeight: maxWidth
+      maxHeight: maxWidth,
     );
   }
 
@@ -410,7 +410,7 @@ class BoxConstraints extends Constraints {
       minWidth: minWidth * factor,
       maxWidth: maxWidth * factor,
       minHeight: minHeight * factor,
-      maxHeight: maxHeight * factor
+      maxHeight: maxHeight * factor,
     );
   }
 
@@ -420,7 +420,7 @@ class BoxConstraints extends Constraints {
       minWidth: minWidth / factor,
       maxWidth: maxWidth / factor,
       minHeight: minHeight / factor,
-      maxHeight: maxHeight / factor
+      maxHeight: maxHeight / factor,
     );
   }
 
@@ -430,7 +430,7 @@ class BoxConstraints extends Constraints {
       minWidth: (minWidth ~/ factor).toDouble(),
       maxWidth: (maxWidth ~/ factor).toDouble(),
       minHeight: (minHeight ~/ factor).toDouble(),
-      maxHeight: (maxHeight ~/ factor).toDouble()
+      maxHeight: (maxHeight ~/ factor).toDouble(),
     );
   }
 
@@ -440,7 +440,7 @@ class BoxConstraints extends Constraints {
       minWidth: minWidth % value,
       maxWidth: maxWidth % value,
       minHeight: minHeight % value,
-      maxHeight: maxHeight % value
+      maxHeight: maxHeight % value,
     );
   }
 
@@ -565,7 +565,7 @@ class BoxConstraints extends Constraints {
       minWidth: minWidth,
       maxWidth: minWidth > maxWidth ? minWidth : maxWidth,
       minHeight: minHeight,
-      maxHeight: minHeight > maxHeight ? minHeight : maxHeight
+      maxHeight: minHeight > maxHeight ? minHeight : maxHeight,
     );
   }
 
@@ -1096,7 +1096,7 @@ abstract class RenderBox extends RenderObject {
       _cachedIntrinsicDimensions ??= <_IntrinsicDimensionsCacheEntry, double>{};
       return _cachedIntrinsicDimensions.putIfAbsent(
         _IntrinsicDimensionsCacheEntry(dimension, argument),
-        () => computer(argument)
+        () => computer(argument),
       );
     }
     return computer(argument);
diff --git a/packages/flutter/lib/src/rendering/custom_layout.dart b/packages/flutter/lib/src/rendering/custom_layout.dart
index 6f5ec14c7d8..e8a53c847ff 100644
--- a/packages/flutter/lib/src/rendering/custom_layout.dart
+++ b/packages/flutter/lib/src/rendering/custom_layout.dart
@@ -285,7 +285,7 @@ class RenderCustomMultiChildLayoutBox extends RenderBox
   /// The [delegate] argument must not be null.
   RenderCustomMultiChildLayoutBox({
     List<RenderBox> children,
-    @required MultiChildLayoutDelegate delegate
+    @required MultiChildLayoutDelegate delegate,
   }) : assert(delegate != null),
        _delegate = delegate {
     addAll(children);
diff --git a/packages/flutter/lib/src/rendering/editable.dart b/packages/flutter/lib/src/rendering/editable.dart
index 66a74bc388d..cbb949246ba 100644
--- a/packages/flutter/lib/src/rendering/editable.dart
+++ b/packages/flutter/lib/src/rendering/editable.dart
@@ -415,7 +415,7 @@ class RenderEditable extends RenderBox {
         onSelectionChanged(
           TextSelection(
             baseOffset: _baseOffset,
-            extentOffset: newOffset
+            extentOffset: newOffset,
           ),
           this,
           SelectionChangedCause.keyboard,
@@ -424,7 +424,7 @@ class RenderEditable extends RenderBox {
         onSelectionChanged(
           TextSelection(
             baseOffset: newOffset,
-            extentOffset: _baseOffset
+            extentOffset: _baseOffset,
           ),
           this,
           SelectionChangedCause.keyboard,
@@ -511,12 +511,12 @@ class RenderEditable extends RenderBox {
       textSelectionDelegate.textEditingValue = TextEditingValue(
         text: selection.textBefore(text.text)
           + selection.textAfter(text.text).substring(1),
-        selection: TextSelection.collapsed(offset: selection.start)
+        selection: TextSelection.collapsed(offset: selection.start),
       );
     } else {
       textSelectionDelegate.textEditingValue = TextEditingValue(
         text: selection.textBefore(text.text),
-        selection: TextSelection.collapsed(offset: selection.start)
+        selection: TextSelection.collapsed(offset: selection.start),
       );
     }
   }
@@ -1478,7 +1478,7 @@ class RenderEditable extends RenderBox {
       _caretPrototype.left - sizeAdjustmentX,
       _caretPrototype.top - sizeAdjustmentY,
       _caretPrototype.right + sizeAdjustmentX,
-      _caretPrototype.bottom + sizeAdjustmentY
+      _caretPrototype.bottom + sizeAdjustmentY,
     );
 
     final Rect caretRect = floatingCaretPrototype.shift(effectiveOffset);
diff --git a/packages/flutter/lib/src/rendering/error.dart b/packages/flutter/lib/src/rendering/error.dart
index a8552b37b51..d34c5f4f7b7 100644
--- a/packages/flutter/lib/src/rendering/error.dart
+++ b/packages/flutter/lib/src/rendering/error.dart
@@ -90,7 +90,7 @@ class RenderErrorBox extends RenderBox {
     color: const Color(0xFFFFFF66),
     fontFamily: 'monospace',
     fontSize: 14.0,
-    fontWeight: FontWeight.bold
+    fontWeight: FontWeight.bold,
   );
 
   /// The paragraph style to use when painting [RenderErrorBox] objects.
diff --git a/packages/flutter/lib/src/rendering/flex.dart b/packages/flutter/lib/src/rendering/flex.dart
index 71b2af6c8f8..5468ee3b8fa 100644
--- a/packages/flutter/lib/src/rendering/flex.dart
+++ b/packages/flutter/lib/src/rendering/flex.dart
@@ -480,7 +480,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
   double _getIntrinsicSize({
     Axis sizingDirection,
     double extent, // the extent in the direction that isn't the sizing direction
-    _ChildSizingFunction childSize // a method to find the size in the sizing direction
+    _ChildSizingFunction childSize, // a method to find the size in the sizing direction
   }) {
     if (_direction == sizingDirection) {
       // INTRINSIC MAIN SIZE
@@ -563,7 +563,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
     return _getIntrinsicSize(
       sizingDirection: Axis.horizontal,
       extent: height,
-      childSize: (RenderBox child, double extent) => child.getMinIntrinsicWidth(extent)
+      childSize: (RenderBox child, double extent) => child.getMinIntrinsicWidth(extent),
     );
   }
 
@@ -572,7 +572,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
     return _getIntrinsicSize(
       sizingDirection: Axis.horizontal,
       extent: height,
-      childSize: (RenderBox child, double extent) => child.getMaxIntrinsicWidth(extent)
+      childSize: (RenderBox child, double extent) => child.getMaxIntrinsicWidth(extent),
     );
   }
 
@@ -581,7 +581,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
     return _getIntrinsicSize(
       sizingDirection: Axis.vertical,
       extent: width,
-      childSize: (RenderBox child, double extent) => child.getMinIntrinsicHeight(extent)
+      childSize: (RenderBox child, double extent) => child.getMinIntrinsicHeight(extent),
     );
   }
 
@@ -590,7 +590,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
     return _getIntrinsicSize(
       sizingDirection: Axis.vertical,
       extent: width,
-      childSize: (RenderBox child, double extent) => child.getMaxIntrinsicHeight(extent)
+      childSize: (RenderBox child, double extent) => child.getMaxIntrinsicHeight(extent),
     );
   }
 
diff --git a/packages/flutter/lib/src/rendering/flow.dart b/packages/flutter/lib/src/rendering/flow.dart
index d0355718f89..d9ebec032df 100644
--- a/packages/flutter/lib/src/rendering/flow.dart
+++ b/packages/flutter/lib/src/rendering/flow.dart
@@ -181,7 +181,7 @@ class RenderFlow extends RenderBox
   /// [isRepaintBoundary].
   RenderFlow({
     List<RenderBox> children,
-    @required FlowDelegate delegate
+    @required FlowDelegate delegate,
   }) : assert(delegate != null),
        _delegate = delegate {
     addAll(children);
diff --git a/packages/flutter/lib/src/rendering/image.dart b/packages/flutter/lib/src/rendering/image.dart
index 6f12dfafdcc..73d9bd4dedb 100644
--- a/packages/flutter/lib/src/rendering/image.dart
+++ b/packages/flutter/lib/src/rendering/image.dart
@@ -38,7 +38,7 @@ class RenderImage extends RenderBox {
     bool matchTextDirection = false,
     TextDirection textDirection,
     bool invertColors = false,
-    FilterQuality filterQuality = FilterQuality.low
+    FilterQuality filterQuality = FilterQuality.low,
   }) : assert(scale != null),
        assert(repeat != null),
        assert(alignment != null),
@@ -299,7 +299,7 @@ class RenderImage extends RenderBox {
     // be treated uniformly.
     constraints = BoxConstraints.tightFor(
       width: _width,
-      height: _height
+      height: _height,
     ).enforce(constraints);
 
     if (_image == null)
@@ -307,7 +307,7 @@ class RenderImage extends RenderBox {
 
     return constraints.constrainSizeAndAttemptToPreserveAspectRatio(Size(
       _image.width.toDouble() / _scale,
-      _image.height.toDouble() / _scale
+      _image.height.toDouble() / _scale,
     ));
   }
 
@@ -366,7 +366,7 @@ class RenderImage extends RenderBox {
       repeat: _repeat,
       flipHorizontally: _flipHorizontally,
       invertColors: invertColors,
-      filterQuality: _filterQuality
+      filterQuality: _filterQuality,
     );
   }
 
diff --git a/packages/flutter/lib/src/rendering/list_wheel_viewport.dart b/packages/flutter/lib/src/rendering/list_wheel_viewport.dart
index bd3b4c5bc99..a2228260ef2 100644
--- a/packages/flutter/lib/src/rendering/list_wheel_viewport.dart
+++ b/packages/flutter/lib/src/rendering/list_wheel_viewport.dart
@@ -763,7 +763,7 @@ class RenderListWheelViewport
     final Offset untransformedPaintingCoordinates = offset
         + Offset(
             layoutOffset.dx,
-            _getUntransformedPaintingCoordinateY(layoutOffset.dy)
+            _getUntransformedPaintingCoordinateY(layoutOffset.dy),
         );
 
     // Get child's center as a fraction of the viewport's height.
@@ -870,7 +870,7 @@ class RenderListWheelViewport
               child,
               cylindricalTransform,
               offsetToCenter);
-          }
+          },
       );
     } else {
       _paintChildCylindrically(
diff --git a/packages/flutter/lib/src/rendering/object.dart b/packages/flutter/lib/src/rendering/object.dart
index a6520b1fdc8..69df9421a8d 100644
--- a/packages/flutter/lib/src/rendering/object.dart
+++ b/packages/flutter/lib/src/rendering/object.dart
@@ -577,7 +577,7 @@ abstract class Constraints {
   /// Returns the same as [isNormalized] if asserts are disabled.
   bool debugAssertIsValid({
     bool isAppliedConstraint = false,
-    InformationCollector informationCollector
+    InformationCollector informationCollector,
   }) {
     assert(isNormalized);
     return isNormalized;
@@ -1206,7 +1206,7 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im
           information.writeln('This RenderObject has no descendants.');
         }
         information.writeAll(descendants, '\n');
-      }
+      },
     ));
   }
 
@@ -1570,7 +1570,7 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im
             information.writeln(stack[targetFrame]);
           }
         }
-      }
+      },
     ));
     assert(!_debugDoingThisResize);
     assert(!_debugDoingThisLayout);
@@ -1735,7 +1735,7 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im
   void rotate({
     int oldAngle, // 0..3
     int newAngle, // 0..3
-    Duration time
+    Duration time,
   }) { }
 
   // when the parent has rotated (e.g. when the screen has been turned
@@ -3098,7 +3098,7 @@ class FlutterErrorDetailsForRendering extends FlutterErrorDetails {
     String context,
     this.renderObject,
     InformationCollector informationCollector,
-    bool silent = false
+    bool silent = false,
   }) : super(
     exception: exception,
     stack: stack,
@@ -3180,7 +3180,7 @@ class _ContainerSemanticsFragment extends _SemanticsFragment {
 abstract class _InterestingSemanticsFragment extends _SemanticsFragment {
   _InterestingSemanticsFragment({
     @required RenderObject owner,
-    @required bool dropsSemanticsOfPreviousSiblings
+    @required bool dropsSemanticsOfPreviousSiblings,
   }) : assert(owner != null),
        _ancestorChain = <RenderObject>[owner],
        super(dropsSemanticsOfPreviousSiblings: dropsSemanticsOfPreviousSiblings);
diff --git a/packages/flutter/lib/src/rendering/platform_view.dart b/packages/flutter/lib/src/rendering/platform_view.dart
index fef206d49e8..d5345aab6bd 100644
--- a/packages/flutter/lib/src/rendering/platform_view.dart
+++ b/packages/flutter/lib/src/rendering/platform_view.dart
@@ -610,7 +610,7 @@ class _MotionEventsDispatcher {
         deviceId: 0,
         edgeFlags: 0,
         source: 0,
-        flags: 0
+        flags: 0,
     );
     viewController.sendMotionEvent(androidMotionEvent);
   }
@@ -626,7 +626,7 @@ class _MotionEventsDispatcher {
         touchMajor: event.radiusMajor,
         touchMinor: event.radiusMinor,
         x: position.dx,
-        y: position.dy
+        y: position.dy,
     );
   }
 
diff --git a/packages/flutter/lib/src/rendering/proxy_box.dart b/packages/flutter/lib/src/rendering/proxy_box.dart
index 5d4e48fab13..58eb19d0e4a 100644
--- a/packages/flutter/lib/src/rendering/proxy_box.dart
+++ b/packages/flutter/lib/src/rendering/proxy_box.dart
@@ -148,7 +148,7 @@ abstract class RenderProxyBoxWithHitTestBehavior extends RenderProxyBox {
   /// By default, the [behavior] is [HitTestBehavior.deferToChild].
   RenderProxyBoxWithHitTestBehavior({
     this.behavior = HitTestBehavior.deferToChild,
-    RenderBox child
+    RenderBox child,
   }) : super(child);
 
   /// How to behave during hit testing.
@@ -305,7 +305,7 @@ class RenderLimitedBox extends RenderProxyBox {
   RenderLimitedBox({
     RenderBox child,
     double maxWidth = double.infinity,
-    double maxHeight = double.infinity
+    double maxHeight = double.infinity,
   }) : assert(maxWidth != null && maxWidth >= 0.0),
        assert(maxHeight != null && maxHeight >= 0.0),
        _maxWidth = maxWidth,
@@ -339,7 +339,7 @@ class RenderLimitedBox extends RenderProxyBox {
       minWidth: constraints.minWidth,
       maxWidth: constraints.hasBoundedWidth ? constraints.maxWidth : constraints.constrainWidth(maxWidth),
       minHeight: constraints.minHeight,
-      maxHeight: constraints.hasBoundedHeight ? constraints.maxHeight : constraints.constrainHeight(maxHeight)
+      maxHeight: constraints.hasBoundedHeight ? constraints.maxHeight : constraints.constrainHeight(maxHeight),
     );
   }
 
@@ -548,7 +548,7 @@ class RenderIntrinsicWidth extends RenderProxyBox {
   RenderIntrinsicWidth({
     double stepWidth,
     double stepHeight,
-    RenderBox child
+    RenderBox child,
   }) : assert(stepWidth == null || stepWidth > 0.0),
        assert(stepHeight == null || stepHeight > 0.0),
        _stepWidth = stepWidth,
@@ -665,7 +665,7 @@ class RenderIntrinsicWidth extends RenderProxyBox {
 class RenderIntrinsicHeight extends RenderProxyBox {
   /// Creates a render object that sizes itself to its child's intrinsic height.
   RenderIntrinsicHeight({
-    RenderBox child
+    RenderBox child,
   }) : super(child);
 
   @override
@@ -2011,7 +2011,7 @@ class RenderTransform extends RenderProxyBox {
     AlignmentGeometry alignment,
     TextDirection textDirection,
     this.transformHitTests = true,
-    RenderBox child
+    RenderBox child,
   }) : assert(transform != null),
        super(child) {
     this.transform = transform;
@@ -2393,7 +2393,7 @@ class RenderFractionalTranslation extends RenderProxyBox {
   RenderFractionalTranslation({
     @required Offset translation,
     this.transformHitTests = true,
-    RenderBox child
+    RenderBox child,
   }) : assert(translation != null),
        _translation = translation,
        super(child);
@@ -2883,7 +2883,7 @@ class RenderIgnorePointer extends RenderProxyBox {
   RenderIgnorePointer({
     RenderBox child,
     bool ignoring = true,
-    bool ignoringSemantics
+    bool ignoringSemantics,
   }) : _ignoring = ignoring,
        _ignoringSemantics = ignoringSemantics,
        super(child) {
@@ -2958,7 +2958,7 @@ class RenderOffstage extends RenderProxyBox {
   /// Creates an offstage render object.
   RenderOffstage({
     bool offstage = true,
-    RenderBox child
+    RenderBox child,
   }) : assert(offstage != null),
        _offstage = offstage,
        super(child);
@@ -3169,7 +3169,7 @@ class RenderMetaData extends RenderProxyBoxWithHitTestBehavior {
   RenderMetaData({
     this.metaData,
     HitTestBehavior behavior = HitTestBehavior.deferToChild,
-    RenderBox child
+    RenderBox child,
   }) : super(behavior: behavior, child: child);
 
   /// Opaque meta data ignored by the render tree
@@ -3194,7 +3194,7 @@ class RenderSemanticsGestureHandler extends RenderProxyBox {
     GestureLongPressCallback onLongPress,
     GestureDragUpdateCallback onHorizontalDragUpdate,
     GestureDragUpdateCallback onVerticalDragUpdate,
-    this.scrollFactor = 0.8
+    this.scrollFactor = 0.8,
   }) : assert(scrollFactor != null),
        _onTap = onTap,
        _onLongPress = onLongPress,
diff --git a/packages/flutter/lib/src/rendering/rotated_box.dart b/packages/flutter/lib/src/rendering/rotated_box.dart
index a19acc90c55..ec989e69d4a 100644
--- a/packages/flutter/lib/src/rendering/rotated_box.dart
+++ b/packages/flutter/lib/src/rendering/rotated_box.dart
@@ -25,7 +25,7 @@ class RenderRotatedBox extends RenderBox with RenderObjectWithChildMixin<RenderB
   /// The [quarterTurns] argument must not be null.
   RenderRotatedBox({
     @required int quarterTurns,
-    RenderBox child
+    RenderBox child,
   }) : assert(quarterTurns != null),
        _quarterTurns = quarterTurns {
     this.child = child;
diff --git a/packages/flutter/lib/src/rendering/shifted_box.dart b/packages/flutter/lib/src/rendering/shifted_box.dart
index 169ef749aa2..f5dc34c7cf7 100644
--- a/packages/flutter/lib/src/rendering/shifted_box.dart
+++ b/packages/flutter/lib/src/rendering/shifted_box.dart
@@ -191,7 +191,7 @@ class RenderPadding extends RenderShiftedBox {
     if (child == null) {
       size = constraints.constrain(Size(
         _resolvedPadding.left + _resolvedPadding.right,
-        _resolvedPadding.top + _resolvedPadding.bottom
+        _resolvedPadding.top + _resolvedPadding.bottom,
       ));
       return;
     }
@@ -201,7 +201,7 @@ class RenderPadding extends RenderShiftedBox {
     childParentData.offset = Offset(_resolvedPadding.left, _resolvedPadding.top);
     size = constraints.constrain(Size(
       _resolvedPadding.left + child.size.width + _resolvedPadding.right,
-      _resolvedPadding.top + child.size.height + _resolvedPadding.bottom
+      _resolvedPadding.top + child.size.height + _resolvedPadding.bottom,
     ));
   }
 
@@ -553,7 +553,7 @@ class RenderConstrainedOverflowBox extends RenderAligningShiftedBox {
       minWidth: _minWidth ?? constraints.minWidth,
       maxWidth: _maxWidth ?? constraints.maxWidth,
       minHeight: _minHeight ?? constraints.minHeight,
-      maxHeight: _maxHeight ?? constraints.maxHeight
+      maxHeight: _maxHeight ?? constraints.maxHeight,
     );
   }
 
@@ -869,7 +869,7 @@ class RenderFractionallySizedOverflowBox extends RenderAligningShiftedBox {
       minWidth: minWidth,
       maxWidth: maxWidth,
       minHeight: minHeight,
-      maxHeight: maxHeight
+      maxHeight: maxHeight,
     );
   }
 
@@ -1032,7 +1032,7 @@ class RenderCustomSingleChildLayoutBox extends RenderShiftedBox {
   /// The [delegate] argument must not be null.
   RenderCustomSingleChildLayoutBox({
     RenderBox child,
-    @required SingleChildLayoutDelegate delegate
+    @required SingleChildLayoutDelegate delegate,
   }) : assert(delegate != null),
        _delegate = delegate,
        super(child);
diff --git a/packages/flutter/lib/src/rendering/sliver.dart b/packages/flutter/lib/src/rendering/sliver.dart
index a493cd2e200..c09253d057f 100644
--- a/packages/flutter/lib/src/rendering/sliver.dart
+++ b/packages/flutter/lib/src/rendering/sliver.dart
@@ -724,7 +724,7 @@ class SliverGeometry extends Diagnosticable {
         verify(false,
           'The "maxPaintExtent" is less than the "paintExtent".\n' +
           _debugCompareFloats('maxPaintExtent', maxPaintExtent, 'paintExtent', paintExtent) +
-          'By definition, a sliver can\'t paint more than the maximum that it can paint!'
+          'By definition, a sliver can\'t paint more than the maximum that it can paint!',
         );
       }
       verify(hitTestExtent != null, 'The "hitTestExtent" is null.');
@@ -1173,7 +1173,7 @@ abstract class RenderSliver extends RenderObject {
         result.add(SliverHitTestEntry(
           this,
           mainAxisPosition: mainAxisPosition,
-          crossAxisPosition: crossAxisPosition
+          crossAxisPosition: crossAxisPosition,
         ));
         return true;
       }
@@ -1369,7 +1369,7 @@ abstract class RenderSliver extends RenderObject {
           ..moveTo(p1.dx - dx1, p1.dy - dy1)
           ..lineTo(p1.dx, p1.dy)
           ..lineTo(p1.dx - dx2, p1.dy - dy2),
-        paint
+        paint,
       );
       return true;
     }());
diff --git a/packages/flutter/lib/src/rendering/sliver_multi_box_adaptor.dart b/packages/flutter/lib/src/rendering/sliver_multi_box_adaptor.dart
index f2de999c8c6..e950078d89f 100644
--- a/packages/flutter/lib/src/rendering/sliver_multi_box_adaptor.dart
+++ b/packages/flutter/lib/src/rendering/sliver_multi_box_adaptor.dart
@@ -191,7 +191,7 @@ abstract class RenderSliverMultiBoxAdaptor extends RenderSliver
   ///
   /// The [childManager] argument must not be null.
   RenderSliverMultiBoxAdaptor({
-    @required RenderSliverBoxChildManager childManager
+    @required RenderSliverBoxChildManager childManager,
   }) : assert(childManager != null),
        _childManager = childManager;
 
diff --git a/packages/flutter/lib/src/rendering/stack.dart b/packages/flutter/lib/src/rendering/stack.dart
index 360d32ed2ad..94cac9351d9 100644
--- a/packages/flutter/lib/src/rendering/stack.dart
+++ b/packages/flutter/lib/src/rendering/stack.dart
@@ -50,7 +50,7 @@ class RelativeRect {
       rect.left - container.left,
       rect.top - container.top,
       container.right - rect.right,
-      container.bottom - rect.bottom
+      container.bottom - rect.bottom,
     );
   }
 
@@ -104,7 +104,7 @@ class RelativeRect {
       math.max(left, other.left),
       math.max(top, other.top),
       math.max(right, other.right),
-      math.max(bottom, other.bottom)
+      math.max(bottom, other.bottom),
     );
   }
 
diff --git a/packages/flutter/lib/src/rendering/table.dart b/packages/flutter/lib/src/rendering/table.dart
index c68dd1b7a17..4ae4b5a8e6d 100644
--- a/packages/flutter/lib/src/rendering/table.dart
+++ b/packages/flutter/lib/src/rendering/table.dart
@@ -237,7 +237,7 @@ class MaxColumnWidth extends TableColumnWidth {
   double minIntrinsicWidth(Iterable<RenderBox> cells, double containerWidth) {
     return math.max(
       a.minIntrinsicWidth(cells, containerWidth),
-      b.minIntrinsicWidth(cells, containerWidth)
+      b.minIntrinsicWidth(cells, containerWidth),
     );
   }
 
@@ -245,7 +245,7 @@ class MaxColumnWidth extends TableColumnWidth {
   double maxIntrinsicWidth(Iterable<RenderBox> cells, double containerWidth) {
     return math.max(
       a.maxIntrinsicWidth(cells, containerWidth),
-      b.maxIntrinsicWidth(cells, containerWidth)
+      b.maxIntrinsicWidth(cells, containerWidth),
     );
   }
 
@@ -288,7 +288,7 @@ class MinColumnWidth extends TableColumnWidth {
   double minIntrinsicWidth(Iterable<RenderBox> cells, double containerWidth) {
     return math.min(
       a.minIntrinsicWidth(cells, containerWidth),
-      b.minIntrinsicWidth(cells, containerWidth)
+      b.minIntrinsicWidth(cells, containerWidth),
     );
   }
 
@@ -296,7 +296,7 @@ class MinColumnWidth extends TableColumnWidth {
   double maxIntrinsicWidth(Iterable<RenderBox> cells, double containerWidth) {
     return math.min(
       a.maxIntrinsicWidth(cells, containerWidth),
-      b.maxIntrinsicWidth(cells, containerWidth)
+      b.maxIntrinsicWidth(cells, containerWidth),
     );
   }
 
@@ -368,7 +368,7 @@ class RenderTable extends RenderBox {
     ImageConfiguration configuration = ImageConfiguration.empty,
     TableCellVerticalAlignment defaultVerticalAlignment = TableCellVerticalAlignment.top,
     TextBaseline textBaseline,
-    List<List<RenderBox>> children
+    List<List<RenderBox>> children,
   }) : assert(columns == null || columns >= 0),
        assert(rows == null || rows >= 0),
        assert(rows == null || children == null),
@@ -1138,7 +1138,7 @@ class RenderTable extends RenderBox {
           _rowDecorationPainters[y].paint(
             canvas,
             Offset(offset.dx, offset.dy + _rowTops[y]),
-            configuration.copyWith(size: Size(size.width, _rowTops[y+1] - _rowTops[y]))
+            configuration.copyWith(size: Size(size.width, _rowTops[y+1] - _rowTops[y])),
           );
         }
       }
diff --git a/packages/flutter/lib/src/rendering/viewport.dart b/packages/flutter/lib/src/rendering/viewport.dart
index 67648731cb0..233afcc78b1 100644
--- a/packages/flutter/lib/src/rendering/viewport.dart
+++ b/packages/flutter/lib/src/rendering/viewport.dart
@@ -576,7 +576,7 @@ abstract class RenderViewportBase<ParentDataClass extends ContainerParentDataMix
       if (child.geometry.visible && child.hitTest(
         result,
         mainAxisPosition: computeChildMainAxisPosition(child, mainAxisPosition),
-        crossAxisPosition: crossAxisPosition
+        crossAxisPosition: crossAxisPosition,
       )) {
         return true;
       }
diff --git a/packages/flutter/lib/src/scheduler/binding.dart b/packages/flutter/lib/src/scheduler/binding.dart
index 1a7f9508f6b..d0b83853e47 100644
--- a/packages/flutter/lib/src/scheduler/binding.dart
+++ b/packages/flutter/lib/src/scheduler/binding.dart
@@ -379,7 +379,7 @@ mixin SchedulerBinding on BindingBase, ServicesBinding {
               'exception was thrown), this was the stack:'
             );
             FlutterError.defaultStackFilter(callbackStack.toString().trimRight().split('\n')).forEach(information.writeln);
-          }
+          },
         ));
       }
       return _taskQueue.isNotEmpty;
@@ -488,7 +488,7 @@ mixin SchedulerBinding on BindingBase, ServicesBinding {
               information.writeln('── callback $id ──');
               FlutterError.defaultStackFilter(entry.debugStack.toString().trimRight().split('\n')).forEach(information.writeln);
             }
-          }
+          },
         ));
       }
       return true;
@@ -957,7 +957,7 @@ mixin SchedulerBinding on BindingBase, ServicesBinding {
     postEvent('Flutter.Frame', <String, dynamic>{
       'number': _profileFrameNumber,
       'startTime': _currentFrameTimeStamp.inMicroseconds,
-      'elapsed': _profileFrameStopwatch.elapsedMicroseconds
+      'elapsed': _profileFrameStopwatch.elapsedMicroseconds,
     });
   }
 
@@ -1001,7 +1001,7 @@ mixin SchedulerBinding on BindingBase, ServicesBinding {
             'exception was thrown), this was the stack:'
           );
           FlutterError.defaultStackFilter(callbackStack.toString().trimRight().split('\n')).forEach(information.writeln);
-        }
+        },
       ));
     }
     assert(() { _FrameCallbackEntry.debugCurrentCallbackStack = null; return true; }());
diff --git a/packages/flutter/lib/src/semantics/semantics.dart b/packages/flutter/lib/src/semantics/semantics.dart
index ee8478ad9fa..828c399754d 100644
--- a/packages/flutter/lib/src/semantics/semantics.dart
+++ b/packages/flutter/lib/src/semantics/semantics.dart
@@ -3698,7 +3698,7 @@ String _concatStrings({
   @required String thisString,
   @required String otherString,
   @required TextDirection thisTextDirection,
-  @required TextDirection otherTextDirection
+  @required TextDirection otherTextDirection,
 }) {
   if (otherString.isEmpty)
     return thisString;
diff --git a/packages/flutter/lib/src/services/binding.dart b/packages/flutter/lib/src/services/binding.dart
index d9b011b0646..a1e5554dd3d 100644
--- a/packages/flutter/lib/src/services/binding.dart
+++ b/packages/flutter/lib/src/services/binding.dart
@@ -78,7 +78,7 @@ mixin ServicesBinding on BindingBase {
       if (split >= 0) {
         result.add(LicenseEntryWithLineBreaks(
           license.substring(0, split).split('\n'),
-          license.substring(split + 2)
+          license.substring(split + 2),
         ));
       } else {
         result.add(LicenseEntryWithLineBreaks(const <String>[], license));
diff --git a/packages/flutter/lib/src/services/platform_views.dart b/packages/flutter/lib/src/services/platform_views.dart
index a2057ded974..c990f477957 100644
--- a/packages/flutter/lib/src/services/platform_views.dart
+++ b/packages/flutter/lib/src/services/platform_views.dart
@@ -143,7 +143,7 @@ class AndroidPointerProperties {
   /// All parameters must not be null.
   const AndroidPointerProperties({
     @required this.id,
-    @required this.toolType
+    @required this.toolType,
   }) : assert(id != null),
        assert(toolType != null);
 
@@ -193,7 +193,7 @@ class AndroidPointerCoords {
     @required this.touchMajor,
     @required this.touchMinor,
     @required this.x,
-    @required this.y
+    @required this.y,
   }) : assert(orientation != null),
        assert(pressure != null),
        assert(size != null),
@@ -280,7 +280,7 @@ class AndroidMotionEvent {
     @required this.deviceId,
     @required this.edgeFlags,
     @required this.source,
-    @required this.flags
+    @required this.flags,
   }) : assert(downTime != null),
        assert(eventTime != null),
        assert(action != null),
diff --git a/packages/flutter/lib/src/services/text_editing.dart b/packages/flutter/lib/src/services/text_editing.dart
index a1798be7274..6b365e8037d 100644
--- a/packages/flutter/lib/src/services/text_editing.dart
+++ b/packages/flutter/lib/src/services/text_editing.dart
@@ -20,7 +20,7 @@ class TextRange {
   /// constant.
   const TextRange({
     @required this.start,
-    @required this.end
+    @required this.end,
   }) : assert(start != null && start >= -1),
        assert(end != null && end >= -1);
 
@@ -86,7 +86,7 @@ class TextRange {
   @override
   int get hashCode => hashValues(
     start.hashCode,
-    end.hashCode
+    end.hashCode,
   );
 
   @override
@@ -103,7 +103,7 @@ class TextSelection extends TextRange {
     @required this.baseOffset,
     @required this.extentOffset,
     this.affinity = TextAffinity.downstream,
-    this.isDirectional = false
+    this.isDirectional = false,
   }) : super(
          start: baseOffset < extentOffset ? baseOffset : extentOffset,
          end: baseOffset < extentOffset ? extentOffset : baseOffset
@@ -118,7 +118,7 @@ class TextSelection extends TextRange {
   /// The [offset] argument must not be null.
   const TextSelection.collapsed({
     @required int offset,
-    this.affinity = TextAffinity.downstream
+    this.affinity = TextAffinity.downstream,
   }) : baseOffset = offset,
        extentOffset = offset,
        isDirectional = false,
@@ -200,7 +200,7 @@ class TextSelection extends TextRange {
     baseOffset.hashCode,
     extentOffset.hashCode,
     affinity.hashCode,
-    isDirectional.hashCode
+    isDirectional.hashCode,
   );
 
   /// Creates a new [TextSelection] based on the current selection, with the
diff --git a/packages/flutter/lib/src/services/text_formatter.dart b/packages/flutter/lib/src/services/text_formatter.dart
index 5d5392dbe03..c92dd709955 100644
--- a/packages/flutter/lib/src/services/text_formatter.dart
+++ b/packages/flutter/lib/src/services/text_formatter.dart
@@ -39,13 +39,13 @@ abstract class TextInputFormatter {
   /// [TextEditingValue] at the beginning of the chain.
   TextEditingValue formatEditUpdate(
     TextEditingValue oldValue,
-    TextEditingValue newValue
+    TextEditingValue newValue,
   );
 
   /// A shorthand to creating a custom [TextInputFormatter] which formats
   /// incoming text input changes with the given function.
   static TextInputFormatter withFunction(
-    TextInputFormatFunction formatFunction
+    TextInputFormatFunction formatFunction,
   ) {
     return _SimpleTextInputFormatter(formatFunction);
   }
@@ -68,7 +68,7 @@ class _SimpleTextInputFormatter extends TextInputFormatter {
   @override
   TextEditingValue formatEditUpdate(
     TextEditingValue oldValue,
-    TextEditingValue newValue
+    TextEditingValue newValue,
   ) {
     return formatFunction(oldValue, newValue);
   }
diff --git a/packages/flutter/lib/src/services/text_input.dart b/packages/flutter/lib/src/services/text_input.dart
index 07fe9f7bcae..70c467e38a0 100644
--- a/packages/flutter/lib/src/services/text_input.dart
+++ b/packages/flutter/lib/src/services/text_input.dart
@@ -487,7 +487,7 @@ class TextEditingValue {
   const TextEditingValue({
     this.text = '',
     this.selection = const TextSelection.collapsed(offset: -1),
-    this.composing = TextRange.empty
+    this.composing = TextRange.empty,
   }) : assert(text != null),
        assert(selection != null),
        assert(composing != null);
@@ -538,12 +538,12 @@ class TextEditingValue {
   TextEditingValue copyWith({
     String text,
     TextSelection selection,
-    TextRange composing
+    TextRange composing,
   }) {
     return TextEditingValue(
       text: text ?? this.text,
       selection: selection ?? this.selection,
-      composing: composing ?? this.composing
+      composing: composing ?? this.composing,
     );
   }
 
@@ -566,7 +566,7 @@ class TextEditingValue {
   int get hashCode => hashValues(
     text.hashCode,
     selection.hashCode,
-    composing.hashCode
+    composing.hashCode,
   );
 }
 
diff --git a/packages/flutter/lib/src/widgets/animated_cross_fade.dart b/packages/flutter/lib/src/widgets/animated_cross_fade.dart
index c211361df8d..ccb2a5bf459 100644
--- a/packages/flutter/lib/src/widgets/animated_cross_fade.dart
+++ b/packages/flutter/lib/src/widgets/animated_cross_fade.dart
@@ -219,7 +219,7 @@ class AnimatedCrossFade extends StatefulWidget {
         Positioned(
           key: topChildKey,
           child: topChild,
-        )
+        ),
       ],
     );
   }
diff --git a/packages/flutter/lib/src/widgets/app.dart b/packages/flutter/lib/src/widgets/app.dart
index 05e6b8fd45c..15d4468fd79 100644
--- a/packages/flutter/lib/src/widgets/app.dart
+++ b/packages/flutter/lib/src/widgets/app.dart
@@ -1135,7 +1135,7 @@ class _WidgetsAppState extends State<WidgetsApp> implements WidgetsBindingObserv
         children: <Widget>[
           result,
           Positioned(top: 0.0, left: 0.0, right: 0.0, child: performanceOverlay),
-        ]
+        ],
       );
     }
 
diff --git a/packages/flutter/lib/src/widgets/async.dart b/packages/flutter/lib/src/widgets/async.dart
index 5ac59b918c5..3e833d04725 100644
--- a/packages/flutter/lib/src/widgets/async.dart
+++ b/packages/flutter/lib/src/widgets/async.dart
@@ -380,7 +380,7 @@ class StreamBuilder<T> extends StreamBuilderBase<T, AsyncSnapshot<T>> {
     Key key,
     this.initialData,
     Stream<T> stream,
-    @required this.builder
+    @required this.builder,
   }) : assert(builder != null),
        super(key: key, stream: stream);
 
@@ -521,7 +521,7 @@ class FutureBuilder<T> extends StatefulWidget {
     Key key,
     this.future,
     this.initialData,
-    @required this.builder
+    @required this.builder,
   }) : assert(builder != null),
        super(key: key);
 
diff --git a/packages/flutter/lib/src/widgets/banner.dart b/packages/flutter/lib/src/widgets/banner.dart
index a9b3c76e2a4..38d184d56ec 100644
--- a/packages/flutter/lib/src/widgets/banner.dart
+++ b/packages/flutter/lib/src/widgets/banner.dart
@@ -21,7 +21,7 @@ const TextStyle _kTextStyle = TextStyle(
   color: Color(0xFFFFFFFF),
   fontSize: _kHeight * 0.85,
   fontWeight: FontWeight.w900,
-  height: 1.0
+  height: 1.0,
 );
 
 /// Where to show a [Banner].
@@ -334,7 +334,7 @@ class CheckedModeBanner extends StatelessWidget {
   /// Creates a checked mode banner.
   const CheckedModeBanner({
     Key key,
-    @required this.child
+    @required this.child,
   }) : super(key: key);
 
   /// The widget to show behind the banner.
diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart
index 02a8aa269ee..9ffdbab56d9 100644
--- a/packages/flutter/lib/src/widgets/basic.dart
+++ b/packages/flutter/lib/src/widgets/basic.dart
@@ -86,7 +86,7 @@ class Directionality extends InheritedWidget {
   const Directionality({
     Key key,
     @required this.textDirection,
-    @required Widget child
+    @required Widget child,
   }) : assert(textDirection != null),
        assert(child != null),
        super(key: key, child: child);
@@ -296,7 +296,7 @@ class ShaderMask extends SingleChildRenderObjectWidget {
     Key key,
     @required this.shaderCallback,
     this.blendMode = BlendMode.modulate,
-    Widget child
+    Widget child,
   }) : assert(shaderCallback != null),
        assert(blendMode != null),
        super(key: key, child: child);
@@ -413,7 +413,7 @@ class BackdropFilter extends SingleChildRenderObjectWidget {
   const BackdropFilter({
     Key key,
     @required this.filter,
-    Widget child
+    Widget child,
   }) : assert(filter != null),
        super(key: key, child: child);
 
@@ -984,7 +984,7 @@ class PhysicalShape extends SingleChildRenderObjectWidget {
       clipBehavior: clipBehavior,
       elevation: elevation,
       color: color,
-      shadowColor: shadowColor
+      shadowColor: shadowColor,
     );
   }
 
@@ -1182,7 +1182,7 @@ class Transform extends SingleChildRenderObjectWidget {
       origin: origin,
       alignment: alignment,
       textDirection: Directionality.of(context),
-      transformHitTests: transformHitTests
+      transformHitTests: transformHitTests,
     );
   }
 
@@ -1652,7 +1652,7 @@ class Align extends SingleChildRenderObjectWidget {
     this.alignment = Alignment.center,
     this.widthFactor,
     this.heightFactor,
-    Widget child
+    Widget child,
   }) : assert(alignment != null),
        assert(widthFactor == null || widthFactor >= 0.0),
        assert(heightFactor == null || heightFactor >= 0.0),
@@ -1762,7 +1762,7 @@ class CustomSingleChildLayout extends SingleChildRenderObjectWidget {
   const CustomSingleChildLayout({
     Key key,
     @required this.delegate,
-    Widget child
+    Widget child,
   }) : assert(delegate != null),
        super(key: key, child: child);
 
@@ -1792,7 +1792,7 @@ class LayoutId extends ParentDataWidget<CustomMultiChildLayout> {
   LayoutId({
     Key key,
     @required this.id,
-    @required Widget child
+    @required Widget child,
   }) : assert(child != null),
        assert(id != null),
        super(key: key ?? ValueKey<Object>(id), child: child);
@@ -2028,7 +2028,7 @@ class ConstrainedBox extends SingleChildRenderObjectWidget {
   ConstrainedBox({
     Key key,
     @required this.constraints,
-    Widget child
+    Widget child,
   }) : assert(constraints != null),
        assert(constraints.debugAssertIsValid()),
        super(key: key, child: child);
@@ -2280,7 +2280,7 @@ class LimitedBox extends SingleChildRenderObjectWidget {
   RenderLimitedBox createRenderObject(BuildContext context) {
     return RenderLimitedBox(
       maxWidth: maxWidth,
-      maxHeight: maxHeight
+      maxHeight: maxHeight,
     );
   }
 
@@ -2577,7 +2577,7 @@ class AspectRatio extends SingleChildRenderObjectWidget {
   const AspectRatio({
     Key key,
     @required this.aspectRatio,
-    Widget child
+    Widget child,
   }) : assert(aspectRatio != null),
        super(key: key, child: child);
 
@@ -2713,7 +2713,7 @@ class Baseline extends SingleChildRenderObjectWidget {
     Key key,
     @required this.baseline,
     @required this.baselineType,
-    Widget child
+    Widget child,
   }) : assert(baseline != null),
        assert(baselineType != null),
        super(key: key, child: child);
@@ -5029,7 +5029,7 @@ class DefaultAssetBundle extends InheritedWidget {
   const DefaultAssetBundle({
     Key key,
     @required this.bundle,
-    @required Widget child
+    @required Widget child,
   }) : assert(bundle != null),
        assert(child != null),
        super(key: key, child: child);
@@ -5192,7 +5192,7 @@ class Listener extends SingleChildRenderObjectWidget {
     this.onPointerUp,
     this.onPointerCancel,
     this.behavior = HitTestBehavior.deferToChild,
-    Widget child
+    Widget child,
   }) : assert(behavior != null),
        super(key: key, child: child);
 
@@ -5252,7 +5252,7 @@ class Listener extends SingleChildRenderObjectWidget {
       onPointerExit: onPointerExit,
       onPointerUp: onPointerUp,
       onPointerCancel: onPointerCancel,
-      behavior: behavior
+      behavior: behavior,
     );
   }
 
@@ -5397,7 +5397,7 @@ class IgnorePointer extends SingleChildRenderObjectWidget {
     Key key,
     this.ignoring = true,
     this.ignoringSemantics,
-    Widget child
+    Widget child,
   }) : assert(ignoring != null),
        super(key: key, child: child);
 
@@ -5418,7 +5418,7 @@ class IgnorePointer extends SingleChildRenderObjectWidget {
   RenderIgnorePointer createRenderObject(BuildContext context) {
     return RenderIgnorePointer(
       ignoring: ignoring,
-      ignoringSemantics: ignoringSemantics
+      ignoringSemantics: ignoringSemantics,
     );
   }
 
@@ -5513,7 +5513,7 @@ class MetaData extends SingleChildRenderObjectWidget {
     Key key,
     this.metaData,
     this.behavior = HitTestBehavior.deferToChild,
-    Widget child
+    Widget child,
   }) : super(key: key, child: child);
 
   /// Opaque meta data ignored by the render tree
@@ -5526,7 +5526,7 @@ class MetaData extends SingleChildRenderObjectWidget {
   RenderMetaData createRenderObject(BuildContext context) {
     return RenderMetaData(
       metaData: metaData,
-      behavior: behavior
+      behavior: behavior,
     );
   }
 
@@ -6030,7 +6030,7 @@ class KeyedSubtree extends StatelessWidget {
   /// Creates a widget that builds its child.
   const KeyedSubtree({
     Key key,
-    @required this.child
+    @required this.child,
   }) : assert(child != null),
        super(key: key);
 
@@ -6077,7 +6077,7 @@ class Builder extends StatelessWidget {
   /// The [builder] argument must not be null.
   const Builder({
     Key key,
-    @required this.builder
+    @required this.builder,
   }) : assert(builder != null),
        super(key: key);
 
@@ -6110,7 +6110,7 @@ class StatefulBuilder extends StatefulWidget {
   /// The [builder] argument must not be null.
   const StatefulBuilder({
     Key key,
-    @required this.builder
+    @required this.builder,
   }) : assert(builder != null),
        super(key: key);
 
diff --git a/packages/flutter/lib/src/widgets/binding.dart b/packages/flutter/lib/src/widgets/binding.dart
index 5e8ec044984..4c2b11fc4e7 100644
--- a/packages/flutter/lib/src/widgets/binding.dart
+++ b/packages/flutter/lib/src/widgets/binding.dart
@@ -298,7 +298,7 @@ mixin WidgetsBinding on BindingBase, SchedulerBinding, GestureBinding, RendererB
             // This is defined to return a STRING, not a boolean.
             // Devtools, the Intellij plugin, and the flutter tool all depend
             // on it returning a string and not a boolean.
-            'enabled': _needToReportFirstFrame ? 'false' : 'true'
+            'enabled': _needToReportFirstFrame ? 'false' : 'true',
           };
         },
       );
@@ -336,7 +336,7 @@ mixin WidgetsBinding on BindingBase, SchedulerBinding, GestureBinding, RendererB
               return Future<void>.value();
             WidgetsApp.debugShowWidgetInspectorOverride = value;
             return _forceRebuild();
-          }
+          },
       );
 
       WidgetInspectorService.instance.initServiceExtensions(registerServiceExtension);
@@ -732,7 +732,7 @@ mixin WidgetsBinding on BindingBase, SchedulerBinding, GestureBinding, RendererB
     _renderViewElement = RenderObjectToWidgetAdapter<RenderBox>(
       container: renderView,
       debugShortDescription: '[root]',
-      child: rootWidget
+      child: rootWidget,
     ).attachToRenderTree(buildOwner, renderViewElement);
   }
 
@@ -809,7 +809,7 @@ class RenderObjectToWidgetAdapter<T extends RenderObject> extends RenderObjectWi
   RenderObjectToWidgetAdapter({
     this.child,
     this.container,
-    this.debugShortDescription
+    this.debugShortDescription,
   }) : super(key: GlobalObjectKey(container));
 
   /// The widget below this widget in the tree.
@@ -937,7 +937,7 @@ class RenderObjectToWidgetElement<T extends RenderObject> extends RootRenderObje
         exception: exception,
         stack: stack,
         library: 'widgets library',
-        context: 'attaching to the render tree'
+        context: 'attaching to the render tree',
       );
       FlutterError.reportError(details);
       final Widget error = ErrorWidget.builder(details);
diff --git a/packages/flutter/lib/src/widgets/container.dart b/packages/flutter/lib/src/widgets/container.dart
index 10a298ff51a..203191a601b 100644
--- a/packages/flutter/lib/src/widgets/container.dart
+++ b/packages/flutter/lib/src/widgets/container.dart
@@ -62,7 +62,7 @@ class DecoratedBox extends SingleChildRenderObjectWidget {
     Key key,
     @required this.decoration,
     this.position = DecorationPosition.background,
-    Widget child
+    Widget child,
   }) : assert(decoration != null),
        assert(position != null),
        super(key: key, child: child);
@@ -355,7 +355,7 @@ class Container extends StatelessWidget {
       current = LimitedBox(
         maxWidth: 0.0,
         maxHeight: 0.0,
-        child: ConstrainedBox(constraints: const BoxConstraints.expand())
+        child: ConstrainedBox(constraints: const BoxConstraints.expand()),
       );
     }
 
@@ -373,7 +373,7 @@ class Container extends StatelessWidget {
       current = DecoratedBox(
         decoration: foregroundDecoration,
         position: DecorationPosition.foreground,
-        child: current
+        child: current,
       );
     }
 
diff --git a/packages/flutter/lib/src/widgets/dismissible.dart b/packages/flutter/lib/src/widgets/dismissible.dart
index d57571173bc..a275aa48871 100644
--- a/packages/flutter/lib/src/widgets/dismissible.dart
+++ b/packages/flutter/lib/src/widgets/dismissible.dart
@@ -186,7 +186,7 @@ class Dismissible extends StatefulWidget {
 class _DismissibleClipper extends CustomClipper<Rect> {
   _DismissibleClipper({
     @required this.axis,
-    @required this.moveAnimation
+    @required this.moveAnimation,
   }) : assert(axis != null),
        assert(moveAnimation != null),
        super(reclip: moveAnimation);
@@ -483,7 +483,7 @@ class _DismissibleState extends State<Dismissible> with TickerProviderStateMixin
         ).drive(
           Tween<double>(
             begin: 1.0,
-            end: 0.0
+            end: 0.0,
           ),
         );
       });
@@ -536,14 +536,14 @@ class _DismissibleState extends State<Dismissible> with TickerProviderStateMixin
         child: SizedBox(
           width: _sizePriorToCollapse.width,
           height: _sizePriorToCollapse.height,
-          child: background
-        )
+          child: background,
+        ),
       );
     }
 
     Widget content = SlideTransition(
       position: _moveAnimation,
-      child: widget.child
+      child: widget.child,
     );
 
     if (background != null) {
@@ -556,8 +556,8 @@ class _DismissibleState extends State<Dismissible> with TickerProviderStateMixin
               axis: _directionIsXAxis ? Axis.horizontal : Axis.vertical,
               moveAnimation: _moveAnimation,
             ),
-            child: background
-          )
+            child: background,
+          ),
         ));
       }
 
diff --git a/packages/flutter/lib/src/widgets/drag_target.dart b/packages/flutter/lib/src/widgets/drag_target.dart
index 5059e3b3a95..fa8f4ad69a3 100644
--- a/packages/flutter/lib/src/widgets/drag_target.dart
+++ b/packages/flutter/lib/src/widgets/drag_target.dart
@@ -398,14 +398,14 @@ class _DraggableState<T> extends State<Draggable<T>> {
           widget.onDragEnd(DraggableDetails(
               wasAccepted: wasAccepted,
               velocity: velocity,
-              offset: offset
+              offset: offset,
           ));
         }
         if (wasAccepted && widget.onDragCompleted != null)
           widget.onDragCompleted();
         if (!wasAccepted && widget.onDraggableCanceled != null)
           widget.onDraggableCanceled(velocity, offset);
-      }
+      },
     );
     if (widget.onDragStarted != null)
       widget.onDragStarted();
@@ -420,7 +420,7 @@ class _DraggableState<T> extends State<Draggable<T>> {
     final bool showChild = _activeCount == 0 || widget.childWhenDragging == null;
     return Listener(
       onPointerDown: canDrag ? _routePointer : null,
-      child: showChild ? widget.child : widget.childWhenDragging
+      child: showChild ? widget.child : widget.childWhenDragging,
     );
   }
 }
@@ -441,7 +441,7 @@ class DraggableDetails {
   DraggableDetails({
     this.wasAccepted = false,
     @required this.velocity,
-    @required this.offset
+    @required this.offset,
   }) : assert(velocity != null),
        assert(offset != null);
 
@@ -556,7 +556,7 @@ class _DragTargetState<T> extends State<DragTarget<T>> {
     return MetaData(
       metaData: this,
       behavior: HitTestBehavior.translucent,
-      child: widget.builder(context, _mapAvatarsToData<T>(_candidateAvatars), _mapAvatarsToData<dynamic>(_rejectedAvatars))
+      child: widget.builder(context, _mapAvatarsToData<T>(_candidateAvatars), _mapAvatarsToData<dynamic>(_rejectedAvatars)),
     );
   }
 }
@@ -654,7 +654,7 @@ class _DragAvatar<T> extends Drag {
         _enteredTargets.add(target);
         return target.didEnter(this);
       },
-      orElse: () => null
+      orElse: () => null,
     );
 
     _activeTarget = newTarget;
@@ -703,7 +703,7 @@ class _DragAvatar<T> extends Drag {
       child: IgnorePointer(
         child: feedback,
         ignoringSemantics: ignoringFeedbackSemantics,
-      )
+      ),
     );
   }
 
diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart
index d93a0382542..dbe9fe0a0a5 100644
--- a/packages/flutter/lib/src/widgets/editable_text.dart
+++ b/packages/flutter/lib/src/widgets/editable_text.dart
@@ -142,7 +142,7 @@ class TextEditingController extends ValueNotifier<TextEditingValue> {
     value = value.copyWith(
       text: newText,
       selection: const TextSelection.collapsed(offset: -1),
-      composing: TextRange.empty
+      composing: TextRange.empty,
     );
   }
 
@@ -939,7 +939,7 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
               ),
               textCapitalization: widget.textCapitalization,
               keyboardAppearance: widget.keyboardAppearance,
-          )
+          ),
       )..setEditingState(localValue);
     }
     _textInputConnection.show();
@@ -1065,7 +1065,7 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
           newCaretRect.left - widget.scrollPadding.left,
           newCaretRect.top - widget.scrollPadding.top,
           newCaretRect.right + widget.scrollPadding.right,
-          newCaretRect.bottom + widget.scrollPadding.bottom
+          newCaretRect.bottom + widget.scrollPadding.bottom,
       );
       _editableKey.currentContext.findRenderObject().showOnScreen(
         rect: inflatedRect,
@@ -1398,7 +1398,7 @@ class _Editable extends LeafRenderObjectWidget {
     this.enableInteractiveSelection = true,
     this.textSelectionDelegate,
     this.paintCursorAboveText,
-    this.devicePixelRatio
+    this.devicePixelRatio,
   }) : assert(textDirection != null),
        assert(rendererIgnoresPointer != null),
        super(key: key);
diff --git a/packages/flutter/lib/src/widgets/fade_in_image.dart b/packages/flutter/lib/src/widgets/fade_in_image.dart
index 5cb2150fade..0eefe13ab88 100644
--- a/packages/flutter/lib/src/widgets/fade_in_image.dart
+++ b/packages/flutter/lib/src/widgets/fade_in_image.dart
@@ -332,7 +332,7 @@ class _ImageProviderResolver {
     final ImageStream oldImageStream = _imageStream;
     _imageStream = provider.resolve(createLocalImageConfiguration(
       state.context,
-      size: widget.width != null && widget.height != null ? Size(widget.width, widget.height) : null
+      size: widget.width != null && widget.height != null ? Size(widget.width, widget.height) : null,
     ));
     assert(_imageStream != null);
 
diff --git a/packages/flutter/lib/src/widgets/form.dart b/packages/flutter/lib/src/widgets/form.dart
index 1d2f9e15772..96844ddf6fb 100644
--- a/packages/flutter/lib/src/widgets/form.dart
+++ b/packages/flutter/lib/src/widgets/form.dart
@@ -162,7 +162,7 @@ class _FormScope extends InheritedWidget {
     Key key,
     Widget child,
     FormState formState,
-    int generation
+    int generation,
   }) : _formState = formState,
        _generation = generation,
        super(key: key, child: child);
diff --git a/packages/flutter/lib/src/widgets/framework.dart b/packages/flutter/lib/src/widgets/framework.dart
index f3aa9bee86a..cbdea165cbd 100644
--- a/packages/flutter/lib/src/widgets/framework.dart
+++ b/packages/flutter/lib/src/widgets/framework.dart
@@ -2277,7 +2277,7 @@ class BuildOwner {
             informationCollector: (StringBuffer information) {
               information.writeln('The element being rebuilt at the time was index $index of $dirtyCount:');
               information.write('  ${_dirtyElements[index]}');
-            }
+            },
           );
         }
         index += 1;
@@ -4056,7 +4056,7 @@ class ParentDataElement<T extends RenderObjectWidget> extends ProxyElement {
           description: '$this',
           ownershipChain: parent.debugGetCreatorChain(10),
           foundValidAncestor: ancestor != null,
-          badAncestors: badAncestors
+          badAncestors: badAncestors,
         )
       );
     }());
@@ -5005,7 +5005,7 @@ FlutterErrorDetails _debugReportException(
   String context,
   dynamic exception,
   StackTrace stack, {
-  InformationCollector informationCollector
+  InformationCollector informationCollector,
 }) {
   final FlutterErrorDetails details = FlutterErrorDetails(
     exception: exception,
diff --git a/packages/flutter/lib/src/widgets/gesture_detector.dart b/packages/flutter/lib/src/widgets/gesture_detector.dart
index 3279519dec1..861d90c851d 100644
--- a/packages/flutter/lib/src/widgets/gesture_detector.dart
+++ b/packages/flutter/lib/src/widgets/gesture_detector.dart
@@ -868,7 +868,7 @@ class RawGestureDetectorState extends State<RawGestureDetector> {
     Widget result = Listener(
       onPointerDown: _handlePointerDown,
       behavior: widget.behavior ?? _defaultBehavior,
-      child: widget.child
+      child: widget.child,
     );
     if (!widget.excludeFromSemantics)
       result = _GestureSemantics(owner: this, child: result);
@@ -893,7 +893,7 @@ class _GestureSemantics extends SingleChildRenderObjectWidget {
   const _GestureSemantics({
     Key key,
     Widget child,
-    this.owner
+    this.owner,
   }) : super(key: key, child: child);
 
   final RawGestureDetectorState owner;
diff --git a/packages/flutter/lib/src/widgets/grid_paper.dart b/packages/flutter/lib/src/widgets/grid_paper.dart
index 516348dc7f3..6f3cc61e8cd 100644
--- a/packages/flutter/lib/src/widgets/grid_paper.dart
+++ b/packages/flutter/lib/src/widgets/grid_paper.dart
@@ -12,7 +12,7 @@ class _GridPaperPainter extends CustomPainter {
     this.color,
     this.interval,
     this.divisions,
-    this.subdivisions
+    this.subdivisions,
   });
 
   final Color color;
diff --git a/packages/flutter/lib/src/widgets/heroes.dart b/packages/flutter/lib/src/widgets/heroes.dart
index 5c163a68160..c6feb068ec0 100644
--- a/packages/flutter/lib/src/widgets/heroes.dart
+++ b/packages/flutter/lib/src/widgets/heroes.dart
@@ -265,7 +265,7 @@ class _HeroState extends State<Hero> {
       if (widget.placeholderBuilder == null) {
         return SizedBox(
           width: _placeholderSize.width,
-          height: _placeholderSize.height
+          height: _placeholderSize.height,
         );
       } else {
         return widget.placeholderBuilder(context, widget.child);
diff --git a/packages/flutter/lib/src/widgets/icon.dart b/packages/flutter/lib/src/widgets/icon.dart
index c1d12a86d2e..0b8cfbc1bea 100644
--- a/packages/flutter/lib/src/widgets/icon.dart
+++ b/packages/flutter/lib/src/widgets/icon.dart
@@ -141,7 +141,7 @@ class Icon extends StatelessWidget {
     if (icon == null) {
       return Semantics(
         label: semanticLabel,
-        child: SizedBox(width: iconSize, height: iconSize)
+        child: SizedBox(width: iconSize, height: iconSize),
       );
     }
 
diff --git a/packages/flutter/lib/src/widgets/image.dart b/packages/flutter/lib/src/widgets/image.dart
index 827cfcad238..785b82f4843 100644
--- a/packages/flutter/lib/src/widgets/image.dart
+++ b/packages/flutter/lib/src/widgets/image.dart
@@ -631,7 +631,7 @@ class _ImageState extends State<Image> {
     final ImageStream newStream =
       widget.image.resolve(createLocalImageConfiguration(
           context,
-          size: widget.width != null && widget.height != null ? Size(widget.width, widget.height) : null
+          size: widget.width != null && widget.height != null ? Size(widget.width, widget.height) : null,
       ));
     assert(newStream != null);
     _updateSourceStream(newStream);
diff --git a/packages/flutter/lib/src/widgets/image_icon.dart b/packages/flutter/lib/src/widgets/image_icon.dart
index af93e7a3178..65b1b04a3d4 100644
--- a/packages/flutter/lib/src/widgets/image_icon.dart
+++ b/packages/flutter/lib/src/widgets/image_icon.dart
@@ -73,7 +73,7 @@ class ImageIcon extends StatelessWidget {
     if (image == null)
       return Semantics(
         label: semanticLabel,
-        child: SizedBox(width: iconSize, height: iconSize)
+        child: SizedBox(width: iconSize, height: iconSize),
       );
 
     final double iconOpacity = iconTheme.opacity;
diff --git a/packages/flutter/lib/src/widgets/implicit_animations.dart b/packages/flutter/lib/src/widgets/implicit_animations.dart
index 4c0357bd98f..815b5df12d2 100644
--- a/packages/flutter/lib/src/widgets/implicit_animations.dart
+++ b/packages/flutter/lib/src/widgets/implicit_animations.dart
@@ -218,7 +218,7 @@ abstract class ImplicitlyAnimatedWidget extends StatefulWidget {
   const ImplicitlyAnimatedWidget({
     Key key,
     this.curve = Curves.linear,
-    @required this.duration
+    @required this.duration,
   }) : assert(curve != null),
        assert(duration != null),
        super(key: key);
@@ -779,7 +779,7 @@ class AnimatedPositioned extends ImplicitlyAnimatedWidget {
     this.child,
     Rect rect,
     Curve curve = Curves.linear,
-    @required Duration duration
+    @required Duration duration,
   }) : left = rect.left,
        top = rect.top,
        width = rect.width,
@@ -1116,7 +1116,7 @@ class _AnimatedOpacityState extends ImplicitlyAnimatedWidgetState<AnimatedOpacit
   Widget build(BuildContext context) {
     return FadeTransition(
       opacity: _opacityAnimation,
-      child: widget.child
+      child: widget.child,
     );
   }
 }
diff --git a/packages/flutter/lib/src/widgets/layout_builder.dart b/packages/flutter/lib/src/widgets/layout_builder.dart
index eb7b2bfacb9..3c16754861b 100644
--- a/packages/flutter/lib/src/widgets/layout_builder.dart
+++ b/packages/flutter/lib/src/widgets/layout_builder.dart
@@ -34,7 +34,7 @@ class LayoutBuilder extends RenderObjectWidget {
   /// The [builder] argument must not be null.
   const LayoutBuilder({
     Key key,
-    @required this.builder
+    @required this.builder,
   }) : assert(builder != null),
        super(key: key);
 
@@ -232,7 +232,7 @@ FlutterErrorDetails _debugReportException(
     exception: exception,
     stack: stack,
     library: 'widgets library',
-    context: context
+    context: context,
   );
   FlutterError.reportError(details);
   return details;
diff --git a/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart b/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart
index c71246f3525..50c8574c3f0 100644
--- a/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart
+++ b/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart
@@ -357,7 +357,7 @@ int _getItemFromOffset({
 double _clipOffsetToScrollableRange(
   double offset,
   double minScrollExtent,
-  double maxScrollExtent
+  double maxScrollExtent,
 ) {
   return math.min(math.max(offset, minScrollExtent), maxScrollExtent);
 }
diff --git a/packages/flutter/lib/src/widgets/modal_barrier.dart b/packages/flutter/lib/src/widgets/modal_barrier.dart
index b11132d62a5..567a7f9d358 100644
--- a/packages/flutter/lib/src/widgets/modal_barrier.dart
+++ b/packages/flutter/lib/src/widgets/modal_barrier.dart
@@ -95,12 +95,12 @@ class ModalBarrier extends StatelessWidget {
               child: color == null ? null : DecoratedBox(
                 decoration: BoxDecoration(
                   color: color,
-                )
-              )
-            )
-          )
-        )
-      )
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
     );
   }
 }
diff --git a/packages/flutter/lib/src/widgets/navigator.dart b/packages/flutter/lib/src/widgets/navigator.dart
index 6a86bdbb11f..13c92241cc0 100644
--- a/packages/flutter/lib/src/widgets/navigator.dart
+++ b/packages/flutter/lib/src/widgets/navigator.dart
@@ -741,7 +741,7 @@ class Navigator extends StatefulWidget {
     this.initialRoute,
     @required this.onGenerateRoute,
     this.onUnknownRoute,
-    this.observers = const <NavigatorObserver>[]
+    this.observers = const <NavigatorObserver>[],
   }) : assert(onGenerateRoute != null),
        super(key: key);
 
diff --git a/packages/flutter/lib/src/widgets/overlay.dart b/packages/flutter/lib/src/widgets/overlay.dart
index 479df850036..aab056f33f7 100644
--- a/packages/flutter/lib/src/widgets/overlay.dart
+++ b/packages/flutter/lib/src/widgets/overlay.dart
@@ -202,7 +202,7 @@ class Overlay extends StatefulWidget {
   /// created by the [WidgetsApp] or the [MaterialApp] for the application.
   const Overlay({
     Key key,
-    this.initialEntries = const <OverlayEntry>[]
+    this.initialEntries = const <OverlayEntry>[],
   }) : assert(initialEntries != null),
        super(key: key);
 
diff --git a/packages/flutter/lib/src/widgets/page_storage.dart b/packages/flutter/lib/src/widgets/page_storage.dart
index 103e6dc3e00..93b801fae4b 100644
--- a/packages/flutter/lib/src/widgets/page_storage.dart
+++ b/packages/flutter/lib/src/widgets/page_storage.dart
@@ -139,7 +139,7 @@ class PageStorage extends StatelessWidget {
   const PageStorage({
     Key key,
     @required this.bucket,
-    @required this.child
+    @required this.child,
   }) : assert(bucket != null),
        super(key: key);
 
diff --git a/packages/flutter/lib/src/widgets/page_view.dart b/packages/flutter/lib/src/widgets/page_view.dart
index 329a0cd045b..9193ed20cfe 100644
--- a/packages/flutter/lib/src/widgets/page_view.dart
+++ b/packages/flutter/lib/src/widgets/page_view.dart
@@ -582,7 +582,7 @@ class _PageViewState extends State<PageView> {
             slivers: <Widget>[
               SliverFillViewport(
                 viewportFraction: widget.controller.viewportFraction,
-                delegate: widget.childrenDelegate
+                delegate: widget.childrenDelegate,
               ),
             ],
           );
diff --git a/packages/flutter/lib/src/widgets/primary_scroll_controller.dart b/packages/flutter/lib/src/widgets/primary_scroll_controller.dart
index cef825b39cf..b49912b65a0 100644
--- a/packages/flutter/lib/src/widgets/primary_scroll_controller.dart
+++ b/packages/flutter/lib/src/widgets/primary_scroll_controller.dart
@@ -21,14 +21,14 @@ class PrimaryScrollController extends InheritedWidget {
   const PrimaryScrollController({
     Key key,
     @required this.controller,
-    @required Widget child
+    @required Widget child,
   }) : assert(controller != null),
        super(key: key, child: child);
 
   /// Creates a subtree without an associated [ScrollController].
   const PrimaryScrollController.none({
     Key key,
-    @required Widget child
+    @required Widget child,
   }) : controller = null,
        super(key: key, child: child);
 
diff --git a/packages/flutter/lib/src/widgets/routes.dart b/packages/flutter/lib/src/widgets/routes.dart
index 74df8f7e3c6..b57170279c3 100644
--- a/packages/flutter/lib/src/widgets/routes.dart
+++ b/packages/flutter/lib/src/widgets/routes.dart
@@ -237,7 +237,7 @@ abstract class TransitionRoute<T> extends OverlayRoute<T> {
               assert(newAnimation.currentTrain == nextRoute._animation);
               _secondaryAnimation.parent = newAnimation.currentTrain;
               newAnimation.dispose();
-            }
+            },
           );
           _secondaryAnimation.parent = newAnimation;
           current.dispose();
@@ -535,7 +535,7 @@ class _ModalScopeStatus extends InheritedWidget {
     @required this.isCurrent,
     @required this.canPop,
     @required this.route,
-    @required Widget child
+    @required Widget child,
   }) : assert(isCurrent != null),
        assert(canPop != null),
        assert(route != null),
diff --git a/packages/flutter/lib/src/widgets/scroll_activity.dart b/packages/flutter/lib/src/widgets/scroll_activity.dart
index da63935a89e..305489999bd 100644
--- a/packages/flutter/lib/src/widgets/scroll_activity.dart
+++ b/packages/flutter/lib/src/widgets/scroll_activity.dart
@@ -341,7 +341,7 @@ class ScrollDragController implements Drag {
               // Ease into the motion when the threshold is initially broken
               // to avoid a visible jump.
               motionStartDistanceThreshold / 3.0,
-              offset.abs()
+              offset.abs(),
             ) * offset.sign;
           }
         } else {
@@ -457,7 +457,7 @@ class DragScrollActivity extends ScrollActivity {
     ScrollEndNotification(
       metrics: metrics,
       context: context,
-      dragDetails: lastDetails is DragEndDetails ? lastDetails : null
+      dragDetails: lastDetails is DragEndDetails ? lastDetails : null,
     ).dispatch(context);
   }
 
diff --git a/packages/flutter/lib/src/widgets/scroll_physics.dart b/packages/flutter/lib/src/widgets/scroll_physics.dart
index c9eb76d8d92..089b4079adb 100644
--- a/packages/flutter/lib/src/widgets/scroll_physics.dart
+++ b/packages/flutter/lib/src/widgets/scroll_physics.dart
@@ -175,7 +175,7 @@ class ScrollPhysics {
     // TODO(ianh): Handle the case of the device pixel ratio changing.
     // TODO(ianh): Get this from the local MediaQuery not dart:ui's window object.
     velocity: 1.0 / (0.050 * WidgetsBinding.instance.window.devicePixelRatio), // logical pixels per second
-    distance: 1.0 / WidgetsBinding.instance.window.devicePixelRatio // logical pixels
+    distance: 1.0 / WidgetsBinding.instance.window.devicePixelRatio, // logical pixels
   );
 
   /// The tolerance to use for ballistic simulations.
@@ -430,7 +430,7 @@ class ClampingScrollPhysics extends ScrollPhysics {
         position.pixels,
         end,
         math.min(0.0, velocity),
-        tolerance: tolerance
+        tolerance: tolerance,
       );
     }
     if (velocity.abs() < tolerance.velocity)
diff --git a/packages/flutter/lib/src/widgets/scroll_view.dart b/packages/flutter/lib/src/widgets/scroll_view.dart
index 949c87c43b8..0dbec871911 100644
--- a/packages/flutter/lib/src/widgets/scroll_view.dart
+++ b/packages/flutter/lib/src/widgets/scroll_view.dart
@@ -978,7 +978,7 @@ class ListView extends BoxScrollView {
          addSemanticIndexes: addSemanticIndexes,
          semanticIndexCallback: (Widget _, int index) {
            return index.isEven ? index ~/ 2 : null;
-         }
+         },
        ),
        super(
          key: key,
diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart
index 4dad42fe10b..f6c344e3576 100644
--- a/packages/flutter/lib/src/widgets/scrollable.dart
+++ b/packages/flutter/lib/src/widgets/scrollable.dart
@@ -266,7 +266,7 @@ class _ScrollableScope extends InheritedWidget {
     Key key,
     @required this.scrollable,
     @required this.position,
-    @required Widget child
+    @required Widget child,
   }) : assert(scrollable != null),
        assert(child != null),
        super(key: key, child: child);
@@ -595,7 +595,7 @@ class _ScrollSemantics extends SingleChildRenderObjectWidget {
     @required this.position,
     @required this.allowImplicitScrolling,
     @required this.semanticChildCount,
-    Widget child
+    Widget child,
   }) : assert(position != null),
        super(key: key, child: child);
 
diff --git a/packages/flutter/lib/src/widgets/semantics_debugger.dart b/packages/flutter/lib/src/widgets/semantics_debugger.dart
index 90be139e857..645bdd8b31f 100644
--- a/packages/flutter/lib/src/widgets/semantics_debugger.dart
+++ b/packages/flutter/lib/src/widgets/semantics_debugger.dart
@@ -261,7 +261,7 @@ String _getMessage(SemanticsNode node) {
 const TextStyle _messageStyle = TextStyle(
   color: Color(0xFF000000),
   fontSize: 10.0,
-  height: 0.8
+  height: 0.8,
 );
 
 void _paintMessage(Canvas canvas, SemanticsNode node) {
diff --git a/packages/flutter/lib/src/widgets/size_changed_layout_notifier.dart b/packages/flutter/lib/src/widgets/size_changed_layout_notifier.dart
index cc87648bfa8..81bbac52bb9 100644
--- a/packages/flutter/lib/src/widgets/size_changed_layout_notifier.dart
+++ b/packages/flutter/lib/src/widgets/size_changed_layout_notifier.dart
@@ -54,7 +54,7 @@ class SizeChangedLayoutNotifier extends SingleChildRenderObjectWidget {
   /// notifications when [child] changes layout size.
   const SizeChangedLayoutNotifier({
     Key key,
-    Widget child
+    Widget child,
   }) : super(key: key, child: child);
 
   @override
@@ -70,7 +70,7 @@ class SizeChangedLayoutNotifier extends SingleChildRenderObjectWidget {
 class _RenderSizeChangedWithCallback extends RenderProxyBox {
   _RenderSizeChangedWithCallback({
     RenderBox child,
-    @required this.onLayoutChangedCallback
+    @required this.onLayoutChangedCallback,
   }) : assert(onLayoutChangedCallback != null),
        super(child);
 
diff --git a/packages/flutter/lib/src/widgets/status_transitions.dart b/packages/flutter/lib/src/widgets/status_transitions.dart
index 081bab4f2e6..dafa1467333 100644
--- a/packages/flutter/lib/src/widgets/status_transitions.dart
+++ b/packages/flutter/lib/src/widgets/status_transitions.dart
@@ -12,7 +12,7 @@ abstract class StatusTransitionWidget extends StatefulWidget {
   /// The [animation] argument must not be null.
   const StatusTransitionWidget({
     Key key,
-    @required this.animation
+    @required this.animation,
   }) : assert(animation != null),
        super(key: key);
 
diff --git a/packages/flutter/lib/src/widgets/table.dart b/packages/flutter/lib/src/widgets/table.dart
index 85257f1b32b..acc21f21931 100644
--- a/packages/flutter/lib/src/widgets/table.dart
+++ b/packages/flutter/lib/src/widgets/table.dart
@@ -261,7 +261,7 @@ class _TableElement extends RenderObjectElement {
         children: row.children.map<Element>((Widget child) {
           assert(child != null);
           return inflateWidget(child, null);
-        }).toList(growable: false)
+        }).toList(growable: false),
       );
     }).toList(growable: false);
     assert(() { _debugWillReattachChildren = false; return true; }());
@@ -321,7 +321,7 @@ class _TableElement extends RenderObjectElement {
       }
       newChildren.add(_TableElementRow(
         key: row.key,
-        children: updateChildren(oldChildren, row.children, forgottenChildren: _forgottenChildren)
+        children: updateChildren(oldChildren, row.children, forgottenChildren: _forgottenChildren),
       ));
     }
     while (oldUnkeyedRows.moveNext())
@@ -345,7 +345,7 @@ class _TableElement extends RenderObjectElement {
           final RenderBox box = child.renderObject;
           return box;
         });
-      }).toList()
+      }).toList(),
     );
   }
 
@@ -375,7 +375,7 @@ class TableCell extends ParentDataWidget<Table> {
   const TableCell({
     Key key,
     this.verticalAlignment,
-    @required Widget child
+    @required Widget child,
   }) : super(key: key, child: child);
 
   /// How this cell is aligned vertically.
diff --git a/packages/flutter/lib/src/widgets/text.dart b/packages/flutter/lib/src/widgets/text.dart
index 7e851a72795..33687c0cb6d 100644
--- a/packages/flutter/lib/src/widgets/text.dart
+++ b/packages/flutter/lib/src/widgets/text.dart
@@ -375,7 +375,7 @@ class Text extends StatelessWidget {
         label: semanticsLabel,
         child: ExcludeSemantics(
           child: result,
-        )
+        ),
       );
     }
     return result;
diff --git a/packages/flutter/lib/src/widgets/text_selection.dart b/packages/flutter/lib/src/widgets/text_selection.dart
index 931b52e9c65..c3e35cda314 100644
--- a/packages/flutter/lib/src/widgets/text_selection.dart
+++ b/packages/flutter/lib/src/widgets/text_selection.dart
@@ -207,7 +207,7 @@ abstract class TextSelectionControls {
       text: delegate.textEditingValue.text,
       selection: TextSelection(
         baseOffset: 0,
-        extentOffset: delegate.textEditingValue.text.length
+        extentOffset: delegate.textEditingValue.text.length,
       ),
     );
     delegate.bringIntoView(delegate.textEditingValue.selection.extent);
@@ -397,7 +397,7 @@ class TextSelectionOverlay {
         selectionControls: selectionControls,
         position: position,
         dragStartBehavior: dragStartBehavior,
-      )
+      ),
     );
   }
 
@@ -504,13 +504,13 @@ class _TextSelectionHandleOverlayState extends State<_TextSelectionHandleOverlay
       case _TextSelectionHandlePosition.start:
         newSelection = TextSelection(
           baseOffset: position.offset,
-          extentOffset: widget.selection.extentOffset
+          extentOffset: widget.selection.extentOffset,
         );
         break;
       case _TextSelectionHandlePosition.end:
         newSelection = TextSelection(
           baseOffset: widget.selection.baseOffset,
-          extentOffset: position.offset
+          extentOffset: position.offset,
         );
         break;
     }
@@ -576,7 +576,7 @@ class _TextSelectionHandleOverlayState extends State<_TextSelectionHandleOverlay
   TextSelectionHandleType _chooseType(
     TextSelectionPoint endpoint,
     TextSelectionHandleType ltrType,
-    TextSelectionHandleType rtlType
+    TextSelectionHandleType rtlType,
   ) {
     if (widget.selection.isCollapsed)
       return TextSelectionHandleType.collapsed;
diff --git a/packages/flutter/lib/src/widgets/ticker_provider.dart b/packages/flutter/lib/src/widgets/ticker_provider.dart
index 5fa7c9fd260..2eb79ca066d 100644
--- a/packages/flutter/lib/src/widgets/ticker_provider.dart
+++ b/packages/flutter/lib/src/widgets/ticker_provider.dart
@@ -22,7 +22,7 @@ class TickerMode extends InheritedWidget {
   const TickerMode({
     Key key,
     @required this.enabled,
-    Widget child
+    Widget child,
   }) : assert(enabled != null),
        super(key: key, child: child);
 
diff --git a/packages/flutter/lib/src/widgets/transitions.dart b/packages/flutter/lib/src/widgets/transitions.dart
index fabeb13201e..358c229c61d 100644
--- a/packages/flutter/lib/src/widgets/transitions.dart
+++ b/packages/flutter/lib/src/widgets/transitions.dart
@@ -91,7 +91,7 @@ abstract class AnimatedWidget extends StatefulWidget {
   /// The [listenable] argument is required.
   const AnimatedWidget({
     Key key,
-    @required this.listenable
+    @required this.listenable,
   }) : assert(listenable != null),
        super(key: key);
 
@@ -431,7 +431,7 @@ class SizeTransition extends AnimatedWidget {
         heightFactor: axis == Axis.vertical ? math.max(sizeFactor.value, 0.0) : null,
         widthFactor: axis == Axis.horizontal ? math.max(sizeFactor.value, 0.0) : null,
         child: child,
-      )
+      ),
     );
   }
 }
diff --git a/packages/flutter/lib/src/widgets/widget_inspector.dart b/packages/flutter/lib/src/widgets/widget_inspector.dart
index c558e2c317e..97779590510 100644
--- a/packages/flutter/lib/src/widgets/widget_inspector.dart
+++ b/packages/flutter/lib/src/widgets/widget_inspector.dart
@@ -42,7 +42,7 @@ typedef InspectorSelectButtonBuilder = Widget Function(BuildContext context, Voi
 
 typedef _RegisterServiceExtensionCallback = void Function({
   @required String name,
-  @required ServiceExtensionCallback callback
+  @required ServiceExtensionCallback callback,
 });
 
 /// A layer that mimics the behavior of another layer.
@@ -864,7 +864,7 @@ mixin WidgetInspectorService {
   void _registerBoolServiceExtension({
     @required String name,
     @required AsyncValueGetter<bool> getter,
-    @required AsyncValueSetter<bool> setter
+    @required AsyncValueSetter<bool> setter,
   }) {
     assert(name != null);
     assert(getter != null);
@@ -2346,7 +2346,7 @@ class _WidgetInspectorState extends State<WidgetInspector>
       children.add(Positioned(
         left: _kInspectButtonMargin,
         bottom: _kInspectButtonMargin,
-        child: widget.selectButtonBuilder(context, _handleEnableSelect)
+        child: widget.selectButtonBuilder(context, _handleEnableSelect),
       ));
     }
     children.add(_InspectorOverlay(selection: selection));
@@ -2756,7 +2756,7 @@ class _Location {
     this.line,
     this.column,
     this.name,
-    this.parameterLocations
+    this.parameterLocations,
   });
 
   /// File path of the location.
diff --git a/packages/flutter/test/animation/animations_test.dart b/packages/flutter/test/animation/animations_test.dart
index 8eb58143ff3..2175587d5ad 100644
--- a/packages/flutter/test/animation/animations_test.dart
+++ b/packages/flutter/test/animation/animations_test.dart
@@ -23,7 +23,7 @@ void main() {
     expect(const AlwaysStoppedAnimation<double>(0.5), hasOneLineDescription);
     CurvedAnimation curvedAnimation = CurvedAnimation(
       parent: kAlwaysDismissedAnimation,
-      curve: Curves.ease
+      curve: Curves.ease,
     );
     expect(curvedAnimation, hasOneLineDescription);
     curvedAnimation.reverseCurve = Curves.elasticOut;
@@ -38,7 +38,7 @@ void main() {
     curvedAnimation = CurvedAnimation(
       parent: controller,
       curve: Curves.ease,
-      reverseCurve: Curves.elasticOut
+      reverseCurve: Curves.elasticOut,
     );
     expect(curvedAnimation, hasOneLineDescription);
     controller.stop();
diff --git a/packages/flutter/test/animation/tween_test.dart b/packages/flutter/test/animation/tween_test.dart
index fda95dc526a..9103fc119b0 100644
--- a/packages/flutter/test/animation/tween_test.dart
+++ b/packages/flutter/test/animation/tween_test.dart
@@ -73,7 +73,7 @@ void main() {
     expect(tween.lerp(1.0), equals(b));
     expect(
       tween.lerp(0.5),
-      equals(a.clone()..translate(3.0, -4.0, 0.0)..scale(0.75, 1.0, 3.0))
+      equals(a.clone()..translate(3.0, -4.0, 0.0)..scale(0.75, 1.0, 3.0)),
     );
     final Matrix4 c = a.clone()..rotateZ(1.0);
     final Matrix4Tween rotationTween = Matrix4Tween(begin: a, end: c);
@@ -83,7 +83,7 @@ void main() {
       rotationTween.lerp(0.5).absoluteError(
         a.clone()..rotateZ(0.5)
       ),
-      moreOrLessEquals(0.0)
+      moreOrLessEquals(0.0),
     );
   }, skip: Platform.isWindows); // floating point math not quite deterministic on Windows?
 
diff --git a/packages/flutter/test/cupertino/action_sheet_test.dart b/packages/flutter/test/cupertino/action_sheet_test.dart
index b682b924ee4..2a0cb58bcae 100644
--- a/packages/flutter/test/cupertino/action_sheet_test.dart
+++ b/packages/flutter/test/cupertino/action_sheet_test.dart
@@ -88,7 +88,7 @@ void main() {
       createAppWithButtonThatLaunchesActionSheet(
         const CupertinoActionSheet(
           title: Text('Action Sheet'),
-          message: Text('An action sheet')
+          message: Text('An action sheet'),
         ),
       ),
     );
@@ -918,7 +918,7 @@ void main() {
                         SemanticsAction.tap,
                       ],
                       label: 'Cancel',
-                    )
+                    ),
                   ],
                 ),
               ],
diff --git a/packages/flutter/test/cupertino/app_test.dart b/packages/flutter/test/cupertino/app_test.dart
index 1ebca963d1d..e7e9bee5fe6 100644
--- a/packages/flutter/test/cupertino/app_test.dart
+++ b/packages/flutter/test/cupertino/app_test.dart
@@ -28,7 +28,7 @@ void main() {
               );
             }),
           ],
-        )
+        ),
     ));
 
     await tester.tap(find.text('next'));
diff --git a/packages/flutter/test/cupertino/bottom_tab_bar_test.dart b/packages/flutter/test/cupertino/bottom_tab_bar_test.dart
index 5db94400869..aa99959efc2 100644
--- a/packages/flutter/test/cupertino/bottom_tab_bar_test.dart
+++ b/packages/flutter/test/cupertino/bottom_tab_bar_test.dart
@@ -158,7 +158,7 @@ void main() {
 
     final Image image = tester.widget(find.descendant(
       of: find.widgetWithText(GestureDetector, 'Tab 2'),
-      matching: find.byType(Image)
+      matching: find.byType(Image),
     ));
 
     expect(image.color, const Color(0xFF123456));
diff --git a/packages/flutter/test/cupertino/button_test.dart b/packages/flutter/test/cupertino/button_test.dart
index dafc643a2ee..a15cc205e10 100644
--- a/packages/flutter/test/cupertino/button_test.dart
+++ b/packages/flutter/test/cupertino/button_test.dart
@@ -176,7 +176,7 @@ void main() {
           child: Center(
             child: CupertinoButton(
               onPressed: () { },
-              child: const Text('ABC')
+              child: const Text('ABC'),
             ),
           ),
       ),
@@ -189,7 +189,7 @@ void main() {
             actions: SemanticsAction.tap.index,
             label: 'ABC',
             flags: SemanticsFlag.isButton.index,
-          )
+          ),
         ],
       ),
       ignoreId: true,
@@ -261,7 +261,7 @@ void main() {
     BoxDecoration decoration = tester.widget<DecoratedBox>(
       find.descendant(
         of: find.byType(CupertinoButton),
-        matching: find.byType(DecoratedBox)
+        matching: find.byType(DecoratedBox),
       )
     ).decoration;
     expect(decoration.color, CupertinoColors.activeBlue);
@@ -296,7 +296,7 @@ void main() {
     decoration = tester.widget<DecoratedBox>(
       find.descendant(
         of: find.byType(CupertinoButton),
-        matching: find.byType(DecoratedBox)
+        matching: find.byType(DecoratedBox),
       )
     ).decoration;
     expect(decoration.color, CupertinoColors.activeOrange);
diff --git a/packages/flutter/test/cupertino/dialog_test.dart b/packages/flutter/test/cupertino/dialog_test.dart
index 8050b9758fa..eb4fb459953 100644
--- a/packages/flutter/test/cupertino/dialog_test.dart
+++ b/packages/flutter/test/cupertino/dialog_test.dart
@@ -74,7 +74,7 @@ void main() {
           CupertinoDialogAction(child: Text('Cancel')),
           CupertinoDialogAction(child: Text('OK')),
         ],
-      )
+      ),
     )));
 
     expect(
@@ -126,7 +126,7 @@ void main() {
       ignoreId: true,
       ignoreRect: true,
       ignoreTransform: true,
-    )
+    ),
   );
 
     semantics.dispose();
diff --git a/packages/flutter/test/cupertino/nav_bar_test.dart b/packages/flutter/test/cupertino/nav_bar_test.dart
index be4b587ef34..b59da698f7f 100644
--- a/packages/flutter/test/cupertino/nav_bar_test.dart
+++ b/packages/flutter/test/cupertino/nav_bar_test.dart
@@ -89,7 +89,7 @@ void main() {
               key: middleBox,
               alignment: Alignment.center,
               widthFactor: 1.0,
-              child: const Text('Title')
+              child: const Text('Title'),
             ),
             trailing: const CupertinoButton(child: Text('Puma'), onPressed: null),
             padding: const EdgeInsetsDirectional.only(
@@ -447,7 +447,7 @@ void main() {
     // Large title initially visible.
     expect(
       largeTitleOpacity.opacity.value,
-      1.0
+      1.0,
     );
     // Middle widget not even wrapped with RenderOpacity, i.e. is always visible.
     expect(
@@ -466,7 +466,7 @@ void main() {
     // Large title no longer visible.
     expect(
       largeTitleOpacity.opacity.value,
-      0.0
+      0.0,
     );
 
     // The persistent toolbar doesn't move or change size.
diff --git a/packages/flutter/test/cupertino/nav_bar_transition_test.dart b/packages/flutter/test/cupertino/nav_bar_transition_test.dart
index 246b4b88c90..8c23ccc2ae6 100644
--- a/packages/flutter/test/cupertino/nav_bar_transition_test.dart
+++ b/packages/flutter/test/cupertino/nav_bar_transition_test.dart
@@ -463,7 +463,7 @@ void main() {
                               navigationBar: CupertinoNavigationBar(),
                               child: Placeholder(),
                             );
-                          }
+                          },
                         ));
                       },
                     ),
diff --git a/packages/flutter/test/cupertino/page_test.dart b/packages/flutter/test/cupertino/page_test.dart
index a0120427ba9..e7f3de563bb 100644
--- a/packages/flutter/test/cupertino/page_test.dart
+++ b/packages/flutter/test/cupertino/page_test.dart
@@ -15,7 +15,7 @@ void main() {
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -91,7 +91,7 @@ void main() {
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -219,7 +219,7 @@ void main() {
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -375,7 +375,7 @@ void main() {
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -437,7 +437,7 @@ void main() {
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -472,7 +472,7 @@ void main() {
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
diff --git a/packages/flutter/test/cupertino/refresh_test.dart b/packages/flutter/test/cupertino/refresh_test.dart
index 115b3a4f17f..1a53eb7ccf8 100644
--- a/packages/flutter/test/cupertino/refresh_test.dart
+++ b/packages/flutter/test/cupertino/refresh_test.dart
@@ -935,7 +935,7 @@ void main() {
         );
 
         debugDefaultTargetPlatformOverride = null;
-      }
+      },
     );
   };
 
@@ -1312,7 +1312,7 @@ void main() {
         );
 
         debugDefaultTargetPlatformOverride = null;
-      }
+      },
     );
   };
 
diff --git a/packages/flutter/test/cupertino/route_test.dart b/packages/flutter/test/cupertino/route_test.dart
index 39544645001..1c2dd128f40 100644
--- a/packages/flutter/test/cupertino/route_test.dart
+++ b/packages/flutter/test/cupertino/route_test.dart
@@ -22,7 +22,7 @@ void main() {
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
+        },
       )
     );
 
@@ -55,7 +55,7 @@ void main() {
               ],
             ),
           );
-        }
+        },
       )
     );
 
@@ -117,7 +117,7 @@ void main() {
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
+        },
       )
     );
 
@@ -132,7 +132,7 @@ void main() {
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
+        },
       )
     );
 
@@ -163,7 +163,7 @@ void main() {
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
+        },
       )
     );
 
@@ -178,7 +178,7 @@ void main() {
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
+        },
       )
     );
 
@@ -205,7 +205,7 @@ void main() {
           navigationBar: CupertinoNavigationBar(),
           child: Placeholder(),
         );
-      }
+      },
     );
 
     final CupertinoPageRoute<void> route3 = CupertinoPageRoute<void>(
@@ -215,7 +215,7 @@ void main() {
           navigationBar: CupertinoNavigationBar(),
           child: Placeholder(),
         );
-      }
+      },
     );
 
     tester.state<NavigatorState>(find.byType(Navigator)).push(route2);
@@ -237,8 +237,8 @@ void main() {
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
-      )
+        },
+      ),
     );
 
     await tester.pump();
diff --git a/packages/flutter/test/cupertino/scaffold_test.dart b/packages/flutter/test/cupertino/scaffold_test.dart
index 7dc7ee02cfd..e42ec03fab7 100644
--- a/packages/flutter/test/cupertino/scaffold_test.dart
+++ b/packages/flutter/test/cupertino/scaffold_test.dart
@@ -155,7 +155,7 @@ void main() {
                     ),
                   )
                   : Stack();
-            }
+            },
           ),
         ),
       ),
diff --git a/packages/flutter/test/cupertino/slider_test.dart b/packages/flutter/test/cupertino/slider_test.dart
index 4112c64d1cd..eec54996f66 100644
--- a/packages/flutter/test/cupertino/slider_test.dart
+++ b/packages/flutter/test/cupertino/slider_test.dart
@@ -109,7 +109,7 @@ void main() {
                 },
                 onChangeStart: (double value) {
                   numberOfTimesOnChangeStartIsCalled++;
-                }
+                },
               ),
             ),
           );
@@ -148,7 +148,7 @@ void main() {
                 },
                 onChangeEnd: (double value) {
                   numberOfTimesOnChangeEndIsCalled++;
-                }
+                },
               ),
             ),
           );
@@ -191,7 +191,7 @@ void main() {
                 },
                 onChangeEnd: (double value) {
                   endValue = value;
-                }
+                },
               ),
             ),
           );
@@ -247,7 +247,7 @@ void main() {
                   setState(() {
                     endValue = value;
                   });
-                }
+                },
               ),
             ),
           );
diff --git a/packages/flutter/test/cupertino/switch_test.dart b/packages/flutter/test/cupertino/switch_test.dart
index 6bdb36d5db9..6417b1fc9d4 100644
--- a/packages/flutter/test/cupertino/switch_test.dart
+++ b/packages/flutter/test/cupertino/switch_test.dart
@@ -118,7 +118,7 @@ void main() {
                       });
                     },
                   ),
-                ]
+                ],
               ),
             );
           },
@@ -226,7 +226,7 @@ void main() {
                       });
                     },
                   ),
-                ]
+                ],
               ),
             );
           },
diff --git a/packages/flutter/test/cupertino/tab_scaffold_test.dart b/packages/flutter/test/cupertino/tab_scaffold_test.dart
index 5e577873795..71291e18643 100644
--- a/packages/flutter/test/cupertino/tab_scaffold_test.dart
+++ b/packages/flutter/test/cupertino/tab_scaffold_test.dart
@@ -28,7 +28,7 @@ void main() {
               child: Text('Page ${index + 1}'),
               painter: TestCallbackPainter(
                 onPaint: () { tabsPainted.add(index); }
-              )
+              ),
             );
           },
         ),
@@ -218,7 +218,7 @@ void main() {
               child: Text('Page ${index + 1}'),
               painter: TestCallbackPainter(
                 onPaint: () { tabsPainted.add(index); }
-              )
+              ),
             );
           },
         ),
@@ -236,7 +236,7 @@ void main() {
               child: Text('Page ${index + 1}'),
               painter: TestCallbackPainter(
                 onPaint: () { tabsPainted.add(index); }
-              )
+              ),
             );
           },
         ),
@@ -354,7 +354,7 @@ void main() {
             tabBuilder: (BuildContext context, int index) {
               innerContext = context;
               return const Placeholder();
-            }
+            },
           ),
         ),
       ),
diff --git a/packages/flutter/test/cupertino/tab_test.dart b/packages/flutter/test/cupertino/tab_test.dart
index ce176156b44..d58fb53b9b1 100644
--- a/packages/flutter/test/cupertino/tab_test.dart
+++ b/packages/flutter/test/cupertino/tab_test.dart
@@ -68,7 +68,7 @@ void main() {
                 settings: settings,
                 builder: (BuildContext context) {
                   return const Text('generated home');
-                }
+                },
               );
             }
             return null;
diff --git a/packages/flutter/test/cupertino/text_field_test.dart b/packages/flutter/test/cupertino/text_field_test.dart
index 566eb4fab24..7e9af7fcaf5 100644
--- a/packages/flutter/test/cupertino/text_field_test.dart
+++ b/packages/flutter/test/cupertino/text_field_test.dart
@@ -186,7 +186,7 @@ void main() {
       final BoxDecoration decoration = tester.widget<DecoratedBox>(
         find.descendant(
           of: find.byType(CupertinoTextField),
-          matching: find.byType(DecoratedBox)
+          matching: find.byType(DecoratedBox),
         ),
       ).decoration;
 
@@ -217,7 +217,7 @@ void main() {
       expect(
         find.descendant(
           of: find.byType(CupertinoTextField),
-          matching: find.byType(DecoratedBox)
+          matching: find.byType(DecoratedBox),
         ),
         findsNothing,
       );
@@ -1008,7 +1008,7 @@ void main() {
 
     await tester.enterText(
       find.widgetWithText(CupertinoTextField, 'field 1'),
-      "j'aime la poutine"
+      "j'aime la poutine",
     );
     await tester.pump();
 
@@ -1632,7 +1632,7 @@ void main() {
         position: textfieldStart + const Offset(150.0, 5.0),
         pressure: 3.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
     // We expect the force press to select a word at the given location.
@@ -1705,7 +1705,7 @@ void main() {
       final BoxDecoration decoration = tester.widget<DecoratedBox>(
         find.descendant(
           of: find.byType(CupertinoTextField),
-          matching: find.byType(DecoratedBox)
+          matching: find.byType(DecoratedBox),
         ),
       ).decoration;
 
diff --git a/packages/flutter/test/cupertino/theme_test.dart b/packages/flutter/test/cupertino/theme_test.dart
index 725e5c468f6..de9166ff74e 100644
--- a/packages/flutter/test/cupertino/theme_test.dart
+++ b/packages/flutter/test/cupertino/theme_test.dart
@@ -55,7 +55,7 @@ void main() {
       brightness: Brightness.dark,
       textTheme: CupertinoTextThemeData(
         textStyle: TextStyle(color: CupertinoColors.black),
-      )
+      ),
     ));
 
     // The brightness still cascaded down to the background color.
diff --git a/packages/flutter/test/engine/rrect_test.dart b/packages/flutter/test/engine/rrect_test.dart
index 972d938eb80..ea380aa0d40 100644
--- a/packages/flutter/test/engine/rrect_test.dart
+++ b/packages/flutter/test/engine/rrect_test.dart
@@ -13,7 +13,7 @@ void main() {
       topLeft: const Radius.circular(0.5),
       topRight: const Radius.circular(0.25),
       bottomRight: const Radius.elliptical(0.25, 0.75),
-      bottomLeft: Radius.zero
+      bottomLeft: Radius.zero,
     );
 
     expect(rrect.contains(const Offset(1.0, 1.0)), isFalse);
@@ -32,7 +32,7 @@ void main() {
       topLeft: const Radius.circular(5000.0),
       topRight: const Radius.circular(2500.0),
       bottomRight: const Radius.elliptical(2500.0, 7500.0),
-      bottomLeft: Radius.zero
+      bottomLeft: Radius.zero,
     );
 
     expect(rrect.contains(const Offset(1.0, 1.0)), isFalse);
diff --git a/packages/flutter/test/foundation/assertions_test.dart b/packages/flutter/test/foundation/assertions_test.dart
index 4a2d8590fd2..9c1dddf3474 100644
--- a/packages/flutter/test/foundation/assertions_test.dart
+++ b/packages/flutter/test/foundation/assertions_test.dart
@@ -84,12 +84,12 @@ void main() {
         exception: 'MESSAGE',
       ).toString(),
       'Error caught by Flutter framework.\n'
-      'MESSAGE'
+      'MESSAGE',
     );
     expect(
       const FlutterErrorDetails().toString(),
       'Error caught by Flutter framework.\n'
-      '  null'
+      '  null',
     );
   });
 }
diff --git a/packages/flutter/test/foundation/consolidate_response_test.dart b/packages/flutter/test/foundation/consolidate_response_test.dart
index 3ab3963304e..49f84cd7dac 100644
--- a/packages/flutter/test/foundation/consolidate_response_test.dart
+++ b/packages/flutter/test/foundation/consolidate_response_test.dart
@@ -22,7 +22,7 @@ void main() {
          any,
          onDone: anyNamed('onDone'),
          onError: anyNamed('onError'),
-         cancelOnError: anyNamed('cancelOnError')
+         cancelOnError: anyNamed('cancelOnError'),
       )).thenAnswer((Invocation invocation) {
         final void Function(List<int>) onData = invocation.positionalArguments[0];
         final void Function(Object) onError = invocation.namedArguments[#onError];
@@ -72,7 +72,7 @@ void main() {
         any,
         onDone: anyNamed('onDone'),
         onError: anyNamed('onError'),
-        cancelOnError: anyNamed('cancelOnError')
+        cancelOnError: anyNamed('cancelOnError'),
       )).thenAnswer((Invocation invocation) {
         final void Function(List<int>) onData = invocation.positionalArguments[0];
         final void Function(Object) onError = invocation.namedArguments[#onError];
diff --git a/packages/flutter/test/foundation/diagnostics_test.dart b/packages/flutter/test/foundation/diagnostics_test.dart
index 44d2c3684f3..294070d53eb 100644
--- a/packages/flutter/test/foundation/diagnostics_test.dart
+++ b/packages/flutter/test/foundation/diagnostics_test.dart
@@ -629,7 +629,7 @@ void main() {
                 StringProperty('node_type', '<leaf node>', showName: false, quoted: false),
                 IntProperty('foo', 42),
               ],
-              style: DiagnosticsTreeStyle.dense
+              style: DiagnosticsTreeStyle.dense,
             ),
           ],
         ),
@@ -1244,7 +1244,7 @@ void main() {
       'name',
       rect,
       showName: false,
-      level: DiagnosticLevel.warning
+      level: DiagnosticLevel.warning,
     );
     expect(hideName.value, equals(rect));
     expect(hideName.level, equals(DiagnosticLevel.warning));
diff --git a/packages/flutter/test/foundation/error_reporting_test.dart b/packages/flutter/test/foundation/error_reporting_test.dart
index 90e4a1c0f46..d0d97d93291 100644
--- a/packages/flutter/test/foundation/error_reporting_test.dart
+++ b/packages/flutter/test/foundation/error_reporting_test.dart
@@ -126,7 +126,7 @@ Future<void> main() async {
       'word word word word word word word word word word word word word word word word word word word word '
       'word word word word word word word word word word word word word word word word word word word word '
       'word word word word word word word word word word word word word word word word word word word word '
-      'word word word word word word word word word word word word word word word word word word word word'
+      'word word word word word word word word word word word word word word word word word word word word',
     );
     console.clear();
     FlutterError.resetErrorCount();
diff --git a/packages/flutter/test/foundation/print_test.dart b/packages/flutter/test/foundation/print_test.dart
index 94de4680f10..4234103b57d 100644
--- a/packages/flutter/test/foundation/print_test.dart
+++ b/packages/flutter/test/foundation/print_test.dart
@@ -12,29 +12,29 @@ void main() {
   test('debugPrint', () {
     expect(
       captureOutput(() { debugPrintSynchronously('Hello, world'); }),
-      equals(<String>['Hello, world'])
+      equals(<String>['Hello, world']),
     );
 
     expect(
       captureOutput(() { debugPrintSynchronously('Hello, world', wrapWidth: 10); }),
-      equals(<String>['Hello,\nworld'])
+      equals(<String>['Hello,\nworld']),
     );
 
     for (int i = 0; i < 14; ++i) {
       expect(
         captureOutput(() { debugPrintSynchronously('Hello,   world', wrapWidth: i); }),
-        equals(<String>['Hello,\nworld'])
+        equals(<String>['Hello,\nworld']),
       );
     }
 
     expect(
       captureOutput(() { debugPrintThrottled('Hello, world'); }),
-      equals(<String>['Hello, world'])
+      equals(<String>['Hello, world']),
     );
 
     expect(
       captureOutput(() { debugPrintThrottled('Hello, world', wrapWidth: 10); }),
-      equals(<String>['Hello,', 'world'])
+      equals(<String>['Hello,', 'world']),
     );
   });
 
diff --git a/packages/flutter/test/foundation/service_extensions_test.dart b/packages/flutter/test/foundation/service_extensions_test.dart
index 9cfbe8e6fb8..34b58056b0b 100644
--- a/packages/flutter/test/foundation/service_extensions_test.dart
+++ b/packages/flutter/test/foundation/service_extensions_test.dart
@@ -31,7 +31,7 @@ class TestServiceExtensionsBinding extends BindingBase
   @override
   void registerServiceExtension({
     @required String name,
-    @required ServiceExtensionCallback callback
+    @required ServiceExtensionCallback callback,
   }) {
     expect(extensions.containsKey(name), isFalse);
     extensions[name] = callback;
diff --git a/packages/flutter/test/gestures/double_tap_test.dart b/packages/flutter/test/gestures/double_tap_test.dart
index 43ca2b9469e..a6062878b64 100644
--- a/packages/flutter/test/gestures/double_tap_test.dart
+++ b/packages/flutter/test/gestures/double_tap_test.dart
@@ -29,61 +29,61 @@ void main() {
   // Down/up pair 1: normal tap sequence
   const PointerDownEvent down1 = PointerDownEvent(
     pointer: 1,
-    position: Offset(10.0, 10.0)
+    position: Offset(10.0, 10.0),
   );
 
   const PointerUpEvent up1 = PointerUpEvent(
     pointer: 1,
-    position: Offset(11.0, 9.0)
+    position: Offset(11.0, 9.0),
   );
 
   // Down/up pair 2: normal tap sequence close to pair 1
   const PointerDownEvent down2 = PointerDownEvent(
     pointer: 2,
-    position: Offset(12.0, 12.0)
+    position: Offset(12.0, 12.0),
   );
 
   const PointerUpEvent up2 = PointerUpEvent(
     pointer: 2,
-    position: Offset(13.0, 11.0)
+    position: Offset(13.0, 11.0),
   );
 
   // Down/up pair 3: normal tap sequence far away from pair 1
   const PointerDownEvent down3 = PointerDownEvent(
     pointer: 3,
-    position: Offset(130.0, 130.0)
+    position: Offset(130.0, 130.0),
   );
 
   const PointerUpEvent up3 = PointerUpEvent(
     pointer: 3,
-    position: Offset(131.0, 129.0)
+    position: Offset(131.0, 129.0),
   );
 
   // Down/move/up sequence 4: intervening motion
   const PointerDownEvent down4 = PointerDownEvent(
     pointer: 4,
-    position: Offset(10.0, 10.0)
+    position: Offset(10.0, 10.0),
   );
 
   const PointerMoveEvent move4 = PointerMoveEvent(
     pointer: 4,
-    position: Offset(25.0, 25.0)
+    position: Offset(25.0, 25.0),
   );
 
   const PointerUpEvent up4 = PointerUpEvent(
     pointer: 4,
-    position: Offset(25.0, 25.0)
+    position: Offset(25.0, 25.0),
   );
 
   // Down/up pair 5: normal tap sequence identical to pair 1 with different pointer
   const PointerDownEvent down5 = PointerDownEvent(
     pointer: 5,
-    position: Offset(10.0, 10.0)
+    position: Offset(10.0, 10.0),
   );
 
   const PointerUpEvent up5 = PointerUpEvent(
     pointer: 5,
-    position: Offset(11.0, 9.0)
+    position: Offset(11.0, 9.0),
   );
 
   testGesture('Should recognize double tap', (GestureTester tester) {
diff --git a/packages/flutter/test/gestures/drag_test.dart b/packages/flutter/test/gestures/drag_test.dart
index 08f817b111f..14195d04871 100644
--- a/packages/flutter/test/gestures/drag_test.dart
+++ b/packages/flutter/test/gestures/drag_test.dart
@@ -319,7 +319,7 @@ void main() {
       '-e',
       'drag1-update',
       '-f',
-      'drag1-end'
+      'drag1-end',
     ]);
   });
 
diff --git a/packages/flutter/test/gestures/tap_test.dart b/packages/flutter/test/gestures/tap_test.dart
index 8c0beb21176..f76f8ee4b6c 100644
--- a/packages/flutter/test/gestures/tap_test.dart
+++ b/packages/flutter/test/gestures/tap_test.dart
@@ -22,55 +22,55 @@ void main() {
   // Down/up pair 1: normal tap sequence
   const PointerDownEvent down1 = PointerDownEvent(
     pointer: 1,
-    position: Offset(10.0, 10.0)
+    position: Offset(10.0, 10.0),
   );
 
   const PointerUpEvent up1 = PointerUpEvent(
     pointer: 1,
-    position: Offset(11.0, 9.0)
+    position: Offset(11.0, 9.0),
   );
 
   // Down/up pair 2: normal tap sequence far away from pair 1
   const PointerDownEvent down2 = PointerDownEvent(
     pointer: 2,
-    position: Offset(30.0, 30.0)
+    position: Offset(30.0, 30.0),
   );
 
   const PointerUpEvent up2 = PointerUpEvent(
     pointer: 2,
-    position: Offset(31.0, 29.0)
+    position: Offset(31.0, 29.0),
   );
 
   // Down/move/up sequence 3: intervening motion, more than kTouchSlop. (~21px)
   const PointerDownEvent down3 = PointerDownEvent(
     pointer: 3,
-    position: Offset(10.0, 10.0)
+    position: Offset(10.0, 10.0),
   );
 
   const PointerMoveEvent move3 = PointerMoveEvent(
     pointer: 3,
-    position: Offset(25.0, 25.0)
+    position: Offset(25.0, 25.0),
   );
 
   const PointerUpEvent up3 = PointerUpEvent(
     pointer: 3,
-    position: Offset(25.0, 25.0)
+    position: Offset(25.0, 25.0),
   );
 
   // Down/move/up sequence 4: intervening motion, less than kTouchSlop. (~17px)
   const PointerDownEvent down4 = PointerDownEvent(
     pointer: 4,
-    position: Offset(10.0, 10.0)
+    position: Offset(10.0, 10.0),
   );
 
   const PointerMoveEvent move4 = PointerMoveEvent(
     pointer: 4,
-    position: Offset(22.0, 22.0)
+    position: Offset(22.0, 22.0),
   );
 
   const PointerUpEvent up4 = PointerUpEvent(
     pointer: 4,
-    position: Offset(22.0, 22.0)
+    position: Offset(22.0, 22.0),
   );
 
   testGesture('Should recognize tap', (GestureTester tester) {
@@ -406,11 +406,11 @@ void main() {
   testGesture('PointerCancelEvent cancels tap', (GestureTester tester) {
     const PointerDownEvent down = PointerDownEvent(
         pointer: 5,
-        position: Offset(10.0, 10.0)
+        position: Offset(10.0, 10.0),
     );
     const PointerCancelEvent cancel = PointerCancelEvent(
         pointer: 5,
-        position: Offset(10.0, 10.0)
+        position: Offset(10.0, 10.0),
     );
 
     final TapGestureRecognizer tap = TapGestureRecognizer();
diff --git a/packages/flutter/test/gestures/velocity_tracker_data.dart b/packages/flutter/test/gestures/velocity_tracker_data.dart
index 78363f82028..1158fce8e86 100644
--- a/packages/flutter/test/gestures/velocity_tracker_data.dart
+++ b/packages/flutter/test/gestures/velocity_tracker_data.dart
@@ -8,1532 +8,1532 @@ const List<PointerEvent> velocityEventData = <PointerEvent>[
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216690896),
     pointer: 1,
-    position: Offset(270.0, 538.2857055664062)
+    position: Offset(270.0, 538.2857055664062),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690906),
     pointer: 1,
-    position: Offset(270.0, 538.2857055664062)
+    position: Offset(270.0, 538.2857055664062),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690951),
     pointer: 1,
-    position: Offset(270.0, 530.8571166992188)
+    position: Offset(270.0, 530.8571166992188),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690959),
     pointer: 1,
-    position: Offset(270.0, 526.8571166992188)
+    position: Offset(270.0, 526.8571166992188),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690967),
     pointer: 1,
-    position: Offset(270.0, 521.4285888671875)
+    position: Offset(270.0, 521.4285888671875),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690975),
     pointer: 1,
-    position: Offset(270.0, 515.4285888671875)
+    position: Offset(270.0, 515.4285888671875),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690983),
     pointer: 1,
-    position: Offset(270.0, 506.8571472167969)
+    position: Offset(270.0, 506.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690991),
     pointer: 1,
-    position: Offset(268.8571472167969, 496.0)
+    position: Offset(268.8571472167969, 496.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216690998),
     pointer: 1,
-    position: Offset(267.4285583496094, 483.1428527832031)
+    position: Offset(267.4285583496094, 483.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691006),
     pointer: 1,
-    position: Offset(266.28570556640625, 469.71429443359375)
+    position: Offset(266.28570556640625, 469.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691014),
     pointer: 1,
-    position: Offset(265.4285583496094, 456.8571472167969)
+    position: Offset(265.4285583496094, 456.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691021),
     pointer: 1,
-    position: Offset(264.28570556640625, 443.71429443359375)
+    position: Offset(264.28570556640625, 443.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691029),
     pointer: 1,
-    position: Offset(264.0, 431.71429443359375)
+    position: Offset(264.0, 431.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691036),
     pointer: 1,
-    position: Offset(263.4285583496094, 421.1428527832031)
+    position: Offset(263.4285583496094, 421.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691044),
     pointer: 1,
-    position: Offset(263.4285583496094, 412.5714416503906)
+    position: Offset(263.4285583496094, 412.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691052),
     pointer: 1,
-    position: Offset(263.4285583496094, 404.5714416503906)
+    position: Offset(263.4285583496094, 404.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691060),
     pointer: 1,
-    position: Offset(263.4285583496094, 396.5714416503906)
+    position: Offset(263.4285583496094, 396.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691068),
     pointer: 1,
-    position: Offset(264.5714416503906, 390.0)
+    position: Offset(264.5714416503906, 390.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691075),
     pointer: 1,
-    position: Offset(265.1428527832031, 384.8571472167969)
+    position: Offset(265.1428527832031, 384.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691083),
     pointer: 1,
-    position: Offset(266.0, 380.28570556640625)
+    position: Offset(266.0, 380.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691091),
     pointer: 1,
-    position: Offset(266.5714416503906, 376.28570556640625)
+    position: Offset(266.5714416503906, 376.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691098),
     pointer: 1,
-    position: Offset(267.1428527832031, 373.1428527832031)
+    position: Offset(267.1428527832031, 373.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691106),
     pointer: 1,
-    position: Offset(267.71429443359375, 370.28570556640625)
+    position: Offset(267.71429443359375, 370.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691114),
     pointer: 1,
-    position: Offset(268.28570556640625, 367.71429443359375)
+    position: Offset(268.28570556640625, 367.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691121),
     pointer: 1,
-    position: Offset(268.5714416503906, 366.0)
+    position: Offset(268.5714416503906, 366.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691130),
     pointer: 1,
-    position: Offset(268.8571472167969, 364.5714416503906)
+    position: Offset(268.8571472167969, 364.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691137),
     pointer: 1,
-    position: Offset(269.1428527832031, 363.71429443359375)
+    position: Offset(269.1428527832031, 363.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691145),
     pointer: 1,
-    position: Offset(269.1428527832031, 362.8571472167969)
+    position: Offset(269.1428527832031, 362.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691153),
     pointer: 1,
-    position: Offset(269.4285583496094, 362.8571472167969)
+    position: Offset(269.4285583496094, 362.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691168),
     pointer: 1,
-    position: Offset(268.5714416503906, 365.4285583496094)
+    position: Offset(268.5714416503906, 365.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691176),
     pointer: 1,
-    position: Offset(267.1428527832031, 370.28570556640625)
+    position: Offset(267.1428527832031, 370.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691183),
     pointer: 1,
-    position: Offset(265.4285583496094, 376.8571472167969)
+    position: Offset(265.4285583496094, 376.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691191),
     pointer: 1,
-    position: Offset(263.1428527832031, 385.71429443359375)
+    position: Offset(263.1428527832031, 385.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691199),
     pointer: 1,
-    position: Offset(261.4285583496094, 396.5714416503906)
+    position: Offset(261.4285583496094, 396.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691207),
     pointer: 1,
-    position: Offset(259.71429443359375, 408.5714416503906)
+    position: Offset(259.71429443359375, 408.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691215),
     pointer: 1,
-    position: Offset(258.28570556640625, 419.4285583496094)
+    position: Offset(258.28570556640625, 419.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691222),
     pointer: 1,
-    position: Offset(257.4285583496094, 428.5714416503906)
+    position: Offset(257.4285583496094, 428.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691230),
     pointer: 1,
-    position: Offset(256.28570556640625, 436.0)
+    position: Offset(256.28570556640625, 436.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691238),
     pointer: 1,
-    position: Offset(255.7142791748047, 442.0)
+    position: Offset(255.7142791748047, 442.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691245),
     pointer: 1,
-    position: Offset(255.14285278320312, 447.71429443359375)
+    position: Offset(255.14285278320312, 447.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691253),
     pointer: 1,
-    position: Offset(254.85714721679688, 453.1428527832031)
+    position: Offset(254.85714721679688, 453.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691261),
     pointer: 1,
-    position: Offset(254.57142639160156, 458.5714416503906)
+    position: Offset(254.57142639160156, 458.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691268),
     pointer: 1,
-    position: Offset(254.2857208251953, 463.71429443359375)
+    position: Offset(254.2857208251953, 463.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691276),
     pointer: 1,
-    position: Offset(254.2857208251953, 470.28570556640625)
+    position: Offset(254.2857208251953, 470.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691284),
     pointer: 1,
-    position: Offset(254.2857208251953, 477.71429443359375)
+    position: Offset(254.2857208251953, 477.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691292),
     pointer: 1,
-    position: Offset(255.7142791748047, 487.1428527832031)
+    position: Offset(255.7142791748047, 487.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691300),
     pointer: 1,
-    position: Offset(256.8571472167969, 498.5714416503906)
+    position: Offset(256.8571472167969, 498.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691307),
     pointer: 1,
-    position: Offset(258.28570556640625, 507.71429443359375)
+    position: Offset(258.28570556640625, 507.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691315),
     pointer: 1,
-    position: Offset(259.4285583496094, 516.0)
+    position: Offset(259.4285583496094, 516.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691323),
     pointer: 1,
-    position: Offset(260.28570556640625, 521.7142944335938)
+    position: Offset(260.28570556640625, 521.7142944335938),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216691338),
     pointer: 1,
-    position: Offset(260.28570556640625, 521.7142944335938)
+    position: Offset(260.28570556640625, 521.7142944335938),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216691573),
     pointer: 2,
-    position: Offset(266.0, 327.4285583496094)
+    position: Offset(266.0, 327.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691588),
     pointer: 2,
-    position: Offset(266.0, 327.4285583496094)
+    position: Offset(266.0, 327.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691626),
     pointer: 2,
-    position: Offset(261.1428527832031, 337.1428527832031)
+    position: Offset(261.1428527832031, 337.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691634),
     pointer: 2,
-    position: Offset(258.28570556640625, 343.1428527832031)
+    position: Offset(258.28570556640625, 343.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691642),
     pointer: 2,
-    position: Offset(254.57142639160156, 354.0)
+    position: Offset(254.57142639160156, 354.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691650),
     pointer: 2,
-    position: Offset(250.2857208251953, 368.28570556640625)
+    position: Offset(250.2857208251953, 368.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691657),
     pointer: 2,
-    position: Offset(247.42857360839844, 382.8571472167969)
+    position: Offset(247.42857360839844, 382.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691665),
     pointer: 2,
-    position: Offset(245.14285278320312, 397.4285583496094)
+    position: Offset(245.14285278320312, 397.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691673),
     pointer: 2,
-    position: Offset(243.14285278320312, 411.71429443359375)
+    position: Offset(243.14285278320312, 411.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691680),
     pointer: 2,
-    position: Offset(242.2857208251953, 426.28570556640625)
+    position: Offset(242.2857208251953, 426.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691688),
     pointer: 2,
-    position: Offset(241.7142791748047, 440.5714416503906)
+    position: Offset(241.7142791748047, 440.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691696),
     pointer: 2,
-    position: Offset(241.7142791748047, 454.5714416503906)
+    position: Offset(241.7142791748047, 454.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691703),
     pointer: 2,
-    position: Offset(242.57142639160156, 467.71429443359375)
+    position: Offset(242.57142639160156, 467.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691712),
     pointer: 2,
-    position: Offset(243.42857360839844, 477.4285583496094)
+    position: Offset(243.42857360839844, 477.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691720),
     pointer: 2,
-    position: Offset(244.85714721679688, 485.71429443359375)
+    position: Offset(244.85714721679688, 485.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691727),
     pointer: 2,
-    position: Offset(246.2857208251953, 493.1428527832031)
+    position: Offset(246.2857208251953, 493.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216691735),
     pointer: 2,
-    position: Offset(248.0, 499.71429443359375)
+    position: Offset(248.0, 499.71429443359375),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216691750),
     pointer: 2,
-    position: Offset(248.0, 499.71429443359375)
+    position: Offset(248.0, 499.71429443359375),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216692255),
     pointer: 3,
-    position: Offset(249.42857360839844, 351.4285583496094)
+    position: Offset(249.42857360839844, 351.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692270),
     pointer: 3,
-    position: Offset(249.42857360839844, 351.4285583496094)
+    position: Offset(249.42857360839844, 351.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692309),
     pointer: 3,
-    position: Offset(246.2857208251953, 361.71429443359375)
+    position: Offset(246.2857208251953, 361.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692317),
     pointer: 3,
-    position: Offset(244.0, 368.5714416503906)
+    position: Offset(244.0, 368.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692325),
     pointer: 3,
-    position: Offset(241.42857360839844, 377.71429443359375)
+    position: Offset(241.42857360839844, 377.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692333),
     pointer: 3,
-    position: Offset(237.7142791748047, 391.71429443359375)
+    position: Offset(237.7142791748047, 391.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692340),
     pointer: 3,
-    position: Offset(235.14285278320312, 406.5714416503906)
+    position: Offset(235.14285278320312, 406.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692348),
     pointer: 3,
-    position: Offset(232.57142639160156, 421.4285583496094)
+    position: Offset(232.57142639160156, 421.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692356),
     pointer: 3,
-    position: Offset(230.2857208251953, 436.5714416503906)
+    position: Offset(230.2857208251953, 436.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692363),
     pointer: 3,
-    position: Offset(228.2857208251953, 451.71429443359375)
+    position: Offset(228.2857208251953, 451.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692371),
     pointer: 3,
-    position: Offset(227.42857360839844, 466.0)
+    position: Offset(227.42857360839844, 466.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692378),
     pointer: 3,
-    position: Offset(226.2857208251953, 479.71429443359375)
+    position: Offset(226.2857208251953, 479.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692387),
     pointer: 3,
-    position: Offset(225.7142791748047, 491.71429443359375)
+    position: Offset(225.7142791748047, 491.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692395),
     pointer: 3,
-    position: Offset(225.14285278320312, 501.71429443359375)
+    position: Offset(225.14285278320312, 501.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692402),
     pointer: 3,
-    position: Offset(224.85714721679688, 509.1428527832031)
+    position: Offset(224.85714721679688, 509.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692410),
     pointer: 3,
-    position: Offset(224.57142639160156, 514.8571166992188)
+    position: Offset(224.57142639160156, 514.8571166992188),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692418),
     pointer: 3,
-    position: Offset(224.2857208251953, 519.4285888671875)
+    position: Offset(224.2857208251953, 519.4285888671875),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692425),
     pointer: 3,
-    position: Offset(224.0, 523.4285888671875)
+    position: Offset(224.0, 523.4285888671875),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692433),
     pointer: 3,
-    position: Offset(224.0, 527.1428833007812)
+    position: Offset(224.0, 527.1428833007812),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692441),
     pointer: 3,
-    position: Offset(224.0, 530.5714111328125)
+    position: Offset(224.0, 530.5714111328125),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692448),
     pointer: 3,
-    position: Offset(224.0, 533.1428833007812)
+    position: Offset(224.0, 533.1428833007812),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692456),
     pointer: 3,
-    position: Offset(224.0, 535.4285888671875)
+    position: Offset(224.0, 535.4285888671875),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692464),
     pointer: 3,
-    position: Offset(223.7142791748047, 536.8571166992188)
+    position: Offset(223.7142791748047, 536.8571166992188),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692472),
     pointer: 3,
-    position: Offset(223.7142791748047, 538.2857055664062)
+    position: Offset(223.7142791748047, 538.2857055664062),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216692487),
     pointer: 3,
-    position: Offset(223.7142791748047, 538.2857055664062)
+    position: Offset(223.7142791748047, 538.2857055664062),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216692678),
     pointer: 4,
-    position: Offset(221.42857360839844, 526.2857055664062)
+    position: Offset(221.42857360839844, 526.2857055664062),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692701),
     pointer: 4,
-    position: Offset(220.57142639160156, 514.8571166992188)
+    position: Offset(220.57142639160156, 514.8571166992188),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692708),
     pointer: 4,
-    position: Offset(220.2857208251953, 508.0)
+    position: Offset(220.2857208251953, 508.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692716),
     pointer: 4,
-    position: Offset(220.2857208251953, 498.0)
+    position: Offset(220.2857208251953, 498.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692724),
     pointer: 4,
-    position: Offset(221.14285278320312, 484.28570556640625)
+    position: Offset(221.14285278320312, 484.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692732),
     pointer: 4,
-    position: Offset(221.7142791748047, 469.4285583496094)
+    position: Offset(221.7142791748047, 469.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692740),
     pointer: 4,
-    position: Offset(223.42857360839844, 453.1428527832031)
+    position: Offset(223.42857360839844, 453.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692748),
     pointer: 4,
-    position: Offset(225.7142791748047, 436.28570556640625)
+    position: Offset(225.7142791748047, 436.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692755),
     pointer: 4,
-    position: Offset(229.14285278320312, 418.28570556640625)
+    position: Offset(229.14285278320312, 418.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692763),
     pointer: 4,
-    position: Offset(232.85714721679688, 400.28570556640625)
+    position: Offset(232.85714721679688, 400.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692770),
     pointer: 4,
-    position: Offset(236.85714721679688, 382.5714416503906)
+    position: Offset(236.85714721679688, 382.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692778),
     pointer: 4,
-    position: Offset(241.14285278320312, 366.0)
+    position: Offset(241.14285278320312, 366.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692786),
     pointer: 4,
-    position: Offset(244.85714721679688, 350.28570556640625)
+    position: Offset(244.85714721679688, 350.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216692793),
     pointer: 4,
-    position: Offset(249.14285278320312, 335.4285583496094)
+    position: Offset(249.14285278320312, 335.4285583496094),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216692809),
     pointer: 4,
-    position: Offset(249.14285278320312, 335.4285583496094)
+    position: Offset(249.14285278320312, 335.4285583496094),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216693222),
     pointer: 5,
-    position: Offset(224.0, 545.4285888671875)
+    position: Offset(224.0, 545.4285888671875),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693245),
     pointer: 5,
-    position: Offset(224.0, 545.4285888671875)
+    position: Offset(224.0, 545.4285888671875),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693275),
     pointer: 5,
-    position: Offset(222.85714721679688, 535.1428833007812)
+    position: Offset(222.85714721679688, 535.1428833007812),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693284),
     pointer: 5,
-    position: Offset(222.85714721679688, 528.8571166992188)
+    position: Offset(222.85714721679688, 528.8571166992188),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693291),
     pointer: 5,
-    position: Offset(222.2857208251953, 518.5714111328125)
+    position: Offset(222.2857208251953, 518.5714111328125),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693299),
     pointer: 5,
-    position: Offset(222.0, 503.4285583496094)
+    position: Offset(222.0, 503.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693307),
     pointer: 5,
-    position: Offset(222.0, 485.4285583496094)
+    position: Offset(222.0, 485.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693314),
     pointer: 5,
-    position: Offset(221.7142791748047, 464.0)
+    position: Offset(221.7142791748047, 464.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216693322),
     pointer: 5,
-    position: Offset(222.2857208251953, 440.28570556640625)
+    position: Offset(222.2857208251953, 440.28570556640625),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216693337),
     pointer: 5,
-    position: Offset(222.2857208251953, 440.28570556640625)
+    position: Offset(222.2857208251953, 440.28570556640625),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216693985),
     pointer: 6,
-    position: Offset(208.0, 544.0)
+    position: Offset(208.0, 544.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694047),
     pointer: 6,
-    position: Offset(208.57142639160156, 532.2857055664062)
+    position: Offset(208.57142639160156, 532.2857055664062),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694054),
     pointer: 6,
-    position: Offset(208.85714721679688, 525.7142944335938)
+    position: Offset(208.85714721679688, 525.7142944335938),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694062),
     pointer: 6,
-    position: Offset(208.85714721679688, 515.1428833007812)
+    position: Offset(208.85714721679688, 515.1428833007812),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694070),
     pointer: 6,
-    position: Offset(208.0, 501.4285583496094)
+    position: Offset(208.0, 501.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694077),
     pointer: 6,
-    position: Offset(207.42857360839844, 487.1428527832031)
+    position: Offset(207.42857360839844, 487.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694085),
     pointer: 6,
-    position: Offset(206.57142639160156, 472.8571472167969)
+    position: Offset(206.57142639160156, 472.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694092),
     pointer: 6,
-    position: Offset(206.57142639160156, 458.8571472167969)
+    position: Offset(206.57142639160156, 458.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694100),
     pointer: 6,
-    position: Offset(206.57142639160156, 446.0)
+    position: Offset(206.57142639160156, 446.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694108),
     pointer: 6,
-    position: Offset(206.57142639160156, 434.28570556640625)
+    position: Offset(206.57142639160156, 434.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694116),
     pointer: 6,
-    position: Offset(207.14285278320312, 423.71429443359375)
+    position: Offset(207.14285278320312, 423.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694124),
     pointer: 6,
-    position: Offset(208.57142639160156, 412.8571472167969)
+    position: Offset(208.57142639160156, 412.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694131),
     pointer: 6,
-    position: Offset(209.7142791748047, 402.28570556640625)
+    position: Offset(209.7142791748047, 402.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694139),
     pointer: 6,
-    position: Offset(211.7142791748047, 393.1428527832031)
+    position: Offset(211.7142791748047, 393.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694147),
     pointer: 6,
-    position: Offset(213.42857360839844, 385.1428527832031)
+    position: Offset(213.42857360839844, 385.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694154),
     pointer: 6,
-    position: Offset(215.42857360839844, 378.28570556640625)
+    position: Offset(215.42857360839844, 378.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694162),
     pointer: 6,
-    position: Offset(217.42857360839844, 371.71429443359375)
+    position: Offset(217.42857360839844, 371.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694169),
     pointer: 6,
-    position: Offset(219.42857360839844, 366.0)
+    position: Offset(219.42857360839844, 366.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694177),
     pointer: 6,
-    position: Offset(221.42857360839844, 360.8571472167969)
+    position: Offset(221.42857360839844, 360.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694185),
     pointer: 6,
-    position: Offset(223.42857360839844, 356.5714416503906)
+    position: Offset(223.42857360839844, 356.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694193),
     pointer: 6,
-    position: Offset(225.14285278320312, 352.28570556640625)
+    position: Offset(225.14285278320312, 352.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694201),
     pointer: 6,
-    position: Offset(226.85714721679688, 348.5714416503906)
+    position: Offset(226.85714721679688, 348.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694209),
     pointer: 6,
-    position: Offset(228.2857208251953, 346.0)
+    position: Offset(228.2857208251953, 346.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694216),
     pointer: 6,
-    position: Offset(229.14285278320312, 343.71429443359375)
+    position: Offset(229.14285278320312, 343.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694224),
     pointer: 6,
-    position: Offset(230.0, 342.0)
+    position: Offset(230.0, 342.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694232),
     pointer: 6,
-    position: Offset(230.57142639160156, 340.5714416503906)
+    position: Offset(230.57142639160156, 340.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694239),
     pointer: 6,
-    position: Offset(230.85714721679688, 339.71429443359375)
+    position: Offset(230.85714721679688, 339.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694247),
     pointer: 6,
-    position: Offset(230.85714721679688, 339.4285583496094)
+    position: Offset(230.85714721679688, 339.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694262),
     pointer: 6,
-    position: Offset(230.2857208251953, 342.0)
+    position: Offset(230.2857208251953, 342.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694270),
     pointer: 6,
-    position: Offset(228.85714721679688, 346.28570556640625)
+    position: Offset(228.85714721679688, 346.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694278),
     pointer: 6,
-    position: Offset(227.14285278320312, 352.5714416503906)
+    position: Offset(227.14285278320312, 352.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694286),
     pointer: 6,
-    position: Offset(225.42857360839844, 359.4285583496094)
+    position: Offset(225.42857360839844, 359.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694294),
     pointer: 6,
-    position: Offset(223.7142791748047, 367.71429443359375)
+    position: Offset(223.7142791748047, 367.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694301),
     pointer: 6,
-    position: Offset(222.57142639160156, 376.0)
+    position: Offset(222.57142639160156, 376.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694309),
     pointer: 6,
-    position: Offset(221.42857360839844, 384.28570556640625)
+    position: Offset(221.42857360839844, 384.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694317),
     pointer: 6,
-    position: Offset(220.85714721679688, 392.28570556640625)
+    position: Offset(220.85714721679688, 392.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694324),
     pointer: 6,
-    position: Offset(220.0, 400.5714416503906)
+    position: Offset(220.0, 400.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694332),
     pointer: 6,
-    position: Offset(219.14285278320312, 409.71429443359375)
+    position: Offset(219.14285278320312, 409.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694339),
     pointer: 6,
-    position: Offset(218.85714721679688, 419.1428527832031)
+    position: Offset(218.85714721679688, 419.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694348),
     pointer: 6,
-    position: Offset(218.2857208251953, 428.8571472167969)
+    position: Offset(218.2857208251953, 428.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694356),
     pointer: 6,
-    position: Offset(218.2857208251953, 438.8571472167969)
+    position: Offset(218.2857208251953, 438.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694363),
     pointer: 6,
-    position: Offset(218.2857208251953, 447.71429443359375)
+    position: Offset(218.2857208251953, 447.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694371),
     pointer: 6,
-    position: Offset(218.2857208251953, 455.71429443359375)
+    position: Offset(218.2857208251953, 455.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694379),
     pointer: 6,
-    position: Offset(219.14285278320312, 462.8571472167969)
+    position: Offset(219.14285278320312, 462.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694386),
     pointer: 6,
-    position: Offset(220.0, 469.4285583496094)
+    position: Offset(220.0, 469.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694394),
     pointer: 6,
-    position: Offset(221.14285278320312, 475.4285583496094)
+    position: Offset(221.14285278320312, 475.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694401),
     pointer: 6,
-    position: Offset(222.0, 480.5714416503906)
+    position: Offset(222.0, 480.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694409),
     pointer: 6,
-    position: Offset(222.85714721679688, 485.4285583496094)
+    position: Offset(222.85714721679688, 485.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694417),
     pointer: 6,
-    position: Offset(224.0, 489.71429443359375)
+    position: Offset(224.0, 489.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694425),
     pointer: 6,
-    position: Offset(224.85714721679688, 492.8571472167969)
+    position: Offset(224.85714721679688, 492.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694433),
     pointer: 6,
-    position: Offset(225.42857360839844, 495.4285583496094)
+    position: Offset(225.42857360839844, 495.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694440),
     pointer: 6,
-    position: Offset(226.0, 497.1428527832031)
+    position: Offset(226.0, 497.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694448),
     pointer: 6,
-    position: Offset(226.2857208251953, 498.28570556640625)
+    position: Offset(226.2857208251953, 498.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694456),
     pointer: 6,
-    position: Offset(226.2857208251953, 498.8571472167969)
+    position: Offset(226.2857208251953, 498.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694471),
     pointer: 6,
-    position: Offset(226.2857208251953, 498.28570556640625)
+    position: Offset(226.2857208251953, 498.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694479),
     pointer: 6,
-    position: Offset(226.2857208251953, 496.5714416503906)
+    position: Offset(226.2857208251953, 496.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694486),
     pointer: 6,
-    position: Offset(226.2857208251953, 493.71429443359375)
+    position: Offset(226.2857208251953, 493.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694494),
     pointer: 6,
-    position: Offset(226.2857208251953, 490.0)
+    position: Offset(226.2857208251953, 490.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694502),
     pointer: 6,
-    position: Offset(226.2857208251953, 486.0)
+    position: Offset(226.2857208251953, 486.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694510),
     pointer: 6,
-    position: Offset(226.2857208251953, 480.5714416503906)
+    position: Offset(226.2857208251953, 480.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694518),
     pointer: 6,
-    position: Offset(226.2857208251953, 475.71429443359375)
+    position: Offset(226.2857208251953, 475.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694525),
     pointer: 6,
-    position: Offset(226.2857208251953, 468.8571472167969)
+    position: Offset(226.2857208251953, 468.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694533),
     pointer: 6,
-    position: Offset(226.2857208251953, 461.4285583496094)
+    position: Offset(226.2857208251953, 461.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694541),
     pointer: 6,
-    position: Offset(226.2857208251953, 452.5714416503906)
+    position: Offset(226.2857208251953, 452.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694548),
     pointer: 6,
-    position: Offset(226.57142639160156, 442.28570556640625)
+    position: Offset(226.57142639160156, 442.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694556),
     pointer: 6,
-    position: Offset(226.57142639160156, 432.28570556640625)
+    position: Offset(226.57142639160156, 432.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694564),
     pointer: 6,
-    position: Offset(226.85714721679688, 423.4285583496094)
+    position: Offset(226.85714721679688, 423.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694571),
     pointer: 6,
-    position: Offset(227.42857360839844, 416.0)
+    position: Offset(227.42857360839844, 416.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694580),
     pointer: 6,
-    position: Offset(227.7142791748047, 410.0)
+    position: Offset(227.7142791748047, 410.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694587),
     pointer: 6,
-    position: Offset(228.2857208251953, 404.28570556640625)
+    position: Offset(228.2857208251953, 404.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694595),
     pointer: 6,
-    position: Offset(228.85714721679688, 399.71429443359375)
+    position: Offset(228.85714721679688, 399.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694603),
     pointer: 6,
-    position: Offset(229.14285278320312, 395.4285583496094)
+    position: Offset(229.14285278320312, 395.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694610),
     pointer: 6,
-    position: Offset(229.42857360839844, 392.28570556640625)
+    position: Offset(229.42857360839844, 392.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694618),
     pointer: 6,
-    position: Offset(229.7142791748047, 390.0)
+    position: Offset(229.7142791748047, 390.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694625),
     pointer: 6,
-    position: Offset(229.7142791748047, 388.0)
+    position: Offset(229.7142791748047, 388.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694633),
     pointer: 6,
-    position: Offset(229.7142791748047, 386.8571472167969)
+    position: Offset(229.7142791748047, 386.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694641),
     pointer: 6,
-    position: Offset(229.7142791748047, 386.28570556640625)
+    position: Offset(229.7142791748047, 386.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694648),
     pointer: 6,
-    position: Offset(229.7142791748047, 386.0)
+    position: Offset(229.7142791748047, 386.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694657),
     pointer: 6,
-    position: Offset(228.85714721679688, 386.0)
+    position: Offset(228.85714721679688, 386.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694665),
     pointer: 6,
-    position: Offset(228.0, 388.0)
+    position: Offset(228.0, 388.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694672),
     pointer: 6,
-    position: Offset(226.0, 392.5714416503906)
+    position: Offset(226.0, 392.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694680),
     pointer: 6,
-    position: Offset(224.0, 397.71429443359375)
+    position: Offset(224.0, 397.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694688),
     pointer: 6,
-    position: Offset(222.0, 404.28570556640625)
+    position: Offset(222.0, 404.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694695),
     pointer: 6,
-    position: Offset(219.7142791748047, 411.1428527832031)
+    position: Offset(219.7142791748047, 411.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694703),
     pointer: 6,
-    position: Offset(218.2857208251953, 418.0)
+    position: Offset(218.2857208251953, 418.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694710),
     pointer: 6,
-    position: Offset(217.14285278320312, 425.4285583496094)
+    position: Offset(217.14285278320312, 425.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694718),
     pointer: 6,
-    position: Offset(215.7142791748047, 433.4285583496094)
+    position: Offset(215.7142791748047, 433.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694726),
     pointer: 6,
-    position: Offset(214.85714721679688, 442.28570556640625)
+    position: Offset(214.85714721679688, 442.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694734),
     pointer: 6,
-    position: Offset(214.0, 454.0)
+    position: Offset(214.0, 454.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694742),
     pointer: 6,
-    position: Offset(214.0, 469.4285583496094)
+    position: Offset(214.0, 469.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694749),
     pointer: 6,
-    position: Offset(215.42857360839844, 485.4285583496094)
+    position: Offset(215.42857360839844, 485.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694757),
     pointer: 6,
-    position: Offset(217.7142791748047, 502.8571472167969)
+    position: Offset(217.7142791748047, 502.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694765),
     pointer: 6,
-    position: Offset(221.14285278320312, 521.4285888671875)
+    position: Offset(221.14285278320312, 521.4285888671875),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694772),
     pointer: 6,
-    position: Offset(224.57142639160156, 541.1428833007812)
+    position: Offset(224.57142639160156, 541.1428833007812),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694780),
     pointer: 6,
-    position: Offset(229.14285278320312, 561.1428833007812)
+    position: Offset(229.14285278320312, 561.1428833007812),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216694788),
     pointer: 6,
-    position: Offset(233.42857360839844, 578.8571166992188)
+    position: Offset(233.42857360839844, 578.8571166992188),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216694802),
     pointer: 6,
-    position: Offset(233.42857360839844, 578.8571166992188)
+    position: Offset(233.42857360839844, 578.8571166992188),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216695344),
     pointer: 7,
-    position: Offset(253.42857360839844, 310.5714416503906)
+    position: Offset(253.42857360839844, 310.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695352),
     pointer: 7,
-    position: Offset(253.42857360839844, 310.5714416503906)
+    position: Offset(253.42857360839844, 310.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695359),
     pointer: 7,
-    position: Offset(252.85714721679688, 318.0)
+    position: Offset(252.85714721679688, 318.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695367),
     pointer: 7,
-    position: Offset(251.14285278320312, 322.0)
+    position: Offset(251.14285278320312, 322.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695375),
     pointer: 7,
-    position: Offset(248.85714721679688, 327.1428527832031)
+    position: Offset(248.85714721679688, 327.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695382),
     pointer: 7,
-    position: Offset(246.0, 334.8571472167969)
+    position: Offset(246.0, 334.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695390),
     pointer: 7,
-    position: Offset(242.57142639160156, 344.5714416503906)
+    position: Offset(242.57142639160156, 344.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695397),
     pointer: 7,
-    position: Offset(238.85714721679688, 357.4285583496094)
+    position: Offset(238.85714721679688, 357.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695406),
     pointer: 7,
-    position: Offset(235.7142791748047, 371.71429443359375)
+    position: Offset(235.7142791748047, 371.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695414),
     pointer: 7,
-    position: Offset(232.2857208251953, 386.8571472167969)
+    position: Offset(232.2857208251953, 386.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695421),
     pointer: 7,
-    position: Offset(229.42857360839844, 402.0)
+    position: Offset(229.42857360839844, 402.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695429),
     pointer: 7,
-    position: Offset(227.42857360839844, 416.8571472167969)
+    position: Offset(227.42857360839844, 416.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695437),
     pointer: 7,
-    position: Offset(226.2857208251953, 431.4285583496094)
+    position: Offset(226.2857208251953, 431.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695444),
     pointer: 7,
-    position: Offset(226.2857208251953, 446.0)
+    position: Offset(226.2857208251953, 446.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695452),
     pointer: 7,
-    position: Offset(227.7142791748047, 460.28570556640625)
+    position: Offset(227.7142791748047, 460.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695459),
     pointer: 7,
-    position: Offset(230.0, 475.1428527832031)
+    position: Offset(230.0, 475.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695467),
     pointer: 7,
-    position: Offset(232.2857208251953, 489.71429443359375)
+    position: Offset(232.2857208251953, 489.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695475),
     pointer: 7,
-    position: Offset(235.7142791748047, 504.0)
+    position: Offset(235.7142791748047, 504.0),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216695490),
     pointer: 7,
-    position: Offset(235.7142791748047, 504.0)
+    position: Offset(235.7142791748047, 504.0),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216695885),
     pointer: 8,
-    position: Offset(238.85714721679688, 524.0)
+    position: Offset(238.85714721679688, 524.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695908),
     pointer: 8,
-    position: Offset(236.2857208251953, 515.7142944335938)
+    position: Offset(236.2857208251953, 515.7142944335938),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695916),
     pointer: 8,
-    position: Offset(234.85714721679688, 509.1428527832031)
+    position: Offset(234.85714721679688, 509.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695924),
     pointer: 8,
-    position: Offset(232.57142639160156, 498.5714416503906)
+    position: Offset(232.57142639160156, 498.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695931),
     pointer: 8,
-    position: Offset(230.57142639160156, 483.71429443359375)
+    position: Offset(230.57142639160156, 483.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695939),
     pointer: 8,
-    position: Offset(229.14285278320312, 466.5714416503906)
+    position: Offset(229.14285278320312, 466.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695947),
     pointer: 8,
-    position: Offset(229.14285278320312, 446.5714416503906)
+    position: Offset(229.14285278320312, 446.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695955),
     pointer: 8,
-    position: Offset(230.57142639160156, 424.8571472167969)
+    position: Offset(230.57142639160156, 424.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695963),
     pointer: 8,
-    position: Offset(232.57142639160156, 402.28570556640625)
+    position: Offset(232.57142639160156, 402.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695970),
     pointer: 8,
-    position: Offset(235.14285278320312, 380.0)
+    position: Offset(235.14285278320312, 380.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216695978),
     pointer: 8,
-    position: Offset(238.57142639160156, 359.4285583496094)
+    position: Offset(238.57142639160156, 359.4285583496094),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216695993),
     pointer: 8,
-    position: Offset(238.57142639160156, 359.4285583496094)
+    position: Offset(238.57142639160156, 359.4285583496094),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216696429),
     pointer: 9,
-    position: Offset(238.2857208251953, 568.5714111328125)
+    position: Offset(238.2857208251953, 568.5714111328125),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696459),
     pointer: 9,
-    position: Offset(234.0, 560.0)
+    position: Offset(234.0, 560.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696467),
     pointer: 9,
-    position: Offset(231.42857360839844, 553.1428833007812)
+    position: Offset(231.42857360839844, 553.1428833007812),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696475),
     pointer: 9,
-    position: Offset(228.2857208251953, 543.1428833007812)
+    position: Offset(228.2857208251953, 543.1428833007812),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696483),
     pointer: 9,
-    position: Offset(225.42857360839844, 528.8571166992188)
+    position: Offset(225.42857360839844, 528.8571166992188),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696491),
     pointer: 9,
-    position: Offset(223.14285278320312, 512.2857055664062)
+    position: Offset(223.14285278320312, 512.2857055664062),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696498),
     pointer: 9,
-    position: Offset(222.0, 495.4285583496094)
+    position: Offset(222.0, 495.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696506),
     pointer: 9,
-    position: Offset(221.7142791748047, 477.4285583496094)
+    position: Offset(221.7142791748047, 477.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696514),
     pointer: 9,
-    position: Offset(221.7142791748047, 458.28570556640625)
+    position: Offset(221.7142791748047, 458.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696521),
     pointer: 9,
-    position: Offset(223.14285278320312, 438.0)
+    position: Offset(223.14285278320312, 438.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216696529),
     pointer: 9,
-    position: Offset(224.2857208251953, 416.28570556640625)
+    position: Offset(224.2857208251953, 416.28570556640625),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216696544),
     pointer: 9,
-    position: Offset(224.2857208251953, 416.28570556640625)
+    position: Offset(224.2857208251953, 416.28570556640625),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216696974),
     pointer: 10,
-    position: Offset(218.57142639160156, 530.5714111328125)
+    position: Offset(218.57142639160156, 530.5714111328125),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697012),
     pointer: 10,
-    position: Offset(220.2857208251953, 522.0)
+    position: Offset(220.2857208251953, 522.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697020),
     pointer: 10,
-    position: Offset(221.14285278320312, 517.7142944335938)
+    position: Offset(221.14285278320312, 517.7142944335938),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697028),
     pointer: 10,
-    position: Offset(222.2857208251953, 511.71429443359375)
+    position: Offset(222.2857208251953, 511.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697036),
     pointer: 10,
-    position: Offset(224.0, 504.28570556640625)
+    position: Offset(224.0, 504.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697044),
     pointer: 10,
-    position: Offset(227.14285278320312, 490.5714416503906)
+    position: Offset(227.14285278320312, 490.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697052),
     pointer: 10,
-    position: Offset(229.42857360839844, 474.0)
+    position: Offset(229.42857360839844, 474.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697059),
     pointer: 10,
-    position: Offset(231.42857360839844, 454.5714416503906)
+    position: Offset(231.42857360839844, 454.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697067),
     pointer: 10,
-    position: Offset(233.7142791748047, 431.1428527832031)
+    position: Offset(233.7142791748047, 431.1428527832031),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216697082),
     pointer: 10,
-    position: Offset(233.7142791748047, 431.1428527832031)
+    position: Offset(233.7142791748047, 431.1428527832031),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216697435),
     pointer: 11,
-    position: Offset(257.1428527832031, 285.1428527832031)
+    position: Offset(257.1428527832031, 285.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697465),
     pointer: 11,
-    position: Offset(251.7142791748047, 296.8571472167969)
+    position: Offset(251.7142791748047, 296.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697473),
     pointer: 11,
-    position: Offset(248.2857208251953, 304.0)
+    position: Offset(248.2857208251953, 304.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697481),
     pointer: 11,
-    position: Offset(244.57142639160156, 314.8571472167969)
+    position: Offset(244.57142639160156, 314.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697489),
     pointer: 11,
-    position: Offset(240.2857208251953, 329.1428527832031)
+    position: Offset(240.2857208251953, 329.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697497),
     pointer: 11,
-    position: Offset(236.85714721679688, 345.1428527832031)
+    position: Offset(236.85714721679688, 345.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697505),
     pointer: 11,
-    position: Offset(233.7142791748047, 361.4285583496094)
+    position: Offset(233.7142791748047, 361.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697512),
     pointer: 11,
-    position: Offset(231.14285278320312, 378.28570556640625)
+    position: Offset(231.14285278320312, 378.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697520),
     pointer: 11,
-    position: Offset(229.42857360839844, 395.4285583496094)
+    position: Offset(229.42857360839844, 395.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697528),
     pointer: 11,
-    position: Offset(229.42857360839844, 412.8571472167969)
+    position: Offset(229.42857360839844, 412.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697535),
     pointer: 11,
-    position: Offset(230.85714721679688, 430.8571472167969)
+    position: Offset(230.85714721679688, 430.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697543),
     pointer: 11,
-    position: Offset(233.42857360839844, 449.71429443359375)
+    position: Offset(233.42857360839844, 449.71429443359375),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216697558),
     pointer: 11,
-    position: Offset(233.42857360839844, 449.71429443359375)
+    position: Offset(233.42857360839844, 449.71429443359375),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216697749),
     pointer: 12,
-    position: Offset(246.0, 311.4285583496094)
+    position: Offset(246.0, 311.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697780),
     pointer: 12,
-    position: Offset(244.57142639160156, 318.28570556640625)
+    position: Offset(244.57142639160156, 318.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697787),
     pointer: 12,
-    position: Offset(243.14285278320312, 325.4285583496094)
+    position: Offset(243.14285278320312, 325.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697795),
     pointer: 12,
-    position: Offset(241.42857360839844, 336.0)
+    position: Offset(241.42857360839844, 336.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697803),
     pointer: 12,
-    position: Offset(239.7142791748047, 351.1428527832031)
+    position: Offset(239.7142791748047, 351.1428527832031),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697811),
     pointer: 12,
-    position: Offset(238.2857208251953, 368.5714416503906)
+    position: Offset(238.2857208251953, 368.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697819),
     pointer: 12,
-    position: Offset(238.0, 389.4285583496094)
+    position: Offset(238.0, 389.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697826),
     pointer: 12,
-    position: Offset(239.14285278320312, 412.0)
+    position: Offset(239.14285278320312, 412.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697834),
     pointer: 12,
-    position: Offset(242.2857208251953, 438.0)
+    position: Offset(242.2857208251953, 438.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697842),
     pointer: 12,
-    position: Offset(247.42857360839844, 466.8571472167969)
+    position: Offset(247.42857360839844, 466.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216697849),
     pointer: 12,
-    position: Offset(254.2857208251953, 497.71429443359375)
+    position: Offset(254.2857208251953, 497.71429443359375),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216697864),
     pointer: 12,
-    position: Offset(254.2857208251953, 497.71429443359375)
+    position: Offset(254.2857208251953, 497.71429443359375),
   ),
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216698321),
     pointer: 13,
-    position: Offset(250.0, 306.0)
+    position: Offset(250.0, 306.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698328),
     pointer: 13,
-    position: Offset(250.0, 306.0)
+    position: Offset(250.0, 306.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698344),
     pointer: 13,
-    position: Offset(249.14285278320312, 314.0)
+    position: Offset(249.14285278320312, 314.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698351),
     pointer: 13,
-    position: Offset(247.42857360839844, 319.4285583496094)
+    position: Offset(247.42857360839844, 319.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698359),
     pointer: 13,
-    position: Offset(245.14285278320312, 326.8571472167969)
+    position: Offset(245.14285278320312, 326.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698366),
     pointer: 13,
-    position: Offset(241.7142791748047, 339.4285583496094)
+    position: Offset(241.7142791748047, 339.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698374),
     pointer: 13,
-    position: Offset(238.57142639160156, 355.71429443359375)
+    position: Offset(238.57142639160156, 355.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698382),
     pointer: 13,
-    position: Offset(236.2857208251953, 374.28570556640625)
+    position: Offset(236.2857208251953, 374.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698390),
     pointer: 13,
-    position: Offset(235.14285278320312, 396.5714416503906)
+    position: Offset(235.14285278320312, 396.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698398),
     pointer: 13,
-    position: Offset(236.57142639160156, 421.4285583496094)
+    position: Offset(236.57142639160156, 421.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698406),
     pointer: 13,
-    position: Offset(241.14285278320312, 451.4285583496094)
+    position: Offset(241.14285278320312, 451.4285583496094),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216698421),
     pointer: 13,
-    position: Offset(241.14285278320312, 451.4285583496094)
+    position: Offset(241.14285278320312, 451.4285583496094),
   ),
 ];
 
@@ -1541,33 +1541,33 @@ const List<PointerEvent> interruptedVelocityEventData = <PointerEvent>[
   PointerDownEvent(
     timeStamp: Duration(milliseconds: 216698321),
     pointer: 13,
-    position: Offset(250.0, 306.0)
+    position: Offset(250.0, 306.0),
   ),
 
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698328),
     pointer: 13,
-    position: Offset(250.0, 306.0)
+    position: Offset(250.0, 306.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698344),
     pointer: 13,
-    position: Offset(249.14285278320312, 314.0)
+    position: Offset(249.14285278320312, 314.0),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698351),
     pointer: 13,
-    position: Offset(247.42857360839844, 319.4285583496094)
+    position: Offset(247.42857360839844, 319.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698359),
     pointer: 13,
-    position: Offset(245.14285278320312, 326.8571472167969)
+    position: Offset(245.14285278320312, 326.8571472167969),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698366),
     pointer: 13,
-    position: Offset(241.7142791748047, 339.4285583496094)
+    position: Offset(241.7142791748047, 339.4285583496094),
   ),
 
   // The pointer "stops" here because we've introduced a 40+ms gap
@@ -1577,31 +1577,31 @@ const List<PointerEvent> interruptedVelocityEventData = <PointerEvent>[
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698374 + 40),
     pointer: 13,
-    position: Offset(238.57142639160156, 355.71429443359375)
+    position: Offset(238.57142639160156, 355.71429443359375),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698382 + 40),
     pointer: 13,
-    position: Offset(236.2857208251953, 374.28570556640625)
+    position: Offset(236.2857208251953, 374.28570556640625),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698390 + 40),
     pointer: 13,
-    position: Offset(235.14285278320312, 396.5714416503906)
+    position: Offset(235.14285278320312, 396.5714416503906),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698398 + 40),
     pointer: 13,
-    position: Offset(236.57142639160156, 421.4285583496094)
+    position: Offset(236.57142639160156, 421.4285583496094),
   ),
   PointerMoveEvent(
     timeStamp: Duration(milliseconds: 216698406 + 40),
     pointer: 13,
-    position: Offset(241.14285278320312, 451.4285583496094)
+    position: Offset(241.14285278320312, 451.4285583496094),
   ),
   PointerUpEvent(
     timeStamp: Duration(milliseconds: 216698421 + 40),
     pointer: 13,
-    position: Offset(241.14285278320312, 451.4285583496094)
+    position: Offset(241.14285278320312, 451.4285583496094),
   ),
 ];
diff --git a/packages/flutter/test/material/about_test.dart b/packages/flutter/test/material/about_test.dart
index 4977be082cb..a8da27fe942 100644
--- a/packages/flutter/test/material/about_test.dart
+++ b/packages/flutter/test/material/about_test.dart
@@ -26,7 +26,7 @@ void main() {
                   applicationLegalese: 'I am the very model of a modern major general.',
                   aboutBoxChildren: <Widget>[
                     Text('About box'),
-                  ]
+                  ],
                 ),
               ],
             ),
@@ -55,7 +55,7 @@ void main() {
 
     LicenseRegistry.addLicense(() {
       return Stream<LicenseEntry>.fromIterable(<LicenseEntry>[
-        const LicenseEntryWithLineBreaks(<String>[ 'Pirate package '], 'Pirate license')
+        const LicenseEntryWithLineBreaks(<String>[ 'Pirate package '], 'Pirate license'),
       ]);
     });
 
@@ -78,13 +78,13 @@ void main() {
   testWidgets('AboutListTile control test', (WidgetTester tester) async {
     LicenseRegistry.addLicense(() {
       return Stream<LicenseEntry>.fromIterable(<LicenseEntry>[
-        const LicenseEntryWithLineBreaks(<String>['AAA'], 'BBB')
+        const LicenseEntryWithLineBreaks(<String>['AAA'], 'BBB'),
       ]);
     });
 
     LicenseRegistry.addLicense(() {
       return Stream<LicenseEntry>.fromIterable(<LicenseEntry>[
-        const LicenseEntryWithLineBreaks(<String>['Another package'], 'Another license')
+        const LicenseEntryWithLineBreaks(<String>['Another package'], 'Another license'),
       ]);
     });
 
@@ -114,7 +114,7 @@ void main() {
 
     LicenseRegistry.addLicense(() {
       return Stream<LicenseEntry>.fromIterable(<LicenseEntry>[
-        const LicenseEntryWithLineBreaks(<String>['ABC'], 'DEF')
+        const LicenseEntryWithLineBreaks(<String>['ABC'], 'DEF'),
       ]);
     });
 
diff --git a/packages/flutter/test/material/animated_icons_private_test.dart b/packages/flutter/test/material/animated_icons_private_test.dart
index b90e32da0c0..f845aae6458 100644
--- a/packages/flutter/test/material/animated_icons_private_test.dart
+++ b/packages/flutter/test/material/animated_icons_private_test.dart
@@ -100,7 +100,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
       painter.paint(mockCanvas, size);
       expect(generatedPaths.length, 1);
@@ -122,7 +122,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
       painter.paint(mockCanvas, size);
       expect(generatedPaths.length, 1);
@@ -144,7 +144,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
       painter.paint(mockCanvas, size);
       expect(generatedPaths.length, 1);
@@ -166,7 +166,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 0.5,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
       painter.paint(mockCanvas, size);
       verify(mockCanvas.scale(0.5, 0.5));
@@ -179,12 +179,12 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: true,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
       painter.paint(mockCanvas, size);
       verifyInOrder(<void>[
         mockCanvas.rotate(math.pi),
-        mockCanvas.translate(-48.0, -48.0)
+        mockCanvas.translate(-48.0, -48.0),
       ]);
     });
 
@@ -195,7 +195,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
       painter.paint(mockCanvas, size);
       expect(generatedPaths.length, 1);
@@ -217,7 +217,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
       painter.paint(mockCanvas, size);
       expect(generatedPaths.length, 1);
@@ -237,7 +237,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
       painter.paint(mockCanvas, size);
       expect(generatedPaths.length, 1);
@@ -257,7 +257,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       final _AnimatedIconPainter painter2 = _AnimatedIconPainter(
@@ -266,7 +266,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       expect(painter1.shouldRepaint(painter2), false);
@@ -279,7 +279,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       final _AnimatedIconPainter painter2 = _AnimatedIconPainter(
@@ -288,7 +288,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       expect(painter1.shouldRepaint(painter2), true);
@@ -301,7 +301,7 @@ void main () {
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       final _AnimatedIconPainter painter2 = _AnimatedIconPainter(
@@ -310,7 +310,7 @@ void main () {
         color: const Color(0xFFFF0000),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       expect(painter1.shouldRepaint(painter2), true);
@@ -323,7 +323,7 @@ void main () {
         color: const Color(0xFF0000FF),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       final _AnimatedIconPainter painter2 = _AnimatedIconPainter(
@@ -332,7 +332,7 @@ void main () {
         color: const Color(0xFF0000FF),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       expect(painter1.shouldRepaint(painter2), true);
diff --git a/packages/flutter/test/material/animated_icons_test.dart b/packages/flutter/test/material/animated_icons_test.dart
index 8ad20d69923..34f7e2d769d 100644
--- a/packages/flutter/test/material/animated_icons_test.dart
+++ b/packages/flutter/test/material/animated_icons_test.dart
@@ -24,7 +24,7 @@ void main() {
           child: AnimatedIcon(
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
-          )
+          ),
         ),
       ),
     );
@@ -46,7 +46,7 @@ void main() {
           child: AnimatedIcon(
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
-          )
+          ),
         ),
       ),
     );
@@ -68,7 +68,7 @@ void main() {
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
             color: Color(0xFF0000FF),
-          )
+          ),
         ),
       ),
     );
@@ -90,7 +90,7 @@ void main() {
           child: AnimatedIcon(
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
-          )
+          ),
         ),
       ),
     );
@@ -114,7 +114,7 @@ void main() {
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
             size: 96.0,
-          )
+          ),
         ),
       ),
     );
@@ -156,7 +156,7 @@ void main() {
           child: AnimatedIcon(
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
-          )
+          ),
         ),
       ),
     );
@@ -165,7 +165,7 @@ void main() {
     customPaint.painter.paint(canvas, const Size(48.0, 48.0));
     verifyInOrder(<void>[
       canvas.rotate(math.pi),
-      canvas.translate(-48.0, -48.0)
+      canvas.translate(-48.0, -48.0),
     ]);
   });
 
@@ -180,7 +180,7 @@ void main() {
           child: AnimatedIcon(
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
-          )
+          ),
         ),
       ),
     );
@@ -203,7 +203,7 @@ void main() {
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
             textDirection: TextDirection.rtl,
-          )
+          ),
         ),
       ),
     );
@@ -212,7 +212,7 @@ void main() {
     customPaint.painter.paint(canvas, const Size(48.0, 48.0));
     verifyInOrder(<void>[
       canvas.rotate(math.pi),
-      canvas.translate(-48.0, -48.0)
+      canvas.translate(-48.0, -48.0),
     ]);
   });
 }
diff --git a/packages/flutter/test/material/app_bar_test.dart b/packages/flutter/test/material/app_bar_test.dart
index 8459d207580..e9b98466645 100644
--- a/packages/flutter/test/material/app_bar_test.dart
+++ b/packages/flutter/test/material/app_bar_test.dart
@@ -153,8 +153,8 @@ void main() {
           appBar: AppBar(
             centerTitle: true,
             title: const Text('X'),
-          )
-        )
+          ),
+        ),
       )
     );
 
@@ -318,7 +318,7 @@ void main() {
 
     actions = <Widget>[
       const SizedBox(width: 100.0),
-      const SizedBox(width: 100.0)
+      const SizedBox(width: 100.0),
     ];
     await tester.pumpWidget(buildApp());
 
@@ -383,7 +383,7 @@ void main() {
     titleWidth = 620.0;
     actions = <Widget>[
       const SizedBox(width: 48.0),
-      const SizedBox(width: 48.0)
+      const SizedBox(width: 48.0),
     ];
     await tester.pumpWidget(buildApp());
     expect(tester.getTopLeft(title).dx, 800 - 620 - 48 - 48);
@@ -438,7 +438,7 @@ void main() {
     titleWidth = 620.0;
     actions = <Widget>[
       const SizedBox(width: 48.0),
-      const SizedBox(width: 48.0)
+      const SizedBox(width: 48.0),
     ];
     await tester.pumpWidget(buildApp());
     expect(tester.getTopRight(title).dx, 620 + 48 + 48);
@@ -878,7 +878,7 @@ void main() {
             data: topPadding100,
             child: Scaffold(
               primary: true,
-              appBar: AppBar(title: const Text('title'))
+              appBar: AppBar(title: const Text('title')),
           ),
         ),
       ),
@@ -1396,7 +1396,7 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       theme: darkTheme,
       home: Scaffold(
-        appBar: AppBar(title: const Text('test'))
+        appBar: AppBar(title: const Text('test')),
       ),
     ));
 
@@ -1412,7 +1412,7 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       theme: lightTheme,
       home: Scaffold(
-        appBar: AppBar(title: const Text('test'))
+        appBar: AppBar(title: const Text('test')),
       ),
     ));
 
diff --git a/packages/flutter/test/material/app_bar_theme_test.dart b/packages/flutter/test/material/app_bar_theme_test.dart
index 57b4001b251..2f854c78e7f 100644
--- a/packages/flutter/test/material/app_bar_theme_test.dart
+++ b/packages/flutter/test/material/app_bar_theme_test.dart
@@ -17,7 +17,7 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(appBar: AppBar(
         actions: <Widget>[
-          IconButton(icon: const Icon(Icons.share), onPressed: () {})
+          IconButton(icon: const Icon(Icons.share), onPressed: () {}),
         ],
       )),
     ));
@@ -45,7 +45,7 @@ void main() {
       home: Scaffold(appBar: AppBar(
         title: const Text('App Bar Title'),
         actions: <Widget>[
-          IconButton(icon: const Icon(Icons.share), onPressed: () {})
+          IconButton(icon: const Icon(Icons.share), onPressed: () {}),
         ],
       )),
     ));
@@ -85,7 +85,7 @@ void main() {
         actionsIconTheme: actionsIconThemeData,
         textTheme: textTheme,
         actions: <Widget>[
-          IconButton(icon: const Icon(Icons.share), onPressed: () {})
+          IconButton(icon: const Icon(Icons.share), onPressed: () {}),
         ],
       )),
     ));
@@ -118,7 +118,7 @@ void main() {
         iconTheme: iconThemeData,
         actionsIconTheme: actionsIconThemeData,
         actions: <Widget>[
-          IconButton(icon: const Icon(Icons.share), color: color, onPressed: () {})
+          IconButton(icon: const Icon(Icons.share), color: color, onPressed: () {}),
         ],
       )),
     ));
@@ -135,7 +135,7 @@ void main() {
       theme: themeData,
       home: Scaffold(appBar: AppBar(
         actions: <Widget>[
-          IconButton(icon: const Icon(Icons.share), onPressed: () {})
+          IconButton(icon: const Icon(Icons.share), onPressed: () {}),
         ],
       )),
     ));
@@ -162,7 +162,7 @@ void main() {
       theme: themeData,
       home: Scaffold(appBar: AppBar(
         actions: <Widget>[
-          IconButton(icon: const Icon(Icons.share), onPressed: () {})
+          IconButton(icon: const Icon(Icons.share), onPressed: () {}),
         ],
       )),
     ));
@@ -205,7 +205,7 @@ ThemeData _themeData() {
     primaryColor: Colors.purple,
     brightness: Brightness.dark,
     primaryIconTheme: const IconThemeData(color: Colors.green),
-    primaryTextTheme: const TextTheme(title: TextStyle(color: Colors.orange), body1: TextStyle(color: Colors.pink))
+    primaryTextTheme: const TextTheme(title: TextStyle(color: Colors.orange), body1: TextStyle(color: Colors.pink)),
   );
 }
 
diff --git a/packages/flutter/test/material/app_test.dart b/packages/flutter/test/material/app_test.dart
index fa68c30a217..64e605dba2c 100644
--- a/packages/flutter/test/material/app_test.dart
+++ b/packages/flutter/test/material/app_test.dart
@@ -256,7 +256,7 @@ void main() {
                       child: const Text('X'),
                       onPressed: () async {
                         result = Navigator.of(context).pushNamed('/a');
-                      }
+                      },
                   ),
                 );
               }
@@ -271,7 +271,7 @@ void main() {
                   },
                 ),
               );
-            }
+            },
           },
         )
     );
diff --git a/packages/flutter/test/material/arc_test.dart b/packages/flutter/test/material/arc_test.dart
index 48776dac217..acd2e522a66 100644
--- a/packages/flutter/test/material/arc_test.dart
+++ b/packages/flutter/test/material/arc_test.dart
@@ -9,12 +9,12 @@ void main() {
   test('MaterialPointArcTween control test', () {
     final MaterialPointArcTween a = MaterialPointArcTween(
       begin: Offset.zero,
-      end: const Offset(0.0, 10.0)
+      end: const Offset(0.0, 10.0),
     );
 
     final MaterialPointArcTween b = MaterialPointArcTween(
       begin: Offset.zero,
-      end: const Offset(0.0, 10.0)
+      end: const Offset(0.0, 10.0),
     );
 
     expect(a, hasOneLineDescription);
@@ -24,12 +24,12 @@ void main() {
   test('MaterialRectArcTween control test', () {
     final MaterialRectArcTween a = MaterialRectArcTween(
       begin: Rect.fromLTWH(0.0, 0.0, 10.0, 10.0),
-      end: Rect.fromLTWH(0.0, 10.0, 10.0, 10.0)
+      end: Rect.fromLTWH(0.0, 10.0, 10.0, 10.0),
     );
 
     final MaterialRectArcTween b = MaterialRectArcTween(
       begin: Rect.fromLTWH(0.0, 0.0, 10.0, 10.0),
-      end: Rect.fromLTWH(0.0, 10.0, 10.0, 10.0)
+      end: Rect.fromLTWH(0.0, 10.0, 10.0, 10.0),
     );
     expect(a, hasOneLineDescription);
     expect(a.toString(), equals(b.toString()));
@@ -38,14 +38,14 @@ void main() {
   test('on-axis MaterialPointArcTween', () {
     MaterialPointArcTween tween = MaterialPointArcTween(
       begin: Offset.zero,
-      end: const Offset(0.0, 10.0)
+      end: const Offset(0.0, 10.0),
     );
     expect(tween.lerp(0.5), equals(const Offset(0.0, 5.0)));
     expect(tween, hasOneLineDescription);
 
     tween = MaterialPointArcTween(
       begin: Offset.zero,
-      end: const Offset(10.0, 0.0)
+      end: const Offset(10.0, 0.0),
     );
     expect(tween.lerp(0.5), equals(const Offset(5.0, 0.0)));
   });
@@ -53,14 +53,14 @@ void main() {
   test('on-axis MaterialRectArcTween', () {
     MaterialRectArcTween tween = MaterialRectArcTween(
       begin: Rect.fromLTWH(0.0, 0.0, 10.0, 10.0),
-      end: Rect.fromLTWH(0.0, 10.0, 10.0, 10.0)
+      end: Rect.fromLTWH(0.0, 10.0, 10.0, 10.0),
     );
     expect(tween.lerp(0.5), equals(Rect.fromLTWH(0.0, 5.0, 10.0, 10.0)));
     expect(tween, hasOneLineDescription);
 
     tween = MaterialRectArcTween(
       begin: Rect.fromLTWH(0.0, 0.0, 10.0, 10.0),
-      end: Rect.fromLTWH(10.0, 0.0, 10.0, 10.0)
+      end: Rect.fromLTWH(10.0, 0.0, 10.0, 10.0),
     );
     expect(tween.lerp(0.5), equals(Rect.fromLTWH(5.0, 0.0, 10.0, 10.0)));
   });
diff --git a/packages/flutter/test/material/back_button_test.dart b/packages/flutter/test/material/back_button_test.dart
index dab5b65f2f7..083777ff536 100644
--- a/packages/flutter/test/material/back_button_test.dart
+++ b/packages/flutter/test/material/back_button_test.dart
@@ -16,10 +16,10 @@ void main() {
             return const Material(
               child: Center(
                 child: BackButton(),
-              )
+              ),
             );
           },
-        }
+        },
       )
     );
 
diff --git a/packages/flutter/test/material/bottom_app_bar_test.dart b/packages/flutter/test/material/bottom_app_bar_test.dart
index 53e4de77ae3..5455c4f0a60 100644
--- a/packages/flutter/test/material/bottom_app_bar_test.dart
+++ b/packages/flutter/test/material/bottom_app_bar_test.dart
@@ -17,7 +17,7 @@ void main() {
           bottomNavigationBar: ShapeListener(
             BottomAppBar(
               child: SizedBox(height: 100.0),
-            )
+            ),
           ),
         ),
       ),
@@ -34,7 +34,7 @@ void main() {
       coversSameAreaAs(
         expectedPath,
         areaToCompare: (Offset.zero & renderBox.size).inflate(5.0),
-      )
+      ),
     );
   });
 
@@ -196,7 +196,7 @@ void main() {
       coversSameAreaAs(
         expectedPath,
         areaToCompare: (Offset.zero & renderBox.size).inflate(5.0),
-      )
+      ),
     );
   });
 
@@ -209,7 +209,7 @@ void main() {
               child: SizedBox(height: 100.0),
               shape: RectangularNotch(),
               notchMargin: 0.0,
-            )
+            ),
           ),
           floatingActionButton: FloatingActionButton(
             onPressed: null,
@@ -248,7 +248,7 @@ void main() {
       coversSameAreaAs(
         expectedPath,
         areaToCompare: (Offset.zero & babSize).inflate(5.0),
-      )
+      ),
     );
   });
 
@@ -261,7 +261,7 @@ void main() {
               child: SizedBox(height: 100.0),
               shape: RectangularNotch(),
               notchMargin: 6.0,
-            )
+            ),
           ),
           floatingActionButton: FloatingActionButton(
             onPressed: null,
@@ -300,7 +300,7 @@ void main() {
       coversSameAreaAs(
         expectedPath,
         areaToCompare: (Offset.zero & babSize).inflate(5.0),
-      )
+      ),
     );
   });
 
@@ -415,7 +415,7 @@ class ShapeListenerState extends State<ShapeListener> {
   Widget build(BuildContext context) {
     return CustomPaint(
       child: widget.child,
-      painter: cache
+      painter: cache,
     );
   }
 
diff --git a/packages/flutter/test/material/bottom_app_bar_theme_test.dart b/packages/flutter/test/material/bottom_app_bar_theme_test.dart
index 238c894ebdc..0dd0fb77cc7 100644
--- a/packages/flutter/test/material/bottom_app_bar_theme_test.dart
+++ b/packages/flutter/test/material/bottom_app_bar_theme_test.dart
@@ -127,7 +127,7 @@ Widget _withTheme(BottomAppBarTheme theme) {
               ],
             ),
           ),
-        )
+        ),
     ),
   );
 }
diff --git a/packages/flutter/test/material/bottom_navigation_bar_test.dart b/packages/flutter/test/material/bottom_navigation_bar_test.dart
index d2312a5a1c9..6d28346960a 100644
--- a/packages/flutter/test/material/bottom_navigation_bar_test.dart
+++ b/packages/flutter/test/material/bottom_navigation_bar_test.dart
@@ -24,18 +24,18 @@ void main() {
             items: const <BottomNavigationBarItem>[
               BottomNavigationBarItem(
                 icon: Icon(Icons.ac_unit),
-                title: Text('AC')
+                title: Text('AC'),
               ),
               BottomNavigationBarItem(
                 icon: Icon(Icons.access_alarm),
-                title: Text('Alarm')
-              )
+                title: Text('Alarm'),
+              ),
             ],
             onTap: (int index) {
               mutatedIndex = index;
-            }
-          )
-        )
+            },
+          ),
+        ),
       )
     );
 
@@ -52,15 +52,15 @@ void main() {
             items: const <BottomNavigationBarItem>[
               BottomNavigationBarItem(
                 icon: Icon(Icons.ac_unit),
-                title: Text('AC')
+                title: Text('AC'),
               ),
               BottomNavigationBarItem(
                 icon: Icon(Icons.access_alarm),
-                title: Text('Alarm')
-              )
+                title: Text('Alarm'),
+              ),
             ]
-          )
-        )
+          ),
+        ),
       )
     );
 
@@ -92,9 +92,9 @@ void main() {
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -128,9 +128,9 @@ void main() {
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -171,9 +171,9 @@ void main() {
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -220,9 +220,9 @@ void main() {
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -247,9 +247,9 @@ void main() {
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -275,9 +275,9 @@ void main() {
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -304,9 +304,9 @@ void main() {
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -353,9 +353,9 @@ void main() {
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -380,9 +380,9 @@ void main() {
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -399,16 +399,16 @@ void main() {
               items: const <BottomNavigationBarItem>[
                 BottomNavigationBarItem(
                   icon: Icon(Icons.ac_unit),
-                  title: Text('AC')
+                  title: Text('AC'),
                 ),
                 BottomNavigationBarItem(
                   icon: Icon(Icons.access_alarm),
-                  title: Text('Alarm')
-                )
+                  title: Text('Alarm'),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -427,15 +427,15 @@ void main() {
             items: const <BottomNavigationBarItem>[
               BottomNavigationBarItem(
                 icon: Icon(Icons.ac_unit),
-                title: Text('AC')
+                title: Text('AC'),
               ),
               BottomNavigationBarItem(
                 icon: Icon(Icons.access_alarm),
-                title: Text('Alarm')
-              )
-            ]
-          )
-        )
+                title: Text('Alarm'),
+              ),
+            ],
+          ),
+        ),
       )
     );
 
@@ -453,15 +453,15 @@ void main() {
             items: const <BottomNavigationBarItem>[
               BottomNavigationBarItem(
                 icon: Icon(Icons.ac_unit),
-                title: Text('AC')
+                title: Text('AC'),
               ),
               BottomNavigationBarItem(
                 icon: Icon(Icons.access_alarm),
-                title: Text('Alarm')
-              )
-            ]
-          )
-        )
+                title: Text('Alarm'),
+              ),
+            ],
+          ),
+        ),
       )
     );
 
@@ -482,23 +482,23 @@ void main() {
             items: const <BottomNavigationBarItem>[
               BottomNavigationBarItem(
                 icon: Icon(Icons.ac_unit),
-                title: Text('AC')
+                title: Text('AC'),
               ),
               BottomNavigationBarItem(
                 icon: Icon(Icons.access_alarm),
-                title: Text('Alarm')
+                title: Text('Alarm'),
               ),
               BottomNavigationBarItem(
                 icon: Icon(Icons.access_time),
-                title: Text('Time')
+                title: Text('Time'),
               ),
               BottomNavigationBarItem(
                 icon: Icon(Icons.add),
-                title: Text('Add')
-              )
-            ]
-          )
-        )
+                title: Text('Add'),
+              ),
+            ],
+          ),
+        ),
       )
     );
 
@@ -543,24 +543,24 @@ void main() {
               items: const <BottomNavigationBarItem>[
                 BottomNavigationBarItem(
                   icon: Icon(Icons.ac_unit),
-                  title: Text('AC')
+                  title: Text('AC'),
                 ),
                 BottomNavigationBarItem(
                   icon: Icon(Icons.access_alarm),
-                  title: Text('Alarm')
+                  title: Text('Alarm'),
                 ),
                 BottomNavigationBarItem(
                   icon: Icon(Icons.access_time),
-                  title: Text('Time')
+                  title: Text('Time'),
                 ),
                 BottomNavigationBarItem(
                   icon: Icon(Icons.add),
-                  title: Text('Add')
-                )
-              ]
-            )
-          )
-        )
+                  title: Text('Add'),
+                ),
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -581,24 +581,24 @@ void main() {
               items: const <BottomNavigationBarItem>[
                 BottomNavigationBarItem(
                   icon: Icon(Icons.ac_unit),
-                  title: Text('AC')
+                  title: Text('AC'),
                 ),
                 BottomNavigationBarItem(
                   icon: Icon(Icons.access_alarm),
-                  title: Text('Alarm')
+                  title: Text('Alarm'),
                 ),
                 BottomNavigationBarItem(
                   icon: Icon(Icons.access_time),
-                  title: Text('Time')
+                  title: Text('Time'),
                 ),
                 BottomNavigationBarItem(
                   icon: Icon(Icons.add),
-                  title: Text('Add')
-                )
-              ]
-            )
-          )
-        )
+                  title: Text('Add'),
+                ),
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -815,7 +815,7 @@ void main() {
           ..restore()
           ..circle(x: 200.0)
           ..translate(x: 400.0)
-          ..circle(x: 200.0)
+          ..circle(x: 200.0),
     );
   });
 
@@ -1168,7 +1168,7 @@ void main() {
             ),
             BottomNavigationBarItem(
               icon: Icon(Icons.access_alarm),
-            )
+            ),
           ])));
     }, throwsA(isInstanceOf<AssertionError>()));
   });
diff --git a/packages/flutter/test/material/buttons_test.dart b/packages/flutter/test/material/buttons_test.dart
index 070f2e80be7..1b16af1304c 100644
--- a/packages/flutter/test/material/buttons_test.dart
+++ b/packages/flutter/test/material/buttons_test.dart
@@ -24,7 +24,7 @@ void main() {
           child: Center(
             child: FlatButton(
               onPressed: () { },
-              child: const Text('ABC')
+              child: const Text('ABC'),
             ),
           ),
         ),
@@ -46,7 +46,7 @@ void main() {
               SemanticsFlag.hasEnabledState,
               SemanticsFlag.isEnabled,
             ],
-          )
+          ),
         ],
       ),
       ignoreId: true,
@@ -64,7 +64,7 @@ void main() {
           child: Center(
             child: RaisedButton(
               onPressed: () { },
-              child: const Text('ABC')
+              child: const Text('ABC'),
             ),
           ),
         ),
@@ -86,7 +86,7 @@ void main() {
               SemanticsFlag.hasEnabledState,
               SemanticsFlag.isEnabled,
             ],
-          )
+          ),
         ]
       ),
       ignoreId: true,
@@ -214,7 +214,7 @@ void main() {
             areaToCompare: expectedClipRect.inflate(10.0),
         ))
         ..circle(color: directSplashColor)
-        ..rect(color: directHighlightColor)
+        ..rect(color: directHighlightColor),
     );
 
     const Color themeSplashColor1 = Color(0xFF001100);
@@ -251,7 +251,7 @@ void main() {
             areaToCompare: expectedClipRect.inflate(10.0),
         ))
         ..circle(color: themeSplashColor1)
-        ..rect(color: themeHighlightColor1)
+        ..rect(color: themeHighlightColor1),
     );
 
     const Color themeSplashColor2 = Color(0xFF002200);
@@ -275,7 +275,7 @@ void main() {
       Material.of(tester.element(find.byType(MaterialButton))),
       paints
         ..circle(color: themeSplashColor2)
-        ..rect(color: themeHighlightColor2)
+        ..rect(color: themeHighlightColor2),
     );
 
     await gesture.up();
@@ -306,7 +306,7 @@ void main() {
 
     expect(
         tester.renderObject(find.byKey(buttonKey)),
-        paintsExactlyCountTimes(#clipPath, 0)
+        paintsExactlyCountTimes(#clipPath, 0),
     );
   });
 
@@ -616,13 +616,13 @@ void main() {
             child: RaisedButton(
               onPressed: () { /* to make sure the button is enabled */ },
             ),
-          )
+          ),
       ),
     );
 
     expect(
         tester.renderObject(find.byType(RaisedButton)),
-        paintsExactlyCountTimes(#clipPath, 0)
+        paintsExactlyCountTimes(#clipPath, 0),
     );
   });
 }
diff --git a/packages/flutter/test/material/card_test.dart b/packages/flutter/test/material/card_test.dart
index e2e42512f97..0e9e73c99e8 100644
--- a/packages/flutter/test/material/card_test.dart
+++ b/packages/flutter/test/material/card_test.dart
@@ -26,9 +26,9 @@ void main() {
                   MaterialButton(
                     child: const Text('Button'),
                     onPressed: () { },
-                  )
+                  ),
                 ],
-              )
+              ),
             ),
           ),
         ),
@@ -67,7 +67,7 @@ void main() {
                 ],
               ),
             ],
-          )
+          ),
         ],
       ),
       ignoreTransform: true,
@@ -91,9 +91,9 @@ void main() {
               child: Column(
                 children: const <Widget>[
                   Text('First child'),
-                  Text('Second child')
+                  Text('Second child'),
                 ],
-              )
+              ),
             ),
           ),
         ),
diff --git a/packages/flutter/test/material/card_theme_test.dart b/packages/flutter/test/material/card_theme_test.dart
index fa943a9b351..d45de99831b 100644
--- a/packages/flutter/test/material/card_theme_test.dart
+++ b/packages/flutter/test/material/card_theme_test.dart
@@ -17,7 +17,7 @@ void main() {
   testWidgets('Passing no CardTheme returns defaults', (WidgetTester tester) async {
     await tester.pumpWidget(const MaterialApp(
       home: Scaffold(
-        body: Card()
+        body: Card(),
       ),
     ));
 
@@ -39,7 +39,7 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       theme: ThemeData(cardTheme: cardTheme),
       home: const Scaffold(
-        body: Card()
+        body: Card(),
       ),
     ));
 
@@ -71,7 +71,7 @@ void main() {
           elevation: elevation,
           margin: margin,
           shape: shape,
-        )
+        ),
       ),
     ));
 
@@ -92,7 +92,7 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       theme: themeData,
       home: const Scaffold(
-        body: Card()
+        body: Card(),
       ),
     ));
 
@@ -106,7 +106,7 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       theme: themeData,
       home: const Scaffold(
-        body: Card()
+        body: Card(),
       ),
     ));
 
@@ -131,9 +131,9 @@ void main() {
           child: Center(
             child: Card(
               child: SizedBox.fromSize(size: const Size(200, 300),),
-            )
-          )
-        )
+            ),
+          ),
+        ),
       ),
     ));
 
@@ -153,7 +153,7 @@ CardTheme _cardTheme() {
     margin: EdgeInsets.all(7.0),
     shape: RoundedRectangleBorder(
       borderRadius: BorderRadius.all(Radius.circular(5.0)),
-    )
+    ),
   );
 }
 
diff --git a/packages/flutter/test/material/checkbox_test.dart b/packages/flutter/test/material/checkbox_test.dart
index 6429fb6eaed..bd11a6ce7df 100644
--- a/packages/flutter/test/material/checkbox_test.dart
+++ b/packages/flutter/test/material/checkbox_test.dart
@@ -201,7 +201,7 @@ void main() {
       flags: <SemanticsFlag>[
         SemanticsFlag.hasCheckedState,
         SemanticsFlag.hasEnabledState,
-        SemanticsFlag.isEnabled
+        SemanticsFlag.isEnabled,
       ],
       actions: <SemanticsAction>[SemanticsAction.tap],
     ), hasLength(1));
diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
index f542d80c348..7b3006eeb61 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart
@@ -1639,7 +1639,7 @@ void main() {
         of: find.byType(RawChip),
         matching: find.byWidgetPredicate((Widget widget) {
           return widget.runtimeType.toString() == '_ChipRenderWidget';
-        })
+        }),
       )
     );
     const Color selectScrimColor = Color(0x60191919);
diff --git a/packages/flutter/test/material/control_list_tile_test.dart b/packages/flutter/test/material/control_list_tile_test.dart
index ccd6beabd44..752cf822d83 100644
--- a/packages/flutter/test/material/control_list_tile_test.dart
+++ b/packages/flutter/test/material/control_list_tile_test.dart
@@ -104,7 +104,7 @@ void main() {
             SemanticsFlag.hasToggledState,
             SemanticsFlag.isToggled,
             SemanticsFlag.hasEnabledState,
-            SemanticsFlag.isEnabled
+            SemanticsFlag.isEnabled,
           ],
           actions: SemanticsAction.tap.index,
           label: 'aaa\nAAA',
@@ -117,7 +117,7 @@ void main() {
             SemanticsFlag.hasCheckedState,
             SemanticsFlag.isChecked,
             SemanticsFlag.hasEnabledState,
-            SemanticsFlag.isEnabled
+            SemanticsFlag.isEnabled,
           ],
           actions: SemanticsAction.tap.index,
           label: 'bbb\nBBB',
diff --git a/packages/flutter/test/material/data_table_test.dart b/packages/flutter/test/material/data_table_test.dart
index 9d99a1ec85e..5b3fb034b94 100644
--- a/packages/flutter/test/material/data_table_test.dart
+++ b/packages/flutter/test/material/data_table_test.dart
@@ -29,7 +29,7 @@ void main() {
             numeric: true,
             onSort: (int columnIndex, bool ascending) {
               log.add('column-sort: $columnIndex $ascending');
-            }
+            },
           ),
         ],
         rows: kDesserts.map<DataRow>((Dessert dessert) {
@@ -56,7 +56,7 @@ void main() {
     }
 
     await tester.pumpWidget(MaterialApp(
-      home: Material(child: buildTable())
+      home: Material(child: buildTable()),
     ));
 
     await tester.tap(find.byType(Checkbox).first);
@@ -75,7 +75,7 @@ void main() {
     log.clear();
 
     await tester.pumpWidget(MaterialApp(
-      home: Material(child: buildTable(sortColumnIndex: 1))
+      home: Material(child: buildTable(sortColumnIndex: 1)),
     ));
     await tester.pumpAndSettle(const Duration(milliseconds: 200));
     await tester.tap(find.text('Calories'));
@@ -84,7 +84,7 @@ void main() {
     log.clear();
 
     await tester.pumpWidget(MaterialApp(
-      home: Material(child: buildTable(sortColumnIndex: 1, sortAscending: false))
+      home: Material(child: buildTable(sortColumnIndex: 1, sortAscending: false)),
     ));
     await tester.pumpAndSettle(const Duration(milliseconds: 200));
 
diff --git a/packages/flutter/test/material/dialog_test.dart b/packages/flutter/test/material/dialog_test.dart
index 28adf610130..856c38e0e1c 100644
--- a/packages/flutter/test/material/dialog_test.dart
+++ b/packages/flutter/test/material/dialog_test.dart
@@ -27,11 +27,11 @@ MaterialApp _appWithAlertDialog(WidgetTester tester, AlertDialog dialog, { Theme
                         return dialog;
                     },
                   );
-                }
-              )
+                },
+              ),
             );
           }
-        )
+        ),
       ),
   );
 }
@@ -60,8 +60,8 @@ void main() {
             onPressed: () {
               didPressOk = true;
             },
-            child: const Text('OK')
-        )
+            child: const Text('OK'),
+        ),
       ],
     );
     await tester.pumpWidget(_appWithAlertDialog(tester, dialog));
@@ -463,7 +463,7 @@ void main() {
 
     expect(semantics, isNot(includesNodeWith(
         label: 'Title',
-        flags: <SemanticsFlag>[SemanticsFlag.namesRoute]
+        flags: <SemanticsFlag>[SemanticsFlag.namesRoute],
     )));
 
     await tester.tap(find.text('X'));
diff --git a/packages/flutter/test/material/dialog_theme_test.dart b/packages/flutter/test/material/dialog_theme_test.dart
index bddbe9e6aa3..cdcc6225449 100644
--- a/packages/flutter/test/material/dialog_theme_test.dart
+++ b/packages/flutter/test/material/dialog_theme_test.dart
@@ -24,11 +24,11 @@ MaterialApp _appWithAlertDialog(WidgetTester tester, AlertDialog dialog, { Theme
                             return RepaintBoundary(key: _painterKey, child: dialog);
                           },
                         );
-                      }
-                  )
+                      },
+                  ),
               );
             }
-        )
+        ),
     ),
   );
 }
@@ -51,7 +51,7 @@ void main() {
       elevation: 8.0,
       shape: null,
       titleTextStyle: TextStyle(color: Color(0xffffffff)),
-      contentTextStyle: TextStyle(color: Color(0xff000000))
+      contentTextStyle: TextStyle(color: Color(0xff000000)),
     ).debugFillProperties(builder);
     final List<String> description = builder.properties
         .where((DiagnosticsNode n) => !n.isFiltered(DiagnosticLevel.info))
diff --git a/packages/flutter/test/material/drawer_test.dart b/packages/flutter/test/material/drawer_test.dart
index 9a542eb9712..086e30ce727 100644
--- a/packages/flutter/test/material/drawer_test.dart
+++ b/packages/flutter/test/material/drawer_test.dart
@@ -63,7 +63,7 @@ void main() {
     await tester.pumpWidget(
       const MaterialApp(
         home: Scaffold(
-          drawer: Drawer()
+          drawer: Drawer(),
         ),
       ),
     );
@@ -88,7 +88,7 @@ void main() {
     await tester.pumpWidget(
       const MaterialApp(
         home: Scaffold(
-            drawer: Drawer()
+            drawer: Drawer(),
         ),
       ),
     );
diff --git a/packages/flutter/test/material/dropdown_test.dart b/packages/flutter/test/material/dropdown_test.dart
index da063969ecc..6d60a986c19 100644
--- a/packages/flutter/test/material/dropdown_test.dart
+++ b/packages/flutter/test/material/dropdown_test.dart
@@ -17,7 +17,7 @@ final ValueChanged<String> onChanged = (_) {};
 
 final Type dropdownButtonType = DropdownButton<String>(
   onChanged: (_) { },
-  items: const <DropdownMenuItem<String>>[]
+  items: const <DropdownMenuItem<String>>[],
 ).runtimeType;
 
 Widget buildFrame({
@@ -53,7 +53,7 @@ Widget buildFrame({
                 child: Text(item, key: ValueKey<String>(item + 'Text')),
               );
             }).toList(),
-          )
+          ),
         ),
       ),
     ),
@@ -254,7 +254,7 @@ void main() {
                 items: menuItems.map((String val) {
                   return DropdownMenuItem<String>(
                     value: val,
-                    child: Text(val)
+                    child: Text(val),
                   );
                 }).toList(),
                 onChanged: (String v) {
@@ -491,7 +491,7 @@ void main() {
     const Offset selectedItemOffset = Offset(0.0, -8.0);
     expect(
       firstItem.size.topCenter(firstItem.localToGlobal(selectedItemOffset)).dy,
-      equals(menuItemContainer.size.topCenter(menuItemContainer.localToGlobal(Offset.zero)).dy)
+      equals(menuItemContainer.size.topCenter(menuItemContainer.localToGlobal(Offset.zero)).dy),
     );
   });
 
@@ -515,7 +515,7 @@ void main() {
     // List should be scrolled so that the selected item is in line with the button
     expect(
       selectedItem.size.center(selectedItem.localToGlobal(Offset.zero)).dy,
-      equals(buttonBox.size.center(buttonBox.localToGlobal(Offset.zero)).dy)
+      equals(buttonBox.size.center(buttonBox.localToGlobal(Offset.zero)).dy),
     );
   });
 
diff --git a/packages/flutter/test/material/expand_icon_test.dart b/packages/flutter/test/material/expand_icon_test.dart
index 57e0a2a5e82..bfe8587b7a1 100644
--- a/packages/flutter/test/material/expand_icon_test.dart
+++ b/packages/flutter/test/material/expand_icon_test.dart
@@ -49,7 +49,7 @@ void main() {
             isExpanded: false,
             onPressed: (bool isExpanded) {
               expanded = !expanded;
-            }
+            },
           )
       )
     );
@@ -60,7 +60,7 @@ void main() {
             isExpanded: true,
             onPressed: (bool isExpanded) {
               expanded = !expanded;
-            }
+            },
         )
       )
     );
diff --git a/packages/flutter/test/material/expansion_tile_test.dart b/packages/flutter/test/material/expansion_tile_test.dart
index 00956c01946..96db2dc85b1 100644
--- a/packages/flutter/test/material/expansion_tile_test.dart
+++ b/packages/flutter/test/material/expansion_tile_test.dart
@@ -74,9 +74,9 @@ void main() {
                 children: <Widget>[
                   ListTile(
                     key: tileKey,
-                    title: const Text('0')
-                  )
-                ]
+                    title: const Text('0'),
+                  ),
+                ],
               ),
               ExpansionTile(
                 key: collapsedKey,
@@ -85,21 +85,21 @@ void main() {
                 children: <Widget>[
                   ListTile(
                     key: tileKey,
-                    title: const Text('0')
-                  )
-                ]
+                    title: const Text('0'),
+                  ),
+                ],
               ),
               const ExpansionTile(
                 key: defaultKey,
                 title: Text('Default'),
                 children: <Widget>[
                   ListTile(title: Text('0')),
-                ]
-              )
-            ]
-          )
-        )
-      )
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
     ));
 
     double getHeight(Key key) => tester.getSize(find.byKey(key)).height;
diff --git a/packages/flutter/test/material/flat_button_test.dart b/packages/flutter/test/material/flat_button_test.dart
index 8fd9ae3a6fe..0079c9c7ab2 100644
--- a/packages/flutter/test/material/flat_button_test.dart
+++ b/packages/flutter/test/material/flat_button_test.dart
@@ -41,13 +41,13 @@ void main() {
             child: Container(),
             onPressed: () { /* to make sure the button is enabled */ },
           ),
-        )
+        ),
       ),
     );
 
     expect(
         tester.renderObject(find.byType(FlatButton)),
-        paintsExactlyCountTimes(#clipPath, 0)
+        paintsExactlyCountTimes(#clipPath, 0),
     );
   });
 }
diff --git a/packages/flutter/test/material/flexible_space_bar_test.dart b/packages/flutter/test/material/flexible_space_bar_test.dart
index 52aef0fc973..079c284b68c 100644
--- a/packages/flutter/test/material/flexible_space_bar_test.dart
+++ b/packages/flutter/test/material/flexible_space_bar_test.dart
@@ -13,10 +13,10 @@ void main() {
         home: Scaffold(
           appBar: AppBar(
             flexibleSpace: const FlexibleSpaceBar(
-              title: Text('X')
-            )
-          )
-        )
+              title: Text('X'),
+            ),
+          ),
+        ),
       )
     );
 
@@ -34,10 +34,10 @@ void main() {
         home: Scaffold(
           appBar: AppBar(
             flexibleSpace: const FlexibleSpaceBar(
-              title: Text('X')
-            )
-          )
-        )
+              title: Text('X'),
+            ),
+          ),
+        ),
       )
     );
 
diff --git a/packages/flutter/test/material/floating_action_button_test.dart b/packages/flutter/test/material/floating_action_button_test.dart
index 64a5a677b4e..9ecd7b629cc 100644
--- a/packages/flutter/test/material/floating_action_button_test.dart
+++ b/packages/flutter/test/material/floating_action_button_test.dart
@@ -136,7 +136,7 @@ void main() {
         home: Scaffold(
           floatingActionButton: FloatingActionButton(
             onPressed: () { },
-            highlightElevation: 20.0
+            highlightElevation: 20.0,
           ),
         ),
       ),
@@ -477,7 +477,7 @@ void main() {
             SemanticsFlag.isEnabled,
           ],
           actions: <SemanticsAction>[
-            SemanticsAction.tap
+            SemanticsAction.tap,
           ],
         ),
       ],
@@ -543,7 +543,7 @@ void main() {
                 TestSemantics(
                   label: 'Add Photo',
                   actions: <SemanticsAction>[
-                    SemanticsAction.tap
+                    SemanticsAction.tap,
                   ],
                   flags: <SemanticsFlag>[
                     SemanticsFlag.isButton,
@@ -663,13 +663,13 @@ void main() {
             child: FloatingActionButton(
               onPressed: () { /* to make sure the button is enabled */ },
             ),
-          )
+          ),
       ),
     );
 
     expect(
         tester.renderObject(find.byType(FloatingActionButton)),
-        paintsExactlyCountTimes(#clipPath, 0)
+        paintsExactlyCountTimes(#clipPath, 0),
     );
   });
 }
diff --git a/packages/flutter/test/material/icon_button_test.dart b/packages/flutter/test/material/icon_button_test.dart
index 1e3fdc78f40..dce6cc56df7 100644
--- a/packages/flutter/test/material/icon_button_test.dart
+++ b/packages/flutter/test/material/icon_button_test.dart
@@ -222,7 +222,7 @@ void main() {
       Material.of(tester.element(find.byType(IconButton))),
       paints
         ..circle(color: directSplashColor)
-        ..circle(color: directHighlightColor)
+        ..circle(color: directHighlightColor),
     );
 
     const Color themeSplashColor1 = Color(0xFF000F00);
@@ -249,7 +249,7 @@ void main() {
       Material.of(tester.element(find.byType(IconButton))),
       paints
         ..circle(color: themeSplashColor1)
-        ..circle(color: themeHighlightColor1)
+        ..circle(color: themeHighlightColor1),
     );
 
     const Color themeSplashColor2 = Color(0xFF002200);
@@ -269,7 +269,7 @@ void main() {
       Material.of(tester.element(find.byType(IconButton))),
       paints
         ..circle(color: themeSplashColor2)
-        ..circle(color: themeHighlightColor2)
+        ..circle(color: themeHighlightColor2),
     );
 
     await gesture.up();
@@ -292,15 +292,15 @@ void main() {
         TestSemantics.rootChild(
           rect: Rect.fromLTRB(0.0, 0.0, 48.0, 48.0),
           actions: <SemanticsAction>[
-            SemanticsAction.tap
+            SemanticsAction.tap,
           ],
           flags: <SemanticsFlag>[
             SemanticsFlag.hasEnabledState,
             SemanticsFlag.isEnabled,
-            SemanticsFlag.isButton
+            SemanticsFlag.isButton,
           ],
           label: 'link',
-        )
+        ),
       ]
     ), ignoreId: true, ignoreTransform: true));
 
@@ -325,10 +325,10 @@ void main() {
             rect: Rect.fromLTRB(0.0, 0.0, 48.0, 48.0),
             flags: <SemanticsFlag>[
               SemanticsFlag.hasEnabledState,
-              SemanticsFlag.isButton
+              SemanticsFlag.isButton,
             ],
             label: 'link',
-          )
+          ),
         ]
     ), ignoreId: true, ignoreTransform: true));
 
diff --git a/packages/flutter/test/material/ink_paint_test.dart b/packages/flutter/test/material/ink_paint_test.dart
index 6ff12c08d26..a3c4093c330 100644
--- a/packages/flutter/test/material/ink_paint_test.dart
+++ b/packages/flutter/test/material/ink_paint_test.dart
@@ -52,7 +52,7 @@ void main() {
         ..rrect(
           rrect: RRect.fromLTRBR(300.0, 270.0, 500.0, 330.0, const Radius.circular(6.0)),
           color: highlightColor,
-        )
+        ),
     );
 
     await gesture.up();
@@ -172,7 +172,7 @@ void main() {
       box,
       paints
         ..rect(rect: Rect.fromLTRB(300.0, 200.0, 500.0, 400.0), color: Color(Colors.blue.value))
-        ..circle(color: Color(Colors.green.value))
+        ..circle(color: Color(Colors.green.value)),
     );
 
     await tester.pumpWidget(
@@ -200,7 +200,7 @@ void main() {
       box,
       paints
         ..rect(rect: Rect.fromLTRB(300.0, 200.0, 500.0, 400.0), color: Color(Colors.red.value))
-        ..circle(color: Color(Colors.green.value))
+        ..circle(color: Color(Colors.green.value)),
     );
 
     await tester.pumpWidget(
diff --git a/packages/flutter/test/material/ink_well_test.dart b/packages/flutter/test/material/ink_well_test.dart
index fb2d0401bc6..ec5bad4c3ff 100644
--- a/packages/flutter/test/material/ink_well_test.dart
+++ b/packages/flutter/test/material/ink_well_test.dart
@@ -38,7 +38,7 @@ void main() {
               },
             ),
           ),
-        )
+        ),
       )
     );
 
@@ -83,7 +83,7 @@ void main() {
         child: Center(
           child: InkWell(),
         ),
-      )
+      ),
     ));
     await tester.tap(find.byType(InkWell), pointer: 1);
     await tester.pump(const Duration(seconds: 1));
@@ -141,7 +141,7 @@ void main() {
               enableFeedback: false,
             ),
           ),
-        )
+        ),
       ));
       await tester.tap(find.byType(InkWell), pointer: 1);
       await tester.pump(const Duration(seconds: 1));
diff --git a/packages/flutter/test/material/input_decorator_test.dart b/packages/flutter/test/material/input_decorator_test.dart
index b6671aee6d8..1cc5a4c5def 100644
--- a/packages/flutter/test/material/input_decorator_test.dart
+++ b/packages/flutter/test/material/input_decorator_test.dart
@@ -1630,7 +1630,7 @@ void main() {
       return tester.firstWidget<AnimatedDefaultTextStyle>(
         find.ancestor(
           of: find.text('label'),
-          matching: find.byType(AnimatedDefaultTextStyle)
+          matching: find.byType(AnimatedDefaultTextStyle),
         )
       ).style;
     }
diff --git a/packages/flutter/test/material/list_tile_test.dart b/packages/flutter/test/material/list_tile_test.dart
index 814c7ccb2fb..7192fe4634d 100644
--- a/packages/flutter/test/material/list_tile_test.dart
+++ b/packages/flutter/test/material/list_tile_test.dart
@@ -364,7 +364,7 @@ void main() {
               ],
             ),
           ),
-        )
+        ),
       ),
     );
 
@@ -405,7 +405,7 @@ void main() {
       return MediaQuery(
         data: const MediaQueryData(
           padding: EdgeInsets.zero,
-          textScaleFactor: 1.0
+          textScaleFactor: 1.0,
         ),
         child: Directionality(
           textDirection: textDirection,
@@ -450,7 +450,7 @@ void main() {
       return MediaQuery(
         data: const MediaQueryData(
           padding: EdgeInsets.zero,
-          textScaleFactor: 1.0
+          textScaleFactor: 1.0,
         ),
         child: Directionality(
           textDirection: textDirection,
@@ -497,7 +497,7 @@ void main() {
       return MediaQuery(
         data: const MediaQueryData(
           padding: EdgeInsets.zero,
-          textScaleFactor: 1.0
+          textScaleFactor: 1.0,
         ),
         child: Directionality(
           textDirection: textDirection,
diff --git a/packages/flutter/test/material/material_test.dart b/packages/flutter/test/material/material_test.dart
index 282f0befca7..2299e9b3ef7 100644
--- a/packages/flutter/test/material/material_test.dart
+++ b/packages/flutter/test/material/material_test.dart
@@ -89,7 +89,7 @@ void main() {
       'color: Color(0xffffffff)',
       'textStyle.inherit: true',
       'textStyle.color: Color(0xff00ff00)',
-      'borderRadius: BorderRadiusDirectional.circular(10.0)'
+      'borderRadius: BorderRadiusDirectional.circular(10.0)',
     ]);
   });
 
@@ -349,7 +349,7 @@ void main() {
         Material(
           key: materialKey,
           type: MaterialType.canvas,
-          child: const SizedBox(width: 100.0, height: 100.0)
+          child: const SizedBox(width: 100.0, height: 100.0),
         )
       );
 
@@ -539,7 +539,7 @@ void main() {
             side: BorderSide(
               width: 2.0,
               color: Color(0xFF0000FF),
-            )
+            ),
           ),
         )
       );
@@ -559,7 +559,7 @@ void main() {
             side: BorderSide(
               width: 2.0,
               color: Color(0xFF0000FF),
-            )
+            ),
           ),
         )
       );
@@ -606,13 +606,13 @@ void main() {
                       Container(
                         color: Colors.green,
                         height: 150,
-                      )
+                      ),
                     ],
                   ),
                 ),
               ),
-            )
-          )
+            ),
+          ),
         ),
       ));
 
@@ -647,13 +647,13 @@ void main() {
                       Container(
                         color: Colors.green,
                         height: 150,
-                      )
+                      ),
                     ],
                   ),
                 ),
               ),
-            )
-          )
+            ),
+          ),
         ),
       ));
 
diff --git a/packages/flutter/test/material/mergeable_material_test.dart b/packages/flutter/test/material/mergeable_material_test.dart
index 30d6c4696a2..a1e6fa25d27 100644
--- a/packages/flutter/test/material/mergeable_material_test.dart
+++ b/packages/flutter/test/material/mergeable_material_test.dart
@@ -70,7 +70,7 @@ void main() {
       const MaterialApp(
         home: Scaffold(
           body: SingleChildScrollView(
-            child: MergeableMaterial()
+            child: MergeableMaterial(),
           ),
         ),
       ),
@@ -91,7 +91,7 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -114,7 +114,7 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 200.0
+                    height: 200.0,
                   ),
                 ),
               ],
@@ -139,14 +139,14 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -171,14 +171,14 @@ void main() {
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -209,7 +209,7 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -241,8 +241,8 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -251,7 +251,7 @@ void main() {
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -277,14 +277,14 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -318,14 +318,14 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -350,8 +350,8 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -360,7 +360,7 @@ void main() {
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -394,20 +394,20 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -426,8 +426,8 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -436,13 +436,13 @@ void main() {
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -468,20 +468,20 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -507,8 +507,8 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -517,13 +517,13 @@ void main() {
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -551,20 +551,20 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -583,27 +583,27 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -623,27 +623,27 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -662,20 +662,20 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -696,20 +696,20 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -728,8 +728,8 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -738,8 +738,8 @@ void main() {
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('y')
@@ -748,13 +748,13 @@ void main() {
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -784,8 +784,8 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -794,8 +794,8 @@ void main() {
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('y')
@@ -804,13 +804,13 @@ void main() {
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -831,20 +831,20 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -872,8 +872,8 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -882,13 +882,13 @@ void main() {
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -908,8 +908,8 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('y')
@@ -918,8 +918,8 @@ void main() {
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('z')
@@ -928,13 +928,13 @@ void main() {
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -964,8 +964,8 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -974,8 +974,8 @@ void main() {
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('y')
@@ -984,13 +984,13 @@ void main() {
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -1011,8 +1011,8 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('z')
@@ -1021,13 +1021,13 @@ void main() {
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -1051,8 +1051,8 @@ void main() {
     return box.decoration == BoxDecoration(
       border: Border(
         top: top ? side : BorderSide.none,
-        bottom: bottom ? side : BorderSide.none
-      )
+        bottom: bottom ? side : BorderSide.none,
+      ),
     );
   }
 
@@ -1068,34 +1068,34 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('D'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
-              ]
-            )
-          )
-        )
+                    height: 100.0,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -1118,15 +1118,15 @@ void main() {
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -1135,20 +1135,20 @@ void main() {
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialSlice(
                   key: ValueKey<String>('D'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
-              ]
-            )
-          )
-        )
+                    height: 100.0,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
       )
     );
 
diff --git a/packages/flutter/test/material/modal_bottom_sheet_test.dart b/packages/flutter/test/material/modal_bottom_sheet_test.dart
index 8123958f57e..88e0b889799 100644
--- a/packages/flutter/test/material/modal_bottom_sheet_test.dart
+++ b/packages/flutter/test/material/modal_bottom_sheet_test.dart
@@ -19,7 +19,7 @@ void main() {
           savedContext = context;
           return Container();
         }
-      )
+      ),
     ));
 
     await tester.pump();
@@ -28,7 +28,7 @@ void main() {
     bool showBottomSheetThenCalled = false;
     showModalBottomSheet<void>(
       context: savedContext,
-      builder: (BuildContext context) => const Text('BottomSheet')
+      builder: (BuildContext context) => const Text('BottomSheet'),
     ).then<void>((void value) {
       showBottomSheetThenCalled = true;
     });
@@ -74,8 +74,8 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(
         key: scaffoldKey,
-        body: const Center(child: Text('body'))
-      )
+        body: const Center(child: Text('body')),
+      ),
     ));
 
     expect(showBottomSheetThenCalled, isFalse);
@@ -84,7 +84,7 @@ void main() {
     scaffoldKey.currentState.showBottomSheet<void>((BuildContext context) {
       return Container(
         margin: const EdgeInsets.all(40.0),
-        child: const Text('BottomSheet')
+        child: const Text('BottomSheet'),
       );
     }).closed.whenComplete(() {
       showBottomSheetThenCalled = true;
@@ -131,14 +131,14 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(
         key: scaffoldKey,
-        body: const Center(child: Text('body'))
-      )
+        body: const Center(child: Text('body')),
+      ),
     ));
 
     scaffoldKey.currentState.showBottomSheet<void>((BuildContext context) {
       return Container(
         margin: const EdgeInsets.all(40.0),
-        child: const Text('BottomSheet')
+        child: const Text('BottomSheet'),
       );
     });
 
@@ -211,14 +211,14 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(
         key: scaffoldKey,
-        body: const Center(child: Text('body'))
-      )
+        body: const Center(child: Text('body')),
+      ),
     ));
 
 
     showModalBottomSheet<void>(context: scaffoldKey.currentContext, builder: (BuildContext context) {
       return Container(
-        child: const Text('BottomSheet')
+        child: const Text('BottomSheet'),
       );
     });
 
diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart
index 75debbf3543..7bd7e48efde 100644
--- a/packages/flutter/test/material/outline_button_test.dart
+++ b/packages/flutter/test/material/outline_button_test.dart
@@ -178,7 +178,7 @@ void main() {
 
     expect(
         tester.renderObject(find.byKey(buttonKey)),
-        paintsExactlyCountTimes(#clipPath, 0)
+        paintsExactlyCountTimes(#clipPath, 0),
     );
   });
 
@@ -213,7 +213,7 @@ void main() {
               SemanticsFlag.hasEnabledState,
               SemanticsFlag.isEnabled,
             ],
-          )
+          ),
         ],
       ),
       ignoreId: true,
diff --git a/packages/flutter/test/material/page_selector_test.dart b/packages/flutter/test/material/page_selector_test.dart
index 8a4101324b2..237b11a1fc9 100644
--- a/packages/flutter/test/material/page_selector_test.dart
+++ b/packages/flutter/test/material/page_selector_test.dart
@@ -49,7 +49,7 @@ List<Color> indicatorColors(WidgetTester tester) {
   final Iterable<TabPageSelectorIndicator> indicators = tester.widgetList(
     find.descendant(
       of: find.byType(TabPageSelector),
-      matching: find.byType(TabPageSelectorIndicator)
+      matching: find.byType(TabPageSelectorIndicator),
     )
   );
   return indicators.map<Color>((TabPageSelectorIndicator indicator) => indicator.backgroundColor).toList();
diff --git a/packages/flutter/test/material/page_test.dart b/packages/flutter/test/material/page_test.dart
index 172bab300c3..23b06549b95 100644
--- a/packages/flutter/test/material/page_test.dart
+++ b/packages/flutter/test/material/page_test.dart
@@ -481,7 +481,7 @@ void main() {
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -517,7 +517,7 @@ void main() {
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
diff --git a/packages/flutter/test/material/paginated_data_table_test.dart b/packages/flutter/test/material/paginated_data_table_test.dart
index c1d833e20e8..b7ae49d211a 100644
--- a/packages/flutter/test/material/paginated_data_table_test.dart
+++ b/packages/flutter/test/material/paginated_data_table_test.dart
@@ -67,7 +67,7 @@ void main() {
           DataColumn(label: Text('Calories'), numeric: true),
           DataColumn(label: Text('Generation')),
         ],
-      )
+      ),
     ));
 
     await tester.tap(find.byTooltip('Next page'));
@@ -130,7 +130,7 @@ void main() {
             numeric: true,
             onSort: (int columnIndex, bool ascending) {
               log.add('column-sort: $columnIndex $ascending');
-            }
+            },
           ),
           const DataColumn(
             label: Text('Generation'),
diff --git a/packages/flutter/test/material/persistent_bottom_sheet_test.dart b/packages/flutter/test/material/persistent_bottom_sheet_test.dart
index 388b5b21187..604bacb9f6e 100644
--- a/packages/flutter/test/material/persistent_bottom_sheet_test.dart
+++ b/packages/flutter/test/material/persistent_bottom_sheet_test.dart
@@ -14,8 +14,8 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(
         key: scaffoldKey,
-        body: const Center(child: Text('body'))
-      )
+        body: const Center(child: Text('body')),
+      ),
     ));
 
     bottomSheet = scaffoldKey.currentState.showBottomSheet<void>((_) {
@@ -41,8 +41,8 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(
         key: scaffoldKey,
-        body: const Center(child: Text('body'))
-      )
+        body: const Center(child: Text('body')),
+      ),
     ));
 
     scaffoldKey.currentState.showBottomSheet<void>((BuildContext context) {
@@ -72,7 +72,7 @@ void main() {
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(
         body: Placeholder(key: key),
-      )
+      ),
     ));
 
     int buildCount = 0;
@@ -109,7 +109,7 @@ void main() {
             }
           ),
         ),
-      )
+      ),
     ));
 
     await tester.pump();
diff --git a/packages/flutter/test/material/popup_menu_test.dart b/packages/flutter/test/material/popup_menu_test.dart
index bf42c476aa9..a08af4d7d2d 100644
--- a/packages/flutter/test/material/popup_menu_test.dart
+++ b/packages/flutter/test/material/popup_menu_test.dart
@@ -32,7 +32,7 @@ void main() {
                     return <PopupMenuItem<int>>[
                       const PopupMenuItem<int>(
                         value: 1,
-                        child: Text('One')
+                        child: Text('One'),
                       ),
                     ];
                   },
@@ -138,7 +138,7 @@ void main() {
                   return <PopupMenuItem<int>>[
                     const PopupMenuItem<int>(
                       value: 1,
-                      child: Text('One')
+                      child: Text('One'),
                     ),
                   ];
                 },
@@ -420,7 +420,7 @@ void main() {
             ),
           ),
         ),
-      )
+      ),
     ));
 
     await tester.tap(find.text('XXX'));
@@ -457,7 +457,7 @@ void main() {
             child: Material(
               child: popupMenuButton,
             ),
-          )
+          ),
         ),
       ),
     );
diff --git a/packages/flutter/test/material/progress_indicator_test.dart b/packages/flutter/test/material/progress_indicator_test.dart
index 0117ed5fc23..6430d1c8f1c 100644
--- a/packages/flutter/test/material/progress_indicator_test.dart
+++ b/packages/flutter/test/material/progress_indicator_test.dart
@@ -66,7 +66,7 @@ void main() {
       find.byType(LinearProgressIndicator),
       paints
         ..rect(rect: Rect.fromLTRB(0.0, 0.0, 200.0, 6.0))
-        ..rect(rect: Rect.fromLTRB(0.0, 0.0, 50.0, 6.0))
+        ..rect(rect: Rect.fromLTRB(0.0, 0.0, 50.0, 6.0)),
     );
 
     expect(tester.binding.transientCallbackCount, 0);
@@ -89,7 +89,7 @@ void main() {
       find.byType(LinearProgressIndicator),
       paints
         ..rect(rect: Rect.fromLTRB(0.0, 0.0, 200.0, 6.0))
-        ..rect(rect: Rect.fromLTRB(150.0, 0.0, 200.0, 6.0))
+        ..rect(rect: Rect.fromLTRB(150.0, 0.0, 200.0, 6.0)),
     );
 
     expect(tester.binding.transientCallbackCount, 0);
@@ -116,7 +116,7 @@ void main() {
       find.byType(LinearProgressIndicator),
       paints
         ..rect(rect: Rect.fromLTRB(0.0, 0.0, 200.0, 6.0))
-        ..rect(rect: Rect.fromLTRB(0.0, 0.0, animationValue * 200.0, 6.0))
+        ..rect(rect: Rect.fromLTRB(0.0, 0.0, animationValue * 200.0, 6.0)),
     );
 
     expect(tester.binding.transientCallbackCount, 1);
@@ -143,7 +143,7 @@ void main() {
       find.byType(LinearProgressIndicator),
       paints
         ..rect(rect: Rect.fromLTRB(0.0, 0.0, 200.0, 6.0))
-        ..rect(rect: Rect.fromLTRB(200.0 - animationValue * 200.0, 0.0, 200.0, 6.0))
+        ..rect(rect: Rect.fromLTRB(200.0 - animationValue * 200.0, 0.0, 200.0, 6.0)),
     );
 
     expect(tester.binding.transientCallbackCount, 1);
@@ -170,7 +170,7 @@ void main() {
       find.byType(LinearProgressIndicator),
       paints
         ..rect(rect: Rect.fromLTRB(0.0, 0.0, 200.0, 6.0))
-        ..rect(rect: Rect.fromLTRB(0.0, 0.0, 50.0, 6.0), color: Colors.white)
+        ..rect(rect: Rect.fromLTRB(0.0, 0.0, 50.0, 6.0), color: Colors.white),
     );
   });
 
@@ -180,8 +180,8 @@ void main() {
       const Directionality(
         textDirection: TextDirection.ltr,
         child: Center(
-          child: CircularProgressIndicator(value: 0.0)
-        )
+          child: CircularProgressIndicator(value: 0.0),
+        ),
       )
     );
 
@@ -196,7 +196,7 @@ void main() {
     final SemanticsHandle handle = tester.ensureSemantics();
     await tester.pumpWidget(
       const Center(
-        child: CircularProgressIndicator(value: null)
+        child: CircularProgressIndicator(value: null),
       )
     );
 
@@ -295,7 +295,7 @@ void main() {
         find.byType(LinearProgressIndicator),
         paints
           ..rect(rect: Rect.fromLTRB(0.0, 0.0, 100.0, 12.0))
-          ..rect(rect: Rect.fromLTRB(0.0, 0.0, 25.0, 12.0))
+          ..rect(rect: Rect.fromLTRB(0.0, 0.0, 25.0, 12.0)),
     );
     expect(tester.binding.transientCallbackCount, 0);
   });
@@ -317,7 +317,7 @@ void main() {
         find.byType(LinearProgressIndicator),
         paints
           ..rect(rect: Rect.fromLTRB(0.0, 0.0, 100.0, 3.0))
-          ..rect(rect: Rect.fromLTRB(0.0, 0.0, 25.0, 3.0))
+          ..rect(rect: Rect.fromLTRB(0.0, 0.0, 25.0, 3.0)),
     );
     expect(tester.binding.transientCallbackCount, 0);
   });
@@ -339,7 +339,7 @@ void main() {
         find.byType(LinearProgressIndicator),
         paints
           ..rect(rect: Rect.fromLTRB(0.0, 0.0, 100.0, 4.0))
-          ..rect(rect: Rect.fromLTRB(0.0, 0.0, 25.0, 4.0))
+          ..rect(rect: Rect.fromLTRB(0.0, 0.0, 25.0, 4.0)),
     );
     expect(tester.binding.transientCallbackCount, 0);
   });
diff --git a/packages/flutter/test/material/raw_material_button_test.dart b/packages/flutter/test/material/raw_material_button_test.dart
index 29ef186919c..97e7e942786 100644
--- a/packages/flutter/test/material/raw_material_button_test.dart
+++ b/packages/flutter/test/material/raw_material_button_test.dart
@@ -200,7 +200,7 @@ void main() {
               key: key,
               onPressed: () {},
               child: const SizedBox(),
-            )
+            ),
           ],
         ),
       ),
diff --git a/packages/flutter/test/material/reorderable_list_test.dart b/packages/flutter/test/material/reorderable_list_test.dart
index 646bec16c24..1ca11ee22cf 100644
--- a/packages/flutter/test/material/reorderable_list_test.dart
+++ b/packages/flutter/test/material/reorderable_list_test.dart
@@ -129,7 +129,7 @@ void main() {
               key: Key('Last item'),
               height: itemHeight,
               child: Text('Last item'),
-            )
+            ),
           ],
           scrollDirection: Axis.vertical,
           onReorder: (int oldIndex, int newIndex) {},
@@ -557,7 +557,7 @@ void main() {
               key: Key('Last item'),
               width: itemHeight,
               child: Text('Last item'),
-            )
+            ),
           ],
           scrollDirection: Axis.horizontal,
           onReorder: (int oldIndex, int newIndex) {},
@@ -914,7 +914,7 @@ void main() {
           SizedBox(
             key: Key('C'),
             child: Text('C'),
-          )
+          ),
         ],
         reverse: true,
         onReorder: (int oldIndex, int newIndex) {},
diff --git a/packages/flutter/test/material/scaffold_test.dart b/packages/flutter/test/material/scaffold_test.dart
index ad0b8c4d34f..44e75e88c05 100644
--- a/packages/flutter/test/material/scaffold_test.dart
+++ b/packages/flutter/test/material/scaffold_test.dart
@@ -218,9 +218,9 @@ void main() {
               dragStartBehavior: DragStartBehavior.down,
               controller: scrollOffset,
               children: List<Widget>.generate(10,
-                (int index) => SizedBox(height: 100.0, child: Text('D$index'))
-              )
-            )
+                (int index) => SizedBox(height: 100.0, child: Text('D$index')),
+              ),
+            ),
           ),
           body: CustomScrollView(
             slivers: <Widget>[
@@ -240,7 +240,7 @@ void main() {
               ),
             ],
           ),
-        )
+        ),
       )
     );
 
@@ -272,7 +272,7 @@ void main() {
             primary: true,
             slivers: <Widget>[
               const SliverAppBar(
-                title: Text('Title')
+                title: Text('Title'),
               ),
               SliverList(
                 delegate: SliverChildListDelegate(List<Widget>.generate(
@@ -367,7 +367,7 @@ void main() {
                 didPressButton = true;
               },
               child: const Text('X'),
-            )
+            ),
           ],
         ),
       ),
@@ -412,7 +412,7 @@ void main() {
         '/scaffold': (_) => Scaffold(
             appBar: AppBar(),
             body: const Text('Scaffold'),
-        )
+        ),
       };
       await tester.pumpWidget(
         MaterialApp(theme: ThemeData(platform: platform), routes: routes)
@@ -887,7 +887,7 @@ void main() {
 
       expect(
         geometry.bottomNavigationBarTop,
-        appBox.size.height - navigationBox.size.height
+        appBox.size.height - navigationBox.size.height,
       );
     });
 
@@ -904,7 +904,7 @@ void main() {
 
       expect(
         geometry.bottomNavigationBarTop,
-        null
+        null,
       );
     });
 
@@ -927,7 +927,7 @@ void main() {
 
       expect(
         geometry.floatingActionButtonArea,
-        fabRect
+        fabRect,
       );
     });
 
@@ -944,7 +944,7 @@ void main() {
 
       expect(
           geometry.floatingActionButtonArea,
-          null
+          null,
       );
     });
 
@@ -991,22 +991,22 @@ void main() {
 
       expect(
         geometry.floatingActionButtonArea,
-        fabRect
+        fabRect,
       );
 
       expect(
         geometry.floatingActionButtonArea.center,
-        transitioningFabRect.center
+        transitioningFabRect.center,
       );
 
       expect(
         geometry.floatingActionButtonArea.width,
-        greaterThan(transitioningFabRect.width)
+        greaterThan(transitioningFabRect.width),
       );
 
       expect(
         geometry.floatingActionButtonArea.height,
-        greaterThan(transitioningFabRect.height)
+        greaterThan(transitioningFabRect.height),
       );
     });
 
@@ -1100,7 +1100,7 @@ void main() {
               body: const Text('scaffold body'),
               appBar: AppBar(
                 centerTitle: true,
-                title: const Text('Title')
+                title: const Text('Title'),
               ),
             ),
           ),
@@ -1153,8 +1153,8 @@ void main() {
               body: const Text('scaffold body'),
               appBar: AppBar(
                 centerTitle: true,
-                title: const Text('Title')
-              )
+                title: const Text('Title'),
+              ),
             ),
           ),
         ),
@@ -1200,7 +1200,7 @@ void main() {
             body: const Text('scaffold body'),
             appBar: AppBar(
               centerTitle: true,
-              title: const Text('Title')
+              title: const Text('Title'),
             ),
           ),
         ),
@@ -1228,7 +1228,7 @@ void main() {
               body: const Text('scaffold body'),
               appBar: AppBar(
                 centerTitle: true,
-                title: const Text('Title')
+                title: const Text('Title'),
               ),
             ),
           ),
@@ -1263,7 +1263,7 @@ void main() {
                 body: const Text('scaffold body'),
                 appBar: AppBar(
                   centerTitle: true,
-                  title: const Text('Title')
+                  title: const Text('Title'),
                 ),
               ),
             ),
diff --git a/packages/flutter/test/material/scrollbar_test.dart b/packages/flutter/test/material/scrollbar_test.dart
index a608643ce57..bb108e36c73 100644
--- a/packages/flutter/test/material/scrollbar_test.dart
+++ b/packages/flutter/test/material/scrollbar_test.dart
@@ -94,7 +94,7 @@ void main() {
       maxScrollExtent: 0.0,
       pixels: 0.0,
       viewportDimension: 100.0,
-      axisDirection: AxisDirection.down
+      axisDirection: AxisDirection.down,
     );
     scrollPainter.update(metrics, AxisDirection.down);
 
diff --git a/packages/flutter/test/material/search_test.dart b/packages/flutter/test/material/search_test.dart
index afaefbb31eb..4f2e034ccf3 100644
--- a/packages/flutter/test/material/search_test.dart
+++ b/packages/flutter/test/material/search_test.dart
@@ -355,7 +355,7 @@ void main() {
               },
             );
           },
-        )
+        ),
       ],
     );
 
@@ -412,7 +412,7 @@ void main() {
               },
             );
           },
-        )
+        ),
       ],
     );
 
@@ -433,7 +433,7 @@ void main() {
               },
             );
           },
-        )
+        ),
       ],
     );
 
diff --git a/packages/flutter/test/material/slider_theme_test.dart b/packages/flutter/test/material/slider_theme_test.dart
index edae4e39176..acd52118a53 100644
--- a/packages/flutter/test/material/slider_theme_test.dart
+++ b/packages/flutter/test/material/slider_theme_test.dart
@@ -153,7 +153,7 @@ void main() {
       sliderBox,
       paints
         ..rect(rect: Rect.fromLTRB(16.0, 299.0, 208.0, 301.0), color: sliderTheme.activeTrackColor)
-        ..rect(rect: Rect.fromLTRB(208.0, 299.0, 784.0, 301.0), color: sliderTheme.inactiveTrackColor)
+        ..rect(rect: Rect.fromLTRB(208.0, 299.0, 784.0, 301.0), color: sliderTheme.inactiveTrackColor),
     );
 
     await tester.pumpWidget(_buildApp(sliderTheme, value: 0.25, enabled: false));
@@ -169,7 +169,7 @@ void main() {
       sliderBox,
       paints
         ..rect(rect: Rect.fromLTRB(16.0, 299.0, 202.0, 301.0), color: sliderTheme.disabledActiveTrackColor)
-        ..rect(rect: Rect.fromLTRB(214.0, 299.0, 784.0, 301.0), color: sliderTheme.disabledInactiveTrackColor)
+        ..rect(rect: Rect.fromLTRB(214.0, 299.0, 784.0, 301.0), color: sliderTheme.disabledInactiveTrackColor),
     );
   });
 
@@ -192,7 +192,7 @@ void main() {
           x: 208.0,
           y: 300.0,
           radius: 6.0,
-        )
+        ),
     );
 
     final Offset center = tester.getCenter(find.byType(Slider));
@@ -215,7 +215,7 @@ void main() {
           x: 208.0,
           y: 300.0,
           radius: 6.0,
-        )
+        ),
     );
 
     await gesture.up();
@@ -230,7 +230,7 @@ void main() {
           x: 208.0,
           y: 300.0,
           radius: 6.0,
-        )
+        ),
     );
   });
 
@@ -261,7 +261,7 @@ void main() {
         ..circle(color: sliderTheme.activeTickMarkColor)
         ..circle(color: sliderTheme.inactiveTickMarkColor)
         ..circle(color: sliderTheme.inactiveTickMarkColor)
-        ..circle(color: sliderTheme.thumbColor, radius: 6.0)
+        ..circle(color: sliderTheme.thumbColor, radius: 6.0),
     );
 
     await tester.pumpWidget(_buildApp(sliderTheme, value: 0.45, divisions: 3, enabled: false));
@@ -274,7 +274,7 @@ void main() {
         ..circle(color: sliderTheme.disabledInactiveTickMarkColor)
         ..circle(color: sliderTheme.disabledInactiveTickMarkColor)
         ..circle(color: sliderTheme.disabledInactiveTickMarkColor)
-        ..circle(color: sliderTheme.disabledThumbColor, radius: 4.0)
+        ..circle(color: sliderTheme.disabledThumbColor, radius: 4.0),
     );
   });
 
@@ -329,7 +329,7 @@ void main() {
             const Offset(-15.9, -40.0),
           ],
           excludes: <Offset>[const Offset(16.1, -40.0), const Offset(-16.1, -40.0)],
-        )
+        ),
     );
 
     await gesture.up();
@@ -351,7 +351,7 @@ void main() {
             const Offset(-35.9, -40.0),
           ],
           excludes: <Offset>[const Offset(36.1, -40.0), const Offset(-36.1, -40.0)],
-        )
+        ),
     );
     await gesture.up();
 
@@ -372,7 +372,7 @@ void main() {
             const Offset(-16.0, -40.0),
           ],
           excludes: <Offset>[const Offset(98.1, -40.0), const Offset(-16.1, -40.0)],
-        )
+        ),
     );
     await gesture.up();
 
@@ -393,7 +393,7 @@ void main() {
             const Offset(-98.0, -40.0),
           ],
           excludes: <Offset>[const Offset(16.1, -40.0), const Offset(-98.1, -40.0)],
-        )
+        ),
     );
     await gesture.up();
 
@@ -419,7 +419,7 @@ void main() {
             const Offset(90.1, -49.0),
             const Offset(-24.1, -49.0),
           ],
-        )
+        ),
     );
     await gesture.up();
 
@@ -445,7 +445,7 @@ void main() {
             const Offset(98.5, -38.8),
             const Offset(-16.1, -38.8),
           ],
-        )
+        ),
     );
     await gesture.up();
   });
@@ -462,7 +462,7 @@ void main() {
       sliderBox,
       paints
         ..rect(rect: Rect.fromLTRB(16.0, 292.0, 208.0, 308.0), color: sliderTheme.activeTrackColor)
-        ..rect(rect: Rect.fromLTRB(208.0, 292.0, 784.0, 308.0), color: sliderTheme.inactiveTrackColor)
+        ..rect(rect: Rect.fromLTRB(208.0, 292.0, 784.0, 308.0), color: sliderTheme.inactiveTrackColor),
     );
 
     await tester.pumpWidget(_buildApp(sliderTheme, value: 0.25, enabled: false));
@@ -474,7 +474,7 @@ void main() {
       sliderBox,
       paints
         ..rect(rect: Rect.fromLTRB(16.0, 292.0, 202.0, 308.0), color: sliderTheme.disabledActiveTrackColor)
-        ..rect(rect: Rect.fromLTRB(214.0, 292.0, 784.0, 308.0), color: sliderTheme.disabledInactiveTrackColor)
+        ..rect(rect: Rect.fromLTRB(214.0, 292.0, 784.0, 308.0), color: sliderTheme.disabledInactiveTrackColor),
     );
   });
 
@@ -491,7 +491,7 @@ void main() {
 
     expect(
       sliderBox,
-      paints..circle(x: 208, y: 300, radius: 7, color: sliderTheme.thumbColor)
+      paints..circle(x: 208, y: 300, radius: 7, color: sliderTheme.thumbColor),
     );
 
     await tester.pumpWidget(_buildApp(sliderTheme, value: 0.25, enabled: false));
@@ -499,7 +499,7 @@ void main() {
 
     expect(
       sliderBox,
-      paints..circle(x: 208, y: 300, radius: 11, color: sliderTheme.disabledThumbColor)
+      paints..circle(x: 208, y: 300, radius: 11, color: sliderTheme.disabledThumbColor),
     );
   });
 
@@ -515,7 +515,7 @@ void main() {
 
     expect(
       sliderBox,
-      paints..circle(x: 208, y: 300, radius: 9, color: sliderTheme.thumbColor)
+      paints..circle(x: 208, y: 300, radius: 9, color: sliderTheme.thumbColor),
     );
 
     await tester.pumpWidget(_buildApp(sliderTheme, value: 0.25, enabled: false));
@@ -525,7 +525,7 @@ void main() {
     // TODO(clocksmith): This ratio will change once thumb sizes are updated to spec.
     expect(
       sliderBox,
-      paints..circle(x: 208, y: 300, radius: 6, color: sliderTheme.disabledThumbColor)
+      paints..circle(x: 208, y: 300, radius: 6, color: sliderTheme.disabledThumbColor),
     );
   });
 
@@ -550,7 +550,7 @@ void main() {
       paints
         ..circle(x: 21, y: 300, radius: 5, color: sliderTheme.activeTickMarkColor)
         ..circle(x: 400, y: 300, radius: 5, color: sliderTheme.activeTickMarkColor)
-        ..circle(x: 779, y: 300, radius: 5, color: sliderTheme.inactiveTickMarkColor)
+        ..circle(x: 779, y: 300, radius: 5, color: sliderTheme.inactiveTickMarkColor),
     );
 
     await tester.pumpWidget(_buildApp(sliderTheme, value: 0.5, divisions: 2,  enabled: false));
@@ -561,7 +561,7 @@ void main() {
       paints
         ..circle(x: 21, y: 300, radius: 5, color: sliderTheme.disabledActiveTickMarkColor)
         ..circle(x: 400, y: 300, radius: 5, color: sliderTheme.disabledActiveTickMarkColor)
-        ..circle(x: 779, y: 300, radius: 5, color: sliderTheme.disabledInactiveTickMarkColor)
+        ..circle(x: 779, y: 300, radius: 5, color: sliderTheme.disabledInactiveTickMarkColor),
     );
   });
 
@@ -587,7 +587,7 @@ void main() {
         y: center.dy,
         radius: uniqueOverlayRadius,
         color: sliderTheme.overlayColor,
-      )
+      ),
     );
   });
 
@@ -609,7 +609,7 @@ void main() {
         showValueIndicator: ShowValueIndicator.never,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
@@ -627,7 +627,7 @@ void main() {
         showValueIndicator: ShowValueIndicator.never,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
@@ -648,7 +648,7 @@ void main() {
         showValueIndicator: ShowValueIndicator.never,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
@@ -669,7 +669,7 @@ void main() {
         showValueIndicator: ShowValueIndicator.never,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
@@ -690,7 +690,7 @@ void main() {
         showValueIndicator: ShowValueIndicator.never,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
@@ -719,7 +719,7 @@ void main() {
         showValueIndicator: ShowValueIndicator.always,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
diff --git a/packages/flutter/test/material/snack_bar_test.dart b/packages/flutter/test/material/snack_bar_test.dart
index 1a719bf3ebf..5c7f0e7d7bb 100644
--- a/packages/flutter/test/material/snack_bar_test.dart
+++ b/packages/flutter/test/material/snack_bar_test.dart
@@ -17,19 +17,19 @@ void main() {
               onTap: () {
                 Scaffold.of(context).showSnackBar(const SnackBar(
                   content: Text(helloSnackBar),
-                  duration: Duration(seconds: 2)
+                  duration: Duration(seconds: 2),
                 ));
               },
               behavior: HitTestBehavior.opaque,
               child: Container(
                 height: 100.0,
                 width: 100.0,
-                key: tapTarget
-              )
+                key: tapTarget,
+              ),
             );
           }
-        )
-      )
+        ),
+      ),
     ));
     expect(find.text(helloSnackBar), findsNothing);
     await tester.tap(find.byKey(tapTarget));
@@ -63,19 +63,19 @@ void main() {
                 snackBarCount += 1;
                 Scaffold.of(context).showSnackBar(SnackBar(
                   content: Text('bar$snackBarCount'),
-                  duration: const Duration(seconds: 2)
+                  duration: const Duration(seconds: 2),
                 ));
               },
               behavior: HitTestBehavior.opaque,
               child: Container(
                 height: 100.0,
                 width: 100.0,
-                key: tapTarget
-              )
+                key: tapTarget,
+              ),
             );
           }
-        )
-      )
+        ),
+      ),
     ));
     expect(find.text('bar1'), findsNothing);
     expect(find.text('bar2'), findsNothing);
@@ -140,19 +140,19 @@ void main() {
                 snackBarCount += 1;
                 lastController = Scaffold.of(context).showSnackBar(SnackBar(
                   content: Text('bar$snackBarCount'),
-                  duration: Duration(seconds: time)
+                  duration: Duration(seconds: time),
                 ));
               },
               behavior: HitTestBehavior.opaque,
               child: Container(
                 height: 100.0,
                 width: 100.0,
-                key: tapTarget
-              )
+                key: tapTarget,
+              ),
             );
           }
-        )
-      )
+        ),
+      ),
     ));
     expect(find.text('bar1'), findsNothing);
     expect(find.text('bar2'), findsNothing);
@@ -224,19 +224,19 @@ void main() {
                 snackBarCount += 1;
                 Scaffold.of(context).showSnackBar(SnackBar(
                   content: Text('bar$snackBarCount'),
-                  duration: const Duration(seconds: 2)
+                  duration: const Duration(seconds: 2),
                 ));
               },
               behavior: HitTestBehavior.opaque,
               child: Container(
                 height: 100.0,
                 width: 100.0,
-                key: tapTarget
-              )
+                key: tapTarget,
+              ),
             );
           }
-        )
-      )
+        ),
+      ),
     ));
     expect(find.text('bar1'), findsNothing);
     expect(find.text('bar2'), findsNothing);
@@ -272,15 +272,15 @@ void main() {
                     label: 'ACTION',
                     onPressed: () {
                       ++tapCount;
-                    }
-                  )
+                    },
+                  ),
                 ));
               },
-              child: const Text('X')
+              child: const Text('X'),
             );
           }
-        )
-      )
+        ),
+      ),
     ));
     await tester.tap(find.text('X'));
     await tester.pump(); // start animation
@@ -317,7 +317,7 @@ void main() {
                     ),
                   );
                 },
-                child: const Text('X')
+                child: const Text('X'),
               );
             }
           ),
@@ -359,10 +359,10 @@ void main() {
                   Scaffold.of(context).showSnackBar(SnackBar(
                     content: const Text('I am a snack bar.'),
                     duration: const Duration(seconds: 2),
-                    action: SnackBarAction(label: 'ACTION', onPressed: () {})
+                    action: SnackBarAction(label: 'ACTION', onPressed: () {}),
                   ));
                 },
-                child: const Text('X')
+                child: const Text('X'),
               );
             }
           ),
@@ -416,10 +416,10 @@ void main() {
                   Scaffold.of(context).showSnackBar(SnackBar(
                     content: const Text('I am a snack bar.'),
                     duration: const Duration(seconds: 2),
-                    action: SnackBarAction(label: 'ACTION', onPressed: () {})
+                    action: SnackBarAction(label: 'ACTION', onPressed: () {}),
                   ));
                 },
-                child: const Text('X')
+                child: const Text('X'),
               );
             }
           ),
@@ -467,17 +467,17 @@ void main() {
                     label: 'ACTION',
                     onPressed: () {
                       actionPressed = true;
-                    }
+                    },
                   ),
                 )).closed.then<void>((SnackBarClosedReason reason) {
                   closedReason = reason;
                 });
               },
-              child: const Text('X')
+              child: const Text('X'),
             );
           },
-        )
-      )
+        ),
+      ),
     ));
 
     // Pop up the snack bar and then press its action button.
@@ -543,16 +543,16 @@ void main() {
                       duration: const Duration(seconds: 1),
                       action: SnackBarAction(
                         label: 'ACTION',
-                        onPressed: () {}
+                        onPressed: () {},
                       ),
                     ));
                   },
-                  child: const Text('X')
+                  child: const Text('X'),
                 );
               },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       ));
       await tester.tap(find.text('X'));
       await tester.pump();
@@ -585,16 +585,16 @@ void main() {
                             duration: const Duration(seconds: 1),
                             action: SnackBarAction(
                                 label: 'ACTION',
-                                onPressed: () {}
+                                onPressed: () {},
                             ),
                           ));
                         },
-                        child: const Text('X')
+                        child: const Text('X'),
                     );
                   },
-                )
-            )
-        )
+                ),
+            ),
+        ),
     ));
     await tester.tap(find.text('X'));
     await tester.pumpAndSettle();
@@ -620,19 +620,19 @@ void main() {
                   return GestureDetector(
                       onTap: () {
                         Scaffold.of(context).showSnackBar(const SnackBar(
-                            content: Text(helloSnackBar)
+                            content: Text(helloSnackBar),
                         ));
                       },
                       behavior: HitTestBehavior.opaque,
                       child: Container(
                           height: 100.0,
                           width: 100.0,
-                          key: tapTarget
-                      )
+                          key: tapTarget,
+                      ),
                   );
                 }
-            )
-        )
+            ),
+        ),
     ));
     expect(find.text(helloSnackBar), findsNothing);
     await tester.tap(find.byKey(tapTarget));
@@ -677,9 +677,9 @@ void main() {
                             child: const Text('X'),
                         );
                       }
-                  )
-              )
-          )
+                  ),
+              ),
+          ),
       ));
     }
 
@@ -723,7 +723,7 @@ void main() {
               child: Container(
                 height: 100.0,
                 width: 100.0,
-                key: tapTarget
+                key: tapTarget,
               ),
             );
           },
diff --git a/packages/flutter/test/material/switch_list_tile_test.dart b/packages/flutter/test/material/switch_list_tile_test.dart
index a4ce394d321..53a729eb07e 100644
--- a/packages/flutter/test/material/switch_list_tile_test.dart
+++ b/packages/flutter/test/material/switch_list_tile_test.dart
@@ -43,7 +43,7 @@ void main() {
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
-        ..circle(color: Colors.yellow[500])
+        ..circle(color: Colors.yellow[500]),
     );
 
     await tester.tap(find.byType(Switch));
@@ -56,7 +56,7 @@ void main() {
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
-        ..circle(color: Colors.red[500])
+        ..circle(color: Colors.red[500]),
     );
   });
 
diff --git a/packages/flutter/test/material/switch_test.dart b/packages/flutter/test/material/switch_test.dart
index 84b8bebc04d..4214de4d2b1 100644
--- a/packages/flutter/test/material/switch_test.dart
+++ b/packages/flutter/test/material/switch_test.dart
@@ -153,7 +153,7 @@ void main() {
                         value = newValue;
                       }
                     );
-                  }
+                  },
                 ),
               ),
             );
@@ -189,7 +189,7 @@ void main() {
                       setState(() {
                         value = newValue;
                       });
-                    }
+                    },
                 ),
               ),
             );
@@ -428,7 +428,7 @@ void main() {
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
-        ..circle(color: Colors.yellow[500])
+        ..circle(color: Colors.yellow[500]),
     );
     await tester.drag(find.byType(Switch), const Offset(-30.0, 0.0));
     await tester.pump();
@@ -443,7 +443,7 @@ void main() {
         ..circle(color: const Color(0x33000000))
         ..circle(color: const Color(0x24000000))
         ..circle(color: const Color(0x1f000000))
-        ..circle(color: Colors.red[500])
+        ..circle(color: Colors.red[500]),
     );
   });
 
diff --git a/packages/flutter/test/material/tab_bar_theme_test.dart b/packages/flutter/test/material/tab_bar_theme_test.dart
index dce4d0b00e4..7eb749376f4 100644
--- a/packages/flutter/test/material/tab_bar_theme_test.dart
+++ b/packages/flutter/test/material/tab_bar_theme_test.dart
@@ -101,7 +101,7 @@ void main() {
             labelStyle: labelStyle,
             unselectedLabelStyle: unselectedLabelStyle,
           ),
-        )
+        ),
       ),
     );
 
@@ -152,7 +152,7 @@ void main() {
       indicator: BoxDecoration(
         border: Border.all(color: Colors.black),
         shape: BoxShape.rectangle,
-      )
+      ),
     );
 
     await tester.pumpWidget(_withTheme(tabBarTheme));
@@ -168,7 +168,7 @@ void main() {
     final TabBarTheme tabBarTheme = TabBarTheme(
       indicator: ShapeDecoration(
         shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(20.0)),
-        color: Colors.black
+        color: Colors.black,
       ),
     );
 
diff --git a/packages/flutter/test/material/tabs_test.dart b/packages/flutter/test/material/tabs_test.dart
index 83a7f4e478e..58aab75152f 100644
--- a/packages/flutter/test/material/tabs_test.dart
+++ b/packages/flutter/test/material/tabs_test.dart
@@ -140,11 +140,11 @@ Widget buildLeftRightApp({ List<String> tabs, String value }) {
         body: const TabBarView(
           children: <Widget>[
             Center(child: Text('LEFT CHILD')),
-            Center(child: Text('RIGHT CHILD'))
-          ]
-        )
-      )
-    )
+            Center(child: Text('RIGHT CHILD')),
+          ],
+        ),
+      ),
+    ),
   );
 }
 
@@ -359,9 +359,9 @@ void main() {
           child: TabBarView(
             children: tabs.map<Widget>((String name) {
               return StateMarker(
-                child: Text(name)
+                child: Text(name),
               );
-            }).toList()
+            }).toList(),
           ),
         ),
       );
@@ -619,8 +619,8 @@ void main() {
             controller: controller,
             children: const <Widget>[
               Center(child: Text('LEFT CHILD')),
-              Center(child: Text('RIGHT CHILD'))
-            ]
+              Center(child: Text('RIGHT CHILD')),
+            ],
           ),
         ),
       );
@@ -680,7 +680,7 @@ void main() {
               Center(child: Text('CHILD A')),
               Center(child: Text('CHILD B')),
               Center(child: Text('CHILD C')),
-            ]
+            ],
           ),
         ),
       );
@@ -1544,8 +1544,8 @@ void main() {
                         rect: Rect.fromLTRB(0.0, 0.0, 116.0, kTextTabBarHeight),
                         transform: Matrix4.translationValues(116.0, 276.0, 0.0),
                       ),
-                    ]
-                )
+                    ],
+                ),
               ],
             ),
           ],
@@ -1808,8 +1808,8 @@ void main() {
                         rect: Rect.fromLTRB(0.0, 0.0, 116.0, kTextTabBarHeight),
                         transform: Matrix4.translationValues(116.0, 276.0, 0.0),
                       ),
-                    ]
-                )
+                    ],
+                ),
               ],
             ),
           ],
diff --git a/packages/flutter/test/material/text_field_splash_test.dart b/packages/flutter/test/material/text_field_splash_test.dart
index 811a2b8227b..4a0b579abcd 100644
--- a/packages/flutter/test/material/text_field_splash_test.dart
+++ b/packages/flutter/test/material/text_field_splash_test.dart
@@ -22,7 +22,7 @@ class TestInkSplash extends InkSplash {
     ShapeBorder customBorder,
     double radius,
     VoidCallback onRemoved,
-    TextDirection textDirection
+    TextDirection textDirection,
   }) : super(
     controller: controller,
     referenceBox: referenceBox,
diff --git a/packages/flutter/test/material/text_field_test.dart b/packages/flutter/test/material/text_field_test.dart
index 8477b3d1bd4..198941e882f 100644
--- a/packages/flutter/test/material/text_field_test.dart
+++ b/packages/flutter/test/material/text_field_test.dart
@@ -207,7 +207,7 @@ void main() {
           ),
           onChanged: (String value) {
             textFieldValue = value;
-          }
+          },
         ),
       )
     );
@@ -1880,7 +1880,7 @@ void main() {
           children: <Widget>[
             TextField(
               key: key1,
-              controller: controller1
+              controller: controller1,
             ),
             TextField(key: key2),
           ],
@@ -2699,7 +2699,7 @@ void main() {
                 controller: controllerA,
                 style: const TextStyle(fontSize: 10.0),
                 strutStyle: StrutStyle.disabled,
-              )
+              ),
             ),
             const Text(
               'abc',
@@ -2751,7 +2751,7 @@ void main() {
                 decoration: null,
                 controller: controllerA,
                 style: const TextStyle(fontSize: 10.0),
-              )
+              ),
             ),
             const Text(
               'abc',
@@ -4582,7 +4582,7 @@ void main() {
           position: offset,
           pressure: 0.0,
           pressureMax: 6.0,
-          pressureMin: 0.0
+          pressureMin: 0.0,
       ),
     );
     await gesture.updateWithCustomEvent(PointerMoveEvent(pointer: pointerValue, position: offset + const Offset(150.0, 5.0), pressure: 0.5, pressureMin: 0, pressureMax: 1));
@@ -4622,7 +4622,7 @@ void main() {
         position: offset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
 
@@ -4745,7 +4745,7 @@ void main() {
       'cursorColor: Color(0xff00ff00)',
       'keyboardAppearance: Brightness.dark',
       'scrollPadding: EdgeInsets.zero',
-      'selection disabled'
+      'selection disabled',
     ]);
   });
 
diff --git a/packages/flutter/test/material/text_theme_test.dart b/packages/flutter/test/material/text_theme_test.dart
index 8ac2db3f49e..75612a130a0 100644
--- a/packages/flutter/test/material/text_theme_test.dart
+++ b/packages/flutter/test/material/text_theme_test.dart
@@ -81,7 +81,7 @@ void main() {
     const TextDecorationStyle decorationStyle = TextDecorationStyle.dashed;
     final TextDecoration decoration = TextDecoration.combine(<TextDecoration>[
       TextDecoration.underline,
-      TextDecoration.lineThrough
+      TextDecoration.lineThrough,
     ]);
 
     final Typography typography = Typography(platform: TargetPlatform.android);
diff --git a/packages/flutter/test/material/theme_defaults_test.dart b/packages/flutter/test/material/theme_defaults_test.dart
index d04b4addb0e..f8933378c53 100644
--- a/packages/flutter/test/material/theme_defaults_test.dart
+++ b/packages/flutter/test/material/theme_defaults_test.dart
@@ -20,7 +20,7 @@ void main() {
             child: RaisedButton(
               onPressed: () { }, // button.enabled == true
               child: const Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -48,7 +48,7 @@ void main() {
             child: RaisedButton(
               onPressed: null, // button.enabled == false
               child: Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -78,7 +78,7 @@ void main() {
             child: FlatButton(
               onPressed: () { }, // button.enabled == true
               child: const Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -106,7 +106,7 @@ void main() {
             child: FlatButton(
               onPressed: null, // button.enabled == false
               child: Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -140,7 +140,7 @@ void main() {
               // elevation is animated to 2.0.
               highlightElevation: 2.0,
               child: const Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -167,7 +167,7 @@ void main() {
             child: OutlineButton(
               onPressed: () { }, // button.enabled == true
               child: const Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -194,7 +194,7 @@ void main() {
             child: OutlineButton(
               onPressed: null, // button.enabled == false
               child: Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -227,7 +227,7 @@ void main() {
               child: FloatingActionButton(
                 onPressed: () { }, // button.enabled == true
                 child: const Icon(Icons.add),
-              )
+              ),
           ),
         ),
       );
@@ -254,7 +254,7 @@ void main() {
               child: FloatingActionButton(
                 onPressed: null, // button.enabled == false
                 child: Icon(Icons.add),
-              )
+              ),
           ),
         ),
       );
diff --git a/packages/flutter/test/material/theme_test.dart b/packages/flutter/test/material/theme_test.dart
index 518a8da130a..83ebe09a471 100644
--- a/packages/flutter/test/material/theme_test.dart
+++ b/packages/flutter/test/material/theme_test.dart
@@ -31,13 +31,13 @@ void main() {
                 key: popupMenuButtonKey,
                 itemBuilder: (BuildContext context) {
                   return <PopupMenuItem<String>>[
-                    const PopupMenuItem<String>(child: Text('menuItem'))
+                    const PopupMenuItem<String>(child: Text('menuItem')),
                   ];
-                }
+                },
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -100,14 +100,14 @@ void main() {
                   key: popupMenuButtonKey,
                   itemBuilder: (BuildContext context) {
                     return <PopupMenuItem<String>>[
-                      const PopupMenuItem<String>(child: Text('menuItem'))
+                      const PopupMenuItem<String>(child: Text('menuItem')),
                     ];
-                  }
+                  },
                 ),
-              ]
-            )
-          )
-        )
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -137,11 +137,11 @@ void main() {
                       child: Text('menuItem'),
                     ),
                   ],
-                )
-              ]
-            )
-          )
-        )
+                ),
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -172,10 +172,10 @@ void main() {
                     child: const Text('SHOW'),
                   );
                 }
-              )
-            )
-          )
-        )
+              ),
+            ),
+          ),
+        ),
       )
     );
 
@@ -209,10 +209,10 @@ void main() {
                     child: const Text('SHOW'),
                   );
                 }
-              )
-            )
-          )
-        )
+              ),
+            ),
+          ),
+        ),
       )
     );
 
diff --git a/packages/flutter/test/material/time_picker_test.dart b/packages/flutter/test/material/time_picker_test.dart
index 55a9cea9496..93f4ab224a5 100644
--- a/packages/flutter/test/material/time_picker_test.dart
+++ b/packages/flutter/test/material/time_picker_test.dart
@@ -40,12 +40,12 @@ class _TimePickerLauncher extends StatelessWidget {
                     context: context,
                     initialTime: const TimeOfDay(hour: 7, minute: 0),
                   ));
-                }
+                },
               );
             }
-          )
-        )
-      )
+          ),
+        ),
+      ),
     );
   }
 }
diff --git a/packages/flutter/test/material/tooltip_test.dart b/packages/flutter/test/material/tooltip_test.dart
index edeaaa96633..5fe557196ed 100644
--- a/packages/flutter/test/material/tooltip_test.dart
+++ b/packages/flutter/test/material/tooltip_test.dart
@@ -432,9 +432,9 @@ void main() {
               width: 100.0,
               height: 100.0,
               color: Colors.green[500],
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -520,9 +520,9 @@ void main() {
               width: 100.0,
               height: 100.0,
               color: Colors.green[500],
-            )
-          )
-        )
+            ),
+          ),
+        ),
       );
     }
 
@@ -630,7 +630,7 @@ void main() {
                 TestSemantics(
                   label: 'Foo\nBar',
                   textDirection: TextDirection.ltr,
-                )
+                ),
               ],
             ),
           ],
@@ -666,7 +666,7 @@ void main() {
                 TestSemantics(
                   label: 'Bar',
                   textDirection: TextDirection.ltr,
-                )
+                ),
               ],
             ),
           ],
diff --git a/packages/flutter/test/material/user_accounts_drawer_header_test.dart b/packages/flutter/test/material/user_accounts_drawer_header_test.dart
index c563272d026..91fca26a696 100644
--- a/packages/flutter/test/material/user_accounts_drawer_header_test.dart
+++ b/packages/flutter/test/material/user_accounts_drawer_header_test.dart
@@ -53,7 +53,7 @@ Future<void> pumpTestWidget(
                 ),
                 CircleAvatar(
                   child: Text('E'),
-                )
+                ),
               ],
               accountName: withName ? const Text('name') : null,
               accountEmail: withEmail ? const Text('email') : null,
@@ -221,11 +221,11 @@ void main() {
     ));
     expect(
       tester.getCenter(find.text('accountName')).dy,
-      tester.getCenter(find.byType(Icon)).dy
+      tester.getCenter(find.byType(Icon)).dy,
     );
     expect(
       tester.getCenter(find.text('accountName')).dx,
-      lessThan(tester.getCenter(find.byType(Icon)).dx)
+      lessThan(tester.getCenter(find.byType(Icon)).dx),
     );
 
     await tester.pumpWidget(buildFrame(
@@ -234,11 +234,11 @@ void main() {
     ));
     expect(
       tester.getCenter(find.text('accountEmail')).dy,
-      tester.getCenter(find.byType(Icon)).dy
+      tester.getCenter(find.byType(Icon)).dy,
     );
     expect(
       tester.getCenter(find.text('accountEmail')).dx,
-      lessThan(tester.getCenter(find.byType(Icon)).dx)
+      lessThan(tester.getCenter(find.byType(Icon)).dx),
     );
 
     await tester.pumpWidget(buildFrame(
@@ -248,19 +248,19 @@ void main() {
     ));
     expect(
       tester.getCenter(find.text('accountEmail')).dy,
-      tester.getCenter(find.byType(Icon)).dy
+      tester.getCenter(find.byType(Icon)).dy,
     );
     expect(
       tester.getCenter(find.text('accountEmail')).dx,
-      lessThan(tester.getCenter(find.byType(Icon)).dx)
+      lessThan(tester.getCenter(find.byType(Icon)).dx),
     );
     expect(
       tester.getBottomLeft(find.text('accountEmail')).dy,
-      greaterThan(tester.getBottomLeft(find.text('accountName')).dy)
+      greaterThan(tester.getBottomLeft(find.text('accountName')).dy),
     );
     expect(
       tester.getBottomLeft(find.text('accountEmail')).dx,
-      tester.getBottomLeft(find.text('accountName')).dx
+      tester.getBottomLeft(find.text('accountName')).dx,
     );
 
     await tester.pumpWidget(buildFrame(
@@ -280,11 +280,11 @@ void main() {
     ));
     expect(
       tester.getBottomLeft(find.byKey(avatarA)).dx,
-      tester.getBottomLeft(find.text('accountName')).dx
+      tester.getBottomLeft(find.text('accountName')).dx,
     );
     expect(
       tester.getBottomLeft(find.text('accountName')).dy,
-      greaterThan(tester.getBottomLeft(find.byKey(avatarA)).dy)
+      greaterThan(tester.getBottomLeft(find.byKey(avatarA)).dy),
     );
   });
 
@@ -332,11 +332,11 @@ void main() {
     ));
     expect(
       tester.getCenter(find.text('accountName')).dy,
-      tester.getCenter(find.byType(Icon)).dy
+      tester.getCenter(find.byType(Icon)).dy,
     );
     expect(
       tester.getCenter(find.text('accountName')).dx,
-      greaterThan(tester.getCenter(find.byType(Icon)).dx)
+      greaterThan(tester.getCenter(find.byType(Icon)).dx),
     );
 
     await tester.pumpWidget(buildFrame(
@@ -345,11 +345,11 @@ void main() {
     ));
     expect(
       tester.getCenter(find.text('accountEmail')).dy,
-      tester.getCenter(find.byType(Icon)).dy
+      tester.getCenter(find.byType(Icon)).dy,
     );
     expect(
       tester.getCenter(find.text('accountEmail')).dx,
-      greaterThan(tester.getCenter(find.byType(Icon)).dx)
+      greaterThan(tester.getCenter(find.byType(Icon)).dx),
     );
 
     await tester.pumpWidget(buildFrame(
@@ -359,19 +359,19 @@ void main() {
     ));
     expect(
       tester.getCenter(find.text('accountEmail')).dy,
-      tester.getCenter(find.byType(Icon)).dy
+      tester.getCenter(find.byType(Icon)).dy,
     );
     expect(
       tester.getCenter(find.text('accountEmail')).dx,
-      greaterThan(tester.getCenter(find.byType(Icon)).dx)
+      greaterThan(tester.getCenter(find.byType(Icon)).dx),
     );
     expect(
       tester.getBottomLeft(find.text('accountEmail')).dy,
-      greaterThan(tester.getBottomLeft(find.text('accountName')).dy)
+      greaterThan(tester.getBottomLeft(find.text('accountName')).dy),
     );
     expect(
       tester.getBottomRight(find.text('accountEmail')).dx,
-      tester.getBottomRight(find.text('accountName')).dx
+      tester.getBottomRight(find.text('accountName')).dx,
     );
 
     await tester.pumpWidget(buildFrame(
@@ -391,11 +391,11 @@ void main() {
     ));
     expect(
       tester.getBottomRight(find.byKey(avatarA)).dx,
-      tester.getBottomRight(find.text('accountName')).dx
+      tester.getBottomRight(find.text('accountName')).dx,
     );
     expect(
       tester.getBottomLeft(find.text('accountName')).dy,
-      greaterThan(tester.getBottomLeft(find.byKey(avatarA)).dy)
+      greaterThan(tester.getBottomLeft(find.byKey(avatarA)).dy),
     );
   });
 
diff --git a/packages/flutter/test/painting/border_rtl_test.dart b/packages/flutter/test/painting/border_rtl_test.dart
index a80a02c4b84..704f1eb9a3e 100644
--- a/packages/flutter/test/painting/border_rtl_test.dart
+++ b/packages/flutter/test/painting/border_rtl_test.dart
@@ -181,7 +181,7 @@ void main() {
           const Offset(110.0, 190.0),
           const Offset(1000.0, 1000.0),
         ],
-      )
+      ),
     );
     expect(
       borderDirectional.getOuterPath(Rect.fromLTRB(50.0, 60.0, 110.0, 190.0), textDirection: TextDirection.rtl),
@@ -597,7 +597,7 @@ void main() {
           includes: <Offset>[const Offset(15.0, 30.0)],
           excludes: <Offset>[const Offset(25.0, 30.0)],
           color: const Color(0xFF00FF00),
-        )
+        ),
     );
     expect(
       (Canvas canvas) {
@@ -609,14 +609,14 @@ void main() {
           includes: <Offset>[const Offset(25.0, 30.0)],
           excludes: <Offset>[const Offset(15.0, 30.0)],
           color: const Color(0xFF00FF00),
-        )
+        ),
     );
     expect(
       (Canvas canvas) {
         const BorderDirectional(end: BorderSide(width: 10.0, color: Color(0xFF00FF00)))
           .paint(canvas, Rect.fromLTRB(10.0, 20.0, 30.0, 40.0));
       },
-      paintsAssertion // no TextDirection
+      paintsAssertion, // no TextDirection
     );
   });
 
@@ -649,7 +649,7 @@ void main() {
         ..path(
           includes: <Offset>[const Offset(49.0, 10.0)],
           excludes: <Offset>[const Offset(31.0, 10.0)],
-        )
+        ),
     );
     expect(
       (Canvas canvas) {
@@ -663,7 +663,7 @@ void main() {
         ..path(
           includes: <Offset>[const Offset(31.0, 10.0)],
           excludes: <Offset>[const Offset(49.0, 10.0)],
-        )
+        ),
     );
     expect(decoration2.padding, const EdgeInsetsDirectional.fromSTEB(2.0, 0.0, 0.0, 0.0));
     expect(decoration2.scale(2.0), decoration4);
diff --git a/packages/flutter/test/painting/box_decoration_test.dart b/packages/flutter/test/painting/box_decoration_test.dart
index 2906be32212..c4728336efa 100644
--- a/packages/flutter/test/painting/box_decoration_test.dart
+++ b/packages/flutter/test/painting/box_decoration_test.dart
@@ -24,7 +24,7 @@ void main() {
         );
       },
       paints
-        ..rrect(rrect: RRect.fromRectAndCorners(Offset.zero & size, topRight: const Radius.circular(100.0)))
+        ..rrect(rrect: RRect.fromRectAndCorners(Offset.zero & size, topRight: const Radius.circular(100.0))),
     );
     expect(decoration.hitTest(size, const Offset(10.0, 10.0), textDirection: TextDirection.rtl), isTrue);
     expect(decoration.hitTest(size, const Offset(990.0, 10.0), textDirection: TextDirection.rtl), isFalse);
@@ -37,7 +37,7 @@ void main() {
         );
       },
       paints
-        ..rrect(rrect: RRect.fromRectAndCorners(Offset.zero & size, topLeft: const Radius.circular(100.0)))
+        ..rrect(rrect: RRect.fromRectAndCorners(Offset.zero & size, topLeft: const Radius.circular(100.0))),
     );
     expect(decoration.hitTest(size, const Offset(10.0, 10.0), textDirection: TextDirection.ltr), isFalse);
     expect(decoration.hitTest(size, const Offset(990.0, 10.0), textDirection: TextDirection.ltr), isTrue);
diff --git a/packages/flutter/test/painting/circle_border_test.dart b/packages/flutter/test/painting/circle_border_test.dart
index 6cb4d4b2d1c..db4a91da484 100644
--- a/packages/flutter/test/painting/circle_border_test.dart
+++ b/packages/flutter/test/painting/circle_border_test.dart
@@ -24,7 +24,7 @@ void main() {
     expect(
       (Canvas canvas) => c10.paint(canvas, Rect.fromLTWH(10.0, 20.0, 30.0, 40.0)),
       paints
-        ..circle(x: 25.0, y: 40.0, radius: 10.0, strokeWidth: 10.0)
+        ..circle(x: 25.0, y: 40.0, radius: 10.0, strokeWidth: 10.0),
     );
   });
 }
diff --git a/packages/flutter/test/painting/decoration_test.dart b/packages/flutter/test/painting/decoration_test.dart
index 75833580d40..40350c2834f 100644
--- a/packages/flutter/test/painting/decoration_test.dart
+++ b/packages/flutter/test/painting/decoration_test.dart
@@ -240,7 +240,7 @@ void main() {
         const BoxDecoration(shape: BoxShape.circle),
         -1.0,
       ),
-      const BoxDecoration(shape: BoxShape.rectangle)
+      const BoxDecoration(shape: BoxShape.rectangle),
     );
     expect(
       BoxDecoration.lerp(
@@ -248,7 +248,7 @@ void main() {
         const BoxDecoration(shape: BoxShape.circle),
         0.0,
       ),
-      const BoxDecoration(shape: BoxShape.rectangle)
+      const BoxDecoration(shape: BoxShape.rectangle),
     );
     expect(
       BoxDecoration.lerp(
@@ -256,7 +256,7 @@ void main() {
         const BoxDecoration(shape: BoxShape.circle),
         0.25,
       ),
-      const BoxDecoration(shape: BoxShape.rectangle)
+      const BoxDecoration(shape: BoxShape.rectangle),
     );
     expect(
       BoxDecoration.lerp(
@@ -264,7 +264,7 @@ void main() {
         const BoxDecoration(shape: BoxShape.circle),
         0.75,
       ),
-      const BoxDecoration(shape: BoxShape.circle)
+      const BoxDecoration(shape: BoxShape.circle),
     );
     expect(
       BoxDecoration.lerp(
@@ -272,7 +272,7 @@ void main() {
         const BoxDecoration(shape: BoxShape.circle),
         1.0,
       ),
-      const BoxDecoration(shape: BoxShape.circle)
+      const BoxDecoration(shape: BoxShape.circle),
     );
     expect(
       BoxDecoration.lerp(
@@ -280,7 +280,7 @@ void main() {
         const BoxDecoration(shape: BoxShape.circle),
         2.0,
       ),
-      const BoxDecoration(shape: BoxShape.circle)
+      const BoxDecoration(shape: BoxShape.circle),
     );
   });
 
@@ -292,7 +292,7 @@ void main() {
         const BoxDecoration(gradient: gradient),
         -1.0,
       ),
-      const BoxDecoration(gradient: LinearGradient(colors: <Color>[ Color(0x00000000), Color(0x00FFFFFF) ]))
+      const BoxDecoration(gradient: LinearGradient(colors: <Color>[ Color(0x00000000), Color(0x00FFFFFF) ])),
     );
     expect(
       BoxDecoration.lerp(
@@ -300,7 +300,7 @@ void main() {
         const BoxDecoration(gradient: gradient),
         0.0,
       ),
-      const BoxDecoration()
+      const BoxDecoration(),
     );
     expect(
       BoxDecoration.lerp(
@@ -308,7 +308,7 @@ void main() {
         const BoxDecoration(gradient: gradient),
         0.25,
       ),
-      const BoxDecoration(gradient: LinearGradient(colors: <Color>[ Color(0x00000000), Color(0x40FFFFFF) ]))
+      const BoxDecoration(gradient: LinearGradient(colors: <Color>[ Color(0x00000000), Color(0x40FFFFFF) ])),
     );
     expect(
       BoxDecoration.lerp(
@@ -316,7 +316,7 @@ void main() {
         const BoxDecoration(gradient: gradient),
         0.75,
       ),
-      const BoxDecoration(gradient: LinearGradient(colors: <Color>[ Color(0x00000000), Color(0xBFFFFFFF) ]))
+      const BoxDecoration(gradient: LinearGradient(colors: <Color>[ Color(0x00000000), Color(0xBFFFFFFF) ])),
     );
     expect(
       BoxDecoration.lerp(
@@ -324,7 +324,7 @@ void main() {
         const BoxDecoration(gradient: gradient),
         1.0,
       ),
-      const BoxDecoration(gradient: gradient)
+      const BoxDecoration(gradient: gradient),
     );
     expect(
       BoxDecoration.lerp(
@@ -332,7 +332,7 @@ void main() {
         const BoxDecoration(gradient: gradient),
         2.0,
       ),
-      const BoxDecoration(gradient: gradient)
+      const BoxDecoration(gradient: gradient),
     );
   });
 
diff --git a/packages/flutter/test/painting/fake_image_provider.dart b/packages/flutter/test/painting/fake_image_provider.dart
index c7d64891b14..58ebb1a6b80 100644
--- a/packages/flutter/test/painting/fake_image_provider.dart
+++ b/packages/flutter/test/painting/fake_image_provider.dart
@@ -30,7 +30,7 @@ class FakeImageProvider extends ImageProvider<FakeImageProvider> {
     assert(key == this);
     return MultiFrameImageStreamCompleter(
       codec: SynchronousFuture<ui.Codec>(_codec),
-      scale: scale
+      scale: scale,
     );
   }
 }
diff --git a/packages/flutter/test/painting/gradient_test.dart b/packages/flutter/test/painting/gradient_test.dart
index 963ffc26bdb..60ab8c79538 100644
--- a/packages/flutter/test/painting/gradient_test.dart
+++ b/packages/flutter/test/painting/gradient_test.dart
@@ -195,7 +195,7 @@ void main() {
       () {
         return const LinearGradient(
           begin: AlignmentDirectional.topStart,
-          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ]
+          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ],
         ).createShader(Rect.fromLTWH(0.0, 0.0, 100.0, 100.0));
       },
       throwsAssertionError,
@@ -204,7 +204,7 @@ void main() {
       () {
         return const LinearGradient(
           begin: AlignmentDirectional.topStart,
-          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ]
+          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ],
         ).createShader(Rect.fromLTWH(0.0, 0.0, 100.0, 100.0), textDirection: TextDirection.rtl);
       },
       returnsNormally,
@@ -213,7 +213,7 @@ void main() {
       () {
         return const LinearGradient(
           begin: AlignmentDirectional.topStart,
-          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ]
+          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ],
         ).createShader(Rect.fromLTWH(0.0, 0.0, 100.0, 100.0), textDirection: TextDirection.ltr);
       },
       returnsNormally,
@@ -222,7 +222,7 @@ void main() {
       () {
         return const LinearGradient(
           begin: Alignment.topLeft,
-          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ]
+          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ],
         ).createShader(Rect.fromLTWH(0.0, 0.0, 100.0, 100.0));
       },
       returnsNormally,
@@ -234,7 +234,7 @@ void main() {
       () {
         return const RadialGradient(
           center: AlignmentDirectional.topStart,
-          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ]
+          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ],
         ).createShader(Rect.fromLTWH(0.0, 0.0, 100.0, 100.0));
       },
       throwsAssertionError,
@@ -244,7 +244,7 @@ void main() {
       () {
         return const RadialGradient(
           center: AlignmentDirectional.topStart,
-          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ]
+          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ],
         ).createShader(Rect.fromLTWH(0.0, 0.0, 100.0, 100.0), textDirection: TextDirection.rtl);
       },
       returnsNormally,
@@ -253,7 +253,7 @@ void main() {
       () {
         return const RadialGradient(
           center: AlignmentDirectional.topStart,
-          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ]
+          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ],
         ).createShader(Rect.fromLTWH(0.0, 0.0, 100.0, 100.0), textDirection: TextDirection.ltr);
       },
       returnsNormally,
@@ -262,7 +262,7 @@ void main() {
       () {
         return const RadialGradient(
           center: Alignment.topLeft,
-          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ]
+          colors: <Color>[ Color(0xFFFFFFFF), Color(0xFFFFFFFF) ],
         ).createShader(Rect.fromLTWH(0.0, 0.0, 100.0, 100.0));
       },
       returnsNormally,
@@ -343,7 +343,7 @@ void main() {
       stops: <double>[
         0.0,
         0.5,
-        1.0
+        1.0,
       ],
     ));
   });
diff --git a/packages/flutter/test/painting/notched_shapes_test.dart b/packages/flutter/test/painting/notched_shapes_test.dart
index 3d9edf34ba8..7fcc5daba08 100644
--- a/packages/flutter/test/painting/notched_shapes_test.dart
+++ b/packages/flutter/test/painting/notched_shapes_test.dart
@@ -23,7 +23,7 @@ void main() {
           expectedPath,
           areaToCompare: host.inflate(5.0),
           sampleSize: 40,
-        )
+        ),
       );
     });
 
@@ -55,7 +55,7 @@ void main() {
           Path()..addRect(host),
           areaToCompare: host.inflate(800.0),
           sampleSize: 100,
-        )
+        ),
       );
     });
 
@@ -79,7 +79,7 @@ void main() {
             ..close(),
           areaToCompare: Rect.fromLTWH(-300.0, -300.0, 600.0, 600.0),
           sampleSize: 100,
-        )
+        ),
       );
     });
 
@@ -101,7 +101,7 @@ void main() {
             ..close(),
           areaToCompare: Rect.fromLTWH(-300.0, -300.0, 600.0, 600.0),
           sampleSize: 100,
-        )
+        ),
       );
     });
   });
diff --git a/packages/flutter/test/painting/rounded_rectangle_border_test.dart b/packages/flutter/test/painting/rounded_rectangle_border_test.dart
index 9a9657da675..ef3dbbb2f15 100644
--- a/packages/flutter/test/painting/rounded_rectangle_border_test.dart
+++ b/packages/flutter/test/painting/rounded_rectangle_border_test.dart
@@ -32,7 +32,7 @@ void main() {
           outer: RRect.fromRectAndRadius(rect, const Radius.circular(100.0)),
           inner: RRect.fromRectAndRadius(rect.deflate(10.0), const Radius.circular(90.0)),
           strokeWidth: 0.0,
-        )
+        ),
     );
 
     const RoundedRectangleBorder directional = RoundedRectangleBorder(
diff --git a/packages/flutter/test/painting/shape_border_test.dart b/packages/flutter/test/painting/shape_border_test.dart
index 25325205531..52e35cf59ce 100644
--- a/packages/flutter/test/painting/shape_border_test.dart
+++ b/packages/flutter/test/painting/shape_border_test.dart
@@ -55,19 +55,19 @@ void main() {
     expect(
       ShapeBorder.lerp(b2 + b1, b1 + b2, 1.0).toString(),
       'Border.all(BorderSide(Color(0xff00ff00), 1.0, BorderStyle.solid)) + '
-      'Border.all(BorderSide(Color(0xff0000ff), 1.0, BorderStyle.solid))'
+      'Border.all(BorderSide(Color(0xff0000ff), 1.0, BorderStyle.solid))',
     );
     expect((b1 + b2).dimensions, const EdgeInsets.all(2.0));
     final Rect rect = Rect.fromLTRB(11.0, 15.0, 299.0, 175.0);
     expect((Canvas canvas) => (b1 + b2).paint(canvas, rect), paints
       ..rect(rect: rect.deflate(0.5), color: b2.top.color)
-      ..rect(rect: rect.deflate(1.5), color: b1.top.color)
+      ..rect(rect: rect.deflate(1.5), color: b1.top.color),
     );
     expect((b1 + b2 + b1).dimensions, const EdgeInsets.all(3.0));
     expect((Canvas canvas) => (b1 + b2 + b1).paint(canvas, rect), paints
       ..rect(rect: rect.deflate(0.5), color: b1.top.color)
       ..rect(rect: rect.deflate(1.5), color: b2.top.color)
-      ..rect(rect: rect.deflate(2.5), color: b1.top.color)
+      ..rect(rect: rect.deflate(2.5), color: b1.top.color),
     );
   });
 
@@ -120,19 +120,19 @@ void main() {
     expect(
       ShapeBorder.lerp(b2 + b1, b1 + b2, 1.0).toString(),
       'BorderDirectional(top: BorderSide(Color(0xff00ff00), 1.0, BorderStyle.solid), start: BorderSide(Color(0xff00ff00), 1.0, BorderStyle.solid), end: BorderSide(Color(0xff00ff00), 1.0, BorderStyle.solid), bottom: BorderSide(Color(0xff00ff00), 1.0, BorderStyle.solid)) + '
-      'BorderDirectional(top: BorderSide(Color(0xff0000ff), 1.0, BorderStyle.solid), start: BorderSide(Color(0xff0000ff), 1.0, BorderStyle.solid), end: BorderSide(Color(0xff0000ff), 1.0, BorderStyle.solid), bottom: BorderSide(Color(0xff0000ff), 1.0, BorderStyle.solid))'
+      'BorderDirectional(top: BorderSide(Color(0xff0000ff), 1.0, BorderStyle.solid), start: BorderSide(Color(0xff0000ff), 1.0, BorderStyle.solid), end: BorderSide(Color(0xff0000ff), 1.0, BorderStyle.solid), bottom: BorderSide(Color(0xff0000ff), 1.0, BorderStyle.solid))',
     );
     expect((b1 + b2).dimensions, const EdgeInsetsDirectional.fromSTEB(2.0, 2.0, 2.0, 2.0));
     final Rect rect = Rect.fromLTRB(11.0, 15.0, 299.0, 175.0);
     expect((Canvas canvas) => (b1 + b2).paint(canvas, rect, textDirection: TextDirection.rtl), paints
       ..rect(rect: rect.deflate(0.5), color: b2.top.color)
-      ..rect(rect: rect.deflate(1.5), color: b1.top.color)
+      ..rect(rect: rect.deflate(1.5), color: b1.top.color),
     );
     expect((b1 + b2 + b1).dimensions, const EdgeInsetsDirectional.fromSTEB(3.0, 3.0, 3.0, 3.0));
     expect((Canvas canvas) => (b1 + b2 + b1).paint(canvas, rect, textDirection: TextDirection.rtl), paints
       ..rect(rect: rect.deflate(0.5), color: b1.top.color)
       ..rect(rect: rect.deflate(1.5), color: b2.top.color)
-      ..rect(rect: rect.deflate(2.5), color: b1.top.color)
+      ..rect(rect: rect.deflate(2.5), color: b1.top.color),
     );
   });
 }
diff --git a/packages/flutter/test/painting/shape_decoration_test.dart b/packages/flutter/test/painting/shape_decoration_test.dart
index 784c290f57c..e1e06ec70d9 100644
--- a/packages/flutter/test/painting/shape_decoration_test.dart
+++ b/packages/flutter/test/painting/shape_decoration_test.dart
@@ -81,7 +81,7 @@ void main() {
         );
       },
       paints
-        ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 100.0, 200.0), destination: Rect.fromLTRB(20.0, 1000.0 - 40.0 - 200.0, 20.0 + 100.0, 1000.0 - 40.0))
+        ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 100.0, 200.0), destination: Rect.fromLTRB(20.0, 1000.0 - 40.0 - 200.0, 20.0 + 100.0, 1000.0 - 40.0)),
     );
     expect(
       (Canvas canvas) {
@@ -94,7 +94,7 @@ void main() {
           ),
         );
       },
-      isNot(paints..image()) // we always use drawImageRect
+      isNot(paints..image()), // we always use drawImageRect
     );
     expect(log, isEmpty);
   });
diff --git a/packages/flutter/test/painting/stadium_border_test.dart b/packages/flutter/test/painting/stadium_border_test.dart
index 6d71e3ad59c..58e694ef5b8 100644
--- a/packages/flutter/test/painting/stadium_border_test.dart
+++ b/packages/flutter/test/painting/stadium_border_test.dart
@@ -31,7 +31,7 @@ void main() {
           ..rrect(
             rrect: RRect.fromRectAndRadius(rect.deflate(5.0), Radius.circular(rect.shortestSide / 2.0 - 5.0)),
             strokeWidth: 10.0,
-          )
+          ),
     );
   });
 
diff --git a/packages/flutter/test/painting/text_painter_rtl_test.dart b/packages/flutter/test/painting/text_painter_rtl_test.dart
index e1d56c45dca..e6d9aca47d0 100644
--- a/packages/flutter/test/painting/text_painter_rtl_test.dart
+++ b/packages/flutter/test/painting/text_painter_rtl_test.dart
@@ -406,7 +406,7 @@ void main() {
       <TextBox>[TextBox.fromLTRBD(50.0, 28.0, 60.0, 38.0, TextDirection.ltr)],
       <TextBox>[TextBox.fromLTRBD(60.0, 28.0, 70.0, 38.0, TextDirection.ltr)],
       <TextBox>[TextBox.fromLTRBD(70.0, 28.0, 80.0, 38.0, TextDirection.ltr)],
-      <TextBox>[TextBox.fromLTRBD(80.0, 28.0, 90.0, 38.0, TextDirection.ltr)]
+      <TextBox>[TextBox.fromLTRBD(80.0, 28.0, 90.0, 38.0, TextDirection.ltr)],
     ]);
   }, skip: skipTestsWithKnownBugs);
 
diff --git a/packages/flutter/test/rendering/aspect_ratio_test.dart b/packages/flutter/test/rendering/aspect_ratio_test.dart
index 47d8f580099..7fd36908fc5 100644
--- a/packages/flutter/test/rendering/aspect_ratio_test.dart
+++ b/packages/flutter/test/rendering/aspect_ratio_test.dart
@@ -53,7 +53,7 @@ void main() {
   test('RenderAspectRatio: Intrinsic sizing 2.0', () {
     final RenderAspectRatio box = RenderAspectRatio(
       aspectRatio: 2.0,
-      child: RenderSizedBox(const Size(90.0, 70.0))
+      child: RenderSizedBox(const Size(90.0, 70.0)),
     );
 
     expect(box.getMinIntrinsicWidth(200.0), 400.0);
@@ -77,7 +77,7 @@ void main() {
   test('RenderAspectRatio: Intrinsic sizing 0.5', () {
     final RenderAspectRatio box = RenderAspectRatio(
       aspectRatio: 0.5,
-      child: RenderSizedBox(const Size(90.0, 70.0))
+      child: RenderSizedBox(const Size(90.0, 70.0)),
     );
 
     expect(box.getMinIntrinsicWidth(200.0), 100.0);
@@ -109,7 +109,7 @@ void main() {
       maxHeight: double.infinity,
       child: RenderAspectRatio(
         aspectRatio: 0.5,
-        child: RenderSizedBox(const Size(90.0, 70.0))
+        child: RenderSizedBox(const Size(90.0, 70.0)),
       ),
     );
     expect(hadError, false);
diff --git a/packages/flutter/test/rendering/baseline_test.dart b/packages/flutter/test/rendering/baseline_test.dart
index b9b15ec5fcf..f762b612069 100644
--- a/packages/flutter/test/rendering/baseline_test.dart
+++ b/packages/flutter/test/rendering/baseline_test.dart
@@ -17,8 +17,8 @@ void main() {
       child: parent = RenderBaseline(
         baseline: 0.0,
         baselineType: TextBaseline.alphabetic,
-        child: child = RenderSizedBox(const Size(100.0, 100.0))
-      )
+        child: child = RenderSizedBox(const Size(100.0, 100.0)),
+      ),
     );
     final BoxParentData childParentData = child.parentData;
 
diff --git a/packages/flutter/test/rendering/box_constraints_test.dart b/packages/flutter/test/rendering/box_constraints_test.dart
index 952c7692866..c9effda4257 100644
--- a/packages/flutter/test/rendering/box_constraints_test.dart
+++ b/packages/flutter/test/rendering/box_constraints_test.dart
@@ -17,7 +17,7 @@ void main() {
       minWidth: 3.0,
       maxWidth: 7.0,
       minHeight: 11.0,
-      maxHeight: 17.0
+      maxHeight: 17.0,
     );
     BoxConstraints copy = constraints.copyWith();
     expect(copy, equals(constraints));
@@ -25,7 +25,7 @@ void main() {
       minWidth: 13.0,
       maxWidth: 17.0,
       minHeight: 111.0,
-      maxHeight: 117.0
+      maxHeight: 117.0,
     );
     expect(copy.minWidth, 13.0);
     expect(copy.maxWidth, 17.0);
@@ -40,7 +40,7 @@ void main() {
       minWidth: 3.0,
       maxWidth: 7.0,
       minHeight: 11.0,
-      maxHeight: 17.0
+      maxHeight: 17.0,
     );
     BoxConstraints copy = constraints * 2.0;
     expect(copy.minWidth, 6.0);
@@ -66,7 +66,7 @@ void main() {
       minWidth: 3.0,
       maxWidth: 7.0,
       minHeight: 11.0,
-      maxHeight: 17.0
+      maxHeight: 17.0,
     );
     BoxConstraints copy = BoxConstraints.lerp(null, constraints, 0.5);
     expect(copy.minWidth, 1.5);
@@ -82,7 +82,7 @@ void main() {
       minWidth: 13.0,
       maxWidth: 17.0,
       minHeight: 111.0,
-      maxHeight: 117.0
+      maxHeight: 117.0,
     ), constraints, 0.2);
     expect(copy.minWidth, 11.0);
     expect(copy.maxWidth, 15.0);
@@ -163,7 +163,7 @@ void main() {
       minWidth: 3.0,
       maxWidth: 2.0,
       minHeight: 11.0,
-      maxHeight: 18.0
+      maxHeight: 18.0,
     );
     final BoxConstraints copy = constraints.normalize();
     expect(copy.minWidth, 3.0);
diff --git a/packages/flutter/test/rendering/constraints_test.dart b/packages/flutter/test/rendering/constraints_test.dart
index ea85b1a7472..e48766804c9 100644
--- a/packages/flutter/test/rendering/constraints_test.dart
+++ b/packages/flutter/test/rendering/constraints_test.dart
@@ -18,9 +18,9 @@ void main() {
           heightFactor: 0.5,
           child: leaf = RenderConstrainedBox(
             additionalConstraints: const BoxConstraints.expand()
-          )
-        )
-      )
+          ),
+        ),
+      ),
     );
     layout(root);
     expect(root.size.width, equals(800.0));
diff --git a/packages/flutter/test/rendering/dynamic_intrinsics_test.dart b/packages/flutter/test/rendering/dynamic_intrinsics_test.dart
index a8c0387094a..f82d4dc72a2 100644
--- a/packages/flutter/test/rendering/dynamic_intrinsics_test.dart
+++ b/packages/flutter/test/rendering/dynamic_intrinsics_test.dart
@@ -51,7 +51,7 @@ class RenderIntrinsicSize extends RenderProxyBox {
     child.layout(constraints);
     size = Size(
       child.getMinIntrinsicWidth(double.infinity),
-      child.getMinIntrinsicHeight(double.infinity)
+      child.getMinIntrinsicHeight(double.infinity),
     );
   }
 }
@@ -70,8 +70,8 @@ void main() {
         minWidth: 0.0,
         minHeight: 0.0,
         maxWidth: 1000.0,
-        maxHeight: 1000.0
-      )
+        maxHeight: 1000.0,
+      ),
     );
     expect(root.size, equals(inner.size));
 
diff --git a/packages/flutter/test/rendering/editable_test.dart b/packages/flutter/test/rendering/editable_test.dart
index 235805afa14..1e0e36fb4f7 100644
--- a/packages/flutter/test/rendering/editable_test.dart
+++ b/packages/flutter/test/rendering/editable_test.dart
@@ -92,7 +92,7 @@ void main() {
     editable.layout(BoxConstraints.loose(const Size(1000.0, 1000.0)));
     expect(
       (Canvas canvas) => editable.paint(TestRecordingPaintingContext(canvas), Offset.zero),
-      paints..clipRect(rect: Rect.fromLTRB(0.0, 0.0, 1000.0, 10.0))
+      paints..clipRect(rect: Rect.fromLTRB(0.0, 0.0, 1000.0, 10.0)),
     );
   });
 
diff --git a/packages/flutter/test/rendering/flex_test.dart b/packages/flutter/test/rendering/flex_test.dart
index 295ddfb4c24..852c64f06fb 100644
--- a/packages/flutter/test/rendering/flex_test.dart
+++ b/packages/flutter/test/rendering/flex_test.dart
@@ -13,7 +13,7 @@ void main() {
     final RenderDecoratedBox box = RenderDecoratedBox(decoration: const BoxDecoration());
     final RenderFlex flex = RenderFlex(textDirection: TextDirection.ltr, children: <RenderBox>[box]);
     layout(flex, constraints: const BoxConstraints(
-      minWidth: 200.0, maxWidth: 200.0, minHeight: 200.0, maxHeight: 200.0)
+      minWidth: 200.0, maxWidth: 200.0, minHeight: 200.0, maxHeight: 200.0),
     );
 
     expect(flex.size.width, equals(200.0), reason: 'flex width');
@@ -30,7 +30,7 @@ void main() {
       children: <RenderBox>[
         RenderConstrainedBox(additionalConstraints: const BoxConstraints.tightFor(height: 200.0)),
         flexible,
-      ]
+      ],
     );
     final FlexParentData flexParentData = flexible.parentData;
     flexParentData.flex = 1;
@@ -53,7 +53,7 @@ void main() {
       children: <RenderBox>[
         RenderConstrainedBox(additionalConstraints: const BoxConstraints.tightFor(width: 200.0)),
         flexible,
-      ]
+      ],
     );
     final FlexParentData flexParentData = flexible.parentData;
     flexParentData.flex = 1;
@@ -72,7 +72,7 @@ void main() {
       verticalDirection: VerticalDirection.down,
       children: <RenderBox>[
         RenderAspectRatio(aspectRatio: 1.0),
-      ]
+      ],
     );
     const BoxConstraints viewport = BoxConstraints(maxHeight: 200.0, maxWidth: 1000.0);
     layout(flex, constraints: viewport);
@@ -108,7 +108,7 @@ void main() {
     final RenderDecoratedBox box2 = RenderDecoratedBox(decoration: const BoxDecoration());
     final RenderFlex flex = RenderFlex(textDirection: TextDirection.ltr, children: <RenderBox>[box1, box2]);
     layout(flex, constraints: const BoxConstraints(
-      minWidth: 0.0, maxWidth: 100.0, minHeight: 0.0, maxHeight: 100.0)
+      minWidth: 0.0, maxWidth: 100.0, minHeight: 0.0, maxHeight: 100.0),
     );
     expect(box1.size.width, equals(0.0));
     expect(box1.size.height, equals(0.0));
@@ -134,7 +134,7 @@ void main() {
     box2ParentData.flex = 2;
     flex.addAll(<RenderBox>[box1, box2]);
     layout(flex, constraints: const BoxConstraints(
-      minWidth: 0.0, maxWidth: 100.0, minHeight: 0.0, maxHeight: 100.0)
+      minWidth: 0.0, maxWidth: 100.0, minHeight: 0.0, maxHeight: 100.0),
     );
     expect(box1.size.width, equals(0.0));
     expect(box1.size.height, equals(0.0));
@@ -163,7 +163,7 @@ void main() {
     final RenderFlex flex = RenderFlex(textDirection: TextDirection.ltr, mainAxisAlignment: MainAxisAlignment.spaceEvenly);
     flex.addAll(<RenderBox>[box1, box2, box3]);
     layout(flex, constraints: const BoxConstraints(
-      minWidth: 0.0, maxWidth: 500.0, minHeight: 0.0, maxHeight: 400.0)
+      minWidth: 0.0, maxWidth: 500.0, minHeight: 0.0, maxHeight: 400.0),
     );
     Offset getOffset(RenderBox box) {
       final FlexParentData parentData = box.parentData;
@@ -193,7 +193,7 @@ void main() {
     final RenderFlex flex = RenderFlex(textDirection: TextDirection.ltr, mainAxisAlignment: MainAxisAlignment.spaceBetween);
     flex.addAll(<RenderBox>[box1, box2, box3]);
     layout(flex, constraints: const BoxConstraints(
-      minWidth: 0.0, maxWidth: 500.0, minHeight: 0.0, maxHeight: 400.0)
+      minWidth: 0.0, maxWidth: 500.0, minHeight: 0.0, maxHeight: 400.0),
     );
     Offset getOffset(RenderBox box) {
       final FlexParentData parentData = box.parentData;
@@ -245,7 +245,7 @@ void main() {
     );
     flex.addAll(<RenderBox>[box1, box2, box3]);
     layout(flex, constraints: const BoxConstraints(
-      minWidth: 0.0, maxWidth: 500.0, minHeight: 0.0, maxHeight: 400.0)
+      minWidth: 0.0, maxWidth: 500.0, minHeight: 0.0, maxHeight: 400.0),
     );
     Offset getOffset(RenderBox box) {
       final FlexParentData parentData = box.parentData;
diff --git a/packages/flutter/test/rendering/independent_layout_test.dart b/packages/flutter/test/rendering/independent_layout_test.dart
index 4a063f7e6cb..a421224000c 100644
--- a/packages/flutter/test/rendering/independent_layout_test.dart
+++ b/packages/flutter/test/rendering/independent_layout_test.dart
@@ -33,7 +33,7 @@ class TestLayout {
 void main() {
   const ViewConfiguration testConfiguration = ViewConfiguration(
     size: Size(800.0, 600.0),
-    devicePixelRatio: 1.0
+    devicePixelRatio: 1.0,
   );
 
   test('onscreen layout does not affect offscreen', () {
diff --git a/packages/flutter/test/rendering/intrinsic_width_test.dart b/packages/flutter/test/rendering/intrinsic_width_test.dart
index bb753877228..a3f4ffd49f7 100644
--- a/packages/flutter/test/rendering/intrinsic_width_test.dart
+++ b/packages/flutter/test/rendering/intrinsic_width_test.dart
@@ -52,8 +52,8 @@ void main() {
         minWidth: 5.0,
         minHeight: 8.0,
         maxWidth: 500.0,
-        maxHeight: 800.0
-      )
+        maxHeight: 800.0,
+      ),
     );
     expect(parent.size.width, equals(100.0));
     expect(parent.size.height, equals(110.0));
@@ -86,8 +86,8 @@ void main() {
         minWidth: 5.0,
         minHeight: 8.0,
         maxWidth: 500.0,
-        maxHeight: 800.0
-      )
+        maxHeight: 800.0,
+      ),
     );
     expect(parent.size.width, equals(5.0));
     expect(parent.size.height, equals(8.0));
@@ -121,8 +121,8 @@ void main() {
         minWidth: 5.0,
         minHeight: 8.0,
         maxWidth: 500.0,
-        maxHeight: 800.0
-      )
+        maxHeight: 800.0,
+      ),
     );
     expect(parent.size.width, equals(3.0 * 47.0));
     expect(parent.size.height, equals(110.0));
@@ -156,8 +156,8 @@ void main() {
         minWidth: 5.0,
         minHeight: 8.0,
         maxWidth: 500.0,
-        maxHeight: 800.0
-      )
+        maxHeight: 800.0,
+      ),
     );
     expect(parent.size.width, equals(100.0));
     expect(parent.size.height, equals(235.0));
@@ -191,8 +191,8 @@ void main() {
         minWidth: 5.0,
         minHeight: 8.0,
         maxWidth: 500.0,
-        maxHeight: 800.0
-      )
+        maxHeight: 800.0,
+      ),
     );
     expect(parent.size.width, equals(3.0 * 37.0));
     expect(parent.size.height, equals(235.0));
@@ -226,8 +226,8 @@ void main() {
         minWidth: 5.0,
         minHeight: 8.0,
         maxWidth: 500.0,
-        maxHeight: 800.0
-      )
+        maxHeight: 800.0,
+      ),
     );
     expect(parent.size.width, equals(55.0));
     expect(parent.size.height, equals(200.0));
@@ -260,8 +260,8 @@ void main() {
         minWidth: 5.0,
         minHeight: 8.0,
         maxWidth: 500.0,
-        maxHeight: 800.0
-      )
+        maxHeight: 800.0,
+      ),
     );
     expect(parent.size.width, equals(5.0));
     expect(parent.size.height, equals(8.0));
@@ -290,7 +290,7 @@ void main() {
   test('Padding and boring intrinsics', () {
     final RenderBox box = RenderPadding(
       padding: const EdgeInsets.all(15.0),
-      child: RenderSizedBox(const Size(20.0, 20.0))
+      child: RenderSizedBox(const Size(20.0, 20.0)),
     );
 
     expect(box.getMinIntrinsicWidth(0.0), 50.0);
@@ -320,15 +320,15 @@ void main() {
         minWidth: 10.0,
         minHeight: 10.0,
         maxWidth: 10.0,
-        maxHeight: 10.0
-      )
+        maxHeight: 10.0,
+      ),
     );
   });
 
   test('Padding and interesting intrinsics', () {
     final RenderBox box = RenderPadding(
       padding: const EdgeInsets.all(15.0),
-      child: RenderAspectRatio(aspectRatio: 1.0)
+      child: RenderAspectRatio(aspectRatio: 1.0),
     );
 
     expect(box.getMinIntrinsicWidth(0.0), 30.0);
@@ -358,15 +358,15 @@ void main() {
         minWidth: 10.0,
         minHeight: 10.0,
         maxWidth: 10.0,
-        maxHeight: 10.0
-      )
+        maxHeight: 10.0,
+      ),
     );
   });
 
   test('Padding and boring intrinsics', () {
     final RenderBox box = RenderPadding(
       padding: const EdgeInsets.all(15.0),
-      child: RenderSizedBox(const Size(20.0, 20.0))
+      child: RenderSizedBox(const Size(20.0, 20.0)),
     );
 
     expect(box.getMinIntrinsicWidth(0.0), 50.0);
@@ -396,15 +396,15 @@ void main() {
         minWidth: 10.0,
         minHeight: 10.0,
         maxWidth: 10.0,
-        maxHeight: 10.0
-      )
+        maxHeight: 10.0,
+      ),
     );
   });
 
   test('Padding and interesting intrinsics', () {
     final RenderBox box = RenderPadding(
       padding: const EdgeInsets.all(15.0),
-      child: RenderAspectRatio(aspectRatio: 1.0)
+      child: RenderAspectRatio(aspectRatio: 1.0),
     );
 
     expect(box.getMinIntrinsicWidth(0.0), 30.0);
@@ -434,8 +434,8 @@ void main() {
         minWidth: 10.0,
         minHeight: 10.0,
         maxWidth: 10.0,
-        maxHeight: 10.0
-      )
+        maxHeight: 10.0,
+      ),
     );
   });
 }
diff --git a/packages/flutter/test/rendering/limited_box_test.dart b/packages/flutter/test/rendering/limited_box_test.dart
index bcd4012c938..d1541d63500 100644
--- a/packages/flutter/test/rendering/limited_box_test.dart
+++ b/packages/flutter/test/rendering/limited_box_test.dart
@@ -21,8 +21,8 @@ void main() {
       child: RenderLimitedBox(
         maxWidth: 100.0,
         maxHeight: 200.0,
-        child: child
-      )
+        child: child,
+      ),
     );
     layout(parent);
     expect(child.size.width, 100.0);
@@ -70,8 +70,8 @@ void main() {
       child: RenderLimitedBox(
         maxWidth: 100.0,
         maxHeight: 200.0,
-        child: child
-      )
+        child: child,
+      ),
     );
     layout(parent);
     expect(child.size.width, 100.0);
@@ -90,8 +90,8 @@ void main() {
       child: RenderLimitedBox(
         maxWidth: 100.0,
         maxHeight: 200.0,
-        child: child
-      )
+        child: child,
+      ),
     );
     layout(parent);
 
@@ -109,7 +109,7 @@ void main() {
       child: box = RenderLimitedBox(
         maxWidth: 100.0,
         maxHeight: 200.0,
-      )
+      ),
     );
     layout(parent);
     expect(box.size, const Size(10.0, 0.0));
@@ -145,7 +145,7 @@ void main() {
         child: box = RenderLimitedBox(
           maxWidth: 100.0,
           maxHeight: 200.0,
-        )
+        ),
     );
     layout(parent);
     expect(box.size, const Size(10.0, 600.0));
diff --git a/packages/flutter/test/rendering/mock_canvas.dart b/packages/flutter/test/rendering/mock_canvas.dart
index 8cbac038f25..2fd33df9ae7 100644
--- a/packages/flutter/test/rendering/mock_canvas.dart
+++ b/packages/flutter/test/rendering/mock_canvas.dart
@@ -867,7 +867,7 @@ abstract class _PaintPredicate {
 abstract class _DrawCommandPaintPredicate extends _PaintPredicate {
   _DrawCommandPaintPredicate(
     this.symbol, this.name, this.argumentCount, this.paintArgumentIndex,
-    { this.color, this.strokeWidth, this.hasMaskFilter, this.style }
+    { this.color, this.strokeWidth, this.hasMaskFilter, this.style, }
   );
 
   final Symbol symbol;
@@ -939,7 +939,7 @@ class _OneParameterPaintPredicate<T> extends _DrawCommandPaintPredicate {
     @required Color color,
     @required double strokeWidth,
     @required bool hasMaskFilter,
-    @required PaintingStyle style
+    @required PaintingStyle style,
   }) : super(
     symbol, name, 2, 1, color: color, strokeWidth: strokeWidth, hasMaskFilter: hasMaskFilter, style: style);
 
@@ -973,7 +973,7 @@ class _TwoParameterPaintPredicate<T1, T2> extends _DrawCommandPaintPredicate {
     @required Color color,
     @required double strokeWidth,
     @required bool hasMaskFilter,
-    @required PaintingStyle style
+    @required PaintingStyle style,
   }) : super(
     symbol, name, 3, 2, color: color, strokeWidth: strokeWidth, hasMaskFilter: hasMaskFilter, style: style);
 
diff --git a/packages/flutter/test/rendering/non_render_object_root_test.dart b/packages/flutter/test/rendering/non_render_object_root_test.dart
index d2e587ff004..8e90bd2eb26 100644
--- a/packages/flutter/test/rendering/non_render_object_root_test.dart
+++ b/packages/flutter/test/rendering/non_render_object_root_test.dart
@@ -49,7 +49,7 @@ void main() {
     final RealRoot root = RealRoot(
       child = RenderPositionedBox(
         alignment: Alignment.center,
-        child: RenderSizedBox(const Size(100.0, 100.0))
+        child: RenderSizedBox(const Size(100.0, 100.0)),
       )
     );
     root.attach(PipelineOwner());
diff --git a/packages/flutter/test/rendering/paragraph_test.dart b/packages/flutter/test/rendering/paragraph_test.dart
index da3bf087a7d..7161844fe59 100644
--- a/packages/flutter/test/rendering/paragraph_test.dart
+++ b/packages/flutter/test/rendering/paragraph_test.dart
@@ -250,7 +250,7 @@ void main() {
     final RenderParagraph paragraph = RenderParagraph(
         testSpan,
         textDirection: TextDirection.ltr,
-        textScaleFactor: 1.3
+        textScaleFactor: 1.3,
     );
     paragraph.layout(const BoxConstraints());
     // anyOf is needed here because Linux and Mac have different text
diff --git a/packages/flutter/test/rendering/positioned_box_test.dart b/packages/flutter/test/rendering/positioned_box_test.dart
index 9e102351cc6..09d6e0b994e 100644
--- a/packages/flutter/test/rendering/positioned_box_test.dart
+++ b/packages/flutter/test/rendering/positioned_box_test.dart
@@ -11,7 +11,7 @@ void main() {
   test('RenderPositionedBox expands', () {
     final RenderConstrainedBox sizer = RenderConstrainedBox(
       additionalConstraints: BoxConstraints.tight(const Size(100.0, 100.0)),
-      child: RenderDecoratedBox(decoration: const BoxDecoration())
+      child: RenderDecoratedBox(decoration: const BoxDecoration()),
     );
     final RenderPositionedBox positioner = RenderPositionedBox(child: sizer);
     layout(positioner, constraints: BoxConstraints.loose(const Size(200.0, 200.0)));
@@ -23,7 +23,7 @@ void main() {
   test('RenderPositionedBox shrink wraps', () {
     final RenderConstrainedBox sizer = RenderConstrainedBox(
       additionalConstraints: BoxConstraints.tight(const Size(100.0, 100.0)),
-      child: RenderDecoratedBox(decoration: const BoxDecoration())
+      child: RenderDecoratedBox(decoration: const BoxDecoration()),
     );
     final RenderPositionedBox positioner = RenderPositionedBox(child: sizer, widthFactor: 1.0);
     layout(positioner, constraints: BoxConstraints.loose(const Size(200.0, 200.0)));
@@ -48,7 +48,7 @@ void main() {
   test('RenderPositionedBox width and height factors', () {
     final RenderConstrainedBox sizer = RenderConstrainedBox(
       additionalConstraints: BoxConstraints.tight(const Size(100.0, 100.0)),
-      child: RenderDecoratedBox(decoration: const BoxDecoration())
+      child: RenderDecoratedBox(decoration: const BoxDecoration()),
     );
     final RenderPositionedBox positioner = RenderPositionedBox(child: sizer, widthFactor: 1.0, heightFactor: 0.0);
     layout(positioner, constraints: BoxConstraints.loose(const Size(200.0, 200.0)));
diff --git a/packages/flutter/test/rendering/reattach_test.dart b/packages/flutter/test/rendering/reattach_test.dart
index 0e927a3deaf..d8085494148 100644
--- a/packages/flutter/test/rendering/reattach_test.dart
+++ b/packages/flutter/test/rendering/reattach_test.dart
@@ -29,7 +29,7 @@ class TestTree {
                 child: RenderPositionedBox(
                   child: child = RenderConstrainedBox(
                     additionalConstraints: const BoxConstraints.tightFor(height: 20.0, width: 20.0),
-                    child: RenderSemanticsAnnotations(label: 'Hello there foo', textDirection: TextDirection.ltr)
+                    child: RenderSemanticsAnnotations(label: 'Hello there foo', textDirection: TextDirection.ltr),
                   ),
                 ),
               ),
diff --git a/packages/flutter/test/rendering/rendering_tester.dart b/packages/flutter/test/rendering/rendering_tester.dart
index bcaf4a6ab6e..bb9810bf317 100644
--- a/packages/flutter/test/rendering/rendering_tester.dart
+++ b/packages/flutter/test/rendering/rendering_tester.dart
@@ -70,8 +70,8 @@ void layout(
       alignment: alignment,
       child: RenderConstrainedBox(
         additionalConstraints: constraints,
-        child: box
-      )
+        child: box,
+      ),
     );
   }
   renderer.renderView.child = box;
diff --git a/packages/flutter/test/rendering/repaint_boundary_test.dart b/packages/flutter/test/rendering/repaint_boundary_test.dart
index fe8c1e3fd0f..18e86719bdc 100644
--- a/packages/flutter/test/rendering/repaint_boundary_test.dart
+++ b/packages/flutter/test/rendering/repaint_boundary_test.dart
@@ -19,9 +19,9 @@ void main() {
             child: c = RenderOpacity(
               opacity: 1.0
             )
-          )
+          ),
         )
-      )
+      ),
     );
     layout(a, phase: EnginePhase.flushSemantics);
     c.opacity = 0.9;
diff --git a/packages/flutter/test/rendering/stack_test.dart b/packages/flutter/test/rendering/stack_test.dart
index 706737b6e1a..05ccc77fb89 100644
--- a/packages/flutter/test/rendering/stack_test.dart
+++ b/packages/flutter/test/rendering/stack_test.dart
@@ -17,7 +17,7 @@ void main() {
       decoration: const BoxDecoration(
         color: Color(0xFFFF0000),
       ),
-      child: size
+      child: size,
     );
 
     final RenderBox green = RenderDecoratedBox(
diff --git a/packages/flutter/test/rendering/viewport_test.dart b/packages/flutter/test/rendering/viewport_test.dart
index 36fe089a82f..f383dfad868 100644
--- a/packages/flutter/test/rendering/viewport_test.dart
+++ b/packages/flutter/test/rendering/viewport_test.dart
@@ -208,7 +208,7 @@ void main() {
                   child: Container(
                     height: 100.0,
                     child: Text('Tile $i'),
-                  )
+                  ),
                 );
                 children.add(sliver);
                 return SliverPadding(
@@ -249,7 +249,7 @@ void main() {
                     child: Container(
                       width: 100.0,
                       child: Text('Tile $i'),
-                    )
+                    ),
                 );
                 children.add(sliver);
                 return SliverPadding(
@@ -290,7 +290,7 @@ void main() {
                     child: Container(
                       height: 100.0,
                       child: Text('Tile $i'),
-                    )
+                    ),
                 );
                 children.add(sliver);
                 return SliverPadding(
@@ -332,7 +332,7 @@ void main() {
                     child: Container(
                       width: 100.0,
                       child: Text('Tile $i'),
-                    )
+                    ),
                 );
                 children.add(sliver);
                 return SliverPadding(
@@ -547,7 +547,7 @@ void main() {
                   ),
                   Container(
                     height: 200.0,
-                  )
+                  ),
                 ],
               ),
             ),
diff --git a/packages/flutter/test/semantics/semantics_elevation_test.dart b/packages/flutter/test/semantics/semantics_elevation_test.dart
index e8a87ee74c8..20864ba705e 100644
--- a/packages/flutter/test/semantics/semantics_elevation_test.dart
+++ b/packages/flutter/test/semantics/semantics_elevation_test.dart
@@ -50,20 +50,20 @@ void main() {
                             Card(
                               elevation: 8.0,
                               child: Text('absolute elevation: 30'),
-                            )
+                            ),
                           ],
                         ),
-                      )
+                      ),
                     ],
                   ),
                 ),
                 const Card(
                   elevation: 15.0,
                   child: Text('absolute elevation: 25'),
-                )
+                ),
               ],
             ),
-          )
+          ),
         ],
       ),
     ));
@@ -129,17 +129,17 @@ void main() {
                             Card(
                               elevation: 8.0,
                               child: Text('absolute elevation: 30'),
-                            )
+                            ),
                           ],
                         ),
-                      )
+                      ),
                     ],
                   ),
                 ),
                 const Text('absolute elevation: 10'),
               ],
             ),
-          )
+          ),
         ],
       ),
     ));
@@ -182,8 +182,8 @@ void main() {
             child: Material(
               elevation: 24.0,
               child: Text('Hello'),
-            )
-        )
+            ),
+        ),
     ));
 
     final SemanticsNode node = tester.getSemantics(find.text('Hello'));
@@ -221,8 +221,8 @@ void main() {
                 ),
               ),
             ],
-          )
-        )
+          ),
+        ),
     ));
 
 
@@ -276,8 +276,8 @@ void main() {
                   ),
                 ),
               ],
-            )
-        )
+            ),
+        ),
     ));
 
 
diff --git a/packages/flutter/test/semantics/semantics_test.dart b/packages/flutter/test/semantics/semantics_test.dart
index 9d853098026..d7afc13fa3d 100644
--- a/packages/flutter/test/semantics/semantics_test.dart
+++ b/packages/flutter/test/semantics/semantics_test.dart
@@ -84,10 +84,10 @@ void main() {
               child: TestRender(
                 hasScrollUpAction: true,
                 isSemanticBoundary: true,
-              )
-            )
-          )
-        )
+              ),
+            ),
+          ),
+        ),
       );
 
       layout(root);
@@ -139,7 +139,7 @@ void main() {
       ' └─SemanticsNode#2\n'
       '     STALE\n'
       '     owner: null\n'
-      '     Rect.fromLTRB(5.0, 0.0, 10.0, 5.0)\n'
+      '     Rect.fromLTRB(5.0, 0.0, 10.0, 5.0)\n',
     );
   });
 
@@ -213,7 +213,7 @@ void main() {
       ' └─SemanticsNode#2\n'
       '     STALE\n'
       '     owner: null\n'
-      '     Rect.fromLTRB(10.0, 0.0, 15.0, 5.0)\n'
+      '     Rect.fromLTRB(10.0, 0.0, 15.0, 5.0)\n',
     );
 
     expect(
@@ -231,7 +231,7 @@ void main() {
       ' └─SemanticsNode#2\n'
       '     STALE\n'
       '     owner: null\n'
-      '     Rect.fromLTRB(10.0, 0.0, 15.0, 5.0)\n'
+      '     Rect.fromLTRB(10.0, 0.0, 15.0, 5.0)\n',
     );
 
     final SemanticsNode child3 = SemanticsNode()
@@ -250,7 +250,7 @@ void main() {
       ..rect = Rect.fromLTRB(0.0, 0.0, 25.0, 5.0);
     rootComplex.updateWith(
         config: null,
-        childrenInInversePaintOrder: <SemanticsNode>[child1, child2, child3]
+        childrenInInversePaintOrder: <SemanticsNode>[child1, child2, child3],
     );
 
     expect(
@@ -283,7 +283,7 @@ void main() {
       '   └─SemanticsNode#6\n'
       '       STALE\n'
       '       owner: null\n'
-      '       Rect.fromLTRB(0.0, 0.0, 5.0, 5.0)\n'
+      '       Rect.fromLTRB(0.0, 0.0, 5.0, 5.0)\n',
     );
 
     expect(
@@ -316,7 +316,7 @@ void main() {
       '   └─SemanticsNode#6\n'
       '       STALE\n'
       '       owner: null\n'
-      '       Rect.fromLTRB(0.0, 0.0, 5.0, 5.0)\n'
+      '       Rect.fromLTRB(0.0, 0.0, 5.0, 5.0)\n',
     );
   });
 
@@ -326,7 +326,7 @@ void main() {
       minimalProperties.toStringDeep(),
       'SemanticsNode#1\n'
       '   Rect.fromLTRB(0.0, 0.0, 0.0, 0.0)\n'
-      '   invisible\n'
+      '   invisible\n',
     );
 
     expect(
@@ -354,7 +354,7 @@ void main() {
       '   scrollPosition: null\n'
       '   scrollExtentMax: null\n'
       '   elevation: 0.0\n'
-      '   thicknes: 0.0\n'
+      '   thicknes: 0.0\n',
     );
 
     final SemanticsConfiguration config = SemanticsConfiguration()
@@ -448,7 +448,7 @@ void main() {
       '   scrollPosition: null\n'
       '   scrollExtentMax: null\n'
       '   elevation: 0.0\n'
-      '   thicknes: 0.0\n'
+      '   thicknes: 0.0\n',
     );
 
   });
@@ -551,7 +551,7 @@ class TestRender extends RenderProxyBox {
     this.hasScrollUpAction = false,
     this.hasScrollDownAction = false,
     this.isSemanticBoundary,
-    RenderObject child
+    RenderObject child,
   }) : super(child);
 
   bool hasTapAction;
diff --git a/packages/flutter/test/services/message_codecs_test.dart b/packages/flutter/test/services/message_codecs_test.dart
index ab60c0dedcd..8df9863e8b4 100644
--- a/packages/flutter/test/services/message_codecs_test.dart
+++ b/packages/flutter/test/services/message_codecs_test.dart
@@ -32,7 +32,7 @@ void main() {
       final ByteData offsetByteData = ByteData.view(
           helloWorldByteData.buffer,
           helloByteData.lengthInBytes,
-          helloWorldByteData.lengthInBytes - helloByteData.lengthInBytes
+          helloWorldByteData.lengthInBytes - helloByteData.lengthInBytes,
       );
 
       expect(string.decodeMessage(offsetByteData), ' world');
@@ -182,7 +182,7 @@ void main() {
           double.minPositive,
           double.maxFinite,
           double.infinity,
-          double.nan
+          double.nan,
         ]),
         <dynamic>['nested', <dynamic>[]],
         <dynamic, dynamic>{ 'a': 'nested', null: <dynamic, dynamic>{} },
diff --git a/packages/flutter/test/services/platform_channel_test.dart b/packages/flutter/test/services/platform_channel_test.dart
index c9d218b2f8a..36f25eab3cf 100644
--- a/packages/flutter/test/services/platform_channel_test.dart
+++ b/packages/flutter/test/services/platform_channel_test.dart
@@ -28,7 +28,7 @@ void main() {
         const StringCodec().encodeMessage('hello'),
         (ByteData replyBinary) {
           reply = string.decodeMessage(replyBinary);
-        }
+        },
       );
       expect(reply, equals('hello world'));
     });
diff --git a/packages/flutter/test/services/text_input_test.dart b/packages/flutter/test/services/text_input_test.dart
index b435ac9a9c0..8f1da8198ea 100644
--- a/packages/flutter/test/services/text_input_test.dart
+++ b/packages/flutter/test/services/text_input_test.dart
@@ -26,7 +26,7 @@ void main() {
       );
       final Map<String, dynamic> json = configuration.toJson();
       expect(json['inputType'], <String, dynamic>{
-        'name': 'TextInputType.text', 'signed': null, 'decimal': null
+        'name': 'TextInputType.text', 'signed': null, 'decimal': null,
       });
       expect(json['obscureText'], true);
       expect(json['autocorrect'], false);
@@ -42,7 +42,7 @@ void main() {
       );
       final Map<String, dynamic> json = configuration.toJson();
       expect(json['inputType'], <String, dynamic>{
-        'name': 'TextInputType.number', 'signed': false, 'decimal': true
+        'name': 'TextInputType.number', 'signed': false, 'decimal': true,
       });
       expect(json['obscureText'], true);
       expect(json['autocorrect'], false);
diff --git a/packages/flutter/test/widgets/align_test.dart b/packages/flutter/test/widgets/align_test.dart
index c8054f713d1..6ed08106647 100644
--- a/packages/flutter/test/widgets/align_test.dart
+++ b/packages/flutter/test/widgets/align_test.dart
@@ -99,7 +99,7 @@ void main() {
           key: alignKey,
           child: Container(
             width: 10.0,
-            height: 10.0
+            height: 10.0,
           ),
           alignment: const Alignment(0.0, 0.0),
         ),
diff --git a/packages/flutter/test/widgets/animated_container_test.dart b/packages/flutter/test/widgets/animated_container_test.dart
index 568460111b8..e19de9d992d 100644
--- a/packages/flutter/test/widgets/animated_container_test.dart
+++ b/packages/flutter/test/widgets/animated_container_test.dart
@@ -41,7 +41,7 @@ void main() {
       AnimatedContainer(
         key: key,
         duration: const Duration(milliseconds: 200),
-        decoration: decorationA
+        decoration: decorationA,
       )
     );
 
@@ -53,7 +53,7 @@ void main() {
       AnimatedContainer(
         key: key,
         duration: const Duration(milliseconds: 200),
-        decoration: decorationB
+        decoration: decorationB,
       )
     );
 
@@ -224,8 +224,8 @@ void main() {
           duration: const Duration(milliseconds: 200),
           width: 100.0,
           height: 100.0,
-          child: const Text('X', textDirection: TextDirection.ltr)
-        )
+          child: const Text('X', textDirection: TextDirection.ltr),
+        ),
       )
     );
 
@@ -244,8 +244,8 @@ void main() {
           duration: const Duration(milliseconds: 200),
           width: 200.0,
           height: 200.0,
-          child: const Text('X', textDirection: TextDirection.ltr)
-        )
+          child: const Text('X', textDirection: TextDirection.ltr),
+        ),
       )
     );
     await tester.pump();
@@ -268,8 +268,8 @@ void main() {
           duration: const Duration(milliseconds: 200),
           width: 200.0,
           height: 100.0,
-          child: const Text('X', textDirection: TextDirection.ltr)
-        )
+          child: const Text('X', textDirection: TextDirection.ltr),
+        ),
       )
     );
     await tester.pump();
diff --git a/packages/flutter/test/widgets/aspect_ratio_test.dart b/packages/flutter/test/widgets/aspect_ratio_test.dart
index e9db7ce663c..b56b147bcaf 100644
--- a/packages/flutter/test/widgets/aspect_ratio_test.dart
+++ b/packages/flutter/test/widgets/aspect_ratio_test.dart
@@ -16,9 +16,9 @@ Future<Size> _getSize(WidgetTester tester, BoxConstraints constraints, double as
           aspectRatio: aspectRatio,
           child: Container(
             key: childKey
-          )
-        )
-      )
+          ),
+        ),
+      ),
     )
   );
   final RenderBox box = tester.renderObject(find.byKey(childKey));
@@ -42,10 +42,10 @@ void main() {
             aspectRatio: 2.0,
             child: Container(
               key: childKey
-            )
-          )
-        )
-      )
+            ),
+          ),
+        ),
+      ),
     ));
     final RenderBox box = tester.renderObject(find.byKey(childKey));
     expect(box.size, equals(const Size(1200.0, 600.0)));
diff --git a/packages/flutter/test/widgets/async_test.dart b/packages/flutter/test/widgets/async_test.dart
index 92bc5a8c5fb..d8af97a5daf 100644
--- a/packages/flutter/test/widgets/async_test.dart
+++ b/packages/flutter/test/widgets/async_test.dart
@@ -35,14 +35,14 @@ void main() {
     testWidgets('FutureBuilder', (WidgetTester tester) async {
       await tester.pumpWidget(FutureBuilder<String>(
         future: Future<String>.value('hello'),
-        builder: snapshotText
+        builder: snapshotText,
       ));
       await eventFiring(tester);
     });
     testWidgets('StreamBuilder', (WidgetTester tester) async {
       await tester.pumpWidget(StreamBuilder<String>(
         stream: Stream<String>.fromIterable(<String>['hello', 'world']),
-        builder: snapshotText
+        builder: snapshotText,
       ));
       await eventFiring(tester);
     });
@@ -57,12 +57,12 @@ void main() {
     testWidgets('gracefully handles transition from null future', (WidgetTester tester) async {
       final GlobalKey key = GlobalKey();
       await tester.pumpWidget(FutureBuilder<String>(
-        key: key, future: null, builder: snapshotText
+        key: key, future: null, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.none, null, null)'), findsOneWidget);
       final Completer<String> completer = Completer<String>();
       await tester.pumpWidget(FutureBuilder<String>(
-        key: key, future: completer.future, builder: snapshotText
+        key: key, future: completer.future, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.waiting, null, null)'), findsOneWidget);
     });
@@ -70,11 +70,11 @@ void main() {
       final GlobalKey key = GlobalKey();
       final Completer<String> completer = Completer<String>();
       await tester.pumpWidget(FutureBuilder<String>(
-        key: key, future: completer.future, builder: snapshotText
+        key: key, future: completer.future, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.waiting, null, null)'), findsOneWidget);
       await tester.pumpWidget(FutureBuilder<String>(
-        key: key, future: null, builder: snapshotText
+        key: key, future: null, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.none, null, null)'), findsOneWidget);
       completer.complete('hello');
@@ -86,11 +86,11 @@ void main() {
       final Completer<String> completerA = Completer<String>();
       final Completer<String> completerB = Completer<String>();
       await tester.pumpWidget(FutureBuilder<String>(
-        key: key, future: completerA.future, builder: snapshotText
+        key: key, future: completerA.future, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.waiting, null, null)'), findsOneWidget);
       await tester.pumpWidget(FutureBuilder<String>(
-        key: key, future: completerB.future, builder: snapshotText
+        key: key, future: completerB.future, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.waiting, null, null)'), findsOneWidget);
       completerB.complete('B');
@@ -101,7 +101,7 @@ void main() {
     testWidgets('tracks life-cycle of Future to success', (WidgetTester tester) async {
       final Completer<String> completer = Completer<String>();
       await tester.pumpWidget(FutureBuilder<String>(
-        future: completer.future, builder: snapshotText
+        future: completer.future, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.waiting, null, null)'), findsOneWidget);
       completer.complete('hello');
@@ -111,7 +111,7 @@ void main() {
     testWidgets('tracks life-cycle of Future to error', (WidgetTester tester) async {
       final Completer<String> completer = Completer<String>();
       await tester.pumpWidget(FutureBuilder<String>(
-        future: completer.future, builder: snapshotText
+        future: completer.future, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.waiting, null, null)'), findsOneWidget);
       completer.completeError('bad');
@@ -151,12 +151,12 @@ void main() {
     testWidgets('gracefully handles transition from null stream', (WidgetTester tester) async {
       final GlobalKey key = GlobalKey();
       await tester.pumpWidget(StreamBuilder<String>(
-        key: key, stream: null, builder: snapshotText
+        key: key, stream: null, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.none, null, null)'), findsOneWidget);
       final StreamController<String> controller = StreamController<String>();
       await tester.pumpWidget(StreamBuilder<String>(
-        key: key, stream: controller.stream, builder: snapshotText
+        key: key, stream: controller.stream, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.waiting, null, null)'), findsOneWidget);
     });
@@ -164,11 +164,11 @@ void main() {
       final GlobalKey key = GlobalKey();
       final StreamController<String> controller = StreamController<String>();
       await tester.pumpWidget(StreamBuilder<String>(
-        key: key, stream: controller.stream, builder: snapshotText
+        key: key, stream: controller.stream, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.waiting, null, null)'), findsOneWidget);
       await tester.pumpWidget(StreamBuilder<String>(
-        key: key, stream: null, builder: snapshotText
+        key: key, stream: null, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.none, null, null)'), findsOneWidget);
     });
@@ -177,11 +177,11 @@ void main() {
       final StreamController<String> controllerA = StreamController<String>();
       final StreamController<String> controllerB = StreamController<String>();
       await tester.pumpWidget(StreamBuilder<String>(
-        key: key, stream: controllerA.stream, builder: snapshotText
+        key: key, stream: controllerA.stream, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.waiting, null, null)'), findsOneWidget);
       await tester.pumpWidget(StreamBuilder<String>(
-        key: key, stream: controllerB.stream, builder: snapshotText
+        key: key, stream: controllerB.stream, builder: snapshotText,
       ));
       controllerB.add('B');
       controllerA.add('A');
@@ -192,7 +192,7 @@ void main() {
       final GlobalKey key = GlobalKey();
       final StreamController<String> controller = StreamController<String>();
       await tester.pumpWidget(StreamBuilder<String>(
-        key: key, stream: controller.stream, builder: snapshotText
+        key: key, stream: controller.stream, builder: snapshotText,
       ));
       expect(find.text('AsyncSnapshot<String>(ConnectionState.waiting, null, null)'), findsOneWidget);
       controller.add('1');
diff --git a/packages/flutter/test/widgets/automatic_keep_alive_test.dart b/packages/flutter/test/widgets/automatic_keep_alive_test.dart
index 68bfe864663..d9a60c904fd 100644
--- a/packages/flutter/test/widgets/automatic_keep_alive_test.dart
+++ b/packages/flutter/test/widgets/automatic_keep_alive_test.dart
@@ -612,7 +612,7 @@ class RenderSliverMultiBoxAdaptorAlt extends RenderSliver with
     RenderSliverWithKeepAliveMixin {
 
   RenderSliverMultiBoxAdaptorAlt({
-    RenderSliverBoxChildManager childManager
+    RenderSliverBoxChildManager childManager,
   }) : _childManager = childManager;
 
   @protected
diff --git a/packages/flutter/test/widgets/banner_test.dart b/packages/flutter/test/widgets/banner_test.dart
index 58eb350b6e5..7e440331fec 100644
--- a/packages/flutter/test/widgets/banner_test.dart
+++ b/packages/flutter/test/widgets/banner_test.dart
@@ -262,7 +262,7 @@ void main() {
       ..rect(rect: Rect.fromLTRB(-40.0, 28.0, 40.0, 40.0), color: const Color(0x7f000000), hasMaskFilter: true)
       ..rect(rect: Rect.fromLTRB(-40.0, 28.0, 40.0, 40.0), color: const Color(0xa0b71c1c), hasMaskFilter: false)
       ..paragraph(offset: const Offset(-40.0, 29.0))
-      ..restore()
+      ..restore(),
     );
     debugDisableShadows = true;
   });
@@ -277,7 +277,7 @@ void main() {
       ..rect(rect: Rect.fromLTRB(-40.0, 28.0, 40.0, 40.0), color: const Color(0x7f000000), hasMaskFilter: true)
       ..rect(rect: Rect.fromLTRB(-40.0, 28.0, 40.0, 40.0), color: const Color(0xa0b71c1c), hasMaskFilter: false)
       ..paragraph(offset: const Offset(-40.0, 29.0))
-      ..restore()
+      ..restore(),
     );
     debugDisableShadows = true;
   });
diff --git a/packages/flutter/test/widgets/basic_test.dart b/packages/flutter/test/widgets/basic_test.dart
index 3c7b894b055..a1d6b91f681 100644
--- a/packages/flutter/test/widgets/basic_test.dart
+++ b/packages/flutter/test/widgets/basic_test.dart
@@ -76,8 +76,8 @@ void main() {
                   color: const Color(0xFF0000FF)
                 ),
               ),
-            )
-          )
+            ),
+          ),
         )
       );
       expect(_pointerDown, isFalse);
@@ -106,8 +106,8 @@ void main() {
                   color: const Color(0xFF0000FF)
                 ),
               ),
-            )
-          )
+            ),
+          ),
         )
       );
       expect(_pointerDown, isFalse);
@@ -136,8 +136,8 @@ void main() {
                   color: const Color(0xFF0000FF)
                 ),
               ),
-            )
-          )
+            ),
+          ),
         )
       );
       expect(_pointerDown, isFalse);
diff --git a/packages/flutter/test/widgets/box_decoration_test.dart b/packages/flutter/test/widgets/box_decoration_test.dart
index b41b7ed8551..91098b48461 100644
--- a/packages/flutter/test/widgets/box_decoration_test.dart
+++ b/packages/flutter/test/widgets/box_decoration_test.dart
@@ -98,8 +98,8 @@ Future<void> main() async {
         decoration: BoxDecoration(
           shape: BoxShape.circle,
           border: Border.all(width: 10.0, color: const Color(0x80FF00FF)),
-          color: Colors.teal[600]
-        )
+          color: Colors.teal[600],
+        ),
       )
     );
   });
@@ -113,9 +113,9 @@ Future<void> main() async {
           decoration: BoxDecoration(border: Border.all(width: 10.0)),
           child: Container(
             width: 25.0,
-            height: 25.0
-          )
-        )
+            height: 25.0,
+          ),
+        ),
       )
     );
     expect(tester.getSize(find.byKey(key)), equals(const Size(45.0, 45.0)));
@@ -261,7 +261,7 @@ Future<void> main() async {
           bottomLeft: const Radius.circular(-10.0),
         ),
       )
-      ..circle(x: 400.0, y: 350.0, radius: 45.0)
+      ..circle(x: 400.0, y: 350.0, radius: 45.0),
     );
   });
 
@@ -284,7 +284,7 @@ Future<void> main() async {
           onTap: () {
             itemsTapped.add(1);
           },
-        )
+        ),
       );
     }
 
@@ -321,7 +321,7 @@ Future<void> main() async {
           onTap: () {
             itemsTapped.add(1);
           },
-        )
+        ),
       );
     }
 
diff --git a/packages/flutter/test/widgets/build_scope_test.dart b/packages/flutter/test/widgets/build_scope_test.dart
index c1407d76e9b..fbcebb852a3 100644
--- a/packages/flutter/test/widgets/build_scope_test.dart
+++ b/packages/flutter/test/widgets/build_scope_test.dart
@@ -140,7 +140,7 @@ void main() {
     await tester.pumpWidget(FlipWidget(
       key: flipKey,
       left: Container(),
-      right: ProbeWidget()
+      right: ProbeWidget(),
     ));
     expect(ProbeWidgetState.buildCount, equals(2));
     final FlipWidgetState flipState1 = flipKey.currentState;
diff --git a/packages/flutter/test/widgets/center_test.dart b/packages/flutter/test/widgets/center_test.dart
index 47e9766887a..dfbd0e54f08 100644
--- a/packages/flutter/test/widgets/center_test.dart
+++ b/packages/flutter/test/widgets/center_test.dart
@@ -10,7 +10,7 @@ void main() {
     await tester.pumpWidget(
       Directionality(
         textDirection: TextDirection.ltr,
-        child: ListView(children: const <Widget>[Center()])
+        child: ListView(children: const <Widget>[Center()]),
       ),
     );
   });
diff --git a/packages/flutter/test/widgets/clip_test.dart b/packages/flutter/test/widgets/clip_test.dart
index bfb69297066..006c0999440 100644
--- a/packages/flutter/test/widgets/clip_test.dart
+++ b/packages/flutter/test/widgets/clip_test.dart
@@ -48,7 +48,7 @@ void main() {
         child: GestureDetector(
           behavior: HitTestBehavior.opaque,
           onTap: () { log.add('tap'); },
-        )
+        ),
       )
     );
     expect(log, equals(<String>['getClip']));
@@ -68,7 +68,7 @@ void main() {
         child: GestureDetector(
           behavior: HitTestBehavior.opaque,
           onTap: () { log.add('tap'); },
-        )
+        ),
       )
     );
     expect(log, equals(<String>[]));
@@ -90,8 +90,8 @@ void main() {
           child: GestureDetector(
             behavior: HitTestBehavior.opaque,
             onTap: () { log.add('tap'); },
-          )
-        )
+          ),
+        ),
       )
     );
     expect(log, equals(<String>[]));
@@ -117,9 +117,9 @@ void main() {
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a']));
@@ -141,9 +141,9 @@ void main() {
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a', 'tap']));
@@ -159,9 +159,9 @@ void main() {
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a', 'tap', 'a']));
@@ -177,9 +177,9 @@ void main() {
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a', 'tap', 'a']));
@@ -195,9 +195,9 @@ void main() {
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a', 'tap', 'a', 'b']));
@@ -213,9 +213,9 @@ void main() {
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a', 'tap', 'a', 'b', 'c']));
@@ -239,12 +239,12 @@ void main() {
       ..save()
       ..path() // Placeholder
       ..restore()
-      ..restore()
+      ..restore(),
     );
     debugPaintSizeEnabled = true;
     expect(tester.renderObject(find.byType(ClipRect)).debugPaint, paints
       ..rect(rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0))
-      ..paragraph()
+      ..paragraph(),
     );
     debugPaintSizeEnabled = false;
   });
diff --git a/packages/flutter/test/widgets/column_test.dart b/packages/flutter/test/widgets/column_test.dart
index 18168cf0955..0fbfa79dc07 100644
--- a/packages/flutter/test/widgets/column_test.dart
+++ b/packages/flutter/test/widgets/column_test.dart
@@ -25,8 +25,8 @@ void main() {
           Container(key: child0Key, width: 100.0, height: 100.0),
           Expanded(child: Container(key: child1Key, width: 100.0, height: 100.0)),
           Container(key: child2Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -71,8 +71,8 @@ void main() {
           Container(key: child0Key, width: 100.0, height: 100.0),
           Container(key: child1Key, width: 100.0, height: 100.0),
           Container(key: child2Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -115,8 +115,8 @@ void main() {
         children: <Widget>[
           Container(key: child0Key, width: 100.0, height: 100.0),
           Container(key: child1Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -155,8 +155,8 @@ void main() {
           Container(key: child0Key, width: 100.0, height: 100.0),
           Container(key: child1Key, width: 100.0, height: 100.0),
           Container(key: child2Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -201,8 +201,8 @@ void main() {
           Container(key: child0Key, width: 100.0, height: 100.0),
           Container(key: child1Key, width: 100.0, height: 100.0),
           Container(key: child2Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -249,8 +249,8 @@ void main() {
           Container(key: child1Key, width: 100.0, height: 100.0),
           Container(key: child2Key, width: 100.0, height: 100.0),
           Container(key: child3Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -301,8 +301,8 @@ void main() {
           Container(key: child0Key, width: 100.0, height: 20.0),
           Container(key: child1Key, width: 100.0, height: 20.0),
           Container(key: child2Key, width: 100.0, height: 20.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -340,9 +340,9 @@ void main() {
         key: flexKey,
         children: <Widget>[
           Container(width: 100.0, height: 100.0),
-          Container(width: 100.0, height: 150.0)
-        ]
-      )
+          Container(width: 100.0, height: 150.0),
+        ],
+      ),
     ));
     RenderBox renderBox = tester.renderObject(find.byKey(flexKey));
     expect(renderBox.size.width, equals(100.0));
@@ -355,9 +355,9 @@ void main() {
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
           Container(width: 100.0, height: 100.0),
-          Container(width: 100.0, height: 150.0)
-        ]
-      )
+          Container(width: 100.0, height: 150.0),
+        ],
+      ),
     ));
     renderBox = tester.renderObject(find.byKey(flexKey));
     expect(renderBox.size.width, equals(100.0));
@@ -377,11 +377,11 @@ void main() {
             Container(
               key: childKey,
               width: 100.0,
-              height: 100.0
-            )
-          ]
-        )
-      )
+              height: 100.0,
+            ),
+          ],
+        ),
+      ),
     ));
 
     final RenderBox renderBox = tester.renderObject(find.byKey(childKey));
@@ -409,8 +409,8 @@ void main() {
           Container(key: child0Key, width: 100.0, height: 100.0),
           Expanded(child: Container(key: child1Key, width: 100.0, height: 100.0)),
           Container(key: child2Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -456,8 +456,8 @@ void main() {
           Container(key: child0Key, width: 100.0, height: 100.0),
           Container(key: child1Key, width: 100.0, height: 100.0),
           Container(key: child2Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -501,8 +501,8 @@ void main() {
         children: <Widget>[
           Container(key: child0Key, width: 100.0, height: 100.0),
           Container(key: child1Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -542,8 +542,8 @@ void main() {
           Container(key: child0Key, width: 100.0, height: 100.0),
           Container(key: child1Key, width: 100.0, height: 100.0),
           Container(key: child2Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -589,8 +589,8 @@ void main() {
           Container(key: child0Key, width: 100.0, height: 100.0),
           Container(key: child1Key, width: 100.0, height: 100.0),
           Container(key: child2Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -638,8 +638,8 @@ void main() {
           Container(key: child1Key, width: 100.0, height: 100.0),
           Container(key: child2Key, width: 100.0, height: 100.0),
           Container(key: child3Key, width: 100.0, height: 100.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -691,8 +691,8 @@ void main() {
           Container(key: child0Key, width: 100.0, height: 20.0),
           Container(key: child1Key, width: 100.0, height: 20.0),
           Container(key: child2Key, width: 100.0, height: 20.0),
-        ]
-      )
+        ],
+      ),
     ));
 
     RenderBox renderBox;
@@ -731,9 +731,9 @@ void main() {
         verticalDirection: VerticalDirection.up,
         children: <Widget>[
           Container(width: 100.0, height: 100.0),
-          Container(width: 100.0, height: 150.0)
-        ]
-      )
+          Container(width: 100.0, height: 150.0),
+        ],
+      ),
     ));
     RenderBox renderBox = tester.renderObject(find.byKey(flexKey));
     expect(renderBox.size.width, equals(100.0));
@@ -747,9 +747,9 @@ void main() {
         verticalDirection: VerticalDirection.up,
         children: <Widget>[
           Container(width: 100.0, height: 100.0),
-          Container(width: 100.0, height: 150.0)
-        ]
-      )
+          Container(width: 100.0, height: 150.0),
+        ],
+      ),
     ));
     renderBox = tester.renderObject(find.byKey(flexKey));
     expect(renderBox.size.width, equals(100.0));
@@ -770,11 +770,11 @@ void main() {
             Container(
               key: childKey,
               width: 100.0,
-              height: 100.0
-            )
-          ]
-        )
-      )
+              height: 100.0,
+            ),
+          ],
+        ),
+      ),
     ));
 
     final RenderBox renderBox = tester.renderObject(find.byKey(childKey));
diff --git a/packages/flutter/test/widgets/container_test.dart b/packages/flutter/test/widgets/container_test.dart
index 84947e636fc..f784853b7d6 100644
--- a/packages/flutter/test/widgets/container_test.dart
+++ b/packages/flutter/test/widgets/container_test.dart
@@ -38,7 +38,7 @@ void main() {
 
     await tester.pumpWidget(Align(
       alignment: Alignment.topLeft,
-      child: container
+      child: container,
     ));
 
     final RenderBox box = tester.renderObject(find.byType(Container));
@@ -47,7 +47,7 @@ void main() {
     expect(box, paints
       ..rect(rect: Rect.fromLTWH(5.0, 5.0, 53.0, 78.0), color: const Color(0xFF00FF00))
       ..rect(rect: Rect.fromLTWH(26.0, 43.0, 25.0, 33.0), color: const Color(0xFFFFFF00))
-      ..rect(rect: Rect.fromLTWH(5.0, 5.0, 53.0, 78.0), color: const Color(0x7F0000FF))
+      ..rect(rect: Rect.fromLTWH(5.0, 5.0, 53.0, 78.0), color: const Color(0x7F0000FF)),
     );
 
     expect(box, hasAGoodToStringDeep);
diff --git a/packages/flutter/test/widgets/custom_multi_child_layout_test.dart b/packages/flutter/test/widgets/custom_multi_child_layout_test.dart
index f7782f292b5..1aa039880bd 100644
--- a/packages/flutter/test/widgets/custom_multi_child_layout_test.dart
+++ b/packages/flutter/test/widgets/custom_multi_child_layout_test.dart
@@ -51,8 +51,8 @@ Widget buildFrame(MultiChildLayoutDelegate delegate) {
         LayoutId(id: 0, child: Container(width: 150.0, height: 100.0)),
         LayoutId(id: 1, child: Container(width: 100.0, height: 200.0)),
       ],
-      delegate: delegate
-    )
+      delegate: delegate,
+    ),
   );
 }
 
@@ -127,13 +127,13 @@ void main() {
                 LayoutId(id: 0, child: Container(width: 150.0, height: 100.0)),
                 LayoutId(id: 1, child: Container(width: 100.0, height: 200.0)),
               ],
-              delegate: delegate
-            )
+              delegate: delegate,
+            ),
           ),
           LayoutId(id: 1, child: Container(width: 100.0, height: 200.0)),
         ],
-        delegate: delegate
-      )
+        delegate: delegate,
+      ),
     ));
 
   });
@@ -143,8 +143,8 @@ void main() {
     await tester.pumpWidget(Center(
       child: CustomMultiChildLayout(
         key: key,
-        delegate: PreferredSizeDelegate(preferredSize: const Size(300.0, 200.0))
-      )
+        delegate: PreferredSizeDelegate(preferredSize: const Size(300.0, 200.0)),
+      ),
     ));
 
     final RenderBox box = tester.renderObject(find.byKey(key));
@@ -154,8 +154,8 @@ void main() {
     await tester.pumpWidget(Center(
       child: CustomMultiChildLayout(
         key: key,
-        delegate: PreferredSizeDelegate(preferredSize: const Size(350.0, 250.0))
-      )
+        delegate: PreferredSizeDelegate(preferredSize: const Size(350.0, 250.0)),
+      ),
     ));
 
     expect(box.size.width, equals(350.0));
diff --git a/packages/flutter/test/widgets/custom_paint_test.dart b/packages/flutter/test/widgets/custom_paint_test.dart
index 6877fd38496..26e5859cd3a 100644
--- a/packages/flutter/test/widgets/custom_paint_test.dart
+++ b/packages/flutter/test/widgets/custom_paint_test.dart
@@ -27,18 +27,18 @@ void main() {
     await tester.pumpWidget(CustomPaint(
       painter: TestCustomPainter(
         log: log,
-        name: 'background'
+        name: 'background',
       ),
       foregroundPainter: TestCustomPainter(
         log: log,
-        name: 'foreground'
+        name: 'foreground',
       ),
       child: CustomPaint(
         painter: TestCustomPainter(
           log: log,
-          name: 'child'
-        )
-      )
+          name: 'child',
+        ),
+      ),
     ));
 
     expect(log, equals(<String>['background', 'child', 'foreground']));
@@ -48,32 +48,32 @@ void main() {
     final GlobalKey target = GlobalKey();
 
     await tester.pumpWidget(Center(
-      child: CustomPaint(key: target)
+      child: CustomPaint(key: target),
     ));
     expect(target.currentContext.size, Size.zero);
 
     await tester.pumpWidget(Center(
-      child: CustomPaint(key: target, child: Container())
+      child: CustomPaint(key: target, child: Container()),
     ));
     expect(target.currentContext.size, const Size(800.0, 600.0));
 
     await tester.pumpWidget(Center(
-      child: CustomPaint(key: target, size: const Size(20.0, 20.0))
+      child: CustomPaint(key: target, size: const Size(20.0, 20.0)),
     ));
     expect(target.currentContext.size, const Size(20.0, 20.0));
 
     await tester.pumpWidget(Center(
-      child: CustomPaint(key: target, size: const Size(2000.0, 100.0))
+      child: CustomPaint(key: target, size: const Size(2000.0, 100.0)),
     ));
     expect(target.currentContext.size, const Size(800.0, 100.0));
 
     await tester.pumpWidget(Center(
-      child: CustomPaint(key: target, size: Size.zero, child: Container())
+      child: CustomPaint(key: target, size: Size.zero, child: Container()),
     ));
     expect(target.currentContext.size, const Size(800.0, 600.0));
 
     await tester.pumpWidget(Center(
-      child: CustomPaint(key: target, child: Container(height: 0.0, width: 0.0))
+      child: CustomPaint(key: target, child: Container(height: 0.0, width: 0.0)),
     ));
     expect(target.currentContext.size, Size.zero);
 
diff --git a/packages/flutter/test/widgets/custom_painter_test.dart b/packages/flutter/test/widgets/custom_painter_test.dart
index 2f730635bff..cc968fba737 100644
--- a/packages/flutter/test/widgets/custom_painter_test.dart
+++ b/packages/flutter/test/widgets/custom_painter_test.dart
@@ -365,7 +365,7 @@ void _defineTests() {
               rect: TestSemantics.fullScreen,
               actions: allActions.fold<int>(0, (int previous, SemanticsAction action) => previous | action.index),
             ),
-          ]
+          ],
         ),
       ],
     );
@@ -440,7 +440,7 @@ void _defineTests() {
                 rect: TestSemantics.fullScreen,
                 flags: flags,
               ),
-            ]
+            ],
         ),
       ],
     );
@@ -487,7 +487,7 @@ void _defineTests() {
                 rect: TestSemantics.fullScreen,
                 flags: flags,
               ),
-            ]
+            ],
         ),
       ],
     );
@@ -753,7 +753,7 @@ class _DiffTester {
         if (node.key != null && idAssignments[node.key] != null) {
           expect(idAssignments[node.key], node.id, reason:
             'Node with key ${node.key} was previously assigned ID ${idAssignments[node.key]}. '
-            'After diffing the child list, its ID changed to ${node.id}. IDs must be stable.'
+            'After diffing the child list, its ID changed to ${node.id}. IDs must be stable.',
           );
         }
         return true;
diff --git a/packages/flutter/test/widgets/dismissible_test.dart b/packages/flutter/test/widgets/dismissible_test.dart
index cc1feb62ac1..65265d51deb 100644
--- a/packages/flutter/test/widgets/dismissible_test.dart
+++ b/packages/flutter/test/widgets/dismissible_test.dart
@@ -160,7 +160,7 @@ Future<void> checkFlingItemBeforeMovementEnd(
   WidgetTester tester,
   int item, {
   @required AxisDirection gestureDirection,
-  DismissMethod mechanism = rollbackElement
+  DismissMethod mechanism = rollbackElement,
 }) async {
   assert(gestureDirection != null);
   final Finder itemFinder = find.text(item.toString());
@@ -176,7 +176,7 @@ Future<void> checkFlingItemAfterMovement(
   WidgetTester tester,
   int item, {
   @required AxisDirection gestureDirection,
-  DismissMethod mechanism = rollbackElement
+  DismissMethod mechanism = rollbackElement,
 }) async {
   assert(gestureDirection != null);
   final Finder itemFinder = find.text(item.toString());
diff --git a/packages/flutter/test/widgets/draggable_test.dart b/packages/flutter/test/widgets/draggable_test.dart
index 859205032a3..54bc5c5dc64 100644
--- a/packages/flutter/test/widgets/draggable_test.dart
+++ b/packages/flutter/test/widgets/draggable_test.dart
@@ -391,7 +391,7 @@ void main() {
             },
             onAccept: (int data) {
               events.add('drop $data');
-            }
+            },
           ),
           Container(height: 400.0),
           const Draggable<int>(
@@ -499,7 +499,7 @@ void main() {
             },
             onAccept: (int data) {
               events.add('drop $data');
-            }
+            },
           ),
           Container(width: 400.0),
           const Draggable<int>(
@@ -606,7 +606,7 @@ void main() {
               },
               onAccept: (int data) {
                 events.add('drop $data');
-              }
+              },
             ),
             Container(width: 400.0),
             const Draggable<int>(
@@ -733,7 +733,7 @@ void main() {
             feedback: const Text('Dragging'),
             onDraggableCanceled: (Velocity velocity, Offset offset) {
               onDraggableCanceledCalled = true;
-            }
+            },
           ),
           DragTarget<int>(
             builder: (BuildContext context, List<int> data, List<dynamic> rejects) {
@@ -804,7 +804,7 @@ void main() {
             builder: (BuildContext context, List<int> data, List<dynamic> rejects) {
               return Container(
                 height: 100.0,
-                child: const Text('Target')
+                child: const Text('Target'),
               );
             },
             onWillAccept: (int data) => false,
@@ -1156,10 +1156,10 @@ void main() {
               Draggable<int>(
                   data: 1,
                   child: Text('Source'),
-                  feedback: Text('Dragging')
+                  feedback: Text('Dragging'),
               ),
-            ]
-        )
+            ],
+        ),
     ));
 
     expect(events, isEmpty);
@@ -1594,7 +1594,7 @@ void main() {
           const Draggable<int>(
             data: 1,
             child: Text('Source'),
-            feedback: Text('Dragging')
+            feedback: Text('Dragging'),
           ),
           DragTarget<int>(
             builder: (BuildContext context, List<int> data, List<dynamic> rejects) {
@@ -1632,10 +1632,10 @@ void main() {
           Draggable<int>(
             data: 1,
             child: Text('Source'),
-            feedback: Text('Dragging')
+            feedback: Text('Dragging'),
           ),
-        ]
-      )
+        ],
+      ),
     ));
 
     expect(events, isEmpty);
@@ -1652,7 +1652,7 @@ void main() {
           const Draggable<int>(
             data: 1,
             child: Text('Source'),
-            feedback: Text('Dragging')
+            feedback: Text('Dragging'),
           ),
           DragTarget<int>(
             builder: (BuildContext context, List<int> data, List<dynamic> rejects) {
diff --git a/packages/flutter/test/widgets/editable_text_cursor_test.dart b/packages/flutter/test/widgets/editable_text_cursor_test.dart
index 357861900a0..53754dbfa4d 100644
--- a/packages/flutter/test/widgets/editable_text_cursor_test.dart
+++ b/packages/flutter/test/widgets/editable_text_cursor_test.dart
@@ -547,7 +547,7 @@ void main() {
     editableTextState.updateFloatingCursor(
       RawFloatingCursorPoint(
         state: FloatingCursorDragState.Update,
-        offset: const Offset(20, 20)
+        offset: const Offset(20, 20),
       ),
     );
     await tester.pump();
@@ -556,7 +556,7 @@ void main() {
       ..rrect(
         rrect: RRect.fromRectAndRadius(
           Rect.fromLTRB(463.3333435058594, 2.0833332538604736, 465.3333435058594, 14.083333015441895),
-          const Radius.circular(2.0)
+          const Radius.circular(2.0),
         ),
         color: const Color(0xff8e8e93),
       )
@@ -566,14 +566,14 @@ void main() {
           const Radius.circular(1.0),
         ),
         color: const Color(0xbf2196f3),
-      )
+      ),
     );
 
     // Moves the cursor right a few characters.
     editableTextState.updateFloatingCursor(
       RawFloatingCursorPoint(
         state: FloatingCursorDragState.Update,
-        offset: const Offset(-250, 20)
+        offset: const Offset(-250, 20),
       ),
     );
 
@@ -581,16 +581,16 @@ void main() {
       ..rrect(
         rrect: RRect.fromRectAndRadius(
           Rect.fromLTRB(191.3333282470703, 2.0833332538604736, 193.3333282470703, 14.083333015441895),
-          const Radius.circular(2.0)
+          const Radius.circular(2.0),
         ),
-        color: const Color(0xff8e8e93)
+        color: const Color(0xff8e8e93),
       )
       ..rrect(
         rrect: RRect.fromRectAndRadius(
           Rect.fromLTRB(193.83334350585938, 1.0833336114883423, 196.83334350585938, 15.083333969116211),
           const Radius.circular(1.0)),
         color: const Color(0xbf2196f3),
-      )
+      ),
     );
 
     editableTextState.updateFloatingCursor(RawFloatingCursorPoint(state: FloatingCursorDragState.End));
diff --git a/packages/flutter/test/widgets/editable_text_test.dart b/packages/flutter/test/widgets/editable_text_test.dart
index 2772703efaf..ade64bd06e6 100644
--- a/packages/flutter/test/widgets/editable_text_test.dart
+++ b/packages/flutter/test/widgets/editable_text_test.dart
@@ -905,7 +905,7 @@ void main() {
       semantics,
       includesNodeWith(flags: <SemanticsFlag>[
         SemanticsFlag.isTextField,
-        SemanticsFlag.isFocused
+        SemanticsFlag.isFocused,
       ]),
     );
 
@@ -1517,7 +1517,7 @@ void main() {
                     TestSemantics(
                       flags: <SemanticsFlag>[
                         SemanticsFlag.isTextField,
-                        SemanticsFlag.isObscured
+                        SemanticsFlag.isObscured,
                       ],
                       value: expectedValue,
                       textDirection: TextDirection.ltr,
@@ -1781,7 +1781,7 @@ void main() {
                         id: expectedNodeId,
                         flags: <SemanticsFlag>[
                           SemanticsFlag.isTextField,
-                          SemanticsFlag.isFocused
+                          SemanticsFlag.isFocused,
                         ],
                         actions: <SemanticsAction>[
                           SemanticsAction.moveCursorBackwardByCharacter,
@@ -1789,7 +1789,7 @@ void main() {
                           SemanticsAction.setSelection,
                           SemanticsAction.copy,
                           SemanticsAction.cut,
-                          SemanticsAction.paste
+                          SemanticsAction.paste,
                         ],
                         value: 'test',
                         textSelection: TextSelection.collapsed(
diff --git a/packages/flutter/test/widgets/ensure_visible_test.dart b/packages/flutter/test/widgets/ensure_visible_test.dart
index 6c654990a4f..dbc8baabf0a 100644
--- a/packages/flutter/test/widgets/ensure_visible_test.dart
+++ b/packages/flutter/test/widgets/ensure_visible_test.dart
@@ -466,7 +466,7 @@ void main() {
               ],
             ),
           ),
-        )
+        ),
       ));
 
       await prepare(321.0);
diff --git a/packages/flutter/test/widgets/fitted_box_test.dart b/packages/flutter/test/widgets/fitted_box_test.dart
index 9612c672c88..fa05086e337 100644
--- a/packages/flutter/test/widgets/fitted_box_test.dart
+++ b/packages/flutter/test/widgets/fitted_box_test.dart
@@ -21,9 +21,9 @@ void main() {
               key: inside,
               width: 100.0,
               height: 50.0,
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -57,9 +57,9 @@ void main() {
               key: inside,
               width: 100.0,
               height: 50.0,
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -93,9 +93,9 @@ void main() {
               key: inside,
               width: 100.0,
               height: 50.0,
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -461,11 +461,11 @@ void main() {
                 child: Container(
                   key: key1,
                   color: const Color(0xFF000000),
-                )
-              )
-            )
-          )
-        )
+                ),
+              ),
+            ),
+          ),
+        ),
       )
     );
     expect(_pointerDown, isFalse);
diff --git a/packages/flutter/test/widgets/flow_test.dart b/packages/flutter/test/widgets/flow_test.dart
index 90c31f35923..26654b48569 100644
--- a/packages/flutter/test/widgets/flow_test.dart
+++ b/packages/flutter/test/widgets/flow_test.dart
@@ -61,8 +61,8 @@ void main() {
           width: 100.0,
           height: 100.0,
           color: const Color(0xFF0000FF),
-          child: Text('$i', textDirection: TextDirection.ltr)
-        )
+          child: Text('$i', textDirection: TextDirection.ltr),
+        ),
       );
     }
 
@@ -77,7 +77,7 @@ void main() {
           buildBox(4),
           buildBox(5),
           buildBox(6),
-        ]
+        ],
       )
     );
 
@@ -107,7 +107,7 @@ void main() {
         delegate: OpacityFlowDelegate(opacity),
         children: <Widget>[
           Container(width: 100.0, height: 100.0),
-        ]
+        ],
       )
     );
     ContainerLayer layer = RendererBinding.instance.renderView.debugLayer;
diff --git a/packages/flutter/test/widgets/form_test.dart b/packages/flutter/test/widgets/form_test.dart
index 55606f17acf..73cf0307620 100644
--- a/packages/flutter/test/widgets/form_test.dart
+++ b/packages/flutter/test/widgets/form_test.dart
@@ -431,7 +431,7 @@ void main() {
                 child: remove ? Container() : TextFormField(
                   autofocus: true,
                   onSaved: (String value) { fieldValue = value; },
-                  validator: (String value) { return value.isEmpty ? null : 'yes'; }
+                  validator: (String value) { return value.isEmpty ? null : 'yes'; },
                 ),
               ),
             ),
diff --git a/packages/flutter/test/widgets/fractionally_sized_box_test.dart b/packages/flutter/test/widgets/fractionally_sized_box_test.dart
index b0579d745ea..1bde2dc0dbb 100644
--- a/packages/flutter/test/widgets/fractionally_sized_box_test.dart
+++ b/packages/flutter/test/widgets/fractionally_sized_box_test.dart
@@ -21,9 +21,9 @@ void main() {
           heightFactor: 0.25,
           child: Container(
             key: inner
-          )
-        )
-      )
+          ),
+        ),
+      ),
     ));
     final RenderBox box = inner.currentContext.findRenderObject();
     expect(box.size, equals(const Size(50.0, 25.0)));
diff --git a/packages/flutter/test/widgets/gesture_detector_semantics_test.dart b/packages/flutter/test/widgets/gesture_detector_semantics_test.dart
index 91b1f68e57f..e616be36e3c 100644
--- a/packages/flutter/test/widgets/gesture_detector_semantics_test.dart
+++ b/packages/flutter/test/widgets/gesture_detector_semantics_test.dart
@@ -28,7 +28,7 @@ void main() {
     );
 
     expect(semantics, includesNodeWith(
-        actions: <SemanticsAction>[SemanticsAction.scrollUp, SemanticsAction.scrollDown])
+        actions: <SemanticsAction>[SemanticsAction.scrollUp, SemanticsAction.scrollDown]),
     );
 
     final int detectorId = detectorKey.currentContext.findRenderObject().debugSemantics.id;
@@ -62,7 +62,7 @@ void main() {
     );
 
     expect(semantics, includesNodeWith(
-        actions: <SemanticsAction>[SemanticsAction.scrollLeft, SemanticsAction.scrollRight])
+        actions: <SemanticsAction>[SemanticsAction.scrollLeft, SemanticsAction.scrollRight]),
     );
 
     final int detectorId = detectorKey.currentContext.findRenderObject().debugSemantics.id;
diff --git a/packages/flutter/test/widgets/gesture_detector_test.dart b/packages/flutter/test/widgets/gesture_detector_test.dart
index 773d9d25048..bb4235d1418 100644
--- a/packages/flutter/test/widgets/gesture_detector_test.dart
+++ b/packages/flutter/test/widgets/gesture_detector_test.dart
@@ -378,7 +378,7 @@ void main() {
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
 
@@ -452,7 +452,7 @@ void main() {
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: maxPressure,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
 
@@ -504,7 +504,7 @@ void main() {
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
 
diff --git a/packages/flutter/test/widgets/gesture_disambiguation_test.dart b/packages/flutter/test/widgets/gesture_disambiguation_test.dart
index 1e838b54603..b881a4322c9 100644
--- a/packages/flutter/test/widgets/gesture_disambiguation_test.dart
+++ b/packages/flutter/test/widgets/gesture_disambiguation_test.dart
@@ -23,10 +23,10 @@ void main() {
           GestureDetector(
             onTap: () { detector2TapCount += 1; },
             behavior: HitTestBehavior.opaque,
-            child: const SizedBox(width: 200.0, height: 200.0)
-          )
+            child: const SizedBox(width: 200.0, height: 200.0),
+          ),
         ],
-      )
+      ),
     );
 
     await tester.pumpWidget(widget);
diff --git a/packages/flutter/test/widgets/global_keys_moving_test.dart b/packages/flutter/test/widgets/global_keys_moving_test.dart
index 45caaceb789..0b9ca28f932 100644
--- a/packages/flutter/test/widgets/global_keys_moving_test.dart
+++ b/packages/flutter/test/widgets/global_keys_moving_test.dart
@@ -40,7 +40,7 @@ class KeyedWrapper extends StatelessWidget {
       key: key1,
       child: StatefulLeaf(
         key: key2,
-      )
+      ),
     );
   }
 }
diff --git a/packages/flutter/test/widgets/heroes_test.dart b/packages/flutter/test/widgets/heroes_test.dart
index 23e64604608..403d1399e08 100644
--- a/packages/flutter/test/widgets/heroes_test.dart
+++ b/packages/flutter/test/widgets/heroes_test.dart
@@ -30,14 +30,14 @@ final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
         Container(height: 100.0, width: 100.0),
         FlatButton(
           child: const Text('two'),
-          onPressed: () { Navigator.pushNamed(context, '/two'); }
+          onPressed: () { Navigator.pushNamed(context, '/two'); },
         ),
         FlatButton(
           child: const Text('twoInset'),
-          onPressed: () { Navigator.pushNamed(context, '/twoInset'); }
+          onPressed: () { Navigator.pushNamed(context, '/twoInset'); },
         ),
-      ]
-    )
+      ],
+    ),
   ),
   '/two': (BuildContext context) => Material(
     child: ListView(
@@ -45,7 +45,7 @@ final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
       children: <Widget>[
         FlatButton(
           child: const Text('pop'),
-          onPressed: () { Navigator.pop(context); }
+          onPressed: () { Navigator.pop(context); },
         ),
         Container(height: 150.0, width: 150.0),
         Card(child: Hero(
@@ -58,8 +58,8 @@ final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
           child: const Text('three'),
           onPressed: () { Navigator.push(context, ThreeRoute()); },
         ),
-      ]
-    )
+      ],
+    ),
   ),
   // This route is the same as /two except that Hero 'a' is shifted to the right by
   // 50 pixels. When the hero's in-flight bounds between / and /twoInset are animated
@@ -71,7 +71,7 @@ final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
       children: <Widget>[
         FlatButton(
           child: const Text('pop'),
-          onPressed: () { Navigator.pop(context); }
+          onPressed: () { Navigator.pop(context); },
         ),
         Container(height: 150.0, width: 150.0),
         Card(
@@ -81,7 +81,7 @@ final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
               tag: 'a',
               transitionOnUserGestures: transitionFromUserGestures,
               child: Container(height: 150.0, width: 150.0, key: secondKey),
-            )
+            ),
           ),
         ),
         Container(height: 150.0, width: 150.0),
@@ -89,8 +89,8 @@ final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
           child: const Text('three'),
           onPressed: () { Navigator.push(context, ThreeRoute()); },
         ),
-      ]
-    )
+      ],
+    ),
   ),
 };
 
@@ -103,8 +103,8 @@ class ThreeRoute extends MaterialPageRoute<void> {
           Container(height: 200.0, width: 200.0),
           Card(child: Hero(tag: 'a', child: Container(height: 200.0, width: 200.0, key: thirdKey))),
           Container(height: 200.0, width: 200.0),
-        ]
-      )
+        ],
+      ),
     );
   });
 }
@@ -252,10 +252,10 @@ void main() {
             const Hero(tag: 'a', child: Text('foo')),
             Builder(builder: (BuildContext context) {
               return FlatButton(child: const Text('two'), onPressed: () => Navigator.push(context, route));
-            })
-          ]
-        )
-      )
+            }),
+          ],
+        ),
+      ),
     ));
 
     await tester.tap(find.text('two'));
@@ -285,25 +285,25 @@ void main() {
     await tester.pump(duration * 0.25);
     expect(
       tester.getSize(find.byKey(secondKey)).height,
-      closeTo(curve.transform(0.25) * deltaHeight + initialHeight, epsilon)
+      closeTo(curve.transform(0.25) * deltaHeight + initialHeight, epsilon),
     );
 
     await tester.pump(duration * 0.25);
     expect(
       tester.getSize(find.byKey(secondKey)).height,
-      closeTo(curve.transform(0.50) * deltaHeight + initialHeight, epsilon)
+      closeTo(curve.transform(0.50) * deltaHeight + initialHeight, epsilon),
     );
 
     await tester.pump(duration * 0.25);
     expect(
       tester.getSize(find.byKey(secondKey)).height,
-      closeTo(curve.transform(0.75) * deltaHeight + initialHeight, epsilon)
+      closeTo(curve.transform(0.75) * deltaHeight + initialHeight, epsilon),
     );
 
     await tester.pump(duration * 0.25);
     expect(
       tester.getSize(find.byKey(secondKey)).height,
-      closeTo(curve.transform(1.0) * deltaHeight + initialHeight, epsilon)
+      closeTo(curve.transform(1.0) * deltaHeight + initialHeight, epsilon),
     );
   });
 
@@ -321,10 +321,10 @@ void main() {
             child: Container(
               width: 100.0,
               height: 100.0,
-              child: const Text('foo')
-            )
-          )
-        )
+              child: const Text('foo'),
+            ),
+          ),
+        ),
       ),
       routes: <String, WidgetBuilder>{
         '/next': (BuildContext context) {
@@ -339,13 +339,13 @@ void main() {
                 child: Container(
                   width: 100.0,
                   height: 150.0,
-                  child: const Text('bar')
-                )
-              )
-            )
+                  child: const Text('bar'),
+                ),
+              ),
+            ),
           );
-        }
-      }
+        },
+      },
     ));
 
     expect(log, isEmpty);
@@ -627,10 +627,10 @@ void main() {
               ),
               FlatButton(
                 child: const Text('POP'),
-                onPressed: () { Navigator.pop(context); }
+                onPressed: () { Navigator.pop(context); },
               ),
             ],
-          )
+          ),
         );
       },
     );
@@ -648,7 +648,7 @@ void main() {
                   ),
                   FlatButton(
                     child: const Text('PUSH'),
-                    onPressed: () { Navigator.push(context, route); }
+                    onPressed: () { Navigator.push(context, route); },
                   ),
                 ],
               );
@@ -721,15 +721,15 @@ void main() {
               // This container will appear at Y=100
               Container(
                 key: routeContainerKey,
-                child: Hero(tag: 'H', child: Container(key: routeHeroKey, height: 200.0, width: 200.0))
+                child: Hero(tag: 'H', child: Container(key: routeHeroKey, height: 200.0, width: 200.0)),
               ),
               FlatButton(
                 child: const Text('POP'),
-                onPressed: () { Navigator.pop(context); }
+                onPressed: () { Navigator.pop(context); },
               ),
               const SizedBox(height: 600.0),
             ],
-          )
+          ),
         );
       },
     );
@@ -749,7 +749,7 @@ void main() {
                   ),
                   FlatButton(
                     child: const Text('PUSH'),
-                    onPressed: () { Navigator.push(context, route); }
+                    onPressed: () { Navigator.push(context, route); },
                   ),
                   const SizedBox(height: 600.0),
                 ],
@@ -804,11 +804,11 @@ void main() {
               // This container will appear at Y=100
               Container(
                 key: routeContainerKey,
-                child: Hero(tag: 'H', child: Container(key: routeHeroKey, height: 200.0, width: 200.0))
+                child: Hero(tag: 'H', child: Container(key: routeHeroKey, height: 200.0, width: 200.0)),
               ),
               const SizedBox(height: 800.0),
             ],
-          )
+          ),
         );
       },
     );
@@ -828,7 +828,7 @@ void main() {
                   ),
                   FlatButton(
                     child: const Text('PUSH'),
-                    onPressed: () { Navigator.push(context, route); }
+                    onPressed: () { Navigator.push(context, route); },
                   ),
                 ],
               );
@@ -880,11 +880,11 @@ void main() {
             children: <Widget>[
               // This container will appear at Y=0
               Container(
-                child: Hero(tag: 'BC', child: Container(key: heroBCKey, height: 150.0))
+                child: Hero(tag: 'BC', child: Container(key: heroBCKey, height: 150.0)),
               ),
               const SizedBox(height: 800.0),
             ],
-          )
+          ),
         );
       },
     );
@@ -898,18 +898,18 @@ void main() {
               const SizedBox(height: 100.0),
               // This container will appear at Y=100
               Container(
-                child: Hero(tag: 'AB', child: Container(key: heroABKey, height: 200.0))
+                child: Hero(tag: 'AB', child: Container(key: heroABKey, height: 200.0)),
               ),
               FlatButton(
                 child: const Text('PUSH C'),
-                onPressed: () { Navigator.push(context, routeC); }
+                onPressed: () { Navigator.push(context, routeC); },
               ),
               Container(
-                child: Hero(tag: 'BC', child: Container(height: 150.0))
+                child: Hero(tag: 'BC', child: Container(height: 150.0)),
               ),
               const SizedBox(height: 800.0),
             ],
-          )
+          ),
         );
       },
     );
@@ -929,7 +929,7 @@ void main() {
                   ),
                   FlatButton(
                     child: const Text('PUSH B'),
-                    onPressed: () { Navigator.push(context, routeB); }
+                    onPressed: () { Navigator.push(context, routeB); },
                   ),
                 ],
               );
@@ -990,10 +990,10 @@ void main() {
               ),
               FlatButton(
                 child: const Text('POP'),
-                onPressed: () { Navigator.pop(context); }
+                onPressed: () { Navigator.pop(context); },
               ),
             ],
-          )
+          ),
         );
       },
     );
@@ -1016,7 +1016,7 @@ void main() {
                   ),
                   FlatButton(
                     child: const Text('PUSH'),
-                    onPressed: () { Navigator.push(context, route); }
+                    onPressed: () { Navigator.push(context, route); },
                   ),
                 ],
               );
@@ -1073,10 +1073,10 @@ void main() {
             ),
             FlatButton(
               child: const Text('two'),
-              onPressed: () { Navigator.pushNamed(context, '/two'); }
+              onPressed: () { Navigator.pushNamed(context, '/two'); },
             ),
-          ]
-        )
+          ],
+        ),
       ),
       '/two': (BuildContext context) => Material(
         child: Column(
@@ -1086,7 +1086,7 @@ void main() {
               height: 200.0,
               child: FlatButton(
                 child: const Text('pop'),
-                onPressed: () { Navigator.pop(context); }
+                onPressed: () { Navigator.pop(context); },
               ),
             ),
             Hero(
diff --git a/packages/flutter/test/widgets/hyperlink_test.dart b/packages/flutter/test/widgets/hyperlink_test.dart
index 65992b959d7..122f2cdb93a 100644
--- a/packages/flutter/test/widgets/hyperlink_test.dart
+++ b/packages/flutter/test/widgets/hyperlink_test.dart
@@ -31,16 +31,16 @@ void main() {
             children: <TextSpan>[
               TextSpan(
                 text: 'xxxxxxxx',
-                recognizer: tapLeft
+                recognizer: tapLeft,
               ),
               const TextSpan(text: 'yyyyyyyy'),
               TextSpan(
                 text: 'zzzzzzzzz',
-                recognizer: tapRight
+                recognizer: tapRight,
               ),
             ]
-          )
-        )
+          ),
+        ),
       )
     );
 
diff --git a/packages/flutter/test/widgets/icon_test.dart b/packages/flutter/test/widgets/icon_test.dart
index f9d11b9af42..0d9e5f2333a 100644
--- a/packages/flutter/test/widgets/icon_test.dart
+++ b/packages/flutter/test/widgets/icon_test.dart
@@ -16,9 +16,9 @@ void main() {
         child: IconTheme(
           data: IconThemeData(
             color: Color(0xFF666666),
-            opacity: 0.5
+            opacity: 0.5,
           ),
-          child: Icon(IconData(0xd0a0, fontFamily: 'Arial'))
+          child: Icon(IconData(0xd0a0, fontFamily: 'Arial')),
         ),
       ),
     );
diff --git a/packages/flutter/test/widgets/image_icon_test.dart b/packages/flutter/test/widgets/image_icon_test.dart
index 676c530c609..706de55c400 100644
--- a/packages/flutter/test/widgets/image_icon_test.dart
+++ b/packages/flutter/test/widgets/image_icon_test.dart
@@ -14,7 +14,7 @@ void main() {
   testWidgets('ImageIcon sizing - no theme, default size', (WidgetTester tester) async {
     await tester.pumpWidget(
       const Center(
-        child: ImageIcon(_kImage)
+        child: ImageIcon(_kImage),
       )
     );
 
@@ -43,8 +43,8 @@ void main() {
       const Center(
         child: ImageIcon(
           null,
-          size: 96.0
-        )
+          size: 96.0,
+        ),
       )
     );
 
@@ -57,8 +57,8 @@ void main() {
       const Center(
         child: IconTheme(
           data: IconThemeData(size: 36.0),
-          child: ImageIcon(null)
-        )
+          child: ImageIcon(null),
+        ),
       )
     );
 
@@ -73,9 +73,9 @@ void main() {
           data: IconThemeData(size: 36.0),
           child: ImageIcon(
             null,
-            size: 48.0
-          )
-        )
+            size: 48.0,
+          ),
+        ),
       )
     );
 
@@ -88,8 +88,8 @@ void main() {
       const Center(
         child: IconTheme(
           data: IconThemeData(),
-          child: ImageIcon(null)
-        )
+          child: ImageIcon(null),
+        ),
       )
     );
 
@@ -105,7 +105,7 @@ void main() {
         child: Center(
           child: IconTheme(
             data: IconThemeData(),
-            child: ImageIcon(null, semanticLabel: 'test')
+            child: ImageIcon(null, semanticLabel: 'test'),
           ),
         ),
       ),
diff --git a/packages/flutter/test/widgets/image_resolution_test.dart b/packages/flutter/test/widgets/image_resolution_test.dart
index b342585da8a..0592624680e 100644
--- a/packages/flutter/test/widgets/image_resolution_test.dart
+++ b/packages/flutter/test/widgets/image_resolution_test.dart
@@ -125,7 +125,7 @@ Widget buildImageAtRatio(String image, Key key, double ratio, bool inferSize, [
     data: MediaQueryData(
       size: const Size(windowSize, windowSize),
       devicePixelRatio: ratio,
-      padding: const EdgeInsets.all(0.0)
+      padding: const EdgeInsets.all(0.0),
     ),
     child: DefaultAssetBundle(
       bundle: bundle ?? TestAssetBundle(),
@@ -134,7 +134,7 @@ Widget buildImageAtRatio(String image, Key key, double ratio, bool inferSize, [
           Image(
             key: key,
             excludeFromSemantics: true,
-            image: TestAssetImage(image)
+            image: TestAssetImage(image),
           ) :
           Image(
             key: key,
@@ -142,10 +142,10 @@ Widget buildImageAtRatio(String image, Key key, double ratio, bool inferSize, [
             image: TestAssetImage(image),
             height: imageSize,
             width: imageSize,
-            fit: BoxFit.fill
-          )
-      )
-    )
+            fit: BoxFit.fill,
+          ),
+      ),
+    ),
   );
 }
 
diff --git a/packages/flutter/test/widgets/image_rtl_test.dart b/packages/flutter/test/widgets/image_rtl_test.dart
index f338f18a775..6eb3d26a7d9 100644
--- a/packages/flutter/test/widgets/image_rtl_test.dart
+++ b/packages/flutter/test/widgets/image_rtl_test.dart
@@ -77,7 +77,7 @@ void main() {
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(52.0, 0.0, 68.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(68.0, 0.0, 84.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 0.0, 100.0, 9.0))
-      ..restore()
+      ..restore(),
     );
     expect(find.byType(Container), isNot(paints..scale()..scale()));
   });
@@ -113,7 +113,7 @@ void main() {
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(52.0, 0.0, 68.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(68.0, 0.0, 84.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 0.0, 100.0, 9.0))
-      ..restore()
+      ..restore(),
     );
     expect(find.byType(Container), isNot(paints..scale()));
   });
@@ -148,7 +148,7 @@ void main() {
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(64.0, 0.0, 80.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(80.0, 0.0, 96.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(96.0, 0.0, 112.0, 9.0))
-      ..restore()
+      ..restore(),
     );
     expect(find.byType(Container), isNot(paints..scale()));
   });
@@ -183,7 +183,7 @@ void main() {
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(52.0, 0.0, 68.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(68.0, 0.0, 84.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 0.0, 100.0, 9.0))
-      ..restore()
+      ..restore(),
     );
     expect(find.byType(Container), isNot(paints..scale()));
   });
@@ -214,7 +214,7 @@ void main() {
       ..scale(x: -1.0, y: 1.0)
       ..translate(x: -50.0, y: 0.0)
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(0.0, 20.5, 16.0, 29.5))
-      ..restore()
+      ..restore(),
     );
     expect(find.byType(Container), isNot(paints..scale()..scale()));
     expect(find.byType(Container), isNot(paints..drawImageRect()..drawImageRect()));
@@ -241,7 +241,7 @@ void main() {
       EnginePhase.layout, // so that we don't try to paint the fake images
     );
     expect(find.byType(Container), paints
-      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5))
+      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5)),
     );
     expect(find.byType(Container), isNot(paints..scale()));
     expect(find.byType(Container), isNot(paints..drawImageRect()..drawImageRect()));
@@ -259,7 +259,7 @@ void main() {
               image: DecorationImage(
                 image: TestImageProvider(),
                 alignment: Alignment.centerRight,
-                matchTextDirection: true
+                matchTextDirection: true,
               ),
             ),
           ),
@@ -269,7 +269,7 @@ void main() {
       EnginePhase.layout, // so that we don't try to paint the fake images
     );
     expect(find.byType(Container), paints
-      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5))
+      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5)),
     );
     expect(find.byType(Container), isNot(paints..scale()));
     expect(find.byType(Container), isNot(paints..drawImageRect()..drawImageRect()));
@@ -287,7 +287,7 @@ void main() {
               image: DecorationImage(
                 image: TestImageProvider(),
                 alignment: Alignment.centerRight,
-                matchTextDirection: true
+                matchTextDirection: true,
               ),
             ),
           ),
@@ -297,7 +297,7 @@ void main() {
       EnginePhase.layout, // so that we don't try to paint the fake images
     );
     expect(find.byType(Container), paints
-      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5))
+      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5)),
     );
     expect(find.byType(Container), isNot(paints..scale()));
     expect(find.byType(Container), isNot(paints..drawImageRect()..drawImageRect()));
@@ -335,7 +335,7 @@ void main() {
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(52.0, 0.0, 68.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(68.0, 0.0, 84.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 0.0, 100.0, 9.0))
-      ..restore()
+      ..restore(),
     );
     expect(find.byType(Container), isNot(paints..scale()..scale()));
   });
@@ -369,7 +369,7 @@ void main() {
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(52.0, 0.0, 68.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(68.0, 0.0, 84.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 0.0, 100.0, 9.0))
-      ..restore()
+      ..restore(),
     );
     expect(find.byType(Container), isNot(paints..scale()));
   });
@@ -402,7 +402,7 @@ void main() {
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(64.0, 0.0, 80.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(80.0, 0.0, 96.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(96.0, 0.0, 112.0, 9.0))
-      ..restore()
+      ..restore(),
     );
     expect(find.byType(Container), isNot(paints..scale()));
   });
@@ -435,7 +435,7 @@ void main() {
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(52.0, 0.0, 68.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(68.0, 0.0, 84.0, 9.0))
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 0.0, 100.0, 9.0))
-      ..restore()
+      ..restore(),
     );
     expect(find.byType(Container), isNot(paints..scale()));
   });
@@ -464,7 +464,7 @@ void main() {
       ..scale(x: -1.0, y: 1.0)
       ..translate(x: -50.0, y: 0.0)
       ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(0.0, 20.5, 16.0, 29.5))
-      ..restore()
+      ..restore(),
     );
     expect(find.byType(Container), isNot(paints..scale()..scale()));
     expect(find.byType(Container), isNot(paints..drawImageRect()..drawImageRect()));
@@ -489,7 +489,7 @@ void main() {
       EnginePhase.layout, // so that we don't try to paint the fake images
     );
     expect(find.byType(Container), paints
-      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5))
+      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5)),
     );
     expect(find.byType(Container), isNot(paints..scale()));
     expect(find.byType(Container), isNot(paints..drawImageRect()..drawImageRect()));
@@ -506,7 +506,7 @@ void main() {
             child: Image(
               image: TestImageProvider(),
               alignment: Alignment.centerRight,
-              matchTextDirection: true
+              matchTextDirection: true,
             ),
           ),
         ),
@@ -515,7 +515,7 @@ void main() {
       EnginePhase.layout, // so that we don't try to paint the fake images
     );
     expect(find.byType(Container), paints
-      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5))
+      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5)),
     );
     expect(find.byType(Container), isNot(paints..scale()));
     expect(find.byType(Container), isNot(paints..drawImageRect()..drawImageRect()));
@@ -532,7 +532,7 @@ void main() {
             child: Image(
               image: TestImageProvider(),
               alignment: Alignment.centerRight,
-              matchTextDirection: true
+              matchTextDirection: true,
             ),
           ),
         ),
@@ -541,7 +541,7 @@ void main() {
       EnginePhase.layout, // so that we don't try to paint the fake images
     );
     expect(find.byType(Container), paints
-      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5))
+      ..drawImageRect(source: Rect.fromLTRB(0.0, 0.0, 16.0, 9.0), destination: Rect.fromLTRB(84.0, 20.5, 100.0, 29.5)),
     );
     expect(find.byType(Container), isNot(paints..scale()));
     expect(find.byType(Container), isNot(paints..drawImageRect()..drawImageRect()));
diff --git a/packages/flutter/test/widgets/image_test.dart b/packages/flutter/test/widgets/image_test.dart
index 943c9b1e25e..a45eea95848 100644
--- a/packages/flutter/test/widgets/image_test.dart
+++ b/packages/flutter/test/widgets/image_test.dart
@@ -24,7 +24,7 @@ void main() {
         child: Image(
           image: imageProvider1,
           excludeFromSemantics: true,
-        )
+        ),
       ),
       null,
       EnginePhase.layout,
@@ -46,10 +46,10 @@ void main() {
         child: Image(
           image: imageProvider2,
           excludeFromSemantics: true,
-        )
+        ),
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
 
     renderImage = key.currentContext.findRenderObject();
@@ -66,10 +66,10 @@ void main() {
           gaplessPlayback: true,
           image: imageProvider1,
           excludeFromSemantics: true,
-        )
+        ),
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
     RenderImage renderImage = key.currentContext.findRenderObject();
     expect(renderImage.image, isNull);
@@ -89,10 +89,10 @@ void main() {
           gaplessPlayback: true,
           image: imageProvider2,
           excludeFromSemantics: true,
-        )
+        ),
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
 
     renderImage = key.currentContext.findRenderObject();
@@ -109,7 +109,7 @@ void main() {
         excludeFromSemantics: true,
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
     RenderImage renderImage = key.currentContext.findRenderObject();
     expect(renderImage.image, isNull);
@@ -129,7 +129,7 @@ void main() {
         excludeFromSemantics: true,
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
 
     renderImage = key.currentContext.findRenderObject();
@@ -147,7 +147,7 @@ void main() {
         excludeFromSemantics: true,
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
     RenderImage renderImage = key.currentContext.findRenderObject();
     expect(renderImage.image, isNull);
@@ -165,10 +165,10 @@ void main() {
         key: key,
         gaplessPlayback: true,
         excludeFromSemantics: true,
-        image: imageProvider2
+        image: imageProvider2,
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
 
     renderImage = key.currentContext.findRenderObject();
@@ -199,9 +199,9 @@ void main() {
           child: Image(
             excludeFromSemantics: true,
             key: imageKey,
-            image: imageProvider
+            image: imageProvider,
           ),
-        )
+        ),
       )
     );
 
@@ -226,9 +226,9 @@ void main() {
           child: Image(
             excludeFromSemantics: true,
             key: imageKey,
-            image: imageProvider
+            image: imageProvider,
           ),
-        )
+        ),
       )
     );
 
@@ -256,8 +256,8 @@ void main() {
             child: Image(
               excludeFromSemantics: true,
               key: imageKey,
-              image: imageProvider
-            )
+              image: imageProvider,
+            ),
           ),
           MediaQuery(
             key: mediaQueryKey1,
@@ -265,9 +265,9 @@ void main() {
               devicePixelRatio: 10.0,
               padding: EdgeInsets.zero,
             ),
-            child: Container(width: 100.0)
-          )
-        ]
+            child: Container(width: 100.0),
+          ),
+        ],
       )
     );
 
@@ -283,7 +283,7 @@ void main() {
               devicePixelRatio: 5.0,
               padding: EdgeInsets.zero,
             ),
-            child: Container(width: 100.0)
+            child: Container(width: 100.0),
           ),
           MediaQuery(
             key: mediaQueryKey1,
@@ -294,10 +294,10 @@ void main() {
             child: Image(
               excludeFromSemantics: true,
               key: imageKey,
-              image: imageProvider
-            )
-          )
-        ]
+              image: imageProvider,
+            ),
+          ),
+        ],
       )
     );
 
@@ -643,7 +643,7 @@ void main() {
         excludeFromSemantics: true,
         image: TestImageProvider(),
         color: const Color(0xFF00FF00),
-        colorBlendMode: BlendMode.clear
+        colorBlendMode: BlendMode.clear,
       )
     );
     final RenderImage renderer = tester.renderObject<RenderImage>(find.byType(Image));
@@ -758,11 +758,11 @@ void main() {
             key: key,
             child: Image(
                 excludeFromSemantics: true,
-                image: imageProvider1
-            )
+                image: imageProvider1,
+            ),
         ),
         null,
-        EnginePhase.layout
+        EnginePhase.layout,
     );
     RenderImage renderImage = key.currentContext.findRenderObject();
     expect(renderImage.image, isNull);
@@ -782,11 +782,11 @@ void main() {
             key: key,
             child: Image(
               excludeFromSemantics: true,
-              image: imageProvider2
-            )
+              image: imageProvider2,
+            ),
         ),
         null,
-        EnginePhase.layout
+        EnginePhase.layout,
     );
 
     renderImage = key.currentContext.findRenderObject();
@@ -838,7 +838,7 @@ void main() {
           rect: Rect.fromLTWH(0.0, 0.0, 100.0, 100.0),
           textDirection: TextDirection.ltr,
           flags: <SemanticsFlag>[SemanticsFlag.isImage],
-        )
+        ),
       ]
     ), ignoreTransform: true));
     semantics.dispose();
diff --git a/packages/flutter/test/widgets/implicit_animations_test.dart b/packages/flutter/test/widgets/implicit_animations_test.dart
index 73e6e82bc79..9759fb5ce02 100644
--- a/packages/flutter/test/widgets/implicit_animations_test.dart
+++ b/packages/flutter/test/widgets/implicit_animations_test.dart
@@ -9,7 +9,7 @@ void main() {
   testWidgets('BoxConstraintsTween control test', (WidgetTester tester) async {
     final BoxConstraintsTween tween = BoxConstraintsTween(
       begin: BoxConstraints.tight(const Size(20.0, 50.0)),
-      end: BoxConstraints.tight(const Size(10.0, 30.0))
+      end: BoxConstraints.tight(const Size(10.0, 30.0)),
     );
     final BoxConstraints result = tween.lerp(0.25);
     expect(result.minWidth, 17.5);
@@ -21,7 +21,7 @@ void main() {
   testWidgets('DecorationTween control test', (WidgetTester tester) async {
     final DecorationTween tween = DecorationTween(
       begin: const BoxDecoration(color: Color(0xFF00FF00)),
-      end: const BoxDecoration(color: Color(0xFFFFFF00))
+      end: const BoxDecoration(color: Color(0xFFFFFF00)),
     );
     final BoxDecoration result = tween.lerp(0.25);
     expect(result.color, const Color(0xFF3FFF00));
@@ -30,7 +30,7 @@ void main() {
   testWidgets('EdgeInsetsTween control test', (WidgetTester tester) async {
     final EdgeInsetsTween tween = EdgeInsetsTween(
       begin: const EdgeInsets.symmetric(vertical: 50.0),
-      end: const EdgeInsets.only(top: 10.0, bottom: 30.0)
+      end: const EdgeInsets.only(top: 10.0, bottom: 30.0),
     );
     final EdgeInsets result = tween.lerp(0.25);
     expect(result.left, 0.0);
@@ -42,7 +42,7 @@ void main() {
   testWidgets('Matrix4Tween control test', (WidgetTester tester) async {
     final Matrix4Tween tween = Matrix4Tween(
       begin: Matrix4.translationValues(10.0, 20.0, 30.0),
-      end: Matrix4.translationValues(14.0, 24.0, 34.0)
+      end: Matrix4.translationValues(14.0, 24.0, 34.0),
     );
     final Matrix4 result = tween.lerp(0.25);
     expect(result, equals(Matrix4.translationValues(11.0, 21.0, 31.0)));
diff --git a/packages/flutter/test/widgets/independent_widget_layout_test.dart b/packages/flutter/test/widgets/independent_widget_layout_test.dart
index b1861fd9937..19d45dde9af 100644
--- a/packages/flutter/test/widgets/independent_widget_layout_test.dart
+++ b/packages/flutter/test/widgets/independent_widget_layout_test.dart
@@ -35,7 +35,7 @@ class OffscreenWidgetTree {
     root = RenderObjectToWidgetAdapter<RenderBox>(
       container: renderView,
       debugShortDescription: '[root]',
-      child: app
+      child: app,
     ).attachToRenderTree(buildOwner, root);
     pumpFrame();
   }
diff --git a/packages/flutter/test/widgets/inherited_test.dart b/packages/flutter/test/widgets/inherited_test.dart
index 91a162b3ff7..c8e64ea67ab 100644
--- a/packages/flutter/test/widgets/inherited_test.dart
+++ b/packages/flutter/test/widgets/inherited_test.dart
@@ -98,8 +98,8 @@ void main() {
               log.add(context.inheritFromWidgetOfExactType(TestInherited));
               return Container();
             }
-          )
-        )
+          ),
+        ),
       );
     }
 
@@ -136,11 +136,11 @@ void main() {
                             log.add('a: ${v.value}');
                             return const Text('', textDirection: TextDirection.ltr);
                           }
-                        )
-                      )
-                    )
-                  )
-                )
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
               ),
               right: Container(
                 child: ValueInherited(
@@ -153,14 +153,14 @@ void main() {
                           log.add('b: ${v.value}');
                           return const Text('', textDirection: TextDirection.ltr);
                         }
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
       )
     );
 
@@ -211,11 +211,11 @@ void main() {
                             log.add('a: ${v.value}');
                             return const Text('', textDirection: TextDirection.ltr);
                           }
-                        )
-                      )
-                    )
-                  )
-                )
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
               ),
               right: Container(
                 child: ValueInherited(
@@ -229,14 +229,14 @@ void main() {
                           log.add('b: ${v.value}');
                           return const Text('', textDirection: TextDirection.ltr);
                         }
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
       )
     );
 
@@ -288,11 +288,11 @@ void main() {
                       value: 3,
                       child: Container(
                         key: key,
-                        child: child
-                      )
-                    )
-                  )
-                )
+                        child: child,
+                      ),
+                    ),
+                  ),
+                ),
               ),
               right: Container(
                 child: ValueInherited(
@@ -300,14 +300,14 @@ void main() {
                   child: Container(
                     child: Container(
                       key: key,
-                      child: child
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
+                      child: child,
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
       )
     );
 
@@ -342,7 +342,7 @@ void main() {
         final ValueInherited v = context.inheritFromWidgetOfExactType(ValueInherited);
         log.add(v.value);
         return const Text('', textDirection: TextDirection.ltr);
-      }
+      },
     );
 
     await tester.pumpWidget(
@@ -351,10 +351,10 @@ void main() {
         child: FlipWidget(
           left: ValueInherited(
             value: 3,
-            child: child
+            child: child,
           ),
-          right: child
-        )
+          right: child,
+        ),
       )
     );
 
@@ -390,7 +390,7 @@ void main() {
           inheritedValue = widget?.value;
           return Container();
         }
-      )
+      ),
     );
 
     await tester.pumpWidget(
@@ -402,7 +402,7 @@ void main() {
     await tester.pumpWidget(
       ValueInherited(
         value: 3,
-        child: inner
+        child: inner,
       )
     );
     expect(inheritedValue, equals(3));
@@ -418,7 +418,7 @@ void main() {
           buildCount += 1;
           return Container();
         }
-      )
+      ),
     );
 
     await tester.pumpWidget(
@@ -429,7 +429,7 @@ void main() {
     await tester.pumpWidget(
       ValueInherited(
         value: 3,
-        child: inner
+        child: inner,
       )
     );
     expect(buildCount, equals(1));
@@ -448,8 +448,8 @@ void main() {
             buildCount += 1;
             return Container();
           }
-        )
-      )
+        ),
+      ),
     );
 
     await tester.pumpWidget(
@@ -460,7 +460,7 @@ void main() {
     await tester.pumpWidget(
       ValueInherited(
         value: 3,
-        child: inner
+        child: inner,
       )
     );
     expect(buildCount, equals(2));
diff --git a/packages/flutter/test/widgets/invert_colors_test.dart b/packages/flutter/test/widgets/invert_colors_test.dart
index d5d7d64a22b..7a10975b68a 100644
--- a/packages/flutter/test/widgets/invert_colors_test.dart
+++ b/packages/flutter/test/widgets/invert_colors_test.dart
@@ -53,7 +53,7 @@ class InvertColorTestWidget extends LeafRenderObjectWidget {
   const InvertColorTestWidget({
     this.color,
     this.filter,
-    Key key
+    Key key,
   }) : super(key: key);
 
   final Color color;
diff --git a/packages/flutter/test/widgets/layout_builder_and_parent_data_test.dart b/packages/flutter/test/widgets/layout_builder_and_parent_data_test.dart
index 1d717e7665a..bd0002d559b 100644
--- a/packages/flutter/test/widgets/layout_builder_and_parent_data_test.dart
+++ b/packages/flutter/test/widgets/layout_builder_and_parent_data_test.dart
@@ -34,8 +34,8 @@ class SizeChangerState extends State<SizeChanger> {
         SizedBox(
           height: _flag ? 50.0 : 100.0,
           width: 100.0,
-          child: widget.child
-        )
+          child: widget.child,
+        ),
       ],
     );
   }
@@ -64,7 +64,7 @@ void main() {
           flex: frame, // this is different after the next pump, so that the parentData has to be applied again
           child: Container(height: 100.0),
         )]);
-      })
+      }),
     ));
     frame += 1;
     tester.state<SizeChangerState>(find.byType(SizeChanger)).trigger();
diff --git a/packages/flutter/test/widgets/layout_builder_mutations_test.dart b/packages/flutter/test/widgets/layout_builder_mutations_test.dart
index 19e6b0d4cef..28788a8b4cd 100644
--- a/packages/flutter/test/widgets/layout_builder_mutations_test.dart
+++ b/packages/flutter/test/widgets/layout_builder_mutations_test.dart
@@ -10,7 +10,7 @@ import 'package:flutter_test/flutter_test.dart';
 class Wrapper extends StatelessWidget {
   const Wrapper({
     Key key,
-    @required this.child
+    @required this.child,
   }) : assert(child != null),
        super(key: key);
 
@@ -36,10 +36,10 @@ void main() {
           child: Wrapper(
             child: LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
               return Wrapper(
-                child: SizedBox(key: victimKey)
+                child: SizedBox(key: victimKey),
               );
-            })
-          )
+            }),
+          ),
         ),
       ],
     ));
@@ -50,16 +50,16 @@ void main() {
         Wrapper(
           child: LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
             return Wrapper(
-              child: SizedBox(key: victimKey)
+              child: SizedBox(key: victimKey),
             );
-          })
+          }),
         ),
         Wrapper(
           child: Wrapper(
             child: LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
               return const SizedBox();
-            })
-          )
+            }),
+          ),
         ),
       ],
     ));
diff --git a/packages/flutter/test/widgets/layout_builder_test.dart b/packages/flutter/test/widgets/layout_builder_test.dart
index 1babfa49fea..9cc7a98a903 100644
--- a/packages/flutter/test/widgets/layout_builder_test.dart
+++ b/packages/flutter/test/widgets/layout_builder_test.dart
@@ -23,11 +23,11 @@ void main() {
               return SizedBox(
                 key: childKey,
                 width: layoutBuilderSize.width / 2.0,
-                height: layoutBuilderSize.height / 2.0
+                height: layoutBuilderSize.height / 2.0,
               );
-            }
-          )
-        )
+            },
+          ),
+        ),
       )
     );
 
@@ -58,12 +58,12 @@ void main() {
                 return SizedBox(
                   key: childKey,
                   width: childWidth,
-                  height: childHeight
+                  height: childHeight,
                 );
               }
             );
-          }
-        )
+          },
+        ),
       )
     );
 
@@ -105,13 +105,13 @@ void main() {
                   return SizedBox(
                     key: childKey,
                     width: layoutBuilderSize.width,
-                    height: layoutBuilderSize.height
+                    height: layoutBuilderSize.height,
                   );
                 }
-              )
+              ),
             );
           }
-        )
+        ),
       )
     );
 
@@ -141,13 +141,13 @@ void main() {
 
     await tester.pumpWidget(MediaQuery(
       data: const MediaQueryData(size: Size(400.0, 300.0)),
-      child: target
+      child: target,
     ));
     expect(built, 1);
 
     await tester.pumpWidget(MediaQuery(
       data: const MediaQueryData(size: Size(300.0, 400.0)),
-      child: target
+      child: target,
     ));
     expect(built, 1);
   });
@@ -165,13 +165,13 @@ void main() {
 
     await tester.pumpWidget(MediaQuery(
       data: const MediaQueryData(size: Size(400.0, 300.0)),
-      child: target
+      child: target,
     ));
     expect(built, 1);
 
     await tester.pumpWidget(MediaQuery(
       data: const MediaQueryData(size: Size(300.0, 400.0)),
-      child: target
+      child: target,
     ));
     expect(built, 2);
   });
diff --git a/packages/flutter/test/widgets/list_view_builder_test.dart b/packages/flutter/test/widgets/list_view_builder_test.dart
index d50e3e23719..52261c569c8 100644
--- a/packages/flutter/test/widgets/list_view_builder_test.dart
+++ b/packages/flutter/test/widgets/list_view_builder_test.dart
@@ -74,7 +74,7 @@ void main() {
         key: ValueKey<int>(index),
         width: 500.0, // this should be ignored
         height: 400.0, // should be overridden by itemExtent
-        child: Text('$index', textDirection: TextDirection.ltr)
+        child: Text('$index', textDirection: TextDirection.ltr),
       );
     };
 
diff --git a/packages/flutter/test/widgets/list_view_horizontal_test.dart b/packages/flutter/test/widgets/list_view_horizontal_test.dart
index 6e3174c0dbc..b8a58621f4d 100644
--- a/packages/flutter/test/widgets/list_view_horizontal_test.dart
+++ b/packages/flutter/test/widgets/list_view_horizontal_test.dart
@@ -21,7 +21,7 @@ Widget buildFrame({ bool reverse = false, @required TextDirection textDirection
           physics: const BouncingScrollPhysics(),
           children: items.map<Widget>((int item) {
             return Container(
-              child: Text('$item')
+              child: Text('$item'),
             );
           }).toList(),
         ),
diff --git a/packages/flutter/test/widgets/list_view_misc_test.dart b/packages/flutter/test/widgets/list_view_misc_test.dart
index d2755946f7e..4b1ba5c87eb 100644
--- a/packages/flutter/test/widgets/list_view_misc_test.dart
+++ b/packages/flutter/test/widgets/list_view_misc_test.dart
@@ -84,7 +84,7 @@ void main() {
               child: Container(
                 height: 350.0, // more than half the height of the test area
                 color: const Color(0xFF00FF00),
-              )
+              ),
             ),
             GestureDetector(
               onTap: () { second += 1; },
@@ -157,7 +157,7 @@ void main() {
       firstIndex: 3,
       lastIndex: 4,
       leadingScrollOffset: 25.0,
-      trailingScrollOffset: 26.0
+      trailingScrollOffset: 26.0,
     );
     expect(maxScrollOffset, equals(26.0));
   });
@@ -182,19 +182,19 @@ void main() {
                   SizedBox(
                     height: 150.0,
                     child: Center(
-                      child: Text('top')
+                      child: Text('top'),
                     ),
                   ),
                   SizedBox(
                     height: 200.0,
                     child: Center(
-                      child: Text('middle')
+                      child: Text('middle'),
                     ),
                   ),
                   SizedBox(
                     height: 150.0,
                     child: Center(
-                      child: Text('bottom')
+                      child: Text('bottom'),
                     ),
                   ),
                 ],
diff --git a/packages/flutter/test/widgets/list_view_relayout_test.dart b/packages/flutter/test/widgets/list_view_relayout_test.dart
index d56b3853938..0c8c856e69b 100644
--- a/packages/flutter/test/widgets/list_view_relayout_test.dart
+++ b/packages/flutter/test/widgets/list_view_relayout_test.dart
@@ -97,7 +97,7 @@ void main() {
       Directionality(
         textDirection: TextDirection.ltr,
         child: ListView(
-          children: const <Widget>[]
+          children: const <Widget>[],
         ),
       ),
     );
@@ -138,7 +138,7 @@ void main() {
       Directionality(
         textDirection: TextDirection.ltr,
         child: ListView(
-          children: const <Widget>[]
+          children: const <Widget>[],
         ),
       ),
     );
diff --git a/packages/flutter/test/widgets/list_view_test.dart b/packages/flutter/test/widgets/list_view_test.dart
index 5c1c420daf2..d7d1f269723 100644
--- a/packages/flutter/test/widgets/list_view_test.dart
+++ b/packages/flutter/test/widgets/list_view_test.dart
@@ -324,7 +324,7 @@ void main() {
             child: Text('$i', textDirection: TextDirection.ltr),
           );
         },
-      )
+      ),
     );
 
     await tester.pumpWidget(
@@ -526,7 +526,7 @@ void main() {
       children: <Matcher>[
         matchesSemantics(
           children: <Matcher>[
-            matchesSemantics(hasImplicitScrolling: true)
+            matchesSemantics(hasImplicitScrolling: true),
           ],
         ),
       ],
diff --git a/packages/flutter/test/widgets/list_view_vertical_test.dart b/packages/flutter/test/widgets/list_view_vertical_test.dart
index 617be7eb634..362fc34591c 100644
--- a/packages/flutter/test/widgets/list_view_vertical_test.dart
+++ b/packages/flutter/test/widgets/list_view_vertical_test.dart
@@ -15,7 +15,7 @@ Widget buildFrame() {
       scrollDirection: Axis.vertical,
       children: items.map<Widget>((int item) {
         return Container(
-          child: Text('$item')
+          child: Text('$item'),
         );
       }).toList(),
     ),
@@ -76,7 +76,7 @@ void main() {
           scrollDirection: Axis.vertical,
           children: items.map<Widget>((int item) {
             return Container(
-              child: Text('$item')
+              child: Text('$item'),
             );
           }).toList(),
         ),
diff --git a/packages/flutter/test/widgets/list_view_viewporting_test.dart b/packages/flutter/test/widgets/list_view_viewporting_test.dart
index e655acbc9f9..84199cffa55 100644
--- a/packages/flutter/test/widgets/list_view_viewporting_test.dart
+++ b/packages/flutter/test/widgets/list_view_viewporting_test.dart
@@ -42,7 +42,7 @@ void main() {
 
     expect(callbackTracker, equals(<int>[
       0, 1, 2, 3, 4, 5, // visible
-      6, 7, 8 // in cached area
+      6, 7, 8, // in cached area
     ]));
 
     callbackTracker.clear();
@@ -109,7 +109,7 @@ void main() {
     expect(callbackTracker, equals(<int>[
       0, 1, 2,
       3, 4, 5, //visible
-      6, 7
+      6, 7,
     ]));
     callbackTracker.clear();
 
@@ -189,7 +189,7 @@ void main() {
         key: ValueKey<int>(index),
         width: 500.0, // this should be ignored
         height: 220.0,
-        child: Text('$index', textDirection: TextDirection.ltr)
+        child: Text('$index', textDirection: TextDirection.ltr),
       );
     };
 
@@ -452,9 +452,9 @@ void main() {
                       Container(height: 80.0, child: text),
                       Container(height: 70.0, child: text),
                     ],
-                  )
+                  ),
               ),
-            )
+            ),
         )
     );
 
@@ -483,9 +483,9 @@ void main() {
                                   child: const Text('hey'),
                                 )).childrenDelegate),
                       ],
-                    )
-                )
-            )
+                    ),
+                ),
+            ),
         )
     );
 
diff --git a/packages/flutter/test/widgets/list_view_with_inherited_test.dart b/packages/flutter/test/widgets/list_view_with_inherited_test.dart
index e699aa2e415..86539a363a6 100644
--- a/packages/flutter/test/widgets/list_view_with_inherited_test.dart
+++ b/packages/flutter/test/widgets/list_view_with_inherited_test.dart
@@ -15,8 +15,8 @@ Widget buildCard(BuildContext context, int index) {
     height: 100.0,
     child: DefaultTextStyle(
       style: TextStyle(fontSize: 2.0 + items.length.toDouble()),
-      child: Text('${items[index]}', textDirection: TextDirection.ltr)
-    )
+      child: Text('${items[index]}', textDirection: TextDirection.ltr),
+    ),
   );
 }
 
diff --git a/packages/flutter/test/widgets/list_wheel_scroll_view_test.dart b/packages/flutter/test/widgets/list_wheel_scroll_view_test.dart
index a374b9b3be1..65a5ba886f9 100644
--- a/packages/flutter/test/widgets/list_wheel_scroll_view_test.dart
+++ b/packages/flutter/test/widgets/list_wheel_scroll_view_test.dart
@@ -96,13 +96,13 @@ void main() {
       // The first item is at the center of the viewport.
       expect(
       tester.getTopLeft(find.widgetWithText(Container, '0')),
-      const Offset(0.0, 250.0)
+      const Offset(0.0, 250.0),
       );
 
       // The last item is just before the first item.
       expect(
         tester.getTopLeft(find.widgetWithText(Container, '9')),
-        const Offset(0.0, 150.0)
+        const Offset(0.0, 150.0),
       );
 
       controller.jumpTo(1000.0);
@@ -111,7 +111,7 @@ void main() {
       // We have passed the end of the list, the list should have looped back.
       expect(
         tester.getTopLeft(find.widgetWithText(Container, '0')),
-        const Offset(0.0, 250.0)
+        const Offset(0.0, 250.0),
       );
     });
 
@@ -144,7 +144,7 @@ void main() {
       await tester.pump();
       expect(
         tester.getTopLeft(find.widgetWithText(Container, '-1000')),
-        const Offset(0.0, 250.0)
+        const Offset(0.0, 250.0),
       );
 
       // Can be scrolled infinitely for positive indexes.
@@ -152,7 +152,7 @@ void main() {
       await tester.pump();
       expect(
         tester.getTopLeft(find.widgetWithText(Container, '1000')),
-        const Offset(0.0, 250.0)
+        const Offset(0.0, 250.0),
       );
     });
 
diff --git a/packages/flutter/test/widgets/listener_test.dart b/packages/flutter/test/widgets/listener_test.dart
index 53315983088..1cde7a928c1 100644
--- a/packages/flutter/test/widgets/listener_test.dart
+++ b/packages/flutter/test/widgets/listener_test.dart
@@ -25,10 +25,10 @@ void main() {
               onPointerDown: (_) {
                 log.add('bottom');
               },
-              child: const Text('X', textDirection: TextDirection.ltr)
-            )
-          )
-        )
+              child: const Text('X', textDirection: TextDirection.ltr),
+            ),
+          ),
+        ),
       )
     );
 
diff --git a/packages/flutter/test/widgets/modal_barrier_test.dart b/packages/flutter/test/widgets/modal_barrier_test.dart
index 725043cb4b4..5198718fca6 100644
--- a/packages/flutter/test/widgets/modal_barrier_test.dart
+++ b/packages/flutter/test/widgets/modal_barrier_test.dart
@@ -23,8 +23,8 @@ void main() {
       child: const SizedBox(
         width: 10.0,
         height: 10.0,
-        child: Text('target', textDirection: TextDirection.ltr)
-      )
+        child: Text('target', textDirection: TextDirection.ltr),
+      ),
     );
   });
 
@@ -34,7 +34,7 @@ void main() {
       children: <Widget>[
         tapTarget,
         const ModalBarrier(dismissible: false),
-      ]
+      ],
     );
 
     await tester.pumpWidget(subject);
@@ -50,7 +50,7 @@ void main() {
       children: <Widget>[
         const ModalBarrier(dismissible: false),
         tapTarget,
-      ]
+      ],
     );
 
     await tester.pumpWidget(subject);
@@ -222,8 +222,8 @@ class FirstWidget extends StatelessWidget {
       Navigator.pushNamed(context, '/modal');
     },
     child: Container(
-      child: const Text('X')
-    )
+      child: const Text('X'),
+    ),
   );
   }
 }
@@ -233,7 +233,7 @@ class SecondWidget extends StatelessWidget {
   Widget build(BuildContext context) {
   return const ModalBarrier(
     key: ValueKey<String>('barrier'),
-    dismissible: true
+    dismissible: true,
   );
   }
 }
diff --git a/packages/flutter/test/widgets/multichild_test.dart b/packages/flutter/test/widgets/multichild_test.dart
index 6845f93e6aa..ad37aeef16d 100644
--- a/packages/flutter/test/widgets/multichild_test.dart
+++ b/packages/flutter/test/widgets/multichild_test.dart
@@ -138,7 +138,7 @@ void main() {
         children: <Widget>[
           const DecoratedBox(decoration: kBoxDecorationA),
           Container(
-            child: const DecoratedBox(decoration: kBoxDecorationB)
+            child: const DecoratedBox(decoration: kBoxDecorationB),
           ),
           const DecoratedBox(decoration: kBoxDecorationC),
         ],
diff --git a/packages/flutter/test/widgets/navigator_and_layers_test.dart b/packages/flutter/test/widgets/navigator_and_layers_test.dart
index d524d3a11db..e676ae6d98f 100644
--- a/packages/flutter/test/widgets/navigator_and_layers_test.dart
+++ b/packages/flutter/test/widgets/navigator_and_layers_test.dart
@@ -39,13 +39,13 @@ void main() {
                   left: CustomPaint(
                     painter: TestCustomPainter(
                       log: log,
-                      name: 'left'
+                      name: 'left',
                     ),
                   ),
                   right: CustomPaint(
                     painter: TestCustomPainter(
                       log: log,
-                      name: 'right'
+                      name: 'right',
                     ),
                   ),
                 ),
diff --git a/packages/flutter/test/widgets/navigator_test.dart b/packages/flutter/test/widgets/navigator_test.dart
index f7d96b6e496..54e38867ff9 100644
--- a/packages/flutter/test/widgets/navigator_test.dart
+++ b/packages/flutter/test/widgets/navigator_test.dart
@@ -62,7 +62,7 @@ class ThirdWidget extends StatelessWidget {
           onException(e);
         }
       },
-      behavior: HitTestBehavior.opaque
+      behavior: HitTestBehavior.opaque,
     );
   }
 }
@@ -190,7 +190,7 @@ void main() {
       targetKey: targetKey,
       onException: (dynamic e) {
         exception = e;
-      }
+      },
     );
     await tester.pumpWidget(widget);
     await tester.tap(find.byKey(targetKey));
@@ -277,13 +277,13 @@ void main() {
                 log.add('left');
                 Navigator.pushNamed(context, '/second');
               },
-              child: const Text('left')
+              child: const Text('left'),
             ),
             GestureDetector(
               onTap: () { log.add('right'); },
-              child: const Text('right')
+              child: const Text('right'),
             ),
-          ]
+          ],
         );
       },
       '/second': (BuildContext context) => Container(),
@@ -566,7 +566,7 @@ void main() {
           },
         );
         return routes[settings.name];
-      }
+      },
     ));
 
     expect(find.text('/'), findsOneWidget);
diff --git a/packages/flutter/test/widgets/nested_scroll_view_test.dart b/packages/flutter/test/widgets/nested_scroll_view_test.dart
index 5d40073c925..1d45aa7337e 100644
--- a/packages/flutter/test/widgets/nested_scroll_view_test.dart
+++ b/packages/flutter/test/widgets/nested_scroll_view_test.dart
@@ -465,7 +465,7 @@ void main() {
               }).toList(),
             ),
           ),
-        )
+        ),
         // END
       )),
     );
diff --git a/packages/flutter/test/widgets/obscured_animated_image_test.dart b/packages/flutter/test/widgets/obscured_animated_image_test.dart
index 1af690a009f..cc339bbc694 100644
--- a/packages/flutter/test/widgets/obscured_animated_image_test.dart
+++ b/packages/flutter/test/widgets/obscured_animated_image_test.dart
@@ -23,8 +23,8 @@ Future<void> main() async {
       MaterialApp(
         home: Image(image: fakeImageProvider, excludeFromSemantics: true, key: imageKey),
         routes: <String, WidgetBuilder> {
-          '/page': (BuildContext context) => Container()
-        }
+          '/page': (BuildContext context) => Container(),
+        },
       )
     );
     final RenderImage renderImage = tester.renderObject(find.byType(Image));
diff --git a/packages/flutter/test/widgets/opacity_test.dart b/packages/flutter/test/widgets/opacity_test.dart
index c32aae49beb..c28892b568e 100644
--- a/packages/flutter/test/widgets/opacity_test.dart
+++ b/packages/flutter/test/widgets/opacity_test.dart
@@ -30,7 +30,7 @@ void main() {
             rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0),
             label: 'a',
             textDirection: TextDirection.rtl,
-          )
+          ),
         ],
       ),
     ));
@@ -64,7 +64,7 @@ void main() {
             rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0),
             label: 'a',
             textDirection: TextDirection.rtl,
-          )
+          ),
         ],
       ),
     ));
@@ -98,7 +98,7 @@ void main() {
             rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0),
             label: 'a',
             textDirection: TextDirection.rtl,
-          )
+          ),
         ],
       ),
     ));
@@ -120,7 +120,7 @@ void main() {
             rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0),
             label: 'a',
             textDirection: TextDirection.rtl,
-          )
+          ),
         ],
       ),
     ));
@@ -142,7 +142,7 @@ void main() {
             rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0),
             label: 'a',
             textDirection: TextDirection.rtl,
-          )
+          ),
         ],
       ),
     ));
@@ -166,15 +166,15 @@ void main() {
                       padding: const EdgeInsets.all(5.0),
                       child: Container(
                           color: Colors.blue,
-                          height: 50
+                          height: 50,
                       ),
-                    )
+                    ),
                   );
                 }),
               ),
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     await expectLater(
diff --git a/packages/flutter/test/widgets/overflow_box_test.dart b/packages/flutter/test/widgets/overflow_box_test.dart
index e6c0517df53..fac1be0f15d 100644
--- a/packages/flutter/test/widgets/overflow_box_test.dart
+++ b/packages/flutter/test/widgets/overflow_box_test.dart
@@ -21,9 +21,9 @@ void main() {
           maxHeight: 50.0,
           child: Container(
             key: inner
-          )
-        )
-      )
+          ),
+        ),
+      ),
     ));
     final RenderBox box = inner.currentContext.findRenderObject();
     expect(box.localToGlobal(Offset.zero), equals(const Offset(745.0, 565.0)));
@@ -36,7 +36,7 @@ void main() {
       minWidth: 1.0,
       maxWidth: 2.0,
       minHeight: 3.0,
-      maxHeight: 4.0
+      maxHeight: 4.0,
     ).debugFillProperties(builder);
     final List<String> description = builder.properties
         .where((DiagnosticsNode n) => !n.isFiltered(DiagnosticLevel.info))
diff --git a/packages/flutter/test/widgets/page_forward_transitions_test.dart b/packages/flutter/test/widgets/page_forward_transitions_test.dart
index 91d0d012546..2c78b245ad8 100644
--- a/packages/flutter/test/widgets/page_forward_transitions_test.dart
+++ b/packages/flutter/test/widgets/page_forward_transitions_test.dart
@@ -11,7 +11,7 @@ class TestTransition extends AnimatedWidget {
     Key key,
     this.childFirstHalf,
     this.childSecondHalf,
-    Animation<double> animation
+    Animation<double> animation,
   }) : super(key: key, listenable: animation);
 
   final Widget childFirstHalf;
@@ -92,17 +92,17 @@ void main() {
                         TestTransition(
                           childFirstHalf: const Text('A'),
                           childSecondHalf: const Text('B'),
-                          animation: route.animation
+                          animation: route.animation,
                         ),
                         TestTransition(
                           childFirstHalf: const Text('C'),
                           childSecondHalf: const Text('D'),
-                          animation: route.secondaryAnimation
+                          animation: route.secondaryAnimation,
                         ),
-                      ]
+                      ],
                     );
-                  }
-                )
+                  },
+                ),
               );
             case '/2': return TestRoute<void>(settings: settings, child: const Text('E'));
             case '/3': return TestRoute<void>(settings: settings, child: const Text('F'));
diff --git a/packages/flutter/test/widgets/page_storage_test.dart b/packages/flutter/test/widgets/page_storage_test.dart
index b77f62967f6..f72cd0aa9de 100644
--- a/packages/flutter/test/widgets/page_storage_test.dart
+++ b/packages/flutter/test/widgets/page_storage_test.dart
@@ -19,10 +19,10 @@ void main() {
             PageStorage.of(context).writeState(context, storedValue);
             setState = setter;
             return Center(
-              child: Text('storedValue: $storedValue')
+              child: Text('storedValue: $storedValue'),
             );
-          }
-        )
+          },
+        ),
       )
     );
 
@@ -49,10 +49,10 @@ void main() {
             PageStorage.of(context).writeState(context, storedValue, identifier: 123);
             setState = setter;
             return Center(
-              child: Text('storedValue: $storedValue')
+              child: Text('storedValue: $storedValue'),
             );
-          }
-        )
+          },
+        ),
       );
     }
 
diff --git a/packages/flutter/test/widgets/page_transitions_test.dart b/packages/flutter/test/widgets/page_transitions_test.dart
index a910bd90cca..04e66f922d3 100644
--- a/packages/flutter/test/widgets/page_transitions_test.dart
+++ b/packages/flutter/test/widgets/page_transitions_test.dart
@@ -41,7 +41,7 @@ class PersistentBottomSheetTestState extends State<PersistentBottomSheetTest> {
   Widget build(BuildContext context) {
     return Scaffold(
       key: _scaffoldKey,
-      body: const Text('Sheet')
+      body: const Text('Sheet'),
     );
   }
 }
@@ -140,9 +140,9 @@ void main() {
           color: const Color(0xff00ffff),
           child: const Hero(
             tag: kHeroTag,
-            child: Text('Home')
-          )
-        )
+            child: Text('Home'),
+          ),
+        ),
       ),
       '/settings': (_) => Scaffold(
         key: containerKey2,
@@ -151,9 +151,9 @@ void main() {
           color: const Color(0xffff00ff),
           child: const Hero(
             tag: kHeroTag,
-            child: Text('Settings')
-          )
-        )
+            child: Text('Settings'),
+          ),
+        ),
       ),
     };
 
diff --git a/packages/flutter/test/widgets/page_view_test.dart b/packages/flutter/test/widgets/page_view_test.dart
index 59574deeda3..31961972c7f 100644
--- a/packages/flutter/test/widgets/page_view_test.dart
+++ b/packages/flutter/test/widgets/page_view_test.dart
@@ -172,7 +172,7 @@ void main() {
           child: PageView(
             children: kStates.map<Widget>((String state) => Text(state)).toList(),
           ),
-        )
+        ),
       ),
     ));
 
@@ -690,7 +690,7 @@ void main() {
               child: Text('Page #$i'),
               container: true,
             );
-          })
+          }),
         ),
     ));
     expect(controller.page, 0);
diff --git a/packages/flutter/test/widgets/pageable_list_test.dart b/packages/flutter/test/widgets/pageable_list_test.dart
index c966b5b477a..7c6f9cb722f 100644
--- a/packages/flutter/test/widgets/pageable_list_test.dart
+++ b/packages/flutter/test/widgets/pageable_list_test.dart
@@ -17,7 +17,7 @@ Widget buildPage(int page) {
     key: globalKeys[page],
     width: pageSize.width,
     height: pageSize.height,
-    child: Text(page.toString())
+    child: Text(page.toString()),
   );
 }
 
diff --git a/packages/flutter/test/widgets/parent_data_test.dart b/packages/flutter/test/widgets/parent_data_test.dart
index bd2847bceb6..5892c28244d 100644
--- a/packages/flutter/test/widgets/parent_data_test.dart
+++ b/packages/flutter/test/widgets/parent_data_test.dart
@@ -359,7 +359,7 @@ void main() {
         textDirection: TextDirection.ltr,
           children: <Widget>[
             Expanded(
-              child: Container()
+              child: Container(),
             ),
           ],
         ),
diff --git a/packages/flutter/test/widgets/platform_view_test.dart b/packages/flutter/test/widgets/platform_view_test.dart
index ba64212695d..3eb017a22ce 100644
--- a/packages/flutter/test/widgets/platform_view_test.dart
+++ b/packages/flutter/test/widgets/platform_view_test.dart
@@ -36,7 +36,7 @@ void main() {
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'webview', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -66,7 +66,7 @@ void main() {
       final ByteData byteData = ByteData.view(
           rawCreationParams.buffer,
           rawCreationParams.offsetInBytes,
-          rawCreationParams.lengthInBytes
+          rawCreationParams.lengthInBytes,
       );
       final dynamic actualParams = const StringCodec().decodeMessage(byteData);
 
@@ -75,7 +75,7 @@ void main() {
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'webview', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr, fakeView.creationParams)
+              AndroidViewController.kAndroidLayoutDirectionLtr, fakeView.creationParams),
         ]),
       );
     });
@@ -134,7 +134,7 @@ void main() {
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'webview', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
 
@@ -145,7 +145,7 @@ void main() {
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'webview', const Size(100.0, 50.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -179,7 +179,7 @@ void main() {
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 2, 'maps', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -243,7 +243,7 @@ void main() {
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'webview', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -318,7 +318,7 @@ void main() {
       );
       expect(
           numPointerDownsOnParent,
-          1
+          1,
       );
     });
 
@@ -366,7 +366,7 @@ void main() {
       );
       expect(
           numPointerDownsOnParent,
-          1
+          1,
       );
     });
 
@@ -414,7 +414,7 @@ void main() {
       );
       expect(
           numPointerDownsOnParent,
-          0
+          0,
       );
     });
 
@@ -468,7 +468,7 @@ void main() {
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'maps', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionRtl)
+              AndroidViewController.kAndroidLayoutDirectionRtl),
         ]),
       );
 
@@ -486,7 +486,7 @@ void main() {
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'maps', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -512,7 +512,7 @@ void main() {
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'maps', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionRtl)
+              AndroidViewController.kAndroidLayoutDirectionRtl),
         ]),
       );
 
@@ -533,7 +533,7 @@ void main() {
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'maps', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -827,7 +827,7 @@ void main() {
       expect(
         viewsController.views,
         unorderedEquals(<FakeUiKitView>[
-          FakeUiKitView(currentViewId + 1, 'webview')
+          FakeUiKitView(currentViewId + 1, 'webview'),
         ]),
       );
     });
@@ -860,7 +860,7 @@ void main() {
       expect(
         viewsController.views,
         unorderedEquals(<FakeUiKitView>[
-          FakeUiKitView(currentViewId + 2, 'maps')
+          FakeUiKitView(currentViewId + 2, 'maps'),
         ]),
       );
     });
@@ -954,7 +954,7 @@ void main() {
       expect(
         viewsController.views,
         unorderedEquals(<FakeUiKitView>[
-          FakeUiKitView(currentViewId + 1, 'webview')
+          FakeUiKitView(currentViewId + 1, 'webview'),
         ]),
       );
     });
@@ -984,7 +984,7 @@ void main() {
       final ByteData byteData = ByteData.view(
           rawCreationParams.buffer,
           rawCreationParams.offsetInBytes,
-          rawCreationParams.lengthInBytes
+          rawCreationParams.lengthInBytes,
       );
       final dynamic actualParams = const StringCodec().decodeMessage(byteData);
 
@@ -992,7 +992,7 @@ void main() {
       expect(
         viewsController.views,
         unorderedEquals(<FakeUiKitView>[
-          FakeUiKitView(currentViewId + 1, 'webview', fakeView.creationParams)
+          FakeUiKitView(currentViewId + 1, 'webview', fakeView.creationParams),
         ]),
       );
     });
diff --git a/packages/flutter/test/widgets/positioned_test.dart b/packages/flutter/test/widgets/positioned_test.dart
index 371a828b4c7..d22b1ca72f2 100644
--- a/packages/flutter/test/widgets/positioned_test.dart
+++ b/packages/flutter/test/widgets/positioned_test.dart
@@ -65,7 +65,7 @@ void main() {
       end: RelativeRect.fromRect(
         Rect.fromLTRB(80.0, 90.0, 90.0, 100.0),
         Rect.fromLTRB(0.0, 10.0, 100.0, 110.0),
-      )
+      ),
     );
     final AnimationController controller = AnimationController(
       duration: const Duration(seconds: 10),
diff --git a/packages/flutter/test/widgets/reassemble_test.dart b/packages/flutter/test/widgets/reassemble_test.dart
index adc74baf98d..b4d540a5f20 100644
--- a/packages/flutter/test/widgets/reassemble_test.dart
+++ b/packages/flutter/test/widgets/reassemble_test.dart
@@ -8,7 +8,7 @@ import 'package:flutter_test/flutter_test.dart';
 void main() {
   testWidgets('reassemble does not crash', (WidgetTester tester) async {
     await tester.pumpWidget(const MaterialApp(
-      home: Text('Hello World')
+      home: Text('Hello World'),
     ));
     await tester.pump();
     tester.binding.reassembleApplication();
diff --git a/packages/flutter/test/widgets/remember_scroll_position_test.dart b/packages/flutter/test/widgets/remember_scroll_position_test.dart
index 36c0aaffb42..2966a2f7b80 100644
--- a/packages/flutter/test/widgets/remember_scroll_position_test.dart
+++ b/packages/flutter/test/widgets/remember_scroll_position_test.dart
@@ -23,7 +23,7 @@ class ThePositiveNumbers extends StatelessWidget {
       controller: _controller,
       itemBuilder: (BuildContext context, int index) {
         return Text('${index + from}', key: ValueKey<int>(index));
-      }
+      },
     );
   }
 }
@@ -50,7 +50,7 @@ Future<void> performTest(WidgetTester tester, bool maintainState) async {
             );
           }
           return null;
-        }
+        },
       ),
     ),
   );
diff --git a/packages/flutter/test/widgets/render_object_widget_test.dart b/packages/flutter/test/widgets/render_object_widget_test.dart
index 1270df44025..9488e1212e0 100644
--- a/packages/flutter/test/widgets/render_object_widget_test.dart
+++ b/packages/flutter/test/widgets/render_object_widget_test.dart
@@ -96,7 +96,7 @@ void main() {
       decoration: kBoxDecorationA,
       child: DecoratedBox(
         decoration: kBoxDecorationB
-      )
+      ),
     ));
 
     checkFullTree();
@@ -106,8 +106,8 @@ void main() {
       child: TestWidget(
         child: DecoratedBox(
           decoration: kBoxDecorationB
-        )
-      )
+        ),
+      ),
     ));
 
     checkFullTree();
@@ -116,7 +116,7 @@ void main() {
       decoration: kBoxDecorationA,
       child: DecoratedBox(
         decoration: kBoxDecorationB
-      )
+      ),
     ));
 
     checkFullTree();
@@ -133,9 +133,9 @@ void main() {
         child: TestWidget(
           child: DecoratedBox(
             decoration: kBoxDecorationB
-          )
-        )
-      )
+          ),
+        ),
+      ),
     ));
 
     checkFullTree();
@@ -155,8 +155,8 @@ void main() {
         decoration: kBoxDecorationB,
         child: DecoratedBox(
           decoration: kBoxDecorationC
-        )
-      )
+        ),
+      ),
     ));
 
     SingleChildRenderObjectElement element =
@@ -195,7 +195,7 @@ void main() {
 
     await tester.pumpWidget(MediaQuery(
       data: const MediaQueryData(size: Size(400.0, 300.0)),
-      child: box
+      child: box,
     ));
 
     final RenderDecoratedBox renderBox = tester.renderObject(find.byKey(boxKey));
@@ -204,7 +204,7 @@ void main() {
 
     await tester.pumpWidget(MediaQuery(
       data: const MediaQueryData(size: Size(300.0, 400.0)),
-      child: box
+      child: box,
     ));
 
     decoration = renderBox.decoration;
diff --git a/packages/flutter/test/widgets/reparent_state_harder_test.dart b/packages/flutter/test/widgets/reparent_state_harder_test.dart
index 5967b5fd054..8f48b304a6b 100644
--- a/packages/flutter/test/widgets/reparent_state_harder_test.dart
+++ b/packages/flutter/test/widgets/reparent_state_harder_test.dart
@@ -143,7 +143,7 @@ void main() {
               }
             );
           }
-        )
+        ),
       ),
     ));
 
diff --git a/packages/flutter/test/widgets/reparent_state_test.dart b/packages/flutter/test/widgets/reparent_state_test.dart
index eec6c1fa161..450cf054624 100644
--- a/packages/flutter/test/widgets/reparent_state_test.dart
+++ b/packages/flutter/test/widgets/reparent_state_test.dart
@@ -59,15 +59,15 @@ void main() {
         textDirection: TextDirection.ltr,
         children: <Widget>[
           Container(
-            child: StateMarker(key: left)
+            child: StateMarker(key: left),
           ),
           Container(
             child: StateMarker(
               key: right,
-              child: grandchild
-            )
+              child: grandchild,
+            ),
           ),
-        ]
+        ],
       )
     );
 
@@ -88,13 +88,13 @@ void main() {
           Container(
             child: StateMarker(
               key: right,
-              child: newGrandchild
-            )
+              child: newGrandchild,
+            ),
           ),
           Container(
-            child: StateMarker(key: left)
+            child: StateMarker(key: left),
           ),
-        ]
+        ],
       )
     );
 
@@ -113,9 +113,9 @@ void main() {
         child: Container(
           child: StateMarker(
             key: left,
-            child: Container()
-          )
-        )
+            child: Container(),
+          ),
+        ),
       )
     );
 
@@ -136,9 +136,9 @@ void main() {
           StateMarker(key: left),
           StateMarker(
             key: right,
-            child: grandchild
-          )
-        ]
+            child: grandchild,
+          ),
+        ],
       )
     );
 
@@ -158,10 +158,10 @@ void main() {
         children: <Widget>[
           StateMarker(
             key: right,
-            child: newGrandchild
+            child: newGrandchild,
           ),
-          StateMarker(key: left)
-        ]
+          StateMarker(key: left),
+        ],
       )
     );
 
@@ -180,9 +180,9 @@ void main() {
         child: Container(
           child: StateMarker(
             key: left,
-            child: Container()
-          )
-        )
+            child: Container(),
+          ),
+        ),
       )
     );
 
@@ -232,7 +232,7 @@ void main() {
       children: <Widget>[
         StateMarker(key: key),
         Container(width: 100.0, height: 100.0),
-      ]
+      ],
     ));
 
     final StateMarkerState keyState = key.currentState;
@@ -243,7 +243,7 @@ void main() {
       children: <Widget>[
         Container(width: 100.0, height: 100.0),
         StateMarker(key: key),
-      ]
+      ],
     ));
 
     expect(key.currentState, equals(keyState));
@@ -254,7 +254,7 @@ void main() {
       children: <Widget>[
         StateMarker(key: key),
         Container(width: 100.0, height: 100.0),
-      ]
+      ],
     ));
 
     expect(key.currentState, equals(keyState));
@@ -270,7 +270,7 @@ void main() {
         Container(width: 100.0, height: 100.0),
         StateMarker(key: key),
         Container(width: 100.0, height: 100.0),
-      ]
+      ],
     ));
 
     final StateMarkerState keyState = key.currentState;
@@ -281,7 +281,7 @@ void main() {
       children: <Widget>[
         Container(width: 100.0, height: 100.0, child: StateMarker(key: key)),
         Container(width: 100.0, height: 100.0),
-      ]
+      ],
     ));
 
     expect(key.currentState, equals(keyState));
@@ -293,7 +293,7 @@ void main() {
         Container(width: 100.0, height: 100.0),
         StateMarker(key: key),
         Container(width: 100.0, height: 100.0),
-      ]
+      ],
     ));
 
     expect(key.currentState, equals(keyState));
@@ -304,7 +304,7 @@ void main() {
       children: <Widget>[
         Container(width: 100.0, height: 100.0),
         Container(width: 100.0, height: 100.0, child: StateMarker(key: key)),
-      ]
+      ],
     ));
 
     expect(key.currentState, equals(keyState));
@@ -316,7 +316,7 @@ void main() {
         Container(width: 100.0, height: 100.0),
         StateMarker(key: key),
         Container(width: 100.0, height: 100.0),
-      ]
+      ],
     ));
 
     expect(key.currentState, equals(keyState));
@@ -360,11 +360,11 @@ void main() {
               key: key2,
               child: StateMarker(
                 key: key3,
-                child: StateMarker(child: Container(width: 100.0))
-              )
-            )
-          )
-        ]
+                child: StateMarker(child: Container(width: 100.0)),
+              ),
+            ),
+          ),
+        ],
       )
     );
 
@@ -374,16 +374,16 @@ void main() {
         children: <Widget>[
           StateMarker(
             key: key2,
-            child: StateMarker(child: Container(width: 100.0))
+            child: StateMarker(child: Container(width: 100.0)),
           ),
           StateMarker(
             key: key1,
             child: StateMarker(
               key: key3,
-              child: StateMarker(child: Container(width: 100.0))
-            )
+              child: StateMarker(child: Container(width: 100.0)),
+            ),
           ),
-        ]
+        ],
       )
     );
   });
diff --git a/packages/flutter/test/widgets/routes_test.dart b/packages/flutter/test/widgets/routes_test.dart
index b4f4f208ea8..0ffbbf720d9 100644
--- a/packages/flutter/test/widgets/routes_test.dart
+++ b/packages/flutter/test/widgets/routes_test.dart
@@ -31,7 +31,7 @@ class TestRoute extends Route<String> with LocalHistoryRoute<String> {
     log('install');
     final OverlayEntry entry = OverlayEntry(
       builder: (BuildContext context) => Container(),
-      opaque: true
+      opaque: true,
     );
     _entries.add(entry);
     navigator.overlay?.insert(entry, above: insertionPoint);
@@ -94,7 +94,7 @@ Future<void> runNavigatorTest(
   WidgetTester tester,
   NavigatorState host,
   VoidCallback test,
-  List<String> expectations
+  List<String> expectations,
 ) async {
   expect(host, isNotNull);
   test();
@@ -152,7 +152,7 @@ void main() {
         'initial: install',
         'initial: didPush',
         'initial: didChangeNext null',
-      ]
+      ],
     );
     TestRoute second;
     await runNavigatorTest(
@@ -164,7 +164,7 @@ void main() {
         'second: didPush',
         'second: didChangeNext null',
         'initial: didChangeNext second',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -175,7 +175,7 @@ void main() {
         'third: didPush',
         'third: didChangeNext null',
         'second: didChangeNext third',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -187,7 +187,7 @@ void main() {
         'two: didChangeNext third',
         'initial: didChangeNext two',
         'second: dispose',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -197,7 +197,7 @@ void main() {
         'third: didPop hello',
         'third: dispose',
         'two: didPopNext third',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -207,7 +207,7 @@ void main() {
         'two: didPop good bye',
         'two: dispose',
         'initial: didPopNext two',
-      ]
+      ],
     );
     await tester.pumpWidget(Container());
     expect(results, equals(<String>['initial: dispose']));
@@ -222,7 +222,7 @@ void main() {
         textDirection: TextDirection.ltr,
         child: Navigator(
           key: navigatorKey,
-          onGenerateRoute: (_) => TestRoute('first')
+          onGenerateRoute: (_) => TestRoute('first'),
         ),
       ),
     );
@@ -235,7 +235,7 @@ void main() {
         'first: install',
         'first: didPush',
         'first: didChangeNext null',
-      ]
+      ],
     );
     TestRoute second;
     await runNavigatorTest(
@@ -247,7 +247,7 @@ void main() {
         'second: didPush',
         'second: didChangeNext null',
         'first: didChangeNext second',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -258,7 +258,7 @@ void main() {
         'third: didPush',
         'third: didChangeNext null',
         'second: didChangeNext third',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -266,7 +266,7 @@ void main() {
       () { host.removeRouteBelow(second); },
       <String>[
         'first: dispose',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -276,7 +276,7 @@ void main() {
         'third: didPop good bye',
         'third: dispose',
         'second: didPopNext third',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -287,7 +287,7 @@ void main() {
         'three: didPush',
         'three: didChangeNext null',
         'second: didChangeNext three',
-      ]
+      ],
     );
     TestRoute four;
     await runNavigatorTest(
@@ -299,7 +299,7 @@ void main() {
         'four: didPush',
         'four: didChangeNext null',
         'three: didChangeNext four',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -308,7 +308,7 @@ void main() {
       <String>[
         'second: didChangeNext four',
         'three: dispose',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -318,7 +318,7 @@ void main() {
         'four: didPop the end',
         'four: dispose',
         'second: didPopNext four',
-      ]
+      ],
     );
     await tester.pumpWidget(Container());
     expect(results, equals(<String>['second: dispose']));
@@ -333,7 +333,7 @@ void main() {
         textDirection: TextDirection.ltr,
         child: Navigator(
           key: navigatorKey,
-          onGenerateRoute: (_) => TestRoute('A')
+          onGenerateRoute: (_) => TestRoute('A'),
         ),
       ),
     );
@@ -346,7 +346,7 @@ void main() {
         'A: install',
         'A: didPush',
         'A: didChangeNext null',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -357,7 +357,7 @@ void main() {
         'B: didPush',
         'B: didChangeNext null',
         'A: didChangeNext B',
-      ]
+      ],
     );
     TestRoute routeC;
     await runNavigatorTest(
@@ -369,7 +369,7 @@ void main() {
         'C: didPush',
         'C: didChangeNext null',
         'B: didChangeNext C',
-      ]
+      ],
     );
     expect(routeC.isActive, isTrue);
     TestRoute routeB;
@@ -383,7 +383,7 @@ void main() {
         'b: didChangeNext C',
         'A: didChangeNext b',
         'B: dispose',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -393,7 +393,7 @@ void main() {
         'C: didPop null',
         'C: dispose',
         'b: didPopNext C',
-      ]
+      ],
     );
     await tester.pumpWidget(Container());
     expect(results, equals(<String>['A: dispose', 'b: dispose']));
@@ -415,7 +415,7 @@ void main() {
         textDirection: TextDirection.ltr,
         child: Navigator(
           key: navigatorKey,
-          onGenerateRoute: (_) => routeA
+          onGenerateRoute: (_) => routeA,
         ),
       ),
     );
@@ -432,7 +432,7 @@ void main() {
         'A: onRemove 1',
         'A: didPop null',
         'A: onRemove 0',
-      ]
+      ],
     );
 
     await runNavigatorTest(
@@ -440,7 +440,7 @@ void main() {
       host,
       () { host.popUntil((Route<dynamic> route) => !route.willHandlePopInternally); },
       <String>[
-      ]
+      ],
     );
   });
 
diff --git a/packages/flutter/test/widgets/run_app_test.dart b/packages/flutter/test/widgets/run_app_test.dart
index 777fb08cb37..2fa75895679 100644
--- a/packages/flutter/test/widgets/run_app_test.dart
+++ b/packages/flutter/test/widgets/run_app_test.dart
@@ -15,9 +15,9 @@ void main() {
             onPressed: () {
               runApp(const Center(child: Text('Done', textDirection: TextDirection.ltr,)));
             },
-            child: const Text('GO')
-          )
-        )
+            child: const Text('GO'),
+          ),
+        ),
       )
     );
     await tester.tap(find.text('GO'));
diff --git a/packages/flutter/test/widgets/scroll_interaction_test.dart b/packages/flutter/test/widgets/scroll_interaction_test.dart
index 0779eef7a6a..4f9f47ac80b 100644
--- a/packages/flutter/test/widgets/scroll_interaction_test.dart
+++ b/packages/flutter/test/widgets/scroll_interaction_test.dart
@@ -12,7 +12,7 @@ void main() {
         textDirection: TextDirection.ltr,
         child: ListView(
           children: <Widget>[
-            Container(height: 100000.0)
+            Container(height: 100000.0),
           ],
         ),
       ),
diff --git a/packages/flutter/test/widgets/scroll_notification_test.dart b/packages/flutter/test/widgets/scroll_notification_test.dart
index b4cdcecddbd..f0e9b498799 100644
--- a/packages/flutter/test/widgets/scroll_notification_test.dart
+++ b/packages/flutter/test/widgets/scroll_notification_test.dart
@@ -17,8 +17,8 @@ void main() {
         return false;
       },
       child: const SingleChildScrollView(
-        child: SizedBox(height: 1200.0)
-      )
+        child: SizedBox(height: 1200.0),
+      ),
     ));
 
     final TestGesture gesture = await tester.startGesture(const Offset(100.0, 100.0));
diff --git a/packages/flutter/test/widgets/scrollable_dispose_test.dart b/packages/flutter/test/widgets/scrollable_dispose_test.dart
index f8dc25781a5..e0d01ffa2c7 100644
--- a/packages/flutter/test/widgets/scrollable_dispose_test.dart
+++ b/packages/flutter/test/widgets/scrollable_dispose_test.dart
@@ -19,7 +19,7 @@ void main() {
         textDirection: TextDirection.ltr,
         child: FlipWidget(
           left: ListView(children: textWidgets),
-          right: Container()
+          right: Container(),
         ),
       ),
     );
diff --git a/packages/flutter/test/widgets/scrollable_fling_test.dart b/packages/flutter/test/widgets/scrollable_fling_test.dart
index 68b8ba61251..fa99a489678 100644
--- a/packages/flutter/test/widgets/scrollable_fling_test.dart
+++ b/packages/flutter/test/widgets/scrollable_fling_test.dart
@@ -66,7 +66,7 @@ void main() {
     await tester.pumpWidget(
       Directionality(
         textDirection: TextDirection.ltr,
-        child: ListView(children: textWidgets, dragStartBehavior: DragStartBehavior.down)
+        child: ListView(children: textWidgets, dragStartBehavior: DragStartBehavior.down),
       ),
     );
 
@@ -94,7 +94,7 @@ void main() {
     await tester.pumpWidget(
       Directionality(
         textDirection: TextDirection.ltr,
-        child: ListView(children: textWidgets, dragStartBehavior: DragStartBehavior.down)
+        child: ListView(children: textWidgets, dragStartBehavior: DragStartBehavior.down),
       ),
     );
 
diff --git a/packages/flutter/test/widgets/scrollable_of_test.dart b/packages/flutter/test/widgets/scrollable_of_test.dart
index ebd88810e42..013b3a41501 100644
--- a/packages/flutter/test/widgets/scrollable_of_test.dart
+++ b/packages/flutter/test/widgets/scrollable_of_test.dart
@@ -92,8 +92,8 @@ void main() {
         return false;
       },
       child: const SingleChildScrollView(
-        child: SizedBox(height: 1200.0)
-      )
+        child: SizedBox(height: 1200.0),
+      ),
     ));
 
     await tester.startGesture(const Offset(100.0, 100.0));
diff --git a/packages/flutter/test/widgets/scrollable_semantics_test.dart b/packages/flutter/test/widgets/scrollable_semantics_test.dart
index 986eb6be89d..253d7c76500 100644
--- a/packages/flutter/test/widgets/scrollable_semantics_test.dart
+++ b/packages/flutter/test/widgets/scrollable_semantics_test.dart
@@ -129,7 +129,7 @@ void main() {
                   ),
                   SliverList(
                     delegate: SliverChildListDelegate(containers),
-                  )
+                  ),
                 ],
               );
             }),
@@ -539,7 +539,7 @@ void main() {
                   cacheExtent: 0.0,
                   offset: offset,
                   center: center,
-                  slivers: children
+                  slivers: children,
                 );
               },
             ),
diff --git a/packages/flutter/test/widgets/scrollable_semantics_traversal_order_test.dart b/packages/flutter/test/widgets/scrollable_semantics_traversal_order_test.dart
index 9d7467900a3..d54c6ed7a28 100644
--- a/packages/flutter/test/widgets/scrollable_semantics_traversal_order_test.dart
+++ b/packages/flutter/test/widgets/scrollable_semantics_traversal_order_test.dart
@@ -101,7 +101,7 @@ void main() {
                             label: 'item 14b',
                             textDirection: TextDirection.ltr,
                           ),
-                        ]
+                        ],
                       ),
                       TestSemantics(
                         children: <TestSemantics>[
diff --git a/packages/flutter/test/widgets/semantics_11_test.dart b/packages/flutter/test/widgets/semantics_11_test.dart
index 9075db702ef..f809a64f80e 100644
--- a/packages/flutter/test/widgets/semantics_11_test.dart
+++ b/packages/flutter/test/widgets/semantics_11_test.dart
@@ -42,11 +42,11 @@ void main() {
                   id: 3,
                   actions: SemanticsAction.tap.index,
                   label: 'foo',
-                )
+                ),
               ],
             ),
           ],
-        )
+        ),
       ],
     ), ignoreRect: true, ignoreTransform: true));
 
@@ -82,11 +82,11 @@ void main() {
                   id: 3,
                   actions: SemanticsAction.tap.index,
                   label: 'bar',
-                )
+                ),
               ],
             ),
           ],
-        )
+        ),
       ],
     ), ignoreRect: true, ignoreTransform: true));
 
diff --git a/packages/flutter/test/widgets/semantics_1_test.dart b/packages/flutter/test/widgets/semantics_1_test.dart
index a887b7daab7..185b294efa5 100644
--- a/packages/flutter/test/widgets/semantics_1_test.dart
+++ b/packages/flutter/test/widgets/semantics_1_test.dart
@@ -35,7 +35,7 @@ void main() {
           label: 'test1',
           rect: TestSemantics.fullScreen,
           flags: SemanticsFlag.isSelected.index,
-        )
+        ),
       ]
     )));
 
@@ -77,7 +77,7 @@ void main() {
           label: 'child1',
           rect: TestSemantics.fullScreen,
           flags: SemanticsFlag.isSelected.index,
-        )
+        ),
       ],
     )));
 
@@ -173,7 +173,7 @@ void main() {
           label: 'child1',
           rect: TestSemantics.fullScreen,
           flags: SemanticsFlag.isSelected.index,
-        )
+        ),
       ],
     )));
 
diff --git a/packages/flutter/test/widgets/semantics_2_test.dart b/packages/flutter/test/widgets/semantics_2_test.dart
index 17c1ef4cb98..920769af978 100644
--- a/packages/flutter/test/widgets/semantics_2_test.dart
+++ b/packages/flutter/test/widgets/semantics_2_test.dart
@@ -109,7 +109,7 @@ void main() {
           label: 'child1',
           rect: TestSemantics.fullScreen,
           flags: SemanticsFlag.isSelected.index,
-        )
+        ),
       ],
     )));
 
diff --git a/packages/flutter/test/widgets/semantics_3_test.dart b/packages/flutter/test/widgets/semantics_3_test.dart
index 3f68fd3952a..f28218320a7 100644
--- a/packages/flutter/test/widgets/semantics_3_test.dart
+++ b/packages/flutter/test/widgets/semantics_3_test.dart
@@ -38,7 +38,7 @@ void main() {
             flags: SemanticsFlag.hasCheckedState.index | SemanticsFlag.isChecked.index,
             label: 'test',
             rect: TestSemantics.fullScreen,
-          )
+          ),
         ]
       )
     ));
@@ -117,7 +117,7 @@ void main() {
             flags: SemanticsFlag.hasCheckedState.index | SemanticsFlag.isChecked.index,
             label: 'test',
             rect: TestSemantics.fullScreen,
-          )
+          ),
         ],
       ),
     ));
diff --git a/packages/flutter/test/widgets/semantics_4_test.dart b/packages/flutter/test/widgets/semantics_4_test.dart
index 1cb51d1bc81..da85ebb2858 100644
--- a/packages/flutter/test/widgets/semantics_4_test.dart
+++ b/packages/flutter/test/widgets/semantics_4_test.dart
@@ -70,7 +70,7 @@ void main() {
                 flags: SemanticsFlag.hasCheckedState.index,
                 rect: TestSemantics.fullScreen,
               ),
-            ]
+            ],
           ),
         ],
       )
diff --git a/packages/flutter/test/widgets/semantics_5_test.dart b/packages/flutter/test/widgets/semantics_5_test.dart
index 682eea1ca91..c3d8122cd89 100644
--- a/packages/flutter/test/widgets/semantics_5_test.dart
+++ b/packages/flutter/test/widgets/semantics_5_test.dart
@@ -28,7 +28,7 @@ void main() {
             label: 'label', // (force a fork)
             textDirection: TextDirection.ltr,
           ),
-        ]
+        ],
       )
     );
 
diff --git a/packages/flutter/test/widgets/semantics_6_test.dart b/packages/flutter/test/widgets/semantics_6_test.dart
index e49231caf1e..7aca6d2987d 100644
--- a/packages/flutter/test/widgets/semantics_6_test.dart
+++ b/packages/flutter/test/widgets/semantics_6_test.dart
@@ -21,7 +21,7 @@ void main() {
           label: 'hello',
           textDirection: TextDirection.ltr,
           rect: TestSemantics.fullScreen,
-        )
+        ),
       ],
     );
 
@@ -71,7 +71,7 @@ Widget buildWidget({ @required String blockedText, bool blocking = true }) {
               container: true,
             ),
           ),
-        ]
+        ],
     ),
   );
 }
diff --git a/packages/flutter/test/widgets/semantics_8_test.dart b/packages/flutter/test/widgets/semantics_8_test.dart
index 07231cd3fed..52aee78352d 100644
--- a/packages/flutter/test/widgets/semantics_8_test.dart
+++ b/packages/flutter/test/widgets/semantics_8_test.dart
@@ -27,11 +27,11 @@ void main() {
                 Semantics(
                   label: 'label',
                   textDirection: TextDirection.ltr,
-                )
-              ]
-            )
-          )
-        )
+                ),
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -44,7 +44,7 @@ void main() {
             label: 'label',
             textDirection: TextDirection.ltr,
             rect: TestSemantics.fullScreen,
-          )
+          ),
         ]
       )
     ));
@@ -65,11 +65,11 @@ void main() {
                 ),
                 Semantics(
                   checked: true
-                )
-              ]
-            )
-          )
-        )
+                ),
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -82,7 +82,7 @@ void main() {
             label: 'label',
             textDirection: TextDirection.ltr,
             rect: TestSemantics.fullScreen,
-          )
+          ),
         ],
       ),
     ));
diff --git a/packages/flutter/test/widgets/semantics_9_test.dart b/packages/flutter/test/widgets/semantics_9_test.dart
index bff31ce385e..ed8676e3f8c 100644
--- a/packages/flutter/test/widgets/semantics_9_test.dart
+++ b/packages/flutter/test/widgets/semantics_9_test.dart
@@ -118,7 +118,7 @@ void main() {
             child: Semantics(
               label: '#2.1',
               child: Container(),
-            )
+            ),
           ),
           Semantics(
             label: '#3',
diff --git a/packages/flutter/test/widgets/semantics_clipping_test.dart b/packages/flutter/test/widgets/semantics_clipping_test.dart
index 330d8cd661b..e2da9c01f3b 100644
--- a/packages/flutter/test/widgets/semantics_clipping_test.dart
+++ b/packages/flutter/test/widgets/semantics_clipping_test.dart
@@ -89,8 +89,8 @@ void main() {
                       width: 75.0,
                       child: const Text('3'),
                     ),
-                  ]
-                )
+                  ],
+                ),
               ),
             ],
           ),
diff --git a/packages/flutter/test/widgets/semantics_event_test.dart b/packages/flutter/test/widgets/semantics_event_test.dart
index eb342dc703a..035ab3daeed 100644
--- a/packages/flutter/test/widgets/semantics_event_test.dart
+++ b/packages/flutter/test/widgets/semantics_event_test.dart
@@ -31,9 +31,9 @@ void main() {
         'type': 'TestEvent',
         'data': <String, dynamic> {
           'text': 'hi',
-          'number': 11
-        }
-      }
+          'number': 11,
+        },
+      },
     );
     expect(
       TestSemanticsEvent(text: 'hi', number: 11).toMap(nodeId: 123),
@@ -42,9 +42,9 @@ void main() {
         'nodeId': 123,
         'data': <String, dynamic> {
           'text': 'hi',
-          'number': 11
-        }
-      }
+          'number': 11,
+        },
+      },
     );
   });
 }
diff --git a/packages/flutter/test/widgets/semantics_test.dart b/packages/flutter/test/widgets/semantics_test.dart
index 6f27b2603ee..018eab49173 100644
--- a/packages/flutter/test/widgets/semantics_test.dart
+++ b/packages/flutter/test/widgets/semantics_test.dart
@@ -26,7 +26,7 @@ void main() {
         TestSemantics.rootChild(
           label: 'test1',
           textDirection: TextDirection.ltr,
-        )
+        ),
       ],
     );
 
@@ -35,8 +35,8 @@ void main() {
         child: Semantics(
           label: 'test1',
           textDirection: TextDirection.ltr,
-          child: Container()
-        )
+          child: Container(),
+        ),
       )
     );
 
@@ -77,10 +77,10 @@ void main() {
             key: key,
             container: true,
             label: 'test2a',
-            child: Container()
-          )
-        )
-      )
+            child: Container(),
+          ),
+        ),
+      ),
     ));
 
     expect(semantics, hasSemantics(
@@ -91,9 +91,9 @@ void main() {
             children: <TestSemantics>[
               TestSemantics(
                 label: 'test2a',
-              )
-            ]
-          )
+              ),
+            ],
+          ),
         ]
       ),
       ignoreId: true,
@@ -113,11 +113,11 @@ void main() {
               key: key,
               container: true,
               label: 'test2b',
-              child: Container()
-            )
-          )
-        )
-      )
+              child: Container(),
+            ),
+          ),
+        ),
+      ),
     ));
 
     expect(semantics, hasSemantics(
@@ -133,9 +133,9 @@ void main() {
                     label: 'test2b',
                   ),
                 ],
-              )
-            ]
-          )
+              ),
+            ],
+          ),
         ]
       ),
       ignoreId: true,
@@ -188,7 +188,7 @@ void main() {
         TestSemantics.rootChild(
           label: 'test1',
           textDirection: TextDirection.ltr,
-        )
+        ),
       ]
     );
 
@@ -215,7 +215,7 @@ void main() {
         TestSemantics.rootChild(
           label: 'test1',
           textDirection: TextDirection.rtl,
-        )
+        ),
       ]
     );
 
@@ -256,7 +256,7 @@ void main() {
           hint: 'hint',
           value: 'value',
           textDirection: TextDirection.ltr,
-        )
+        ),
       ]
     );
 
@@ -279,7 +279,7 @@ void main() {
               ),
               Semantics(
                 hint: 'hint two',
-              )
+              ),
 
             ],
           ),
@@ -292,7 +292,7 @@ void main() {
         TestSemantics.rootChild(
           hint: 'hint one\nhint two',
           textDirection: TextDirection.ltr,
-        )
+        ),
       ]
     );
 
@@ -315,15 +315,15 @@ void main() {
                 child: Container(
                   height: 10.0,
                   width: 10.0,
-                )
+                ),
               ),
               Semantics(
                 value: 'value two',
                 child: Container(
                   height: 10.0,
                   width: 10.0,
-                )
-              )
+                ),
+              ),
             ],
           ),
         ),
@@ -343,7 +343,7 @@ void main() {
               textDirection: TextDirection.ltr,
             ),
           ]
-        )
+        ),
       ],
     );
 
@@ -379,7 +379,7 @@ void main() {
           hint: 'hint',
           value: 'value',
           textDirection: TextDirection.ltr,
-        )
+        ),
       ]
     );
 
@@ -645,7 +645,7 @@ void main() {
 
     expect(tester.getSemantics(find.byType(Semantics)), matchesSemantics(
       hasTapAction: true,
-      onTapHint: 'test'
+      onTapHint: 'test',
     ));
 
     await tester.pumpWidget(Semantics(
@@ -656,7 +656,7 @@ void main() {
 
     expect(tester.getSemantics(find.byType(Semantics)), matchesSemantics(
       hasLongPressAction: true,
-      onLongPressHint: 'foo'
+      onLongPressHint: 'foo',
     ));
     semantics.dispose();
   });
@@ -667,7 +667,7 @@ void main() {
       container: true,
       customSemanticsActions: <CustomSemanticsAction, VoidCallback>{
         const CustomSemanticsAction(label: 'foo'): () {},
-        const CustomSemanticsAction(label: 'bar'): () {}
+        const CustomSemanticsAction(label: 'bar'): () {},
       },
     ));
 
@@ -1089,7 +1089,7 @@ void main() {
             textDirection: TextDirection.ltr,
           ),
         ],
-      ), ignoreId: true, ignoreRect: true, ignoreTransform: true)
+      ), ignoreId: true, ignoreRect: true, ignoreTransform: true),
     );
     semantics.dispose();
   });
diff --git a/packages/flutter/test/widgets/semantics_tester_generateTestSemanticsExpressionForCurrentSemanticsTree_test.dart b/packages/flutter/test/widgets/semantics_tester_generateTestSemanticsExpressionForCurrentSemanticsTree_test.dart
index 16202740cad..66e656cefca 100644
--- a/packages/flutter/test/widgets/semantics_tester_generateTestSemanticsExpressionForCurrentSemanticsTree_test.dart
+++ b/packages/flutter/test/widgets/semantics_tester_generateTestSemanticsExpressionForCurrentSemanticsTree_test.dart
@@ -150,7 +150,7 @@ void _tests() {
         ignoreRect: true,
         ignoreTransform: true,
         ignoreId: true,
-      )
+      ),
     );
     semantics.dispose();
   });
diff --git a/packages/flutter/test/widgets/semantics_traversal_test.dart b/packages/flutter/test/widgets/semantics_traversal_test.dart
index 0c198499a21..56464fdc1b9 100644
--- a/packages/flutter/test/widgets/semantics_traversal_test.dart
+++ b/packages/flutter/test/widgets/semantics_traversal_test.dart
@@ -317,7 +317,7 @@ class TraversalTester {
                   }).toList(),
                 ),
               ),
-            )
+            ),
         )
     );
 
@@ -331,7 +331,7 @@ class TraversalTester {
                 label: label,
               );
             }).toList(),
-          )
+          ),
         ],
       ),
       ignoreTransform: true,
diff --git a/packages/flutter/test/widgets/set_state_2_test.dart b/packages/flutter/test/widgets/set_state_2_test.dart
index 674169c434b..645fe104be4 100644
--- a/packages/flutter/test/widgets/set_state_2_test.dart
+++ b/packages/flutter/test/widgets/set_state_2_test.dart
@@ -32,7 +32,7 @@ void main() {
                   log.add('middle $value');
                   return inner;
                 }
-              )
+              ),
             );
           }
         );
diff --git a/packages/flutter/test/widgets/shader_mask_test.dart b/packages/flutter/test/widgets/shader_mask_test.dart
index 6d0de8adb35..d672bf2cda0 100644
--- a/packages/flutter/test/widgets/shader_mask_test.dart
+++ b/packages/flutter/test/widgets/shader_mask_test.dart
@@ -12,7 +12,7 @@ Shader createShader(Rect bounds) {
     begin: Alignment.topCenter,
     end: Alignment.bottomCenter,
     colors: <Color>[Color(0x00FFFFFF), Color(0xFFFFFFFF)],
-    stops: <double>[0.1, 0.35]
+    stops: <double>[0.1, 0.35],
   ).createShader(bounds);
 }
 
@@ -37,7 +37,7 @@ void main() {
         height: 400.0,
         child: ShaderMask(
           shaderCallback: recordShaderBounds,
-          child: Container(width: 100.0, height: 100.0)
+          child: Container(width: 100.0, height: 100.0),
         ),
       ),
     );
diff --git a/packages/flutter/test/widgets/shape_decoration_test.dart b/packages/flutter/test/widgets/shape_decoration_test.dart
index dc8297614a1..0ef27a9668e 100644
--- a/packages/flutter/test/widgets/shape_decoration_test.dart
+++ b/packages/flutter/test/widgets/shape_decoration_test.dart
@@ -36,7 +36,7 @@ Future<void> main() async {
       paints
         ..drawImageRect(image: rawImage)
         ..rect(color: Colors.black)
-        ..rect(color: Colors.white)
+        ..rect(color: Colors.white),
     );
   });
 
@@ -57,7 +57,7 @@ Future<void> main() async {
       paints
         ..path(color: Color(Colors.blue.value))
         ..rect(color: Colors.black)
-        ..rect(color: Colors.white)
+        ..rect(color: Colors.white),
     );
   });
 
@@ -77,7 +77,7 @@ Future<void> main() async {
       log,
       <String>[
         'getOuterPath Rect.fromLTRB(0.0, 0.0, 800.0, 600.0) TextDirection.ltr',
-        'paint Rect.fromLTRB(0.0, 0.0, 800.0, 600.0) TextDirection.ltr'
+        'paint Rect.fromLTRB(0.0, 0.0, 800.0, 600.0) TextDirection.ltr',
       ],
     );
   });
@@ -101,7 +101,7 @@ Future<void> main() async {
       log,
       <String>[
         'getInnerPath Rect.fromLTRB(0.0, 0.0, 800.0, 600.0) TextDirection.rtl',
-        'paint Rect.fromLTRB(0.0, 0.0, 800.0, 600.0) TextDirection.rtl'
+        'paint Rect.fromLTRB(0.0, 0.0, 800.0, 600.0) TextDirection.rtl',
       ],
     );
   });
diff --git a/packages/flutter/test/widgets/simple_semantics_test.dart b/packages/flutter/test/widgets/simple_semantics_test.dart
index 9d5db74bfda..2f2fc09f196 100644
--- a/packages/flutter/test/widgets/simple_semantics_test.dart
+++ b/packages/flutter/test/widgets/simple_semantics_test.dart
@@ -17,7 +17,7 @@ void main() {
 
     await tester.pumpWidget(
       const Center(
-          child: Text('Hello!', textDirection: TextDirection.ltr)
+          child: Text('Hello!', textDirection: TextDirection.ltr),
       ),
     );
 
@@ -29,7 +29,7 @@ void main() {
           textDirection: TextDirection.ltr,
           rect: Rect.fromLTRB(0.0, 0.0, 84.0, 14.0),
           transform: Matrix4.translationValues(358.0, 293.0, 0.0),
-        )
+        ),
       ],
     )));
 
@@ -69,7 +69,7 @@ void main() {
                   textDirection: TextDirection.ltr,
                   rect: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0),
                   transform: Matrix4.translationValues(395.0, 295.0, 0.0),
-                )
+                ),
               ],
             ),
           ],
diff --git a/packages/flutter/test/widgets/single_child_scroll_view_test.dart b/packages/flutter/test/widgets/single_child_scroll_view_test.dart
index f28cfb8d092..b1aa815baf6 100644
--- a/packages/flutter/test/widgets/single_child_scroll_view_test.dart
+++ b/packages/flutter/test/widgets/single_child_scroll_view_test.dart
@@ -585,7 +585,7 @@ void main() {
                           height: 100.0,
                           width: 100.0,
                         );
-                      })
+                      }),
                     );
                   }),
                 ),
@@ -739,7 +739,7 @@ void main() {
                     ),
                     Container(
                       height: 200.0,
-                    )
+                    ),
                   ],
                 ),
               ),
diff --git a/packages/flutter/test/widgets/sized_box_test.dart b/packages/flutter/test/widgets/sized_box_test.dart
index 4d5ca9e7250..9b8b6678019 100644
--- a/packages/flutter/test/widgets/sized_box_test.dart
+++ b/packages/flutter/test/widgets/sized_box_test.dart
@@ -43,7 +43,7 @@ void main() {
       Center(
         child: SizedBox(
           key: patient,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
@@ -53,7 +53,7 @@ void main() {
         child: SizedBox(
           key: patient,
           height: 0.0,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
@@ -64,7 +64,7 @@ void main() {
           key: patient,
           width: 0.0,
           height: 0.0,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
@@ -75,7 +75,7 @@ void main() {
           key: patient,
           width: 100.0,
           height: 100.0,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(100.0, 100.0)));
@@ -86,7 +86,7 @@ void main() {
           key: patient,
           width: 1000.0,
           height: 1000.0,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 600.0)));
@@ -95,7 +95,7 @@ void main() {
       Center(
         child: SizedBox.expand(
           key: patient,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 600.0)));
@@ -104,7 +104,7 @@ void main() {
       Center(
         child: SizedBox.shrink(
           key: patient,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
@@ -118,7 +118,7 @@ void main() {
         child: SizedBox(
           key: patient,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 600.0)));
@@ -129,7 +129,7 @@ void main() {
           key: patient,
           height: 0.0,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 0.0)));
@@ -141,7 +141,7 @@ void main() {
           width: 0.0,
           height: 0.0,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
@@ -153,7 +153,7 @@ void main() {
           width: 100.0,
           height: 100.0,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(100.0, 100.0)));
@@ -165,7 +165,7 @@ void main() {
           width: 1000.0,
           height: 1000.0,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 600.0)));
@@ -175,7 +175,7 @@ void main() {
         child: SizedBox.expand(
           key: patient,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 600.0)));
@@ -185,7 +185,7 @@ void main() {
         child: SizedBox.shrink(
           key: patient,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
diff --git a/packages/flutter/test/widgets/sliver_appbar_opacity.dart b/packages/flutter/test/widgets/sliver_appbar_opacity.dart
index 385a14d0635..a22bf340f38 100644
--- a/packages/flutter/test/widgets/sliver_appbar_opacity.dart
+++ b/packages/flutter/test/widgets/sliver_appbar_opacity.dart
@@ -196,7 +196,7 @@ class _TestWidget extends StatelessWidget {
                 height: 100.0,
               );
             })),
-          )
+          ),
         ],
       ),
     );
diff --git a/packages/flutter/test/widgets/slivers_appbar_floating_pinned_test.dart b/packages/flutter/test/widgets/slivers_appbar_floating_pinned_test.dart
index 563920b5619..d0f246823bf 100644
--- a/packages/flutter/test/widgets/slivers_appbar_floating_pinned_test.dart
+++ b/packages/flutter/test/widgets/slivers_appbar_floating_pinned_test.dart
@@ -93,7 +93,7 @@ void main() {
                       height: 100.0,
                     );
                   })),
-                )
+                ),
               ],
             ),
           ),
diff --git a/packages/flutter/test/widgets/stack_test.dart b/packages/flutter/test/widgets/stack_test.dart
index 39e6226d7e9..96381c8993b 100644
--- a/packages/flutter/test/widgets/stack_test.dart
+++ b/packages/flutter/test/widgets/stack_test.dart
@@ -535,7 +535,7 @@ void main() {
       '=1=',
       'BoxConstraints(w=3.0, h=7.0)',
       '=2=',
-      'BoxConstraints(2.0<=w<=3.0, 5.0<=h<=7.0)'
+      'BoxConstraints(2.0<=w<=3.0, 5.0<=h<=7.0)',
     ]);
   });
 
diff --git a/packages/flutter/test/widgets/state_setting_in_scrollables_test.dart b/packages/flutter/test/widgets/state_setting_in_scrollables_test.dart
index 3b7b060df7c..8796c927d37 100644
--- a/packages/flutter/test/widgets/state_setting_in_scrollables_test.dart
+++ b/packages/flutter/test/widgets/state_setting_in_scrollables_test.dart
@@ -32,7 +32,7 @@ class FooState extends State<Foo> {
                   child: SizedBox(
                     height: 200.0,
                   ),
-                )
+                ),
               ),
               const DecoratedBox(
                 decoration: BoxDecoration(color: Color(0)),
@@ -65,7 +65,7 @@ class FooState extends State<Foo> {
                 ),
               ),
             ],
-          )
+          ),
         );
       }
     );
diff --git a/packages/flutter/test/widgets/stateful_component_test.dart b/packages/flutter/test/widgets/stateful_component_test.dart
index 6363f0523e3..9a63eeba007 100644
--- a/packages/flutter/test/widgets/stateful_component_test.dart
+++ b/packages/flutter/test/widgets/stateful_component_test.dart
@@ -24,7 +24,7 @@ void main() {
     await tester.pumpWidget(
       const FlipWidget(
         left: DecoratedBox(decoration: kBoxDecorationA),
-        right: DecoratedBox(decoration: kBoxDecorationB)
+        right: DecoratedBox(decoration: kBoxDecorationB),
       )
     );
 
@@ -33,7 +33,7 @@ void main() {
     await tester.pumpWidget(
       const FlipWidget(
         left: DecoratedBox(decoration: kBoxDecorationB),
-        right: DecoratedBox(decoration: kBoxDecorationA)
+        right: DecoratedBox(decoration: kBoxDecorationA),
       )
     );
 
@@ -48,7 +48,7 @@ void main() {
     await tester.pumpWidget(
       const FlipWidget(
         left: DecoratedBox(decoration: kBoxDecorationA),
-        right: DecoratedBox(decoration: kBoxDecorationB)
+        right: DecoratedBox(decoration: kBoxDecorationB),
       )
     );
 
@@ -60,7 +60,7 @@ void main() {
       FlipWidget(
         key: const Key('rebuild test'),
         left: TestBuildCounter(),
-        right: const DecoratedBox(decoration: kBoxDecorationB)
+        right: const DecoratedBox(decoration: kBoxDecorationB),
       )
     );
 
diff --git a/packages/flutter/test/widgets/syncing_test.dart b/packages/flutter/test/widgets/syncing_test.dart
index e6b6296cf45..a0d4490bef1 100644
--- a/packages/flutter/test/widgets/syncing_test.dart
+++ b/packages/flutter/test/widgets/syncing_test.dart
@@ -49,9 +49,9 @@ void main() {
         child: Container(
           child: TestWidget(
             persistentState: 1,
-            child: Container()
-          )
-        )
+            child: Container(),
+          ),
+        ),
       )
     );
 
@@ -65,9 +65,9 @@ void main() {
         child: Container(
           child: TestWidget(
             persistentState: 2,
-            child: Container()
-          )
-        )
+            child: Container(),
+          ),
+        ),
       )
     );
 
@@ -83,9 +83,9 @@ void main() {
         child: Container(
           child: TestWidget(
             persistentState: 10,
-            child: Container()
-          )
-        )
+            child: Container(),
+          ),
+        ),
       )
     );
 
@@ -98,8 +98,8 @@ void main() {
       Container(
         child: TestWidget(
           persistentState: 11,
-          child: Container()
-        )
+          child: Container(),
+        ),
       )
     );
 
@@ -124,13 +124,13 @@ void main() {
         children: <Widget>[
           Container(
             key: keyA,
-            child: a
+            child: a,
           ),
           Container(
             key: keyB,
-            child: b
-          )
-        ]
+            child: b,
+          ),
+        ],
       )
     );
 
@@ -151,13 +151,13 @@ void main() {
         children: <Widget>[
           Container(
             key: keyA,
-            child: a
+            child: a,
           ),
           Container(
             key: keyB,
-            child: b
-          )
-        ]
+            child: b,
+          ),
+        ],
       )
     );
 
@@ -180,13 +180,13 @@ void main() {
         children: <Widget>[
           Container(
             key: keyA,
-            child: b
+            child: b,
           ),
           Container(
             key: keyB,
-            child: a
-          )
-        ]
+            child: a,
+          ),
+        ],
       )
     );
 
diff --git a/packages/flutter/test/widgets/table_test.dart b/packages/flutter/test/widgets/table_test.dart
index e47e1975bf7..b12d1cfe09b 100644
--- a/packages/flutter/test/widgets/table_test.dart
+++ b/packages/flutter/test/widgets/table_test.dart
@@ -524,7 +524,7 @@ void main() {
               ],
             ),
           ],
-        )
+        ),
       ),
     );
     final RenderBox boxA = tester.renderObject(find.text('AAA'));
diff --git a/packages/flutter/test/widgets/text_golden_test.dart b/packages/flutter/test/widgets/text_golden_test.dart
index aee652de0be..9f787952d15 100644
--- a/packages/flutter/test/widgets/text_golden_test.dart
+++ b/packages/flutter/test/widgets/text_golden_test.dart
@@ -160,7 +160,7 @@ void main() {
                 style: TextStyle(
                   color: translucentGreen,
                   background: Paint()
-                    ..color = red.withOpacity(0.5)
+                    ..color = red.withOpacity(0.5),
                 ),
                 children: <TextSpan>[
                   TextSpan(
@@ -168,8 +168,8 @@ void main() {
                     style: TextStyle(
                       color: translucentDarkRed,
                       background: Paint()
-                        ..color = blue.withOpacity(0.5)
-                    )
+                        ..color = blue.withOpacity(0.5),
+                    ),
                   ),
                 ],
               ),
@@ -211,7 +211,7 @@ void main() {
                 ),
               ),
             ),
-          )
+          ),
         )
     );
 
@@ -319,7 +319,7 @@ void main() {
                 text: 'Hello\n',
                 style: TextStyle(
                   color: Colors.red,
-                  fontSize: 30
+                  fontSize: 30,
                 ),
                 children: <TextSpan>[
                   TextSpan(
@@ -376,7 +376,7 @@ void main() {
                   'FakeFont 2',
                   'EvilFont 3',
                   'Nice Font 4',
-                  'ahem'
+                  'ahem',
                 ],
                 fontSize: 14,
               ),
@@ -407,7 +407,7 @@ void main() {
                 text: 'Hello\n',
                 style: TextStyle(
                   color: Colors.red,
-                  fontSize: 30
+                  fontSize: 30,
                 ),
                 children: <TextSpan>[
                   TextSpan(
diff --git a/packages/flutter/test/widgets/text_selection_test.dart b/packages/flutter/test/widgets/text_selection_test.dart
index c4df7c5d810..1d112dc2a86 100644
--- a/packages/flutter/test/widgets/text_selection_test.dart
+++ b/packages/flutter/test/widgets/text_selection_test.dart
@@ -167,7 +167,7 @@ void main() {
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
 
@@ -182,7 +182,7 @@ void main() {
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
     await gesture.updateWithCustomEvent(const PointerMoveEvent(pointer: pointerValue, position: Offset(0.0, 0.0), pressure: 0.5, pressureMin: 0, pressureMax: 1));
@@ -196,7 +196,7 @@ void main() {
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
     await gesture.updateWithCustomEvent(const PointerMoveEvent(pointer: pointerValue, position: Offset(0.0, 0.0), pressure: 0.5, pressureMin: 0, pressureMax: 1));
@@ -210,7 +210,7 @@ void main() {
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
     await gesture.updateWithCustomEvent(const PointerMoveEvent(pointer: pointerValue, position: Offset(0.0, 0.0), pressure: 0.5, pressureMin: 0, pressureMax: 1));
@@ -231,7 +231,7 @@ void main() {
           position: forcePressOffset,
           pressure: 0.0,
           pressureMax: 6.0,
-          pressureMin: 0.0
+          pressureMin: 0.0,
       ),
 
     );
@@ -242,7 +242,7 @@ void main() {
         position: Offset(0.0, 0.0),
         pressure: 0.0,
         pressureMin: 0,
-        pressureMax: 1
+        pressureMax: 1,
       )
     );
     await tester.pump(const Duration(milliseconds: 50));
@@ -256,7 +256,7 @@ void main() {
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
     await gesture.updateWithCustomEvent(const PointerMoveEvent(
@@ -264,7 +264,7 @@ void main() {
       position: Offset(0.0, 0.0),
       pressure: 0.5,
       pressureMin: 0,
-      pressureMax: 1
+      pressureMax: 1,
     ));
     expect(forcePressStartCount, 1);
 
diff --git a/packages/flutter/test/widgets/text_test.dart b/packages/flutter/test/widgets/text_test.dart
index 504ddadced7..8943f11689b 100644
--- a/packages/flutter/test/widgets/text_test.dart
+++ b/packages/flutter/test/widgets/text_test.dart
@@ -15,8 +15,8 @@ void main() {
     await tester.pumpWidget(const MediaQuery(
       data: MediaQueryData(textScaleFactor: 1.3),
       child: Center(
-        child: Text('Hello', textDirection: TextDirection.ltr)
-      )
+        child: Text('Hello', textDirection: TextDirection.ltr),
+      ),
     ));
 
     RichText text = tester.firstWidget(find.byType(RichText));
@@ -24,7 +24,7 @@ void main() {
     expect(text.textScaleFactor, 1.3);
 
     await tester.pumpWidget(const Center(
-      child: Text('Hello', textDirection: TextDirection.ltr)
+      child: Text('Hello', textDirection: TextDirection.ltr),
     ));
 
     text = tester.firstWidget(find.byType(RichText));
@@ -45,7 +45,7 @@ void main() {
     expect(baseSize.height, equals(14.0));
 
     await tester.pumpWidget(const Center(
-      child: Text('Hello', textScaleFactor: 1.5, textDirection: TextDirection.ltr)
+      child: Text('Hello', textScaleFactor: 1.5, textDirection: TextDirection.ltr),
     ));
 
     text = tester.firstWidget(find.byType(RichText));
@@ -59,7 +59,7 @@ void main() {
   testWidgets('Text respects textScaleFactor with explicit font size', (WidgetTester tester) async {
     await tester.pumpWidget(const Center(
       child: Text('Hello',
-        style: TextStyle(fontSize: 20.0), textDirection: TextDirection.ltr)
+        style: TextStyle(fontSize: 20.0), textDirection: TextDirection.ltr),
     ));
 
     RichText text = tester.firstWidget(find.byType(RichText));
@@ -73,7 +73,7 @@ void main() {
       child: Text('Hello',
         style: TextStyle(fontSize: 20.0),
         textScaleFactor: 1.3,
-        textDirection: TextDirection.ltr)
+        textDirection: TextDirection.ltr),
     ));
 
     text = tester.firstWidget(find.byType(RichText));
@@ -175,7 +175,7 @@ void main() {
             TestSemantics(
               label: ' this is a cat-astrophe',
               textDirection: TextDirection.ltr,
-            )
+            ),
           ],
         ),
       ],
diff --git a/packages/flutter/test/widgets/ticker_provider_test.dart b/packages/flutter/test/widgets/ticker_provider_test.dart
index 4cec82d8916..2cc8eb778af 100644
--- a/packages/flutter/test/widgets/ticker_provider_test.dart
+++ b/packages/flutter/test/widgets/ticker_provider_test.dart
@@ -9,7 +9,7 @@ void main() {
   testWidgets('TickerMode', (WidgetTester tester) async {
     const Widget widget = TickerMode(
       enabled: false,
-      child: CircularProgressIndicator()
+      child: CircularProgressIndicator(),
     );
     expect(widget.toString, isNot(throwsException));
 
@@ -19,14 +19,14 @@ void main() {
 
     await tester.pumpWidget(const TickerMode(
       enabled: true,
-      child: CircularProgressIndicator()
+      child: CircularProgressIndicator(),
     ));
 
     expect(tester.binding.transientCallbackCount, 1);
 
     await tester.pumpWidget(const TickerMode(
       enabled: false,
-      child: CircularProgressIndicator()
+      child: CircularProgressIndicator(),
     ));
 
     expect(tester.binding.transientCallbackCount, 0);
diff --git a/packages/flutter/test/widgets/transform_test.dart b/packages/flutter/test/widgets/transform_test.dart
index 81afd854d80..1e17e9b2dc0 100644
--- a/packages/flutter/test/widgets/transform_test.dart
+++ b/packages/flutter/test/widgets/transform_test.dart
@@ -349,9 +349,9 @@ void main() {
             child: Container(
               key: key1,
               color: const Color(0xFF000000),
-            )
-          )
-        )
+            ),
+          ),
+        ),
       ),
     );
     expect(_pointerDown, isFalse);
diff --git a/packages/flutter/test/widgets/transitions_test.dart b/packages/flutter/test/widgets/transitions_test.dart
index 4f97dd3c412..a1403b30a26 100644
--- a/packages/flutter/test/widgets/transitions_test.dart
+++ b/packages/flutter/test/widgets/transitions_test.dart
@@ -99,7 +99,7 @@ void main() {
 
         expect(actualDecoration.color, const Color(0xFF000000));
         expect(actualDecoration.boxShadow, null);
-      }
+      },
     );
 
     testWidgets('animations work with curves test', (WidgetTester tester) async {
diff --git a/packages/flutter/test/widgets/visibility_test.dart b/packages/flutter/test/widgets/visibility_test.dart
index 18afe636b14..bf339cf0c9f 100644
--- a/packages/flutter/test/widgets/visibility_test.dart
+++ b/packages/flutter/test/widgets/visibility_test.dart
@@ -53,7 +53,7 @@ void main() {
             label: 'a true',
             textDirection: TextDirection.rtl,
             actions: <SemanticsAction>[SemanticsAction.tap],
-          )
+          ),
         ],
       ),
       ignoreId: true,
diff --git a/packages/flutter/test/widgets/wrap_test.dart b/packages/flutter/test/widgets/wrap_test.dart
index 5e6acde6026..1bb2a208bff 100644
--- a/packages/flutter/test/widgets/wrap_test.dart
+++ b/packages/flutter/test/widgets/wrap_test.dart
@@ -848,7 +848,7 @@ void main() {
       const Offset(0.0, 0.0),
       const Offset(210.0, 0.0),
       const Offset(420.0, 0.0),
-      const Offset(0.0, 20.0)
+      const Offset(0.0, 20.0),
     ]);
   });
 
diff --git a/packages/flutter_driver/lib/src/common/enum_util.dart b/packages/flutter_driver/lib/src/common/enum_util.dart
index 2023476b62f..46ad6fd99e1 100644
--- a/packages/flutter_driver/lib/src/common/enum_util.dart
+++ b/packages/flutter_driver/lib/src/common/enum_util.dart
@@ -20,11 +20,11 @@ class EnumIndex<E> {
   EnumIndex(List<E> enumValues)
     : _nameToValue = Map<String, E>.fromIterable(
         enumValues,
-        key: _getSimpleName
+        key: _getSimpleName,
       ),
       _valueToName = Map<E, String>.fromIterable(
         enumValues,
-        value: _getSimpleName
+        value: _getSimpleName,
       );
 
   final Map<String, E> _nameToValue;
diff --git a/packages/flutter_driver/lib/src/common/render_tree.dart b/packages/flutter_driver/lib/src/common/render_tree.dart
index 718253c891e..6bd827ed029 100644
--- a/packages/flutter_driver/lib/src/common/render_tree.dart
+++ b/packages/flutter_driver/lib/src/common/render_tree.dart
@@ -32,6 +32,6 @@ class RenderTree extends Result {
 
   @override
   Map<String, dynamic> toJson() => <String, dynamic>{
-    'tree': tree
+    'tree': tree,
   };
 }
diff --git a/packages/flutter_driver/lib/src/driver/driver.dart b/packages/flutter_driver/lib/src/driver/driver.dart
index 528ecd77319..7152c8cd0cb 100644
--- a/packages/flutter_driver/lib/src/driver/driver.dart
+++ b/packages/flutter_driver/lib/src/driver/driver.dart
@@ -322,7 +322,7 @@ class FlutterDriver {
         message: 'Flutter Driver extension is taking a long time to become available. '
                  'Ensure your test app (often "lib/main.dart") imports '
                  '"package:flutter_driver/driver_extension.dart" and '
-                 'calls enableFlutterDriverExtension() as the first call in main().'
+                 'calls enableFlutterDriverExtension() as the first call in main().',
       );
     } else if (isolate.pauseEvent is VMPauseExitEvent ||
                isolate.pauseEvent is VMPauseBreakpointEvent ||
@@ -725,7 +725,7 @@ class FlutterDriver {
     try {
       await _warnIfSlow<void>(
         future: _peer.sendRequest(_setVMTimelineFlagsMethodName, <String, String>{
-          'recordedStreams': _timelineStreamsToString(streams)
+          'recordedStreams': _timelineStreamsToString(streams),
         }),
         timeout: timeout,
         message: 'VM is taking an unusually long time to respond to being told to start tracing...',
@@ -797,7 +797,7 @@ class FlutterDriver {
   /// operation exceeds the specified timeout; it does not actually cancel the
   /// operation.
   Future<void> clearTimeline({
-    Duration timeout = _kUnusuallyLongTimeout
+    Duration timeout = _kUnusuallyLongTimeout,
   }) async {
     assert(timeout != null);
     try {
diff --git a/packages/flutter_driver/lib/src/driver/timeline.dart b/packages/flutter_driver/lib/src/driver/timeline.dart
index 6bb3087659b..1273156aed9 100644
--- a/packages/flutter_driver/lib/src/driver/timeline.dart
+++ b/packages/flutter_driver/lib/src/driver/timeline.dart
@@ -42,7 +42,7 @@ class TimelineEvent {
         : null,
       json['ts'],
       json['tts'],
-      json['args']
+      json['args'],
     );
   }
 
@@ -57,7 +57,7 @@ class TimelineEvent {
     this.threadDuration,
     this.timestampMicros,
     this.threadTimestampMicros,
-    this.arguments
+    this.arguments,
   );
 
   /// The original event JSON.
diff --git a/packages/flutter_driver/test/flutter_driver_test.dart b/packages/flutter_driver/test/flutter_driver_test.dart
index c5e23caaa0c..a9f52785808 100644
--- a/packages/flutter_driver/test/flutter_driver_test.dart
+++ b/packages/flutter_driver/test/flutter_driver_test.dart
@@ -150,7 +150,7 @@ void main() {
             'timeout': _kSerializedTestTimeout,
             'finderType': 'ByValueKey',
             'keyValueString': 'foo',
-            'keyValueType': 'String'
+            'keyValueType': 'String',
           });
           return makeMockResponse(<String, dynamic>{});
         });
@@ -189,10 +189,10 @@ void main() {
             'timeout': _kSerializedTestTimeout,
             'finderType': 'ByValueKey',
             'keyValueString': '123',
-            'keyValueType': 'int'
+            'keyValueType': 'int',
           });
           return makeMockResponse(<String, String>{
-            'text': 'hello'
+            'text': 'hello',
           });
         });
         final String result = await driver.getText(find.byValueKey(123), timeout: _kTestTimeout);
@@ -274,8 +274,8 @@ void main() {
           return <String, dynamic> {
             'traceEvents': <dynamic>[
               <String, String>{
-                'name': 'test event'
-              }
+                'name': 'test event',
+              },
             ],
           };
         });
@@ -333,8 +333,8 @@ void main() {
           return <String, dynamic> {
             'traceEvents': <dynamic>[
               <String, String>{
-                'name': 'test event'
-              }
+                'name': 'test event',
+              },
             ],
           };
         });
@@ -345,7 +345,7 @@ void main() {
         streams: const <TimelineStream>[
           TimelineStream.dart,
           TimelineStream.gc,
-          TimelineStream.compiler
+          TimelineStream.compiler,
         ],
         retainPriorEvents: true);
 
@@ -376,7 +376,7 @@ void main() {
       test('remote error', () async {
         when(mockIsolate.invokeExtension(any, any)).thenAnswer((Invocation i) {
           return makeMockResponse(<String, dynamic>{
-            'message': 'This is a failure'
+            'message': 'This is a failure',
           }, isError: true);
         });
         try {
@@ -432,7 +432,7 @@ Future<Map<String, dynamic>> makeMockResponse(
 }) {
   return Future<Map<String, dynamic>>.value(<String, dynamic>{
     'isError': isError,
-    'response': response
+    'response': response,
   });
 }
 
diff --git a/packages/flutter_driver/test/src/timeline_summary_test.dart b/packages/flutter_driver/test/src/timeline_summary_test.dart
index 151b4cf9622..4ab98fdd7bf 100644
--- a/packages/flutter_driver/test/src/timeline_summary_test.dart
+++ b/packages/flutter_driver/test/src/timeline_summary_test.dart
@@ -21,15 +21,15 @@ void main() {
     }
 
     Map<String, dynamic> build(int timeStamp, int duration) => <String, dynamic>{
-      'name': 'Frame', 'ph': 'X', 'ts': timeStamp, 'dur': duration
+      'name': 'Frame', 'ph': 'X', 'ts': timeStamp, 'dur': duration,
     };
 
     Map<String, dynamic> begin(int timeStamp) => <String, dynamic>{
-      'name': 'GPURasterizer::Draw', 'ph': 'B', 'ts': timeStamp
+      'name': 'GPURasterizer::Draw', 'ph': 'B', 'ts': timeStamp,
     };
 
     Map<String, dynamic> end(int timeStamp) => <String, dynamic>{
-      'name': 'GPURasterizer::Draw', 'ph': 'E', 'ts': timeStamp
+      'name': 'GPURasterizer::Draw', 'ph': 'E', 'ts': timeStamp,
     };
 
     List<Map<String, dynamic>> rasterizeTimeSequenceInMillis(List<int> sequence) {
@@ -50,7 +50,7 @@ void main() {
             build(1000, 1000),
             build(3000, 2000),
           ]).countFrames(),
-          2
+          2,
         );
       });
     });
@@ -59,7 +59,7 @@ void main() {
       test('throws when there is no data', () {
         expect(
           () => summarize(<Map<String, dynamic>>[]).computeAverageFrameBuildTimeMillis(),
-          throwsA(predicate<ArgumentError>((ArgumentError e) => e.message == 'durations is empty!'))
+          throwsA(predicate<ArgumentError>((ArgumentError e) => e.message == 'durations is empty!')),
         );
       });
 
@@ -69,7 +69,7 @@ void main() {
             build(1000, 1000),
             build(3000, 2000),
           ]).computeAverageFrameBuildTimeMillis(),
-          1.5
+          1.5,
         );
       });
     });
@@ -78,7 +78,7 @@ void main() {
       test('throws when there is no data', () {
         expect(
           () => summarize(<Map<String, dynamic>>[]).computeWorstFrameBuildTimeMillis(),
-          throwsA(predicate<ArgumentError>((ArgumentError e) => e.message == 'durations is empty!'))
+          throwsA(predicate<ArgumentError>((ArgumentError e) => e.message == 'durations is empty!')),
         );
       });
 
@@ -88,14 +88,14 @@ void main() {
             build(1000, 1000),
             build(3000, 2000),
           ]).computeWorstFrameBuildTimeMillis(),
-          2.0
+          2.0,
         );
         expect(
           summarize(<Map<String, dynamic>>[
             build(3000, 2000),
             build(1000, 1000),
           ]).computeWorstFrameBuildTimeMillis(),
-          2.0
+          2.0,
         );
       });
     });
@@ -117,7 +117,7 @@ void main() {
       test('throws when there is no data', () {
         expect(
           () => summarize(<Map<String, dynamic>>[]).computeAverageFrameRasterizerTimeMillis(),
-          throwsA(predicate<ArgumentError>((ArgumentError e) => e.message == 'durations is empty!'))
+          throwsA(predicate<ArgumentError>((ArgumentError e) => e.message == 'durations is empty!')),
         );
       });
 
@@ -127,7 +127,7 @@ void main() {
               begin(1000), end(2000),
               begin(3000), end(5000),
             ]).computeAverageFrameRasterizerTimeMillis(),
-            1.5
+            1.5,
         );
       });
 
@@ -137,7 +137,7 @@ void main() {
               end(1000),
               begin(2000), end(4000),
             ]).computeAverageFrameRasterizerTimeMillis(),
-            2.0
+            2.0,
         );
       });
 
@@ -147,7 +147,7 @@ void main() {
               begin(2000), end(4000),
               begin(5000),
             ]).computeAverageFrameRasterizerTimeMillis(),
-            2.0
+            2.0,
         );
       });
     });
@@ -156,7 +156,7 @@ void main() {
       test('throws when there is no data', () {
         expect(
           () => summarize(<Map<String, dynamic>>[]).computeWorstFrameRasterizerTimeMillis(),
-          throwsA(predicate<ArgumentError>((ArgumentError e) => e.message == 'durations is empty!'))
+          throwsA(predicate<ArgumentError>((ArgumentError e) => e.message == 'durations is empty!')),
         );
       });
 
@@ -167,14 +167,14 @@ void main() {
               begin(1000), end(2000),
               begin(3000), end(5000),
             ]).computeWorstFrameRasterizerTimeMillis(),
-            2.0
+            2.0,
         );
         expect(
             summarize(<Map<String, dynamic>>[
               begin(3000), end(5000),
               begin(1000), end(2000),
             ]).computeWorstFrameRasterizerTimeMillis(),
-            2.0
+            2.0,
         );
       });
 
@@ -184,7 +184,7 @@ void main() {
               end(1000),
               begin(2000), end(4000),
             ]).computeWorstFrameRasterizerTimeMillis(),
-            2.0
+            2.0,
         );
       });
 
@@ -194,7 +194,7 @@ void main() {
               begin(2000), end(4000),
               begin(5000),
             ]).computeWorstFrameRasterizerTimeMillis(),
-            2.0
+            2.0,
         );
       });
     });
@@ -203,7 +203,7 @@ void main() {
       test('throws when there is no data', () {
         expect(
           () => summarize(<Map<String, dynamic>>[]).computePercentileFrameRasterizerTimeMillis(90.0),
-          throwsA(predicate<ArgumentError>((ArgumentError e) => e.message == 'durations is empty!'))
+          throwsA(predicate<ArgumentError>((ArgumentError e) => e.message == 'durations is empty!')),
         );
       });
 
@@ -211,20 +211,20 @@ void main() {
       const List<List<int>> sequences = <List<int>>[
         <int>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
         <int>[1, 2, 3, 4, 5],
-        <int>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
+        <int>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20],
       ];
 
       const List<int> p90s = <int>[
         9,
         5,
-        18
+        18,
       ];
 
       test('computes 90th frame rasterizer time in milliseconds', () {
         for(int i = 0; i < sequences.length; ++i) {
           expect(
             summarize(rasterizeTimeSequenceInMillis(sequences[i])).computePercentileFrameRasterizerTimeMillis(90.0),
-            p90s[i]
+            p90s[i],
           );
         }
       });
@@ -236,7 +236,7 @@ void main() {
         }
         expect(
           summarize(rasterizeTimeSequenceInMillis(sequence)).computePercentileFrameRasterizerTimeMillis(99.0),
-          99
+          99,
         );
       });
     });
@@ -278,7 +278,7 @@ void main() {
             'frame_count': 3,
             'frame_build_times': <int>[17000, 9000, 19000],
             'frame_rasterizer_times': <int>[18000, 10000, 20000],
-          }
+          },
         );
       });
     });
diff --git a/packages/flutter_driver/test/src/timeline_test.dart b/packages/flutter_driver/test/src/timeline_test.dart
index 5f031cfc91a..d89940c9791 100644
--- a/packages/flutter_driver/test/src/timeline_test.dart
+++ b/packages/flutter_driver/test/src/timeline_test.dart
@@ -23,11 +23,11 @@ void main() {
             'tts': 567,
             'args': <String, dynamic>{
               'arg1': true,
-            }
+            },
           },
           // Tests that we don't choke on missing data
-          <String, dynamic>{}
-        ]
+          <String, dynamic>{},
+        ],
       });
 
       expect(timeline.events, hasLength(2));
diff --git a/packages/flutter_localizations/lib/src/l10n/date_localizations.dart b/packages/flutter_localizations/lib/src/l10n/date_localizations.dart
index c2a0f5f7acb..fcb0eaadec8 100644
--- a/packages/flutter_localizations/lib/src/l10n/date_localizations.dart
+++ b/packages/flutter_localizations/lib/src/l10n/date_localizations.dart
@@ -25,7 +25,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''س''',
       r'''ك''',
       r'''ب''',
-      r'''د'''
+      r'''د''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ي''',
@@ -39,7 +39,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''س''',
       r'''ك''',
       r'''ب''',
-      r'''د'''
+      r'''د''',
     ],
     'MONTHS': <dynamic>[
       r'''يناير''',
@@ -53,7 +53,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سبتمبر''',
       r'''أكتوبر''',
       r'''نوفمبر''',
-      r'''ديسمبر'''
+      r'''ديسمبر''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''يناير''',
@@ -67,7 +67,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سبتمبر''',
       r'''أكتوبر''',
       r'''نوفمبر''',
-      r'''ديسمبر'''
+      r'''ديسمبر''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''يناير''',
@@ -81,7 +81,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سبتمبر''',
       r'''أكتوبر''',
       r'''نوفمبر''',
-      r'''ديسمبر'''
+      r'''ديسمبر''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''يناير''',
@@ -95,7 +95,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سبتمبر''',
       r'''أكتوبر''',
       r'''نوفمبر''',
-      r'''ديسمبر'''
+      r'''ديسمبر''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''الأحد''',
@@ -104,7 +104,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''الأربعاء''',
       r'''الخميس''',
       r'''الجمعة''',
-      r'''السبت'''
+      r'''السبت''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''الأحد''',
@@ -113,7 +113,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''الأربعاء''',
       r'''الخميس''',
       r'''الجمعة''',
-      r'''السبت'''
+      r'''السبت''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''الأحد''',
@@ -122,7 +122,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''الأربعاء''',
       r'''الخميس''',
       r'''الجمعة''',
-      r'''السبت'''
+      r'''السبت''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''الأحد''',
@@ -131,7 +131,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''الأربعاء''',
       r'''الخميس''',
       r'''الجمعة''',
-      r'''السبت'''
+      r'''السبت''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''ح''',
@@ -140,7 +140,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ر''',
       r'''خ''',
       r'''ج''',
-      r'''س'''
+      r'''س''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''ح''',
@@ -149,32 +149,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ر''',
       r'''خ''',
       r'''ج''',
-      r'''س'''
+      r'''س''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''الربع الأول''',
       r'''الربع الثاني''',
       r'''الربع الثالث''',
-      r'''الربع الرابع'''
+      r'''الربع الرابع''',
     ],
     'QUARTERS': <dynamic>[
       r'''الربع الأول''',
       r'''الربع الثاني''',
       r'''الربع الثالث''',
-      r'''الربع الرابع'''
+      r'''الربع الرابع''',
     ],
     'AMPMS': <dynamic>[r'''ص''', r'''م'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE، d MMMM y''',
       r'''d MMMM y''',
       r'''dd‏/MM‏/y''',
-      r'''d‏/M‏/y'''
+      r'''d‏/M‏/y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 5,
@@ -184,7 +184,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
     'ZERODIGIT': r'''٠''',
   },
@@ -204,7 +204,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''с''',
       r'''о''',
       r'''н''',
-      r'''д'''
+      r'''д''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''я''',
@@ -218,7 +218,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''с''',
       r'''о''',
       r'''н''',
-      r'''д'''
+      r'''д''',
     ],
     'MONTHS': <dynamic>[
       r'''януари''',
@@ -232,7 +232,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''септември''',
       r'''октомври''',
       r'''ноември''',
-      r'''декември'''
+      r'''декември''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''януари''',
@@ -246,7 +246,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''септември''',
       r'''октомври''',
       r'''ноември''',
-      r'''декември'''
+      r'''декември''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''яну''',
@@ -260,7 +260,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сеп''',
       r'''окт''',
       r'''ное''',
-      r'''дек'''
+      r'''дек''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''яну''',
@@ -274,7 +274,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сеп''',
       r'''окт''',
       r'''ное''',
-      r'''дек'''
+      r'''дек''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''неделя''',
@@ -283,7 +283,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сряда''',
       r'''четвъртък''',
       r'''петък''',
-      r'''събота'''
+      r'''събота''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''неделя''',
@@ -292,7 +292,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сряда''',
       r'''четвъртък''',
       r'''петък''',
-      r'''събота'''
+      r'''събота''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''нд''',
@@ -301,7 +301,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''нд''',
@@ -310,7 +310,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''н''',
@@ -319,7 +319,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''с''',
       r'''ч''',
       r'''п''',
-      r'''с'''
+      r'''с''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''н''',
@@ -328,32 +328,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''с''',
       r'''ч''',
       r'''п''',
-      r'''с'''
+      r'''с''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''1. трим.''',
       r'''2. трим.''',
       r'''3. трим.''',
-      r'''4. трим.'''
+      r'''4. трим.''',
     ],
     'QUARTERS': <dynamic>[
       r'''1. тримесечие''',
       r'''2. тримесечие''',
       r'''3. тримесечие''',
-      r'''4. тримесечие'''
+      r'''4. тримесечие''',
     ],
     'AMPMS': <dynamic>[r'''пр.об.''', r'''сл.об.'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d MMMM y 'г'.""",
       r"""d MMMM y 'г'.""",
       r"""d.MM.y 'г'.""",
-      r"""d.MM.yy 'г'."""
+      r"""d.MM.yy 'г'.""",
     ],
     'TIMEFORMATS': <dynamic>[
       r"""H:mm:ss 'ч'. zzzz""",
       r"""H:mm:ss 'ч'. z""",
       r"""H:mm:ss 'ч'.""",
-      r"""H:mm 'ч'."""
+      r"""H:mm 'ч'.""",
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -363,7 +363,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'bs': <String, dynamic>{
@@ -382,7 +382,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''j''',
@@ -396,7 +396,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'MONTHS': <dynamic>[
       r'''januar''',
@@ -410,7 +410,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembar''',
       r'''oktobar''',
       r'''novembar''',
-      r'''decembar'''
+      r'''decembar''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januar''',
@@ -424,7 +424,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembar''',
       r'''oktobar''',
       r'''novembar''',
-      r'''decembar'''
+      r'''decembar''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -438,7 +438,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -452,7 +452,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''nedjelja''',
@@ -461,7 +461,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''srijeda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''nedjelja''',
@@ -470,7 +470,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''srijeda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -479,7 +479,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sri''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -488,7 +488,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sri''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''N''',
@@ -497,7 +497,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''Č''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -506,27 +506,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''č''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''KV1''', r'''KV2''', r'''KV3''', r'''KV4'''],
     'QUARTERS': <dynamic>[
       r'''Prvi kvartal''',
       r'''Drugi kvartal''',
       r'''Treći kvartal''',
-      r'''Četvrti kvartal'''
+      r'''Četvrti kvartal''',
     ],
     'AMPMS': <dynamic>[r'''prijepodne''', r'''popodne'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d. MMMM y.''',
       r'''d. MMMM y.''',
       r'''d. MMM y.''',
-      r'''d.M.yy.'''
+      r'''d.M.yy.''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -536,7 +536,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'u' {0}""",
       r"""{1} 'u' {0}""",
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'ca': <String, dynamic>{
@@ -555,7 +555,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ST''',
       r'''OC''',
       r'''NV''',
-      r'''DS'''
+      r'''DS''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''GN''',
@@ -569,7 +569,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ST''',
       r'''OC''',
       r'''NV''',
-      r'''DS'''
+      r'''DS''',
     ],
     'MONTHS': <dynamic>[
       r'''de gener''',
@@ -583,7 +583,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''de setembre''',
       r'''d’octubre''',
       r'''de novembre''',
-      r'''de desembre'''
+      r'''de desembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''gener''',
@@ -597,7 +597,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''setembre''',
       r'''octubre''',
       r'''novembre''',
-      r'''desembre'''
+      r'''desembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''de gen.''',
@@ -611,7 +611,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''de set.''',
       r'''d’oct.''',
       r'''de nov.''',
-      r'''de des.'''
+      r'''de des.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''gen.''',
@@ -625,7 +625,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''set.''',
       r'''oct.''',
       r'''nov.''',
-      r'''des.'''
+      r'''des.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''diumenge''',
@@ -634,7 +634,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''dimecres''',
       r'''dijous''',
       r'''divendres''',
-      r'''dissabte'''
+      r'''dissabte''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''diumenge''',
@@ -643,7 +643,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''dimecres''',
       r'''dijous''',
       r'''divendres''',
-      r'''dissabte'''
+      r'''dissabte''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dg.''',
@@ -652,7 +652,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''dc.''',
       r'''dj.''',
       r'''dv.''',
-      r'''ds.'''
+      r'''ds.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dg.''',
@@ -661,7 +661,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''dc.''',
       r'''dj.''',
       r'''dv.''',
-      r'''ds.'''
+      r'''ds.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''dg''',
@@ -670,7 +670,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''dc''',
       r'''dj''',
       r'''dv''',
-      r'''ds'''
+      r'''ds''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''dg''',
@@ -679,27 +679,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''dc''',
       r'''dj''',
       r'''dv''',
-      r'''ds'''
+      r'''ds''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''1T''', r'''2T''', r'''3T''', r'''4T'''],
     'QUARTERS': <dynamic>[
       r'''1r trimestre''',
       r'''2n trimestre''',
       r'''3r trimestre''',
-      r'''4t trimestre'''
+      r'''4t trimestre''',
     ],
     'AMPMS': <dynamic>[r'''a. m.''', r'''p. m.'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d MMMM 'de' y""",
       r"""d MMMM 'de' y""",
       r'''d MMM y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H:mm:ss zzzz''',
       r'''H:mm:ss z''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -709,7 +709,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'a' 'les' {0}""",
       r"""{1} 'a' 'les' {0}""",
       r'''{1}, {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'cs': <String, dynamic>{
@@ -717,7 +717,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
     'ERAS': <dynamic>[r'''př. n. l.''', r'''n. l.'''],
     'ERANAMES': <dynamic>[
       r'''před naším letopočtem''',
-      r'''našeho letopočtu'''
+      r'''našeho letopočtu''',
     ],
     'NARROWMONTHS': <dynamic>[
       r'''1''',
@@ -731,7 +731,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -745,7 +745,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''ledna''',
@@ -759,7 +759,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''září''',
       r'''října''',
       r'''listopadu''',
-      r'''prosince'''
+      r'''prosince''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''leden''',
@@ -773,7 +773,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''září''',
       r'''říjen''',
       r'''listopad''',
-      r'''prosinec'''
+      r'''prosinec''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''led''',
@@ -787,7 +787,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''zář''',
       r'''říj''',
       r'''lis''',
-      r'''pro'''
+      r'''pro''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''led''',
@@ -801,7 +801,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''zář''',
       r'''říj''',
       r'''lis''',
-      r'''pro'''
+      r'''pro''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''neděle''',
@@ -810,7 +810,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''středa''',
       r'''čtvrtek''',
       r'''pátek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''neděle''',
@@ -819,7 +819,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''středa''',
       r'''čtvrtek''',
       r'''pátek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ne''',
@@ -828,7 +828,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''st''',
       r'''čt''',
       r'''pá''',
-      r'''so'''
+      r'''so''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ne''',
@@ -837,7 +837,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''st''',
       r'''čt''',
       r'''pá''',
-      r'''so'''
+      r'''so''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''N''',
@@ -846,7 +846,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''Č''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''N''',
@@ -855,27 +855,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''Č''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1. čtvrtletí''',
       r'''2. čtvrtletí''',
       r'''3. čtvrtletí''',
-      r'''4. čtvrtletí'''
+      r'''4. čtvrtletí''',
     ],
     'AMPMS': <dynamic>[r'''dop.''', r'''odp.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d. MMMM y''',
       r'''d. MMMM y''',
       r'''d. M. y''',
-      r'''dd.MM.yy'''
+      r'''dd.MM.yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H:mm:ss zzzz''',
       r'''H:mm:ss z''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -885,7 +885,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'da': <String, dynamic>{
@@ -904,7 +904,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -918,7 +918,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''januar''',
@@ -932,7 +932,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januar''',
@@ -946,7 +946,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -960,7 +960,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -974,7 +974,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''søndag''',
@@ -983,7 +983,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lørdag'''
+      r'''lørdag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''søndag''',
@@ -992,7 +992,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lørdag'''
+      r'''lørdag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''søn.''',
@@ -1001,7 +1001,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ons.''',
       r'''tor.''',
       r'''fre.''',
-      r'''lør.'''
+      r'''lør.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''søn''',
@@ -1010,7 +1010,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ons''',
       r'''tor''',
       r'''fre''',
-      r'''lør'''
+      r'''lør''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1019,7 +1019,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''O''',
       r'''T''',
       r'''F''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1028,32 +1028,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''O''',
       r'''T''',
       r'''F''',
-      r'''L'''
+      r'''L''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''1. kvt.''',
       r'''2. kvt.''',
       r'''3. kvt.''',
-      r'''4. kvt.'''
+      r'''4. kvt.''',
     ],
     'QUARTERS': <dynamic>[
       r'''1. kvartal''',
       r'''2. kvartal''',
       r'''3. kvartal''',
-      r'''4. kvartal'''
+      r'''4. kvartal''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE 'den' d. MMMM y""",
       r'''d. MMMM y''',
       r'''d. MMM y''',
-      r'''dd/MM/y'''
+      r'''dd/MM/y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH.mm.ss zzzz''',
       r'''HH.mm.ss z''',
       r'''HH.mm.ss''',
-      r'''HH.mm'''
+      r'''HH.mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -1063,7 +1063,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'kl'. {0}""",
       r"""{1} 'kl'. {0}""",
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'de': <String, dynamic>{
@@ -1082,7 +1082,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -1096,7 +1096,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januar''',
@@ -1110,7 +1110,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Dezember'''
+      r'''Dezember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januar''',
@@ -1124,7 +1124,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Dezember'''
+      r'''Dezember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan.''',
@@ -1138,7 +1138,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep.''',
       r'''Okt.''',
       r'''Nov.''',
-      r'''Dez.'''
+      r'''Dez.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -1152,7 +1152,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dez'''
+      r'''Dez''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sonntag''',
@@ -1161,7 +1161,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mittwoch''',
       r'''Donnerstag''',
       r'''Freitag''',
-      r'''Samstag'''
+      r'''Samstag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sonntag''',
@@ -1170,7 +1170,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mittwoch''',
       r'''Donnerstag''',
       r'''Freitag''',
-      r'''Samstag'''
+      r'''Samstag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''So.''',
@@ -1179,7 +1179,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mi.''',
       r'''Do.''',
       r'''Fr.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''So''',
@@ -1188,7 +1188,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mi''',
       r'''Do''',
       r'''Fr''',
-      r'''Sa'''
+      r'''Sa''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1197,7 +1197,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''D''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1206,27 +1206,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''D''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1. Quartal''',
       r'''2. Quartal''',
       r'''3. Quartal''',
-      r'''4. Quartal'''
+      r'''4. Quartal''',
     ],
     'AMPMS': <dynamic>[r'''vorm.''', r'''nachm.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d. MMMM y''',
       r'''d. MMMM y''',
       r'''dd.MM.y''',
-      r'''dd.MM.yy'''
+      r'''dd.MM.yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -1236,7 +1236,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'um' {0}""",
       r"""{1} 'um' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'de_CH': <String, dynamic>{
@@ -1255,7 +1255,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -1269,7 +1269,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januar''',
@@ -1283,7 +1283,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Dezember'''
+      r'''Dezember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januar''',
@@ -1297,7 +1297,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Dezember'''
+      r'''Dezember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan.''',
@@ -1311,7 +1311,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep.''',
       r'''Okt.''',
       r'''Nov.''',
-      r'''Dez.'''
+      r'''Dez.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -1325,7 +1325,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dez'''
+      r'''Dez''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sonntag''',
@@ -1334,7 +1334,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mittwoch''',
       r'''Donnerstag''',
       r'''Freitag''',
-      r'''Samstag'''
+      r'''Samstag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sonntag''',
@@ -1343,7 +1343,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mittwoch''',
       r'''Donnerstag''',
       r'''Freitag''',
-      r'''Samstag'''
+      r'''Samstag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''So.''',
@@ -1352,7 +1352,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mi.''',
       r'''Do.''',
       r'''Fr.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''So''',
@@ -1361,7 +1361,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mi''',
       r'''Do''',
       r'''Fr''',
-      r'''Sa'''
+      r'''Sa''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1370,7 +1370,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''D''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1379,27 +1379,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''D''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1. Quartal''',
       r'''2. Quartal''',
       r'''3. Quartal''',
-      r'''4. Quartal'''
+      r'''4. Quartal''',
     ],
     'AMPMS': <dynamic>[r'''vorm.''', r'''nachm.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d. MMMM y''',
       r'''d. MMMM y''',
       r'''dd.MM.y''',
-      r'''dd.MM.yy'''
+      r'''dd.MM.yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -1409,7 +1409,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'um' {0}""",
       r"""{1} 'um' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'el': <String, dynamic>{
@@ -1428,7 +1428,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Σ''',
       r'''Ο''',
       r'''Ν''',
-      r'''Δ'''
+      r'''Δ''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''Ι''',
@@ -1442,7 +1442,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Σ''',
       r'''Ο''',
       r'''Ν''',
-      r'''Δ'''
+      r'''Δ''',
     ],
     'MONTHS': <dynamic>[
       r'''Ιανουαρίου''',
@@ -1456,7 +1456,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Σεπτεμβρίου''',
       r'''Οκτωβρίου''',
       r'''Νοεμβρίου''',
-      r'''Δεκεμβρίου'''
+      r'''Δεκεμβρίου''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Ιανουάριος''',
@@ -1470,7 +1470,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Σεπτέμβριος''',
       r'''Οκτώβριος''',
       r'''Νοέμβριος''',
-      r'''Δεκέμβριος'''
+      r'''Δεκέμβριος''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Ιαν''',
@@ -1484,7 +1484,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Σεπ''',
       r'''Οκτ''',
       r'''Νοε''',
-      r'''Δεκ'''
+      r'''Δεκ''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Ιαν''',
@@ -1498,7 +1498,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Σεπ''',
       r'''Οκτ''',
       r'''Νοέ''',
-      r'''Δεκ'''
+      r'''Δεκ''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Κυριακή''',
@@ -1507,7 +1507,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Τετάρτη''',
       r'''Πέμπτη''',
       r'''Παρασκευή''',
-      r'''Σάββατο'''
+      r'''Σάββατο''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Κυριακή''',
@@ -1516,7 +1516,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Τετάρτη''',
       r'''Πέμπτη''',
       r'''Παρασκευή''',
-      r'''Σάββατο'''
+      r'''Σάββατο''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Κυρ''',
@@ -1525,7 +1525,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Τετ''',
       r'''Πέμ''',
       r'''Παρ''',
-      r'''Σάβ'''
+      r'''Σάβ''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Κυρ''',
@@ -1534,7 +1534,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Τετ''',
       r'''Πέμ''',
       r'''Παρ''',
-      r'''Σάβ'''
+      r'''Σάβ''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Κ''',
@@ -1543,7 +1543,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Τ''',
       r'''Π''',
       r'''Π''',
-      r'''Σ'''
+      r'''Σ''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Κ''',
@@ -1552,27 +1552,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Τ''',
       r'''Π''',
       r'''Π''',
-      r'''Σ'''
+      r'''Σ''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Τ1''', r'''Τ2''', r'''Τ3''', r'''Τ4'''],
     'QUARTERS': <dynamic>[
       r'''1ο τρίμηνο''',
       r'''2ο τρίμηνο''',
       r'''3ο τρίμηνο''',
-      r'''4ο τρίμηνο'''
+      r'''4ο τρίμηνο''',
     ],
     'AMPMS': <dynamic>[r'''π.μ.''', r'''μ.μ.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -1582,7 +1582,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} - {0}''',
       r'''{1} - {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'en': <String, dynamic>{
@@ -1601,7 +1601,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -1615,7 +1615,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -1629,7 +1629,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -1643,7 +1643,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -1657,7 +1657,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -1671,7 +1671,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -1680,7 +1680,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -1689,7 +1689,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -1698,7 +1698,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -1707,7 +1707,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1716,7 +1716,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1725,27 +1725,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1st quarter''',
       r'''2nd quarter''',
       r'''3rd quarter''',
-      r'''4th quarter'''
+      r'''4th quarter''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, MMMM d, y''',
       r'''MMMM d, y''',
       r'''MMM d, y''',
-      r'''M/d/yy'''
+      r'''M/d/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -1755,7 +1755,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'at' {0}""",
       r"""{1} 'at' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'en_AU': <String, dynamic>{
@@ -1774,7 +1774,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -1788,7 +1788,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -1802,7 +1802,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -1816,7 +1816,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan.''',
@@ -1830,7 +1830,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep.''',
       r'''Oct.''',
       r'''Nov.''',
-      r'''Dec.'''
+      r'''Dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan.''',
@@ -1844,7 +1844,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep.''',
       r'''Oct.''',
       r'''Nov.''',
-      r'''Dec.'''
+      r'''Dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -1853,7 +1853,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -1862,7 +1862,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun.''',
@@ -1871,7 +1871,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed.''',
       r'''Thu.''',
       r'''Fri.''',
-      r'''Sat.'''
+      r'''Sat.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun.''',
@@ -1880,7 +1880,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed.''',
       r'''Thu.''',
       r'''Fri.''',
-      r'''Sat.'''
+      r'''Sat.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Su.''',
@@ -1889,7 +1889,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W.''',
       r'''Th.''',
       r'''F.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Su.''',
@@ -1898,27 +1898,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W.''',
       r'''Th.''',
       r'''F.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1st quarter''',
       r'''2nd quarter''',
       r'''3rd quarter''',
-      r'''4th quarter'''
+      r'''4th quarter''',
     ],
     'AMPMS': <dynamic>[r'''am''', r'''pm'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -1928,7 +1928,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'at' {0}""",
       r"""{1} 'at' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'en_CA': <String, dynamic>{
@@ -1947,7 +1947,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -1961,7 +1961,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -1975,7 +1975,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -1989,7 +1989,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan.''',
@@ -2003,7 +2003,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep.''',
       r'''Oct.''',
       r'''Nov.''',
-      r'''Dec.'''
+      r'''Dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2017,7 +2017,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2026,7 +2026,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2035,7 +2035,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun.''',
@@ -2044,7 +2044,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed.''',
       r'''Thu.''',
       r'''Fri.''',
-      r'''Sat.'''
+      r'''Sat.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun.''',
@@ -2053,7 +2053,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed.''',
       r'''Thu.''',
       r'''Fri.''',
-      r'''Sat.'''
+      r'''Sat.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2062,7 +2062,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2071,27 +2071,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1st quarter''',
       r'''2nd quarter''',
       r'''3rd quarter''',
-      r'''4th quarter'''
+      r'''4th quarter''',
     ],
     'AMPMS': <dynamic>[r'''a.m.''', r'''p.m.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, MMMM d, y''',
       r'''MMMM d, y''',
       r'''MMM d, y''',
-      r'''y-MM-dd'''
+      r'''y-MM-dd''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -2101,7 +2101,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'at' {0}""",
       r"""{1} 'at' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'en_GB': <String, dynamic>{
@@ -2120,7 +2120,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -2134,7 +2134,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -2148,7 +2148,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -2162,7 +2162,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2176,7 +2176,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2190,7 +2190,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2199,7 +2199,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2208,7 +2208,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2217,7 +2217,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2226,7 +2226,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2235,7 +2235,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2244,27 +2244,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1st quarter''',
       r'''2nd quarter''',
       r'''3rd quarter''',
-      r'''4th quarter'''
+      r'''4th quarter''',
     ],
     'AMPMS': <dynamic>[r'''am''', r'''pm'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''dd/MM/y'''
+      r'''dd/MM/y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -2274,7 +2274,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'at' {0}""",
       r"""{1} 'at' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'en_IE': <String, dynamic>{
@@ -2293,7 +2293,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -2307,7 +2307,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -2321,7 +2321,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -2335,7 +2335,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2349,7 +2349,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2363,7 +2363,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2372,7 +2372,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2381,7 +2381,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2390,7 +2390,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2399,7 +2399,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2408,7 +2408,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2417,27 +2417,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1st quarter''',
       r'''2nd quarter''',
       r'''3rd quarter''',
-      r'''4th quarter'''
+      r'''4th quarter''',
     ],
     'AMPMS': <dynamic>[r'''a.m.''', r'''p.m.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''dd/MM/y'''
+      r'''dd/MM/y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -2447,7 +2447,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'at' {0}""",
       r"""{1} 'at' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'en_IN': <String, dynamic>{
@@ -2466,7 +2466,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -2480,7 +2480,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -2494,7 +2494,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -2508,7 +2508,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2522,7 +2522,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2536,7 +2536,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2545,7 +2545,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2554,7 +2554,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2563,7 +2563,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2572,7 +2572,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2581,7 +2581,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2590,27 +2590,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1st quarter''',
       r'''2nd quarter''',
       r'''3rd quarter''',
-      r'''4th quarter'''
+      r'''4th quarter''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM, y''',
       r'''d MMMM y''',
       r'''dd-MMM-y''',
-      r'''dd/MM/yy'''
+      r'''dd/MM/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -2620,7 +2620,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'at' {0}""",
       r"""{1} 'at' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'en_SG': <String, dynamic>{
@@ -2639,7 +2639,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -2653,7 +2653,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -2667,7 +2667,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -2681,7 +2681,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2695,7 +2695,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2709,7 +2709,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2718,7 +2718,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2727,7 +2727,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2736,7 +2736,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2745,7 +2745,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2754,7 +2754,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2763,27 +2763,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1st quarter''',
       r'''2nd quarter''',
       r'''3rd quarter''',
-      r'''4th quarter'''
+      r'''4th quarter''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -2793,7 +2793,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'at' {0}""",
       r"""{1} 'at' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'en_ZA': <String, dynamic>{
@@ -2812,7 +2812,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -2826,7 +2826,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -2840,7 +2840,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -2854,7 +2854,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2868,7 +2868,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2882,7 +2882,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2891,7 +2891,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2900,7 +2900,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2909,7 +2909,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2918,7 +2918,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2927,7 +2927,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2936,27 +2936,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1st quarter''',
       r'''2nd quarter''',
       r'''3rd quarter''',
-      r'''4th quarter'''
+      r'''4th quarter''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, dd MMMM y''',
       r'''dd MMMM y''',
       r'''dd MMM y''',
-      r'''y/MM/dd'''
+      r'''y/MM/dd''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -2966,7 +2966,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'at' {0}""",
       r"""{1} 'at' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'es': <String, dynamic>{
@@ -2985,7 +2985,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -2999,7 +2999,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''enero''',
@@ -3013,7 +3013,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''enero''',
@@ -3027,7 +3027,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3041,7 +3041,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3055,7 +3055,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3064,7 +3064,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3073,7 +3073,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3082,7 +3082,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3091,7 +3091,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3100,7 +3100,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''X''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3109,27 +3109,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''X''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''T1''', r'''T2''', r'''T3''', r'''T4'''],
     'QUARTERS': <dynamic>[
       r'''1.er trimestre''',
       r'''2.º trimestre''',
       r'''3.er trimestre''',
-      r'''4.º trimestre'''
+      r'''4.º trimestre''',
     ],
     'AMPMS': <dynamic>[r'''a. m.''', r'''p. m.'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d 'de' MMMM 'de' y""",
       r"""d 'de' MMMM 'de' y""",
       r'''d MMM y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H:mm:ss (zzzz)''',
       r'''H:mm:ss z''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -3139,7 +3139,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'es_419': <String, dynamic>{
@@ -3158,7 +3158,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -3172,7 +3172,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''enero''',
@@ -3186,7 +3186,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''enero''',
@@ -3200,7 +3200,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3214,7 +3214,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3228,7 +3228,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3237,7 +3237,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3246,7 +3246,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3255,7 +3255,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3264,7 +3264,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''d''',
@@ -3273,7 +3273,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''m''',
       r'''j''',
       r'''v''',
-      r'''s'''
+      r'''s''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3282,27 +3282,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''T1''', r'''T2''', r'''T3''', r'''T4'''],
     'QUARTERS': <dynamic>[
       r'''1.º trimestre''',
       r'''2.º trimestre''',
       r'''3.º trimestre''',
-      r'''4.º trimestre'''
+      r'''4.º trimestre''',
     ],
     'AMPMS': <dynamic>[r'''a.m.''', r'''p.m.'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d 'de' MMMM 'de' y""",
       r"""d 'de' MMMM 'de' y""",
       r'''d MMM y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -3312,7 +3312,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'es_MX': <String, dynamic>{
@@ -3331,7 +3331,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -3345,7 +3345,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''enero''',
@@ -3359,7 +3359,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''enero''',
@@ -3373,7 +3373,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ene''',
@@ -3387,7 +3387,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep''',
       r'''oct''',
       r'''nov''',
-      r'''dic'''
+      r'''dic''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3401,7 +3401,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3410,7 +3410,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3419,7 +3419,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3428,7 +3428,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3437,7 +3437,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3446,7 +3446,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3455,32 +3455,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''1er. trim.''',
       r'''2º. trim.''',
       r'''3er. trim.''',
-      r'''4º trim.'''
+      r'''4º trim.''',
     ],
     'QUARTERS': <dynamic>[
       r'''1.er trimestre''',
       r'''2º. trimestre''',
       r'''3.er trimestre''',
-      r'''4o. trimestre'''
+      r'''4o. trimestre''',
     ],
     'AMPMS': <dynamic>[r'''a. m.''', r'''p. m.'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d 'de' MMMM 'de' y""",
       r"""d 'de' MMMM 'de' y""",
       r'''d MMM y''',
-      r'''dd/MM/yy'''
+      r'''dd/MM/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H:mm:ss zzzz''',
       r'''H:mm:ss z''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -3490,7 +3490,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'es_US': <String, dynamic>{
@@ -3509,7 +3509,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -3523,7 +3523,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''enero''',
@@ -3537,7 +3537,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''enero''',
@@ -3551,7 +3551,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3565,7 +3565,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3579,7 +3579,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3588,7 +3588,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3597,7 +3597,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3606,7 +3606,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3615,7 +3615,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3624,7 +3624,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3633,27 +3633,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''T1''', r'''T2''', r'''T3''', r'''T4'''],
     'QUARTERS': <dynamic>[
       r'''1.er trimestre''',
       r'''2.º trimestre''',
       r'''3.er trimestre''',
-      r'''4.º trimestre'''
+      r'''4.º trimestre''',
     ],
     'AMPMS': <dynamic>[r'''a. m.''', r'''p. m.'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d 'de' MMMM 'de' y""",
       r"""d 'de' MMMM 'de' y""",
       r'''d MMM y''',
-      r'''d/M/y'''
+      r'''d/M/y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -3663,7 +3663,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'et': <String, dynamic>{
@@ -3682,7 +3682,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -3696,7 +3696,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''jaanuar''',
@@ -3710,7 +3710,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktoober''',
       r'''november''',
-      r'''detsember'''
+      r'''detsember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''jaanuar''',
@@ -3724,7 +3724,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktoober''',
       r'''november''',
-      r'''detsember'''
+      r'''detsember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jaan''',
@@ -3738,7 +3738,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept''',
       r'''okt''',
       r'''nov''',
-      r'''dets'''
+      r'''dets''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jaan''',
@@ -3752,7 +3752,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept''',
       r'''okt''',
       r'''nov''',
-      r'''dets'''
+      r'''dets''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''pühapäev''',
@@ -3761,7 +3761,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''kolmapäev''',
       r'''neljapäev''',
       r'''reede''',
-      r'''laupäev'''
+      r'''laupäev''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''pühapäev''',
@@ -3770,7 +3770,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''kolmapäev''',
       r'''neljapäev''',
       r'''reede''',
-      r'''laupäev'''
+      r'''laupäev''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''P''',
@@ -3779,7 +3779,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''K''',
       r'''N''',
       r'''R''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''P''',
@@ -3788,7 +3788,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''K''',
       r'''N''',
       r'''R''',
-      r'''L'''
+      r'''L''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''P''',
@@ -3797,7 +3797,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''K''',
       r'''N''',
       r'''R''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''P''',
@@ -3806,27 +3806,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''K''',
       r'''N''',
       r'''R''',
-      r'''L'''
+      r'''L''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''K1''', r'''K2''', r'''K3''', r'''K4'''],
     'QUARTERS': <dynamic>[
       r'''1. kvartal''',
       r'''2. kvartal''',
       r'''3. kvartal''',
-      r'''4. kvartal'''
+      r'''4. kvartal''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d. MMMM y''',
       r'''d. MMMM y''',
       r'''d. MMM y''',
-      r'''dd.MM.yy'''
+      r'''dd.MM.yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -3836,7 +3836,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'fa': <String, dynamic>{
@@ -3855,7 +3855,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''س''',
       r'''ا''',
       r'''ن''',
-      r'''د'''
+      r'''د''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ژ''',
@@ -3869,7 +3869,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''س''',
       r'''ا''',
       r'''ن''',
-      r'''د'''
+      r'''د''',
     ],
     'MONTHS': <dynamic>[
       r'''ژانویهٔ''',
@@ -3883,7 +3883,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سپتامبر''',
       r'''اکتبر''',
       r'''نوامبر''',
-      r'''دسامبر'''
+      r'''دسامبر''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''ژانویه''',
@@ -3897,7 +3897,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سپتامبر''',
       r'''اکتبر''',
       r'''نوامبر''',
-      r'''دسامبر'''
+      r'''دسامبر''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ژانویهٔ''',
@@ -3911,7 +3911,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سپتامبر''',
       r'''اکتبر''',
       r'''نوامبر''',
-      r'''دسامبر'''
+      r'''دسامبر''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ژانویه''',
@@ -3925,7 +3925,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سپتامبر''',
       r'''اکتبر''',
       r'''نوامبر''',
-      r'''دسامبر'''
+      r'''دسامبر''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''یکشنبه''',
@@ -3934,7 +3934,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''چهارشنبه''',
       r'''پنجشنبه''',
       r'''جمعه''',
-      r'''شنبه'''
+      r'''شنبه''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''یکشنبه''',
@@ -3943,7 +3943,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''چهارشنبه''',
       r'''پنجشنبه''',
       r'''جمعه''',
-      r'''شنبه'''
+      r'''شنبه''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''یکشنبه''',
@@ -3952,7 +3952,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''چهارشنبه''',
       r'''پنجشنبه''',
       r'''جمعه''',
-      r'''شنبه'''
+      r'''شنبه''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''یکشنبه''',
@@ -3961,7 +3961,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''چهارشنبه''',
       r'''پنجشنبه''',
       r'''جمعه''',
-      r'''شنبه'''
+      r'''شنبه''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''ی''',
@@ -3970,7 +3970,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''چ''',
       r'''پ''',
       r'''ج''',
-      r'''ش'''
+      r'''ش''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''ی''',
@@ -3979,32 +3979,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''چ''',
       r'''پ''',
       r'''ج''',
-      r'''ش'''
+      r'''ش''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''س‌م۱''',
       r'''س‌م۲''',
       r'''س‌م۳''',
-      r'''س‌م۴'''
+      r'''س‌م۴''',
     ],
     'QUARTERS': <dynamic>[
       r'''سه‌ماههٔ اول''',
       r'''سه‌ماههٔ دوم''',
       r'''سه‌ماههٔ سوم''',
-      r'''سه‌ماههٔ چهارم'''
+      r'''سه‌ماههٔ چهارم''',
     ],
     'AMPMS': <dynamic>[r'''قبل‌ازظهر''', r'''بعدازظهر'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''y/M/d'''
+      r'''y/M/d''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H:mm:ss (zzzz)''',
       r'''H:mm:ss (z)''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 5,
@@ -4014,7 +4014,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1}، ساعت {0}''',
       r'''{1}، ساعت {0}''',
       r'''{1}،‏ {0}''',
-      r'''{1}،‏ {0}'''
+      r'''{1}،‏ {0}''',
     ],
     'ZERODIGIT': r'''۰''',
   },
@@ -4023,7 +4023,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
     'ERAS': <dynamic>[r'''eKr.''', r'''jKr.'''],
     'ERANAMES': <dynamic>[
       r'''ennen Kristuksen syntymää''',
-      r'''jälkeen Kristuksen syntymän'''
+      r'''jälkeen Kristuksen syntymän''',
     ],
     'NARROWMONTHS': <dynamic>[
       r'''T''',
@@ -4037,7 +4037,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''L''',
       r'''M''',
-      r'''J'''
+      r'''J''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''T''',
@@ -4051,7 +4051,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''L''',
       r'''M''',
-      r'''J'''
+      r'''J''',
     ],
     'MONTHS': <dynamic>[
       r'''tammikuuta''',
@@ -4065,7 +4065,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''syyskuuta''',
       r'''lokakuuta''',
       r'''marraskuuta''',
-      r'''joulukuuta'''
+      r'''joulukuuta''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''tammikuu''',
@@ -4079,7 +4079,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''syyskuu''',
       r'''lokakuu''',
       r'''marraskuu''',
-      r'''joulukuu'''
+      r'''joulukuu''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''tammik.''',
@@ -4093,7 +4093,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''syysk.''',
       r'''lokak.''',
       r'''marrask.''',
-      r'''jouluk.'''
+      r'''jouluk.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''tammi''',
@@ -4107,7 +4107,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''syys''',
       r'''loka''',
       r'''marras''',
-      r'''joulu'''
+      r'''joulu''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''sunnuntaina''',
@@ -4116,7 +4116,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''keskiviikkona''',
       r'''torstaina''',
       r'''perjantaina''',
-      r'''lauantaina'''
+      r'''lauantaina''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''sunnuntai''',
@@ -4125,7 +4125,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''keskiviikko''',
       r'''torstai''',
       r'''perjantai''',
-      r'''lauantai'''
+      r'''lauantai''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''su''',
@@ -4134,7 +4134,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ke''',
       r'''to''',
       r'''pe''',
-      r'''la'''
+      r'''la''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''su''',
@@ -4143,7 +4143,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ke''',
       r'''to''',
       r'''pe''',
-      r'''la'''
+      r'''la''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -4152,7 +4152,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''K''',
       r'''T''',
       r'''P''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -4161,32 +4161,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''K''',
       r'''T''',
       r'''P''',
-      r'''L'''
+      r'''L''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''1. nelj.''',
       r'''2. nelj.''',
       r'''3. nelj.''',
-      r'''4. nelj.'''
+      r'''4. nelj.''',
     ],
     'QUARTERS': <dynamic>[
       r'''1. neljännes''',
       r'''2. neljännes''',
       r'''3. neljännes''',
-      r'''4. neljännes'''
+      r'''4. neljännes''',
     ],
     'AMPMS': <dynamic>[r'''ap.''', r'''ip.'''],
     'DATEFORMATS': <dynamic>[
       r'''cccc d. MMMM y''',
       r'''d. MMMM y''',
       r'''d.M.y''',
-      r'''d.M.y'''
+      r'''d.M.y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H.mm.ss zzzz''',
       r'''H.mm.ss z''',
       r'''H.mm.ss''',
-      r'''H.mm'''
+      r'''H.mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -4196,7 +4196,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'klo' {0}""",
       r"""{1} 'klo' {0}""",
       r"""{1} 'klo' {0}""",
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'fil': <String, dynamic>{
@@ -4215,7 +4215,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -4229,7 +4229,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'MONTHS': <dynamic>[
       r'''Enero''',
@@ -4243,7 +4243,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Setyembre''',
       r'''Oktubre''',
       r'''Nobyembre''',
-      r'''Disyembre'''
+      r'''Disyembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Enero''',
@@ -4257,7 +4257,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Setyembre''',
       r'''Oktubre''',
       r'''Nobyembre''',
-      r'''Disyembre'''
+      r'''Disyembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Ene''',
@@ -4271,7 +4271,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Ene''',
@@ -4285,7 +4285,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Linggo''',
@@ -4294,7 +4294,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miyerkules''',
       r'''Huwebes''',
       r'''Biyernes''',
-      r'''Sabado'''
+      r'''Sabado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Linggo''',
@@ -4303,7 +4303,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miyerkules''',
       r'''Huwebes''',
       r'''Biyernes''',
-      r'''Sabado'''
+      r'''Sabado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -4312,7 +4312,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -4321,7 +4321,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -4330,7 +4330,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -4339,27 +4339,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''ika-1 quarter''',
       r'''ika-2 quarter''',
       r'''ika-3 quarter''',
-      r'''ika-4 na quarter'''
+      r'''ika-4 na quarter''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, MMMM d, y''',
       r'''MMMM d, y''',
       r'''MMM d, y''',
-      r'''M/d/yy'''
+      r'''M/d/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -4369,7 +4369,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'nang' {0}""",
       r"""{1} 'nang' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'fr': <String, dynamic>{
@@ -4388,7 +4388,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -4402,7 +4402,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''janvier''',
@@ -4416,7 +4416,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembre''',
       r'''octobre''',
       r'''novembre''',
-      r'''décembre'''
+      r'''décembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''janvier''',
@@ -4430,7 +4430,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembre''',
       r'''octobre''',
       r'''novembre''',
-      r'''décembre'''
+      r'''décembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -4444,7 +4444,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''déc.'''
+      r'''déc.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -4458,7 +4458,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''déc.'''
+      r'''déc.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''dimanche''',
@@ -4467,7 +4467,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mercredi''',
       r'''jeudi''',
       r'''vendredi''',
-      r'''samedi'''
+      r'''samedi''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''dimanche''',
@@ -4476,7 +4476,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mercredi''',
       r'''jeudi''',
       r'''vendredi''',
-      r'''samedi'''
+      r'''samedi''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dim.''',
@@ -4485,7 +4485,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mer.''',
       r'''jeu.''',
       r'''ven.''',
-      r'''sam.'''
+      r'''sam.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dim.''',
@@ -4494,7 +4494,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mer.''',
       r'''jeu.''',
       r'''ven.''',
-      r'''sam.'''
+      r'''sam.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -4503,7 +4503,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -4512,27 +4512,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''T1''', r'''T2''', r'''T3''', r'''T4'''],
     'QUARTERS': <dynamic>[
       r'''1er trimestre''',
       r'''2e trimestre''',
       r'''3e trimestre''',
-      r'''4e trimestre'''
+      r'''4e trimestre''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''dd/MM/y'''
+      r'''dd/MM/y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -4542,7 +4542,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'à' {0}""",
       r"""{1} 'à' {0}""",
       r"""{1} 'à' {0}""",
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'fr_CA': <String, dynamic>{
@@ -4561,7 +4561,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -4575,7 +4575,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''janvier''',
@@ -4589,7 +4589,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembre''',
       r'''octobre''',
       r'''novembre''',
-      r'''décembre'''
+      r'''décembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''janvier''',
@@ -4603,7 +4603,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembre''',
       r'''octobre''',
       r'''novembre''',
-      r'''décembre'''
+      r'''décembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -4617,7 +4617,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''déc.'''
+      r'''déc.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -4631,7 +4631,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''déc.'''
+      r'''déc.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''dimanche''',
@@ -4640,7 +4640,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mercredi''',
       r'''jeudi''',
       r'''vendredi''',
-      r'''samedi'''
+      r'''samedi''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''dimanche''',
@@ -4649,7 +4649,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mercredi''',
       r'''jeudi''',
       r'''vendredi''',
-      r'''samedi'''
+      r'''samedi''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dim.''',
@@ -4658,7 +4658,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mer.''',
       r'''jeu.''',
       r'''ven.''',
-      r'''sam.'''
+      r'''sam.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dim.''',
@@ -4667,7 +4667,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mer.''',
       r'''jeu.''',
       r'''ven.''',
-      r'''sam.'''
+      r'''sam.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -4676,7 +4676,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -4685,27 +4685,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''T1''', r'''T2''', r'''T3''', r'''T4'''],
     'QUARTERS': <dynamic>[
       r'''1er trimestre''',
       r'''2e trimestre''',
       r'''3e trimestre''',
-      r'''4e trimestre'''
+      r'''4e trimestre''',
     ],
     'AMPMS': <dynamic>[r'''a.m.''', r'''p.m.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''yy-MM-dd'''
+      r'''yy-MM-dd''',
     ],
     'TIMEFORMATS': <dynamic>[
       r"""HH 'h' mm 'min' ss 's' zzzz""",
       r"""HH 'h' mm 'min' ss 's' z""",
       r"""HH 'h' mm 'min' ss 's'""",
-      r"""HH 'h' mm"""
+      r"""HH 'h' mm""",
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -4715,7 +4715,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'à' {0}""",
       r"""{1} 'à' {0}""",
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'gl': <String, dynamic>{
@@ -4734,7 +4734,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s.''',
       r'''o.''',
       r'''n.''',
-      r'''d.'''
+      r'''d.''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''X''',
@@ -4748,7 +4748,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''xaneiro''',
@@ -4762,7 +4762,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''setembro''',
       r'''outubro''',
       r'''novembro''',
-      r'''decembro'''
+      r'''decembro''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Xaneiro''',
@@ -4776,7 +4776,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Setembro''',
       r'''Outubro''',
       r'''Novembro''',
-      r'''Decembro'''
+      r'''Decembro''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''xan.''',
@@ -4790,7 +4790,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''set.''',
       r'''out.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Xan.''',
@@ -4804,7 +4804,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Set.''',
       r'''Out.''',
       r'''Nov.''',
-      r'''Dec.'''
+      r'''Dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -4813,7 +4813,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mércores''',
       r'''xoves''',
       r'''venres''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Domingo''',
@@ -4822,7 +4822,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mércores''',
       r'''Xoves''',
       r'''Venres''',
-      r'''Sábado'''
+      r'''Sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -4831,7 +4831,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mér.''',
       r'''xov.''',
       r'''ven.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Dom.''',
@@ -4840,7 +4840,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mér.''',
       r'''Xov.''',
       r'''Ven.''',
-      r'''Sáb.'''
+      r'''Sáb.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''d.''',
@@ -4849,7 +4849,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''m.''',
       r'''x.''',
       r'''v.''',
-      r'''s.'''
+      r'''s.''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -4858,27 +4858,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''X''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''T1''', r'''T2''', r'''T3''', r'''T4'''],
     'QUARTERS': <dynamic>[
       r'''1.º trimestre''',
       r'''2.º trimestre''',
       r'''3.º trimestre''',
-      r'''4.º trimestre'''
+      r'''4.º trimestre''',
     ],
     'AMPMS': <dynamic>[r'''a.m.''', r'''p.m.'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d 'de' MMMM 'de' y""",
       r"""d 'de' MMMM 'de' y""",
       r'''dd/MM/y''',
-      r'''dd/MM/yy'''
+      r'''dd/MM/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -4888,7 +4888,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{0} 'do' {1}""",
       r"""{0} 'do' {1}""",
       r'''{0}, {1}''',
-      r'''{0}, {1}'''
+      r'''{0}, {1}''',
     ],
   },
   'gsw': <String, dynamic>{
@@ -4907,7 +4907,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -4921,7 +4921,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januar''',
@@ -4935,7 +4935,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Septämber''',
       r'''Oktoober''',
       r'''Novämber''',
-      r'''Dezämber'''
+      r'''Dezämber''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januar''',
@@ -4949,7 +4949,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Septämber''',
       r'''Oktoober''',
       r'''Novämber''',
-      r'''Dezämber'''
+      r'''Dezämber''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -4963,7 +4963,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dez'''
+      r'''Dez''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -4977,7 +4977,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dez'''
+      r'''Dez''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunntig''',
@@ -4986,7 +4986,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mittwuch''',
       r'''Dunschtig''',
       r'''Friitig''',
-      r'''Samschtig'''
+      r'''Samschtig''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunntig''',
@@ -4995,7 +4995,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mittwuch''',
       r'''Dunschtig''',
       r'''Friitig''',
-      r'''Samschtig'''
+      r'''Samschtig''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Su.''',
@@ -5004,7 +5004,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mi.''',
       r'''Du.''',
       r'''Fr.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Su.''',
@@ -5013,7 +5013,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Mi.''',
       r'''Du.''',
       r'''Fr.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -5022,7 +5022,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''D''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -5031,27 +5031,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''D''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1. Quartal''',
       r'''2. Quartal''',
       r'''3. Quartal''',
-      r'''4. Quartal'''
+      r'''4. Quartal''',
     ],
     'AMPMS': <dynamic>[r'''am Vormittag''', r'''am Namittag'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d. MMMM y''',
       r'''d. MMMM y''',
       r'''dd.MM.y''',
-      r'''dd.MM.yy'''
+      r'''dd.MM.yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -5061,7 +5061,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'he': <String, dynamic>{
@@ -5080,7 +5080,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -5094,7 +5094,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''ינואר''',
@@ -5108,7 +5108,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ספטמבר''',
       r'''אוקטובר''',
       r'''נובמבר''',
-      r'''דצמבר'''
+      r'''דצמבר''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''ינואר''',
@@ -5122,7 +5122,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ספטמבר''',
       r'''אוקטובר''',
       r'''נובמבר''',
-      r'''דצמבר'''
+      r'''דצמבר''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ינו׳''',
@@ -5136,7 +5136,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ספט׳''',
       r'''אוק׳''',
       r'''נוב׳''',
-      r'''דצמ׳'''
+      r'''דצמ׳''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ינו׳''',
@@ -5150,7 +5150,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ספט׳''',
       r'''אוק׳''',
       r'''נוב׳''',
-      r'''דצמ׳'''
+      r'''דצמ׳''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''יום ראשון''',
@@ -5159,7 +5159,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''יום רביעי''',
       r'''יום חמישי''',
       r'''יום שישי''',
-      r'''יום שבת'''
+      r'''יום שבת''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''יום ראשון''',
@@ -5168,7 +5168,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''יום רביעי''',
       r'''יום חמישי''',
       r'''יום שישי''',
-      r'''יום שבת'''
+      r'''יום שבת''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''יום א׳''',
@@ -5177,7 +5177,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''יום ד׳''',
       r'''יום ה׳''',
       r'''יום ו׳''',
-      r'''שבת'''
+      r'''שבת''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''יום א׳''',
@@ -5186,7 +5186,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''יום ד׳''',
       r'''יום ה׳''',
       r'''יום ו׳''',
-      r'''שבת'''
+      r'''שבת''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''א׳''',
@@ -5195,7 +5195,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ד׳''',
       r'''ה׳''',
       r'''ו׳''',
-      r'''ש׳'''
+      r'''ש׳''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''א׳''',
@@ -5204,27 +5204,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ד׳''',
       r'''ה׳''',
       r'''ו׳''',
-      r'''ש׳'''
+      r'''ש׳''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''רבעון 1''',
       r'''רבעון 2''',
       r'''רבעון 3''',
-      r'''רבעון 4'''
+      r'''רבעון 4''',
     ],
     'AMPMS': <dynamic>[r'''לפנה״צ''', r'''אחה״צ'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d בMMMM y''',
       r'''d בMMMM y''',
       r'''d בMMM y''',
-      r'''d.M.y'''
+      r'''d.M.y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H:mm:ss zzzz''',
       r'''H:mm:ss z''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -5234,7 +5234,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} בשעה {0}''',
       r'''{1} בשעה {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'hi': <String, dynamic>{
@@ -5253,7 +5253,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''सि''',
       r'''अ''',
       r'''न''',
-      r'''दि'''
+      r'''दि''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ज''',
@@ -5267,7 +5267,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''सि''',
       r'''अ''',
       r'''न''',
-      r'''दि'''
+      r'''दि''',
     ],
     'MONTHS': <dynamic>[
       r'''जनवरी''',
@@ -5281,7 +5281,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''सितंबर''',
       r'''अक्तूबर''',
       r'''नवंबर''',
-      r'''दिसंबर'''
+      r'''दिसंबर''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''जनवरी''',
@@ -5295,7 +5295,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''सितंबर''',
       r'''अक्तूबर''',
       r'''नवंबर''',
-      r'''दिसंबर'''
+      r'''दिसंबर''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''जन॰''',
@@ -5309,7 +5309,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''सित॰''',
       r'''अक्तू॰''',
       r'''नव॰''',
-      r'''दिस॰'''
+      r'''दिस॰''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''जन॰''',
@@ -5323,7 +5323,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''सित॰''',
       r'''अक्तू॰''',
       r'''नव॰''',
-      r'''दिस॰'''
+      r'''दिस॰''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''रविवार''',
@@ -5332,7 +5332,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बुधवार''',
       r'''गुरुवार''',
       r'''शुक्रवार''',
-      r'''शनिवार'''
+      r'''शनिवार''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''रविवार''',
@@ -5341,7 +5341,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बुधवार''',
       r'''गुरुवार''',
       r'''शुक्रवार''',
-      r'''शनिवार'''
+      r'''शनिवार''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''रवि''',
@@ -5350,7 +5350,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बुध''',
       r'''गुरु''',
       r'''शुक्र''',
-      r'''शनि'''
+      r'''शनि''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''रवि''',
@@ -5359,7 +5359,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बुध''',
       r'''गुरु''',
       r'''शुक्र''',
-      r'''शनि'''
+      r'''शनि''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''र''',
@@ -5368,7 +5368,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बु''',
       r'''गु''',
       r'''शु''',
-      r'''श'''
+      r'''श''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''र''',
@@ -5377,27 +5377,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बु''',
       r'''गु''',
       r'''शु''',
-      r'''श'''
+      r'''श''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''ति1''', r'''ति2''', r'''ति3''', r'''ति4'''],
     'QUARTERS': <dynamic>[
       r'''पहली तिमाही''',
       r'''दूसरी तिमाही''',
       r'''तीसरी तिमाही''',
-      r'''चौथी तिमाही'''
+      r'''चौथी तिमाही''',
     ],
     'AMPMS': <dynamic>[r'''am''', r'''pm'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -5407,7 +5407,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} को {0}''',
       r'''{1} को {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'hr': <String, dynamic>{
@@ -5426,7 +5426,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9.''',
       r'''10.''',
       r'''11.''',
-      r'''12.'''
+      r'''12.''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1.''',
@@ -5440,7 +5440,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9.''',
       r'''10.''',
       r'''11.''',
-      r'''12.'''
+      r'''12.''',
     ],
     'MONTHS': <dynamic>[
       r'''siječnja''',
@@ -5454,7 +5454,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''rujna''',
       r'''listopada''',
       r'''studenoga''',
-      r'''prosinca'''
+      r'''prosinca''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''siječanj''',
@@ -5468,7 +5468,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''rujan''',
       r'''listopad''',
       r'''studeni''',
-      r'''prosinac'''
+      r'''prosinac''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''sij''',
@@ -5482,7 +5482,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ruj''',
       r'''lis''',
       r'''stu''',
-      r'''pro'''
+      r'''pro''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''sij''',
@@ -5496,7 +5496,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ruj''',
       r'''lis''',
       r'''stu''',
-      r'''pro'''
+      r'''pro''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''nedjelja''',
@@ -5505,7 +5505,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''srijeda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''nedjelja''',
@@ -5514,7 +5514,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''srijeda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -5523,7 +5523,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sri''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -5532,7 +5532,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sri''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''N''',
@@ -5541,7 +5541,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''Č''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -5550,27 +5550,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''č''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''1kv''', r'''2kv''', r'''3kv''', r'''4kv'''],
     'QUARTERS': <dynamic>[
       r'''1. kvartal''',
       r'''2. kvartal''',
       r'''3. kvartal''',
-      r'''4. kvartal'''
+      r'''4. kvartal''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d. MMMM y.''',
       r'''d. MMMM y.''',
       r'''d. MMM y.''',
-      r'''dd. MM. y.'''
+      r'''dd. MM. y.''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss (zzzz)''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -5580,7 +5580,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'u' {0}""",
       r"""{1} 'u' {0}""",
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'hu': <String, dynamic>{
@@ -5599,7 +5599,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sz''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -5613,7 +5613,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sz''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''január''',
@@ -5627,7 +5627,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''szeptember''',
       r'''október''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''január''',
@@ -5641,7 +5641,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''szeptember''',
       r'''október''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -5655,7 +5655,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''szept.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -5669,7 +5669,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''szept.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''vasárnap''',
@@ -5678,7 +5678,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''szerda''',
       r'''csütörtök''',
       r'''péntek''',
-      r'''szombat'''
+      r'''szombat''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''vasárnap''',
@@ -5687,7 +5687,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''szerda''',
       r'''csütörtök''',
       r'''péntek''',
-      r'''szombat'''
+      r'''szombat''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''V''',
@@ -5696,7 +5696,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sze''',
       r'''Cs''',
       r'''P''',
-      r'''Szo'''
+      r'''Szo''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''V''',
@@ -5705,7 +5705,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sze''',
       r'''Cs''',
       r'''P''',
-      r'''Szo'''
+      r'''Szo''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''V''',
@@ -5714,7 +5714,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sz''',
       r'''Cs''',
       r'''P''',
-      r'''Sz'''
+      r'''Sz''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''V''',
@@ -5723,32 +5723,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sz''',
       r'''Cs''',
       r'''P''',
-      r'''Sz'''
+      r'''Sz''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''I. n.év''',
       r'''II. n.év''',
       r'''III. n.év''',
-      r'''IV. n.év'''
+      r'''IV. n.év''',
     ],
     'QUARTERS': <dynamic>[
       r'''I. negyedév''',
       r'''II. negyedév''',
       r'''III. negyedév''',
-      r'''IV. negyedév'''
+      r'''IV. negyedév''',
     ],
     'AMPMS': <dynamic>[r'''de.''', r'''du.'''],
     'DATEFORMATS': <dynamic>[
       r'''y. MMMM d., EEEE''',
       r'''y. MMMM d.''',
       r'''y. MMM d.''',
-      r'''y. MM. dd.'''
+      r'''y. MM. dd.''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H:mm:ss zzzz''',
       r'''H:mm:ss z''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -5758,7 +5758,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'hy': <String, dynamic>{
@@ -5777,7 +5777,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Ս''',
       r'''Հ''',
       r'''Ն''',
-      r'''Դ'''
+      r'''Դ''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''Հ''',
@@ -5791,7 +5791,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Ս''',
       r'''Հ''',
       r'''Ն''',
-      r'''Դ'''
+      r'''Դ''',
     ],
     'MONTHS': <dynamic>[
       r'''հունվարի''',
@@ -5805,7 +5805,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''սեպտեմբերի''',
       r'''հոկտեմբերի''',
       r'''նոյեմբերի''',
-      r'''դեկտեմբերի'''
+      r'''դեկտեմբերի''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''հունվար''',
@@ -5819,7 +5819,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''սեպտեմբեր''',
       r'''հոկտեմբեր''',
       r'''նոյեմբեր''',
-      r'''դեկտեմբեր'''
+      r'''դեկտեմբեր''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''հնվ''',
@@ -5833,7 +5833,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''սեպ''',
       r'''հոկ''',
       r'''նոյ''',
-      r'''դեկ'''
+      r'''դեկ''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''հնվ''',
@@ -5847,7 +5847,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''սեպ''',
       r'''հոկ''',
       r'''նոյ''',
-      r'''դեկ'''
+      r'''դեկ''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''կիրակի''',
@@ -5856,7 +5856,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''չորեքշաբթի''',
       r'''հինգշաբթի''',
       r'''ուրբաթ''',
-      r'''շաբաթ'''
+      r'''շաբաթ''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''կիրակի''',
@@ -5865,7 +5865,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''չորեքշաբթի''',
       r'''հինգշաբթի''',
       r'''ուրբաթ''',
-      r'''շաբաթ'''
+      r'''շաբաթ''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''կիր''',
@@ -5874,7 +5874,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''չրք''',
       r'''հնգ''',
       r'''ուր''',
-      r'''շբթ'''
+      r'''շբթ''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''կիր''',
@@ -5883,7 +5883,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''չրք''',
       r'''հնգ''',
       r'''ուր''',
-      r'''շբթ'''
+      r'''շբթ''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Կ''',
@@ -5892,7 +5892,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Չ''',
       r'''Հ''',
       r'''Ո''',
-      r'''Շ'''
+      r'''Շ''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Կ''',
@@ -5901,32 +5901,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Չ''',
       r'''Հ''',
       r'''Ո''',
-      r'''Շ'''
+      r'''Շ''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''1-ին եռմս.''',
       r'''2-րդ եռմս.''',
       r'''3-րդ եռմս.''',
-      r'''4-րդ եռմս.'''
+      r'''4-րդ եռմս.''',
     ],
     'QUARTERS': <dynamic>[
       r'''1-ին եռամսյակ''',
       r'''2-րդ եռամսյակ''',
       r'''3-րդ եռամսյակ''',
-      r'''4-րդ եռամսյակ'''
+      r'''4-րդ եռամսյակ''',
     ],
     'AMPMS': <dynamic>[r'''ԿԱ''', r'''ԿՀ'''],
     'DATEFORMATS': <dynamic>[
       r'''y թ. MMMM d, EEEE''',
       r'''dd MMMM, y թ.''',
       r'''dd MMM, y թ.''',
-      r'''dd.MM.yy'''
+      r'''dd.MM.yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -5936,7 +5936,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'id': <String, dynamic>{
@@ -5955,7 +5955,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -5969,7 +5969,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januari''',
@@ -5983,7 +5983,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Desember'''
+      r'''Desember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januari''',
@@ -5997,7 +5997,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Desember'''
+      r'''Desember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -6011,7 +6011,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Des'''
+      r'''Des''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -6025,7 +6025,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Des'''
+      r'''Des''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Minggu''',
@@ -6034,7 +6034,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Rabu''',
       r'''Kamis''',
       r'''Jumat''',
-      r'''Sabtu'''
+      r'''Sabtu''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Minggu''',
@@ -6043,7 +6043,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Rabu''',
       r'''Kamis''',
       r'''Jumat''',
-      r'''Sabtu'''
+      r'''Sabtu''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Min''',
@@ -6052,7 +6052,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Rab''',
       r'''Kam''',
       r'''Jum''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Min''',
@@ -6061,7 +6061,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Rab''',
       r'''Kam''',
       r'''Jum''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''M''',
@@ -6070,7 +6070,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''R''',
       r'''K''',
       r'''J''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''M''',
@@ -6079,27 +6079,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''R''',
       r'''K''',
       r'''J''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''K1''', r'''K2''', r'''K3''', r'''K4'''],
     'QUARTERS': <dynamic>[
       r'''Kuartal ke-1''',
       r'''Kuartal ke-2''',
       r'''Kuartal ke-3''',
-      r'''Kuartal ke-4'''
+      r'''Kuartal ke-4''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, dd MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''dd/MM/yy'''
+      r'''dd/MM/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH.mm.ss zzzz''',
       r'''HH.mm.ss z''',
       r'''HH.mm.ss''',
-      r'''HH.mm'''
+      r'''HH.mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -6109,7 +6109,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'it': <String, dynamic>{
@@ -6128,7 +6128,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''G''',
@@ -6142,7 +6142,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''gennaio''',
@@ -6156,7 +6156,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''settembre''',
       r'''ottobre''',
       r'''novembre''',
-      r'''dicembre'''
+      r'''dicembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''gennaio''',
@@ -6170,7 +6170,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''settembre''',
       r'''ottobre''',
       r'''novembre''',
-      r'''dicembre'''
+      r'''dicembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''gen''',
@@ -6184,7 +6184,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''set''',
       r'''ott''',
       r'''nov''',
-      r'''dic'''
+      r'''dic''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''gen''',
@@ -6198,7 +6198,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''set''',
       r'''ott''',
       r'''nov''',
-      r'''dic'''
+      r'''dic''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domenica''',
@@ -6207,7 +6207,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mercoledì''',
       r'''giovedì''',
       r'''venerdì''',
-      r'''sabato'''
+      r'''sabato''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domenica''',
@@ -6216,7 +6216,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mercoledì''',
       r'''giovedì''',
       r'''venerdì''',
-      r'''sabato'''
+      r'''sabato''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom''',
@@ -6225,7 +6225,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mer''',
       r'''gio''',
       r'''ven''',
-      r'''sab'''
+      r'''sab''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom''',
@@ -6234,7 +6234,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mer''',
       r'''gio''',
       r'''ven''',
-      r'''sab'''
+      r'''sab''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -6243,7 +6243,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''G''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -6252,27 +6252,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''G''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''T1''', r'''T2''', r'''T3''', r'''T4'''],
     'QUARTERS': <dynamic>[
       r'''1º trimestre''',
       r'''2º trimestre''',
       r'''3º trimestre''',
-      r'''4º trimestre'''
+      r'''4º trimestre''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''dd/MM/yy'''
+      r'''dd/MM/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -6282,7 +6282,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ja': <String, dynamic>{
@@ -6301,7 +6301,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -6315,7 +6315,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''1月''',
@@ -6329,7 +6329,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''1月''',
@@ -6343,7 +6343,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -6357,7 +6357,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -6371,7 +6371,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''日曜日''',
@@ -6380,7 +6380,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''水曜日''',
       r'''木曜日''',
       r'''金曜日''',
-      r'''土曜日'''
+      r'''土曜日''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''日曜日''',
@@ -6389,7 +6389,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''水曜日''',
       r'''木曜日''',
       r'''金曜日''',
-      r'''土曜日'''
+      r'''土曜日''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''日''',
@@ -6398,7 +6398,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''水''',
       r'''木''',
       r'''金''',
-      r'''土'''
+      r'''土''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''日''',
@@ -6407,7 +6407,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''水''',
       r'''木''',
       r'''金''',
-      r'''土'''
+      r'''土''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -6416,7 +6416,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''水''',
       r'''木''',
       r'''金''',
-      r'''土'''
+      r'''土''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -6425,27 +6425,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''水''',
       r'''木''',
       r'''金''',
-      r'''土'''
+      r'''土''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''第1四半期''',
       r'''第2四半期''',
       r'''第3四半期''',
-      r'''第4四半期'''
+      r'''第4四半期''',
     ],
     'AMPMS': <dynamic>[r'''午前''', r'''午後'''],
     'DATEFORMATS': <dynamic>[
       r'''y年M月d日EEEE''',
       r'''y年M月d日''',
       r'''y/MM/dd''',
-      r'''y/MM/dd'''
+      r'''y/MM/dd''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H時mm分ss秒 zzzz''',
       r'''H:mm:ss z''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -6455,7 +6455,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'km': <String, dynamic>{
@@ -6474,7 +6474,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ក''',
       r'''ត''',
       r'''វ''',
-      r'''ធ'''
+      r'''ធ''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ម''',
@@ -6488,7 +6488,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ក''',
       r'''ត''',
       r'''វ''',
-      r'''ធ'''
+      r'''ធ''',
     ],
     'MONTHS': <dynamic>[
       r'''មករា''',
@@ -6502,7 +6502,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''កញ្ញា''',
       r'''តុលា''',
       r'''វិច្ឆិកា''',
-      r'''ធ្នូ'''
+      r'''ធ្នូ''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''មករា''',
@@ -6516,7 +6516,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''កញ្ញា''',
       r'''តុលា''',
       r'''វិច្ឆិកា''',
-      r'''ធ្នូ'''
+      r'''ធ្នូ''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''មករា''',
@@ -6530,7 +6530,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''កញ្ញា''',
       r'''តុលា''',
       r'''វិច្ឆិកា''',
-      r'''ធ្នូ'''
+      r'''ធ្នូ''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''មករា''',
@@ -6544,7 +6544,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''កញ្ញា''',
       r'''តុលា''',
       r'''វិច្ឆិកា''',
-      r'''ធ្នូ'''
+      r'''ធ្នូ''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''អាទិត្យ''',
@@ -6553,7 +6553,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ពុធ''',
       r'''ព្រហស្បតិ៍''',
       r'''សុក្រ''',
-      r'''សៅរ៍'''
+      r'''សៅរ៍''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''អាទិត្យ''',
@@ -6562,7 +6562,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ពុធ''',
       r'''ព្រហស្បតិ៍''',
       r'''សុក្រ''',
-      r'''សៅរ៍'''
+      r'''សៅរ៍''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''អាទិត្យ''',
@@ -6571,7 +6571,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ពុធ''',
       r'''ព្រហស្បតិ៍''',
       r'''សុក្រ''',
-      r'''សៅរ៍'''
+      r'''សៅរ៍''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''អាទិត្យ''',
@@ -6580,7 +6580,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ពុធ''',
       r'''ព្រហស្បតិ៍''',
       r'''សុក្រ''',
-      r'''សៅរ៍'''
+      r'''សៅរ៍''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''អ''',
@@ -6589,7 +6589,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ព''',
       r'''ព''',
       r'''ស''',
-      r'''ស'''
+      r'''ស''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''អ''',
@@ -6598,32 +6598,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ព''',
       r'''ព''',
       r'''ស''',
-      r'''ស'''
+      r'''ស''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''ត្រីមាសទី 1''',
       r'''ត្រីមាសទី 2''',
       r'''ត្រីមាសទី 3''',
-      r'''ត្រីមាសទី 4'''
+      r'''ត្រីមាសទី 4''',
     ],
     'QUARTERS': <dynamic>[
       r'''ត្រីមាសទី 1''',
       r'''ត្រីមាសទី 2''',
       r'''ត្រីមាសទី 3''',
-      r'''ត្រីមាសទី 4'''
+      r'''ត្រីមាសទី 4''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -6633,7 +6633,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} នៅ​ម៉ោង {0}''',
       r'''{1} នៅ​ម៉ោង {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ko': <String, dynamic>{
@@ -6652,7 +6652,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1월''',
@@ -6666,7 +6666,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'MONTHS': <dynamic>[
       r'''1월''',
@@ -6680,7 +6680,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''1월''',
@@ -6694,7 +6694,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1월''',
@@ -6708,7 +6708,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1월''',
@@ -6722,7 +6722,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''일요일''',
@@ -6731,7 +6731,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''수요일''',
       r'''목요일''',
       r'''금요일''',
-      r'''토요일'''
+      r'''토요일''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''일요일''',
@@ -6740,7 +6740,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''수요일''',
       r'''목요일''',
       r'''금요일''',
-      r'''토요일'''
+      r'''토요일''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''일''',
@@ -6749,7 +6749,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''수''',
       r'''목''',
       r'''금''',
-      r'''토'''
+      r'''토''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''일''',
@@ -6758,7 +6758,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''수''',
       r'''목''',
       r'''금''',
-      r'''토'''
+      r'''토''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''일''',
@@ -6767,7 +6767,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''수''',
       r'''목''',
       r'''금''',
-      r'''토'''
+      r'''토''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''일''',
@@ -6776,27 +6776,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''수''',
       r'''목''',
       r'''금''',
-      r'''토'''
+      r'''토''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''1분기''', r'''2분기''', r'''3분기''', r'''4분기'''],
     'QUARTERS': <dynamic>[
       r'''제 1/4분기''',
       r'''제 2/4분기''',
       r'''제 3/4분기''',
-      r'''제 4/4분기'''
+      r'''제 4/4분기''',
     ],
     'AMPMS': <dynamic>[r'''오전''', r'''오후'''],
     'DATEFORMATS': <dynamic>[
       r'''y년 M월 d일 EEEE''',
       r'''y년 M월 d일''',
       r'''y. M. d.''',
-      r'''yy. M. d.'''
+      r'''yy. M. d.''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''a h시 m분 s초 zzzz''',
       r'''a h시 m분 s초 z''',
       r'''a h:mm:ss''',
-      r'''a h:mm'''
+      r'''a h:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -6806,7 +6806,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'lt': <String, dynamic>{
@@ -6825,7 +6825,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''R''',
       r'''S''',
       r'''L''',
-      r'''G'''
+      r'''G''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''S''',
@@ -6839,7 +6839,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''R''',
       r'''S''',
       r'''L''',
-      r'''G'''
+      r'''G''',
     ],
     'MONTHS': <dynamic>[
       r'''sausio''',
@@ -6853,7 +6853,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''rugsėjo''',
       r'''spalio''',
       r'''lapkričio''',
-      r'''gruodžio'''
+      r'''gruodžio''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''sausis''',
@@ -6867,7 +6867,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''rugsėjis''',
       r'''spalis''',
       r'''lapkritis''',
-      r'''gruodis'''
+      r'''gruodis''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''saus.''',
@@ -6881,7 +6881,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''rugs.''',
       r'''spal.''',
       r'''lapkr.''',
-      r'''gruod.'''
+      r'''gruod.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''saus.''',
@@ -6895,7 +6895,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''rugs.''',
       r'''spal.''',
       r'''lapkr.''',
-      r'''gruod.'''
+      r'''gruod.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''sekmadienis''',
@@ -6904,7 +6904,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''trečiadienis''',
       r'''ketvirtadienis''',
       r'''penktadienis''',
-      r'''šeštadienis'''
+      r'''šeštadienis''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''sekmadienis''',
@@ -6913,7 +6913,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''trečiadienis''',
       r'''ketvirtadienis''',
       r'''penktadienis''',
-      r'''šeštadienis'''
+      r'''šeštadienis''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''sk''',
@@ -6922,7 +6922,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''tr''',
       r'''kt''',
       r'''pn''',
-      r'''št'''
+      r'''št''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''sk''',
@@ -6931,7 +6931,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''tr''',
       r'''kt''',
       r'''pn''',
-      r'''št'''
+      r'''št''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -6940,7 +6940,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''T''',
       r'''K''',
       r'''P''',
-      r'''Š'''
+      r'''Š''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -6949,32 +6949,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''T''',
       r'''K''',
       r'''P''',
-      r'''Š'''
+      r'''Š''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''I k.''',
       r'''II k.''',
       r'''III k.''',
-      r'''IV k.'''
+      r'''IV k.''',
     ],
     'QUARTERS': <dynamic>[
       r'''I ketvirtis''',
       r'''II ketvirtis''',
       r'''III ketvirtis''',
-      r'''IV ketvirtis'''
+      r'''IV ketvirtis''',
     ],
     'AMPMS': <dynamic>[r'''priešpiet''', r'''popiet'''],
     'DATEFORMATS': <dynamic>[
       r"""y 'm'. MMMM d 'd'., EEEE""",
       r"""y 'm'. MMMM d 'd'.""",
       r'''y-MM-dd''',
-      r'''y-MM-dd'''
+      r'''y-MM-dd''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -6984,7 +6984,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'lv': <String, dynamic>{
@@ -7003,7 +7003,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -7017,7 +7017,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''janvāris''',
@@ -7031,7 +7031,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembris''',
       r'''oktobris''',
       r'''novembris''',
-      r'''decembris'''
+      r'''decembris''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''janvāris''',
@@ -7045,7 +7045,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembris''',
       r'''oktobris''',
       r'''novembris''',
-      r'''decembris'''
+      r'''decembris''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -7059,7 +7059,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -7073,7 +7073,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''svētdiena''',
@@ -7082,7 +7082,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''trešdiena''',
       r'''ceturtdiena''',
       r'''piektdiena''',
-      r'''sestdiena'''
+      r'''sestdiena''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Svētdiena''',
@@ -7091,7 +7091,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Trešdiena''',
       r'''Ceturtdiena''',
       r'''Piektdiena''',
-      r'''Sestdiena'''
+      r'''Sestdiena''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''svētd.''',
@@ -7100,7 +7100,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''trešd.''',
       r'''ceturtd.''',
       r'''piektd.''',
-      r'''sestd.'''
+      r'''sestd.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Svētd.''',
@@ -7109,7 +7109,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Trešd.''',
       r'''Ceturtd.''',
       r'''Piektd.''',
-      r'''Sestd.'''
+      r'''Sestd.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -7118,7 +7118,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''T''',
       r'''C''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -7127,32 +7127,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''T''',
       r'''C''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''1. cet.''',
       r'''2. cet.''',
       r'''3. cet.''',
-      r'''4. cet.'''
+      r'''4. cet.''',
     ],
     'QUARTERS': <dynamic>[
       r'''1. ceturksnis''',
       r'''2. ceturksnis''',
       r'''3. ceturksnis''',
-      r'''4. ceturksnis'''
+      r'''4. ceturksnis''',
     ],
     'AMPMS': <dynamic>[r'''priekšpusdienā''', r'''pēcpusdienā'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, y. 'gada' d. MMMM""",
       r"""y. 'gada' d. MMMM""",
       r"""y. 'gada' d. MMM""",
-      r'''dd.MM.yy'''
+      r'''dd.MM.yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -7162,7 +7162,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'mn': <String, dynamic>{
@@ -7181,7 +7181,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''IX''',
       r'''X''',
       r'''XI''',
-      r'''XII'''
+      r'''XII''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''I''',
@@ -7195,7 +7195,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''IX''',
       r'''X''',
       r'''XI''',
-      r'''XII'''
+      r'''XII''',
     ],
     'MONTHS': <dynamic>[
       r'''Нэгдүгээр сар''',
@@ -7209,7 +7209,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Есдүгээр сар''',
       r'''Аравдугаар сар''',
       r'''Арван нэгдүгээр сар''',
-      r'''Арван хоёрдугаар сар'''
+      r'''Арван хоёрдугаар сар''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Нэгдүгээр сар''',
@@ -7223,7 +7223,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Есдүгээр сар''',
       r'''Аравдугаар сар''',
       r'''Арван нэгдүгээр сар''',
-      r'''Арван хоёрдугаар сар'''
+      r'''Арван хоёрдугаар сар''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1-р сар''',
@@ -7237,7 +7237,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9-р сар''',
       r'''10-р сар''',
       r'''11-р сар''',
-      r'''12-р сар'''
+      r'''12-р сар''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1-р сар''',
@@ -7251,7 +7251,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9-р сар''',
       r'''10-р сар''',
       r'''11-р сар''',
-      r'''12-р сар'''
+      r'''12-р сар''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''ням''',
@@ -7260,7 +7260,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''лхагва''',
       r'''пүрэв''',
       r'''баасан''',
-      r'''бямба'''
+      r'''бямба''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''ням''',
@@ -7269,7 +7269,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''лхагва''',
       r'''пүрэв''',
       r'''баасан''',
-      r'''бямба'''
+      r'''бямба''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Ня''',
@@ -7278,7 +7278,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Лх''',
       r'''Пү''',
       r'''Ба''',
-      r'''Бя'''
+      r'''Бя''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Ня''',
@@ -7287,7 +7287,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Лх''',
       r'''Пү''',
       r'''Ба''',
-      r'''Бя'''
+      r'''Бя''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Ня''',
@@ -7296,7 +7296,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Лх''',
       r'''Пү''',
       r'''Ба''',
-      r'''Бя'''
+      r'''Бя''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Ня''',
@@ -7305,32 +7305,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Лх''',
       r'''Пү''',
       r'''Ба''',
-      r'''Бя'''
+      r'''Бя''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''I улирал''',
       r'''II улирал''',
       r'''III улирал''',
-      r'''IV улирал'''
+      r'''IV улирал''',
     ],
     'QUARTERS': <dynamic>[
       r'''1-р улирал''',
       r'''2-р улирал''',
       r'''3-р улирал''',
-      r'''4-р улирал'''
+      r'''4-р улирал''',
     ],
     'AMPMS': <dynamic>[r'''ү.ө''', r'''ү.х'''],
     'DATEFORMATS': <dynamic>[
       r'''y.MM.dd, EEEE''',
       r'''y.MM.dd''',
       r'''y.MM.dd''',
-      r'''y.MM.dd'''
+      r'''y.MM.dd''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss (zzzz)''',
       r'''HH:mm:ss (z)''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -7340,7 +7340,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'mr': <String, dynamic>{
@@ -7359,7 +7359,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''स''',
       r'''ऑ''',
       r'''नो''',
-      r'''डि'''
+      r'''डि''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''जा''',
@@ -7373,7 +7373,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''स''',
       r'''ऑ''',
       r'''नो''',
-      r'''डि'''
+      r'''डि''',
     ],
     'MONTHS': <dynamic>[
       r'''जानेवारी''',
@@ -7387,7 +7387,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''सप्टेंबर''',
       r'''ऑक्टोबर''',
       r'''नोव्हेंबर''',
-      r'''डिसेंबर'''
+      r'''डिसेंबर''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''जानेवारी''',
@@ -7401,7 +7401,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''सप्टेंबर''',
       r'''ऑक्टोबर''',
       r'''नोव्हेंबर''',
-      r'''डिसेंबर'''
+      r'''डिसेंबर''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''जाने''',
@@ -7415,7 +7415,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''सप्टें''',
       r'''ऑक्टो''',
       r'''नोव्हें''',
-      r'''डिसें'''
+      r'''डिसें''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''जाने''',
@@ -7429,7 +7429,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''सप्टें''',
       r'''ऑक्टो''',
       r'''नोव्हें''',
-      r'''डिसें'''
+      r'''डिसें''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''रविवार''',
@@ -7438,7 +7438,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बुधवार''',
       r'''गुरुवार''',
       r'''शुक्रवार''',
-      r'''शनिवार'''
+      r'''शनिवार''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''रविवार''',
@@ -7447,7 +7447,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बुधवार''',
       r'''गुरुवार''',
       r'''शुक्रवार''',
-      r'''शनिवार'''
+      r'''शनिवार''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''रवि''',
@@ -7456,7 +7456,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बुध''',
       r'''गुरु''',
       r'''शुक्र''',
-      r'''शनि'''
+      r'''शनि''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''रवि''',
@@ -7465,7 +7465,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बुध''',
       r'''गुरु''',
       r'''शुक्र''',
-      r'''शनि'''
+      r'''शनि''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''र''',
@@ -7474,7 +7474,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बु''',
       r'''गु''',
       r'''शु''',
-      r'''श'''
+      r'''श''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''र''',
@@ -7483,27 +7483,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''बु''',
       r'''गु''',
       r'''शु''',
-      r'''श'''
+      r'''श''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''ति१''', r'''ति२''', r'''ति३''', r'''ति४'''],
     'QUARTERS': <dynamic>[
       r'''प्रथम तिमाही''',
       r'''द्वितीय तिमाही''',
       r'''तृतीय तिमाही''',
-      r'''चतुर्थ तिमाही'''
+      r'''चतुर्थ तिमाही''',
     ],
     'AMPMS': <dynamic>[r'''म.पू.''', r'''म.उ.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM, y''',
       r'''d MMMM, y''',
       r'''d MMM, y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -7513,7 +7513,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} रोजी {0}''',
       r'''{1} रोजी {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
     'ZERODIGIT': r'''०''',
   },
@@ -7533,7 +7533,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -7547,7 +7547,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januari''',
@@ -7561,7 +7561,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Disember'''
+      r'''Disember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januari''',
@@ -7575,7 +7575,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Disember'''
+      r'''Disember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -7589,7 +7589,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -7603,7 +7603,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Ahad''',
@@ -7612,7 +7612,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Rabu''',
       r'''Khamis''',
       r'''Jumaat''',
-      r'''Sabtu'''
+      r'''Sabtu''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Ahad''',
@@ -7621,7 +7621,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Rabu''',
       r'''Khamis''',
       r'''Jumaat''',
-      r'''Sabtu'''
+      r'''Sabtu''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Ahd''',
@@ -7630,7 +7630,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Rab''',
       r'''Kha''',
       r'''Jum''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Ahd''',
@@ -7639,7 +7639,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Rab''',
       r'''Kha''',
       r'''Jum''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''A''',
@@ -7648,7 +7648,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''R''',
       r'''K''',
       r'''J''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''A''',
@@ -7657,27 +7657,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''R''',
       r'''K''',
       r'''J''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''S1''', r'''S2''', r'''S3''', r'''S4'''],
     'QUARTERS': <dynamic>[
       r'''Suku pertama''',
       r'''Suku Ke-2''',
       r'''Suku Ke-3''',
-      r'''Suku Ke-4'''
+      r'''Suku Ke-4''',
     ],
     'AMPMS': <dynamic>[r'''PG''', r'''PTG'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''d/MM/yy'''
+      r'''d/MM/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -7687,7 +7687,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'nb': <String, dynamic>{
@@ -7706,7 +7706,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -7720,7 +7720,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''januar''',
@@ -7734,7 +7734,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''desember'''
+      r'''desember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januar''',
@@ -7748,7 +7748,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''desember'''
+      r'''desember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -7762,7 +7762,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''des.'''
+      r'''des.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -7776,7 +7776,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''des'''
+      r'''des''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''søndag''',
@@ -7785,7 +7785,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lørdag'''
+      r'''lørdag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''søndag''',
@@ -7794,7 +7794,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lørdag'''
+      r'''lørdag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''søn.''',
@@ -7803,7 +7803,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ons.''',
       r'''tor.''',
       r'''fre.''',
-      r'''lør.'''
+      r'''lør.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''søn.''',
@@ -7812,7 +7812,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ons.''',
       r'''tor.''',
       r'''fre.''',
-      r'''lør.'''
+      r'''lør.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -7821,7 +7821,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''O''',
       r'''T''',
       r'''F''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -7830,27 +7830,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''O''',
       r'''T''',
       r'''F''',
-      r'''L'''
+      r'''L''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''K1''', r'''K2''', r'''K3''', r'''K4'''],
     'QUARTERS': <dynamic>[
       r'''1. kvartal''',
       r'''2. kvartal''',
       r'''3. kvartal''',
-      r'''4. kvartal'''
+      r'''4. kvartal''',
     ],
     'AMPMS': <dynamic>[r'''a.m.''', r'''p.m.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d. MMMM y''',
       r'''d. MMMM y''',
       r'''d. MMM y''',
-      r'''dd.MM.y'''
+      r'''dd.MM.y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -7860,7 +7860,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r"""{1} 'kl'. {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'nl': <String, dynamic>{
@@ -7879,7 +7879,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -7893,7 +7893,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''januari''',
@@ -7907,7 +7907,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januari''',
@@ -7921,7 +7921,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -7935,7 +7935,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -7949,7 +7949,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''zondag''',
@@ -7958,7 +7958,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''woensdag''',
       r'''donderdag''',
       r'''vrijdag''',
-      r'''zaterdag'''
+      r'''zaterdag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''zondag''',
@@ -7967,7 +7967,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''woensdag''',
       r'''donderdag''',
       r'''vrijdag''',
-      r'''zaterdag'''
+      r'''zaterdag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''zo''',
@@ -7976,7 +7976,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''wo''',
       r'''do''',
       r'''vr''',
-      r'''za'''
+      r'''za''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''zo''',
@@ -7985,7 +7985,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''wo''',
       r'''do''',
       r'''vr''',
-      r'''za'''
+      r'''za''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Z''',
@@ -7994,7 +7994,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''D''',
       r'''V''',
-      r'''Z'''
+      r'''Z''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Z''',
@@ -8003,27 +8003,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''D''',
       r'''V''',
-      r'''Z'''
+      r'''Z''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''K1''', r'''K2''', r'''K3''', r'''K4'''],
     'QUARTERS': <dynamic>[
       r'''1e kwartaal''',
       r'''2e kwartaal''',
       r'''3e kwartaal''',
-      r'''4e kwartaal'''
+      r'''4e kwartaal''',
     ],
     'AMPMS': <dynamic>[r'''a.m.''', r'''p.m.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''dd-MM-yy'''
+      r'''dd-MM-yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -8033,7 +8033,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'om' {0}""",
       r"""{1} 'om' {0}""",
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'pl': <String, dynamic>{
@@ -8052,7 +8052,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''w''',
       r'''p''',
       r'''l''',
-      r'''g'''
+      r'''g''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''S''',
@@ -8066,7 +8066,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''P''',
       r'''L''',
-      r'''G'''
+      r'''G''',
     ],
     'MONTHS': <dynamic>[
       r'''stycznia''',
@@ -8080,7 +8080,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''września''',
       r'''października''',
       r'''listopada''',
-      r'''grudnia'''
+      r'''grudnia''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''styczeń''',
@@ -8094,7 +8094,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''wrzesień''',
       r'''październik''',
       r'''listopad''',
-      r'''grudzień'''
+      r'''grudzień''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''sty''',
@@ -8108,7 +8108,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''wrz''',
       r'''paź''',
       r'''lis''',
-      r'''gru'''
+      r'''gru''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''sty''',
@@ -8122,7 +8122,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''wrz''',
       r'''paź''',
       r'''lis''',
-      r'''gru'''
+      r'''gru''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''niedziela''',
@@ -8131,7 +8131,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''środa''',
       r'''czwartek''',
       r'''piątek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''niedziela''',
@@ -8140,7 +8140,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''środa''',
       r'''czwartek''',
       r'''piątek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''niedz.''',
@@ -8149,7 +8149,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''śr.''',
       r'''czw.''',
       r'''pt.''',
-      r'''sob.'''
+      r'''sob.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''niedz.''',
@@ -8158,7 +8158,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''śr.''',
       r'''czw.''',
       r'''pt.''',
-      r'''sob.'''
+      r'''sob.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -8167,7 +8167,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ś''',
       r'''c''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''N''',
@@ -8176,32 +8176,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Ś''',
       r'''C''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''I kw.''',
       r'''II kw.''',
       r'''III kw.''',
-      r'''IV kw.'''
+      r'''IV kw.''',
     ],
     'QUARTERS': <dynamic>[
       r'''I kwartał''',
       r'''II kwartał''',
       r'''III kwartał''',
-      r'''IV kwartał'''
+      r'''IV kwartał''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''dd.MM.y'''
+      r'''dd.MM.y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -8211,7 +8211,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ps': <String, dynamic>{
@@ -8219,7 +8219,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
     'ERAS': <dynamic>[r'''له میلاد وړاندې''', r'''م.'''],
     'ERANAMES': <dynamic>[
       r'''له میلاد څخه وړاندې''',
-      r'''له میلاد څخه وروسته'''
+      r'''له میلاد څخه وروسته''',
     ],
     'NARROWMONTHS': <dynamic>[
       r'''ج''',
@@ -8233,7 +8233,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''س''',
       r'''ا''',
       r'''ن''',
-      r'''د'''
+      r'''د''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -8247,7 +8247,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''جنوري''',
@@ -8261,7 +8261,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سېپتمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''جنوري''',
@@ -8275,7 +8275,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سپتمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''جنوري''',
@@ -8289,7 +8289,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سېپتمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''جنوري''',
@@ -8303,7 +8303,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''سپتمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''يونۍ''',
@@ -8312,7 +8312,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''څلرنۍ''',
       r'''پينځنۍ''',
       r'''جمعه''',
-      r'''اونۍ'''
+      r'''اونۍ''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''يونۍ''',
@@ -8321,7 +8321,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''څلرنۍ''',
       r'''پينځنۍ''',
       r'''جمعه''',
-      r'''اونۍ'''
+      r'''اونۍ''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''يونۍ''',
@@ -8330,7 +8330,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''څلرنۍ''',
       r'''پينځنۍ''',
       r'''جمعه''',
-      r'''اونۍ'''
+      r'''اونۍ''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''يونۍ''',
@@ -8339,7 +8339,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''څلرنۍ''',
       r'''پينځنۍ''',
       r'''جمعه''',
-      r'''اونۍ'''
+      r'''اونۍ''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -8348,7 +8348,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -8357,32 +8357,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''لومړۍ ربعه''',
       r'''۲مه ربعه''',
       r'''۳مه ربعه''',
-      r'''۴مه ربعه'''
+      r'''۴مه ربعه''',
     ],
     'QUARTERS': <dynamic>[
       r'''لومړۍ ربعه''',
       r'''۲مه ربعه''',
       r'''۳مه ربعه''',
-      r'''۴مه ربعه'''
+      r'''۴مه ربعه''',
     ],
     'AMPMS': <dynamic>[r'''غ.م.''', r'''غ.و.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE د y د MMMM d''',
       r'''د y د MMMM d''',
       r'''y MMM d''',
-      r'''y/M/d'''
+      r'''y/M/d''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H:mm:ss (zzzz)''',
       r'''H:mm:ss (z)''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 5,
@@ -8392,7 +8392,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
     'ZERODIGIT': r'''۰''',
   },
@@ -8412,7 +8412,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -8426,7 +8426,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''janeiro''',
@@ -8440,7 +8440,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''setembro''',
       r'''outubro''',
       r'''novembro''',
-      r'''dezembro'''
+      r'''dezembro''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''janeiro''',
@@ -8454,7 +8454,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''setembro''',
       r'''outubro''',
       r'''novembro''',
-      r'''dezembro'''
+      r'''dezembro''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -8468,7 +8468,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''set''',
       r'''out''',
       r'''nov''',
-      r'''dez'''
+      r'''dez''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -8482,7 +8482,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''set''',
       r'''out''',
       r'''nov''',
-      r'''dez'''
+      r'''dez''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8491,7 +8491,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''quarta-feira''',
       r'''quinta-feira''',
       r'''sexta-feira''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8500,7 +8500,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''quarta-feira''',
       r'''quinta-feira''',
       r'''sexta-feira''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom''',
@@ -8509,7 +8509,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''qua''',
       r'''qui''',
       r'''sex''',
-      r'''sáb'''
+      r'''sáb''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom''',
@@ -8518,7 +8518,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''qua''',
       r'''qui''',
       r'''sex''',
-      r'''sáb'''
+      r'''sáb''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8527,7 +8527,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Q''',
       r'''Q''',
       r'''S''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8536,27 +8536,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Q''',
       r'''Q''',
       r'''S''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''T1''', r'''T2''', r'''T3''', r'''T4'''],
     'QUARTERS': <dynamic>[
       r'''1º trimestre''',
       r'''2º trimestre''',
       r'''3º trimestre''',
-      r'''4º trimestre'''
+      r'''4º trimestre''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d 'de' MMMM 'de' y""",
       r"""d 'de' MMMM 'de' y""",
       r"""d 'de' MMM 'de' y""",
-      r'''dd/MM/y'''
+      r'''dd/MM/y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -8566,7 +8566,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'pt_PT': <String, dynamic>{
@@ -8585,7 +8585,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -8599,7 +8599,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''janeiro''',
@@ -8613,7 +8613,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''setembro''',
       r'''outubro''',
       r'''novembro''',
-      r'''dezembro'''
+      r'''dezembro''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''janeiro''',
@@ -8627,7 +8627,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''setembro''',
       r'''outubro''',
       r'''novembro''',
-      r'''dezembro'''
+      r'''dezembro''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -8641,7 +8641,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''set''',
       r'''out''',
       r'''nov''',
-      r'''dez'''
+      r'''dez''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -8655,7 +8655,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''set''',
       r'''out''',
       r'''nov''',
-      r'''dez'''
+      r'''dez''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8664,7 +8664,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''quarta-feira''',
       r'''quinta-feira''',
       r'''sexta-feira''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8673,7 +8673,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''quarta-feira''',
       r'''quinta-feira''',
       r'''sexta-feira''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8682,7 +8682,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''quarta''',
       r'''quinta''',
       r'''sexta''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8691,7 +8691,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''quarta''',
       r'''quinta''',
       r'''sexta''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8700,7 +8700,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Q''',
       r'''Q''',
       r'''S''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8709,27 +8709,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Q''',
       r'''Q''',
       r'''S''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''T1''', r'''T2''', r'''T3''', r'''T4'''],
     'QUARTERS': <dynamic>[
       r'''1.º trimestre''',
       r'''2.º trimestre''',
       r'''3.º trimestre''',
-      r'''4.º trimestre'''
+      r'''4.º trimestre''',
     ],
     'AMPMS': <dynamic>[r'''da manhã''', r'''da tarde'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d 'de' MMMM 'de' y""",
       r"""d 'de' MMMM 'de' y""",
       r'''dd/MM/y''',
-      r'''dd/MM/yy'''
+      r'''dd/MM/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -8739,7 +8739,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'às' {0}""",
       r"""{1} 'às' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ro': <String, dynamic>{
@@ -8758,7 +8758,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''I''',
@@ -8772,7 +8772,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''ianuarie''',
@@ -8786,7 +8786,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembrie''',
       r'''octombrie''',
       r'''noiembrie''',
-      r'''decembrie'''
+      r'''decembrie''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''ianuarie''',
@@ -8800,7 +8800,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembrie''',
       r'''octombrie''',
       r'''noiembrie''',
-      r'''decembrie'''
+      r'''decembrie''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ian.''',
@@ -8814,7 +8814,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ian.''',
@@ -8828,7 +8828,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''duminică''',
@@ -8837,7 +8837,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''miercuri''',
       r'''joi''',
       r'''vineri''',
-      r'''sâmbătă'''
+      r'''sâmbătă''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''duminică''',
@@ -8846,7 +8846,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''miercuri''',
       r'''joi''',
       r'''vineri''',
-      r'''sâmbătă'''
+      r'''sâmbătă''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dum.''',
@@ -8855,7 +8855,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mie.''',
       r'''joi''',
       r'''vin.''',
-      r'''sâm.'''
+      r'''sâm.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dum.''',
@@ -8864,7 +8864,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''mie.''',
       r'''joi''',
       r'''vin.''',
-      r'''sâm.'''
+      r'''sâm.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8873,7 +8873,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8882,32 +8882,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''trim. I''',
       r'''trim. II''',
       r'''trim. III''',
-      r'''trim. IV'''
+      r'''trim. IV''',
     ],
     'QUARTERS': <dynamic>[
       r'''trimestrul I''',
       r'''trimestrul al II-lea''',
       r'''trimestrul al III-lea''',
-      r'''trimestrul al IV-lea'''
+      r'''trimestrul al IV-lea''',
     ],
     'AMPMS': <dynamic>[r'''a.m.''', r'''p.m.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''dd.MM.y'''
+      r'''dd.MM.y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -8917,7 +8917,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ru': <String, dynamic>{
@@ -8925,7 +8925,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
     'ERAS': <dynamic>[r'''до н. э.''', r'''н. э.'''],
     'ERANAMES': <dynamic>[
       r'''до Рождества Христова''',
-      r'''от Рождества Христова'''
+      r'''от Рождества Христова''',
     ],
     'NARROWMONTHS': <dynamic>[
       r'''Я''',
@@ -8939,7 +8939,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''С''',
       r'''О''',
       r'''Н''',
-      r'''Д'''
+      r'''Д''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''Я''',
@@ -8953,7 +8953,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''С''',
       r'''О''',
       r'''Н''',
-      r'''Д'''
+      r'''Д''',
     ],
     'MONTHS': <dynamic>[
       r'''января''',
@@ -8967,7 +8967,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сентября''',
       r'''октября''',
       r'''ноября''',
-      r'''декабря'''
+      r'''декабря''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''январь''',
@@ -8981,7 +8981,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сентябрь''',
       r'''октябрь''',
       r'''ноябрь''',
-      r'''декабрь'''
+      r'''декабрь''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''янв.''',
@@ -8995,7 +8995,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сент.''',
       r'''окт.''',
       r'''нояб.''',
-      r'''дек.'''
+      r'''дек.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''янв.''',
@@ -9009,7 +9009,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сент.''',
       r'''окт.''',
       r'''нояб.''',
-      r'''дек.'''
+      r'''дек.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''воскресенье''',
@@ -9018,7 +9018,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''среда''',
       r'''четверг''',
       r'''пятница''',
-      r'''суббота'''
+      r'''суббота''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''воскресенье''',
@@ -9027,7 +9027,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''среда''',
       r'''четверг''',
       r'''пятница''',
-      r'''суббота'''
+      r'''суббота''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''вс''',
@@ -9036,7 +9036,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''вс''',
@@ -9045,7 +9045,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''вс''',
@@ -9054,7 +9054,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''В''',
@@ -9063,32 +9063,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''С''',
       r'''Ч''',
       r'''П''',
-      r'''С'''
+      r'''С''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''1-й кв.''',
       r'''2-й кв.''',
       r'''3-й кв.''',
-      r'''4-й кв.'''
+      r'''4-й кв.''',
     ],
     'QUARTERS': <dynamic>[
       r'''1-й квартал''',
       r'''2-й квартал''',
       r'''3-й квартал''',
-      r'''4-й квартал'''
+      r'''4-й квартал''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d MMMM y 'г'.""",
       r"""d MMMM y 'г'.""",
       r"""d MMM y 'г'.""",
-      r'''dd.MM.y'''
+      r'''dd.MM.y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H:mm:ss zzzz''',
       r'''H:mm:ss z''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -9098,7 +9098,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'sk': <String, dynamic>{
@@ -9117,7 +9117,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''j''',
@@ -9131,7 +9131,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'MONTHS': <dynamic>[
       r'''januára''',
@@ -9145,7 +9145,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembra''',
       r'''októbra''',
       r'''novembra''',
-      r'''decembra'''
+      r'''decembra''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''január''',
@@ -9159,7 +9159,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''október''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -9173,7 +9173,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -9187,7 +9187,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''nedeľa''',
@@ -9196,7 +9196,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''streda''',
       r'''štvrtok''',
       r'''piatok''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''nedeľa''',
@@ -9205,7 +9205,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''streda''',
       r'''štvrtok''',
       r'''piatok''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ne''',
@@ -9214,7 +9214,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''st''',
       r'''št''',
       r'''pi''',
-      r'''so'''
+      r'''so''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ne''',
@@ -9223,7 +9223,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''st''',
       r'''št''',
       r'''pi''',
-      r'''so'''
+      r'''so''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9232,7 +9232,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''š''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9241,27 +9241,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''š''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''1. štvrťrok''',
       r'''2. štvrťrok''',
       r'''3. štvrťrok''',
-      r'''4. štvrťrok'''
+      r'''4. štvrťrok''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d. MMMM y''',
       r'''d. MMMM y''',
       r'''d. M. y''',
-      r'''d. M. y'''
+      r'''d. M. y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H:mm:ss zzzz''',
       r'''H:mm:ss z''',
       r'''H:mm:ss''',
-      r'''H:mm'''
+      r'''H:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -9271,7 +9271,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1}, {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'sl': <String, dynamic>{
@@ -9290,7 +9290,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''j''',
@@ -9304,7 +9304,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'MONTHS': <dynamic>[
       r'''januar''',
@@ -9318,7 +9318,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januar''',
@@ -9332,7 +9332,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -9346,7 +9346,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -9360,7 +9360,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''nedelja''',
@@ -9369,7 +9369,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sreda''',
       r'''četrtek''',
       r'''petek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''nedelja''',
@@ -9378,7 +9378,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sreda''',
       r'''četrtek''',
       r'''petek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ned.''',
@@ -9387,7 +9387,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sre.''',
       r'''čet.''',
       r'''pet.''',
-      r'''sob.'''
+      r'''sob.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ned.''',
@@ -9396,7 +9396,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sre.''',
       r'''čet.''',
       r'''pet.''',
-      r'''sob.'''
+      r'''sob.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9405,7 +9405,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''č''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9414,32 +9414,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''č''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''1. čet.''',
       r'''2. čet.''',
       r'''3. čet.''',
-      r'''4. čet.'''
+      r'''4. čet.''',
     ],
     'QUARTERS': <dynamic>[
       r'''1. četrtletje''',
       r'''2. četrtletje''',
       r'''3. četrtletje''',
-      r'''4. četrtletje'''
+      r'''4. četrtletje''',
     ],
     'AMPMS': <dynamic>[r'''dop.''', r'''pop.'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, dd. MMMM y''',
       r'''dd. MMMM y''',
       r'''d. MMM y''',
-      r'''d. MM. yy'''
+      r'''d. MM. yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -9449,7 +9449,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'sr': <String, dynamic>{
@@ -9468,7 +9468,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''с''',
       r'''о''',
       r'''н''',
-      r'''д'''
+      r'''д''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ј''',
@@ -9482,7 +9482,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''с''',
       r'''о''',
       r'''н''',
-      r'''д'''
+      r'''д''',
     ],
     'MONTHS': <dynamic>[
       r'''јануар''',
@@ -9496,7 +9496,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''септембар''',
       r'''октобар''',
       r'''новембар''',
-      r'''децембар'''
+      r'''децембар''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''јануар''',
@@ -9510,7 +9510,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''септембар''',
       r'''октобар''',
       r'''новембар''',
-      r'''децембар'''
+      r'''децембар''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''јан''',
@@ -9524,7 +9524,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сеп''',
       r'''окт''',
       r'''нов''',
-      r'''дец'''
+      r'''дец''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''јан''',
@@ -9538,7 +9538,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сеп''',
       r'''окт''',
       r'''нов''',
-      r'''дец'''
+      r'''дец''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''недеља''',
@@ -9547,7 +9547,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''среда''',
       r'''четвртак''',
       r'''петак''',
-      r'''субота'''
+      r'''субота''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''недеља''',
@@ -9556,7 +9556,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''среда''',
       r'''четвртак''',
       r'''петак''',
-      r'''субота'''
+      r'''субота''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''нед''',
@@ -9565,7 +9565,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сре''',
       r'''чет''',
       r'''пет''',
-      r'''суб'''
+      r'''суб''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''нед''',
@@ -9574,7 +9574,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''сре''',
       r'''чет''',
       r'''пет''',
-      r'''суб'''
+      r'''суб''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''н''',
@@ -9583,7 +9583,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''с''',
       r'''ч''',
       r'''п''',
-      r'''с'''
+      r'''с''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''н''',
@@ -9592,27 +9592,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''с''',
       r'''ч''',
       r'''п''',
-      r'''с'''
+      r'''с''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''К1''', r'''К2''', r'''К3''', r'''К4'''],
     'QUARTERS': <dynamic>[
       r'''први квартал''',
       r'''други квартал''',
       r'''трећи квартал''',
-      r'''четврти квартал'''
+      r'''четврти квартал''',
     ],
     'AMPMS': <dynamic>[r'''пре подне''', r'''по подне'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, dd. MMMM y.''',
       r'''dd. MMMM y.''',
       r'''dd.MM.y.''',
-      r'''d.M.yy.'''
+      r'''d.M.yy.''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -9622,7 +9622,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'sr_Latn': <String, dynamic>{
@@ -9641,7 +9641,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''j''',
@@ -9655,7 +9655,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'MONTHS': <dynamic>[
       r'''januar''',
@@ -9669,7 +9669,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembar''',
       r'''oktobar''',
       r'''novembar''',
-      r'''decembar'''
+      r'''decembar''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januar''',
@@ -9683,7 +9683,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''septembar''',
       r'''oktobar''',
       r'''novembar''',
-      r'''decembar'''
+      r'''decembar''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -9697,7 +9697,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -9711,7 +9711,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''nedelja''',
@@ -9720,7 +9720,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sreda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''nedelja''',
@@ -9729,7 +9729,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sreda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -9738,7 +9738,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sre''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -9747,7 +9747,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sre''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9756,7 +9756,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''č''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9765,27 +9765,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''s''',
       r'''č''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''K1''', r'''K2''', r'''K3''', r'''K4'''],
     'QUARTERS': <dynamic>[
       r'''prvi kvartal''',
       r'''drugi kvartal''',
       r'''treći kvartal''',
-      r'''četvrti kvartal'''
+      r'''četvrti kvartal''',
     ],
     'AMPMS': <dynamic>[r'''pre podne''', r'''po podne'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, dd. MMMM y.''',
       r'''dd. MMMM y.''',
       r'''dd.MM.y.''',
-      r'''d.M.yy.'''
+      r'''d.M.yy.''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -9795,7 +9795,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'sv': <String, dynamic>{
@@ -9814,7 +9814,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -9828,7 +9828,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''januari''',
@@ -9842,7 +9842,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januari''',
@@ -9856,7 +9856,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -9870,7 +9870,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -9884,7 +9884,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''söndag''',
@@ -9893,7 +9893,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lördag'''
+      r'''lördag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''söndag''',
@@ -9902,7 +9902,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lördag'''
+      r'''lördag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''sön''',
@@ -9911,7 +9911,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ons''',
       r'''tors''',
       r'''fre''',
-      r'''lör'''
+      r'''lör''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''sön''',
@@ -9920,7 +9920,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ons''',
       r'''tors''',
       r'''fre''',
-      r'''lör'''
+      r'''lör''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -9929,7 +9929,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''O''',
       r'''T''',
       r'''F''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -9938,27 +9938,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''O''',
       r'''T''',
       r'''F''',
-      r'''L'''
+      r'''L''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''K1''', r'''K2''', r'''K3''', r'''K4'''],
     'QUARTERS': <dynamic>[
       r'''1:a kvartalet''',
       r'''2:a kvartalet''',
       r'''3:e kvartalet''',
-      r'''4:e kvartalet'''
+      r'''4:e kvartalet''',
     ],
     'AMPMS': <dynamic>[r'''fm''', r'''em'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''y-MM-dd'''
+      r'''y-MM-dd''',
     ],
     'TIMEFORMATS': <dynamic>[
       r"""'kl'. HH:mm:ss zzzz""",
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -9968,7 +9968,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'sw': <String, dynamic>{
@@ -9987,7 +9987,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -10001,7 +10001,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januari''',
@@ -10015,7 +10015,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Septemba''',
       r'''Oktoba''',
       r'''Novemba''',
-      r'''Desemba'''
+      r'''Desemba''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januari''',
@@ -10029,7 +10029,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Septemba''',
       r'''Oktoba''',
       r'''Novemba''',
-      r'''Desemba'''
+      r'''Desemba''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -10043,7 +10043,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Des'''
+      r'''Des''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -10057,7 +10057,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Des'''
+      r'''Des''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Jumapili''',
@@ -10066,7 +10066,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Jumatano''',
       r'''Alhamisi''',
       r'''Ijumaa''',
-      r'''Jumamosi'''
+      r'''Jumamosi''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Jumapili''',
@@ -10075,7 +10075,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Jumatano''',
       r'''Alhamisi''',
       r'''Ijumaa''',
-      r'''Jumamosi'''
+      r'''Jumamosi''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Jumapili''',
@@ -10084,7 +10084,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Jumatano''',
       r'''Alhamisi''',
       r'''Ijumaa''',
-      r'''Jumamosi'''
+      r'''Jumamosi''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Jumapili''',
@@ -10093,7 +10093,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Jumatano''',
       r'''Alhamisi''',
       r'''Ijumaa''',
-      r'''Jumamosi'''
+      r'''Jumamosi''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -10102,7 +10102,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -10111,32 +10111,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''Robo ya 1''',
       r'''Robo ya 2''',
       r'''Robo ya 3''',
-      r'''Robo ya 4'''
+      r'''Robo ya 4''',
     ],
     'QUARTERS': <dynamic>[
       r'''Robo ya 1''',
       r'''Robo ya 2''',
       r'''Robo ya 3''',
-      r'''Robo ya 4'''
+      r'''Robo ya 4''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM y''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''dd/MM/y'''
+      r'''dd/MM/y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -10146,7 +10146,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'ta': <String, dynamic>{
@@ -10165,7 +10165,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''செ''',
       r'''அ''',
       r'''ந''',
-      r'''டி'''
+      r'''டி''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ஜ''',
@@ -10179,7 +10179,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''செ''',
       r'''அ''',
       r'''ந''',
-      r'''டி'''
+      r'''டி''',
     ],
     'MONTHS': <dynamic>[
       r'''ஜனவரி''',
@@ -10193,7 +10193,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''செப்டம்பர்''',
       r'''அக்டோபர்''',
       r'''நவம்பர்''',
-      r'''டிசம்பர்'''
+      r'''டிசம்பர்''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''ஜனவரி''',
@@ -10207,7 +10207,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''செப்டம்பர்''',
       r'''அக்டோபர்''',
       r'''நவம்பர்''',
-      r'''டிசம்பர்'''
+      r'''டிசம்பர்''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ஜன.''',
@@ -10221,7 +10221,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''செப்.''',
       r'''அக்.''',
       r'''நவ.''',
-      r'''டிச.'''
+      r'''டிச.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ஜன.''',
@@ -10235,7 +10235,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''செப்.''',
       r'''அக்.''',
       r'''நவ.''',
-      r'''டிச.'''
+      r'''டிச.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''ஞாயிறு''',
@@ -10244,7 +10244,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''புதன்''',
       r'''வியாழன்''',
       r'''வெள்ளி''',
-      r'''சனி'''
+      r'''சனி''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''ஞாயிறு''',
@@ -10253,7 +10253,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''புதன்''',
       r'''வியாழன்''',
       r'''வெள்ளி''',
-      r'''சனி'''
+      r'''சனி''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ஞாயி.''',
@@ -10262,7 +10262,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''புத.''',
       r'''வியா.''',
       r'''வெள்.''',
-      r'''சனி'''
+      r'''சனி''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ஞாயி.''',
@@ -10271,7 +10271,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''புத.''',
       r'''வியா.''',
       r'''வெள்.''',
-      r'''சனி'''
+      r'''சனி''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''ஞா''',
@@ -10280,7 +10280,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''பு''',
       r'''வி''',
       r'''வெ''',
-      r'''ச'''
+      r'''ச''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''ஞா''',
@@ -10289,32 +10289,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''பு''',
       r'''வி''',
       r'''வெ''',
-      r'''ச'''
+      r'''ச''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''காலா.1''',
       r'''காலா.2''',
       r'''காலா.3''',
-      r'''காலா.4'''
+      r'''காலா.4''',
     ],
     'QUARTERS': <dynamic>[
       r'''ஒன்றாம் காலாண்டு''',
       r'''இரண்டாம் காலாண்டு''',
       r'''மூன்றாம் காலாண்டு''',
-      r'''நான்காம் காலாண்டு'''
+      r'''நான்காம் காலாண்டு''',
     ],
     'AMPMS': <dynamic>[r'''முற்பகல்''', r'''பிற்பகல்'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM, y''',
       r'''d MMMM, y''',
       r'''d MMM, y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''a h:mm:ss zzzz''',
       r'''a h:mm:ss z''',
       r'''a h:mm:ss''',
-      r'''a h:mm'''
+      r'''a h:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -10324,7 +10324,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} ’அன்று’ {0}''',
       r'''{1} ’அன்று’ {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'th': <String, dynamic>{
@@ -10343,7 +10343,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ก.ย.''',
       r'''ต.ค.''',
       r'''พ.ย.''',
-      r'''ธ.ค.'''
+      r'''ธ.ค.''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ม.ค.''',
@@ -10357,7 +10357,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ก.ย.''',
       r'''ต.ค.''',
       r'''พ.ย.''',
-      r'''ธ.ค.'''
+      r'''ธ.ค.''',
     ],
     'MONTHS': <dynamic>[
       r'''มกราคม''',
@@ -10371,7 +10371,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''กันยายน''',
       r'''ตุลาคม''',
       r'''พฤศจิกายน''',
-      r'''ธันวาคม'''
+      r'''ธันวาคม''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''มกราคม''',
@@ -10385,7 +10385,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''กันยายน''',
       r'''ตุลาคม''',
       r'''พฤศจิกายน''',
-      r'''ธันวาคม'''
+      r'''ธันวาคม''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ม.ค.''',
@@ -10399,7 +10399,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ก.ย.''',
       r'''ต.ค.''',
       r'''พ.ย.''',
-      r'''ธ.ค.'''
+      r'''ธ.ค.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ม.ค.''',
@@ -10413,7 +10413,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ก.ย.''',
       r'''ต.ค.''',
       r'''พ.ย.''',
-      r'''ธ.ค.'''
+      r'''ธ.ค.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''วันอาทิตย์''',
@@ -10422,7 +10422,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''วันพุธ''',
       r'''วันพฤหัสบดี''',
       r'''วันศุกร์''',
-      r'''วันเสาร์'''
+      r'''วันเสาร์''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''วันอาทิตย์''',
@@ -10431,7 +10431,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''วันพุธ''',
       r'''วันพฤหัสบดี''',
       r'''วันศุกร์''',
-      r'''วันเสาร์'''
+      r'''วันเสาร์''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''อา.''',
@@ -10440,7 +10440,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''พ.''',
       r'''พฤ.''',
       r'''ศ.''',
-      r'''ส.'''
+      r'''ส.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''อา.''',
@@ -10449,7 +10449,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''พ.''',
       r'''พฤ.''',
       r'''ศ.''',
-      r'''ส.'''
+      r'''ส.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''อา''',
@@ -10458,7 +10458,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''พ''',
       r'''พฤ''',
       r'''ศ''',
-      r'''ส'''
+      r'''ส''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''อา''',
@@ -10467,32 +10467,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''พ''',
       r'''พฤ''',
       r'''ศ''',
-      r'''ส'''
+      r'''ส''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''ไตรมาส 1''',
       r'''ไตรมาส 2''',
       r'''ไตรมาส 3''',
-      r'''ไตรมาส 4'''
+      r'''ไตรมาส 4''',
     ],
     'QUARTERS': <dynamic>[
       r'''ไตรมาส 1''',
       r'''ไตรมาส 2''',
       r'''ไตรมาส 3''',
-      r'''ไตรมาส 4'''
+      r'''ไตรมาส 4''',
     ],
     'AMPMS': <dynamic>[r'''ก่อนเที่ยง''', r'''หลังเที่ยง'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEEที่ d MMMM G y''',
       r'''d MMMM G y''',
       r'''d MMM y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''H นาฬิกา mm นาที ss วินาที zzzz''',
       r'''H นาฬิกา mm นาที ss วินาที z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -10502,7 +10502,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'tl': <String, dynamic>{
@@ -10521,7 +10521,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -10535,7 +10535,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'MONTHS': <dynamic>[
       r'''Enero''',
@@ -10549,7 +10549,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Setyembre''',
       r'''Oktubre''',
       r'''Nobyembre''',
-      r'''Disyembre'''
+      r'''Disyembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Enero''',
@@ -10563,7 +10563,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Setyembre''',
       r'''Oktubre''',
       r'''Nobyembre''',
-      r'''Disyembre'''
+      r'''Disyembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Ene''',
@@ -10577,7 +10577,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Ene''',
@@ -10591,7 +10591,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Linggo''',
@@ -10600,7 +10600,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miyerkules''',
       r'''Huwebes''',
       r'''Biyernes''',
-      r'''Sabado'''
+      r'''Sabado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Linggo''',
@@ -10609,7 +10609,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miyerkules''',
       r'''Huwebes''',
       r'''Biyernes''',
-      r'''Sabado'''
+      r'''Sabado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -10618,7 +10618,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -10627,7 +10627,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -10636,7 +10636,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -10645,27 +10645,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''ika-1 quarter''',
       r'''ika-2 quarter''',
       r'''ika-3 quarter''',
-      r'''ika-4 na quarter'''
+      r'''ika-4 na quarter''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, MMMM d, y''',
       r'''MMMM d, y''',
       r'''MMM d, y''',
-      r'''M/d/yy'''
+      r'''M/d/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -10675,7 +10675,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'nang' {0}""",
       r"""{1} 'nang' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'tr': <String, dynamic>{
@@ -10694,7 +10694,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''E''',
       r'''E''',
       r'''K''',
-      r'''A'''
+      r'''A''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''O''',
@@ -10708,7 +10708,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''E''',
       r'''E''',
       r'''K''',
-      r'''A'''
+      r'''A''',
     ],
     'MONTHS': <dynamic>[
       r'''Ocak''',
@@ -10722,7 +10722,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Eylül''',
       r'''Ekim''',
       r'''Kasım''',
-      r'''Aralık'''
+      r'''Aralık''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Ocak''',
@@ -10736,7 +10736,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Eylül''',
       r'''Ekim''',
       r'''Kasım''',
-      r'''Aralık'''
+      r'''Aralık''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Oca''',
@@ -10750,7 +10750,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Eyl''',
       r'''Eki''',
       r'''Kas''',
-      r'''Ara'''
+      r'''Ara''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Oca''',
@@ -10764,7 +10764,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Eyl''',
       r'''Eki''',
       r'''Kas''',
-      r'''Ara'''
+      r'''Ara''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Pazar''',
@@ -10773,7 +10773,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Çarşamba''',
       r'''Perşembe''',
       r'''Cuma''',
-      r'''Cumartesi'''
+      r'''Cumartesi''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Pazar''',
@@ -10782,7 +10782,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Çarşamba''',
       r'''Perşembe''',
       r'''Cuma''',
-      r'''Cumartesi'''
+      r'''Cumartesi''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Paz''',
@@ -10791,7 +10791,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Çar''',
       r'''Per''',
       r'''Cum''',
-      r'''Cmt'''
+      r'''Cmt''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Paz''',
@@ -10800,7 +10800,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Çar''',
       r'''Per''',
       r'''Cum''',
-      r'''Cmt'''
+      r'''Cmt''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''P''',
@@ -10809,7 +10809,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Ç''',
       r'''P''',
       r'''C''',
-      r'''C'''
+      r'''C''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''P''',
@@ -10818,27 +10818,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Ç''',
       r'''P''',
       r'''C''',
-      r'''C'''
+      r'''C''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Ç1''', r'''Ç2''', r'''Ç3''', r'''Ç4'''],
     'QUARTERS': <dynamic>[
       r'''1. çeyrek''',
       r'''2. çeyrek''',
       r'''3. çeyrek''',
-      r'''4. çeyrek'''
+      r'''4. çeyrek''',
     ],
     'AMPMS': <dynamic>[r'''ÖÖ''', r'''ÖS'''],
     'DATEFORMATS': <dynamic>[
       r'''d MMMM y EEEE''',
       r'''d MMMM y''',
       r'''d MMM y''',
-      r'''d.MM.y'''
+      r'''d.MM.y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -10848,7 +10848,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'uk': <String, dynamic>{
@@ -10867,7 +10867,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''в''',
       r'''ж''',
       r'''л''',
-      r'''г'''
+      r'''г''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''С''',
@@ -10881,7 +10881,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''В''',
       r'''Ж''',
       r'''Л''',
-      r'''Г'''
+      r'''Г''',
     ],
     'MONTHS': <dynamic>[
       r'''січня''',
@@ -10895,7 +10895,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''вересня''',
       r'''жовтня''',
       r'''листопада''',
-      r'''грудня'''
+      r'''грудня''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''січень''',
@@ -10909,7 +10909,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''вересень''',
       r'''жовтень''',
       r'''листопад''',
-      r'''грудень'''
+      r'''грудень''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''січ.''',
@@ -10923,7 +10923,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''вер.''',
       r'''жовт.''',
       r'''лист.''',
-      r'''груд.'''
+      r'''груд.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''січ''',
@@ -10937,7 +10937,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''вер''',
       r'''жов''',
       r'''лис''',
-      r'''гру'''
+      r'''гру''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''неділя''',
@@ -10946,7 +10946,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''середа''',
       r'''четвер''',
       r'''пʼятниця''',
-      r'''субота'''
+      r'''субота''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''неділя''',
@@ -10955,7 +10955,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''середа''',
       r'''четвер''',
       r'''пʼятниця''',
-      r'''субота'''
+      r'''субота''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''нд''',
@@ -10964,7 +10964,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''нд''',
@@ -10973,7 +10973,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Н''',
@@ -10982,7 +10982,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''С''',
       r'''Ч''',
       r'''П''',
-      r'''С'''
+      r'''С''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Н''',
@@ -10991,32 +10991,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''С''',
       r'''Ч''',
       r'''П''',
-      r'''С'''
+      r'''С''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''1-й кв.''',
       r'''2-й кв.''',
       r'''3-й кв.''',
-      r'''4-й кв.'''
+      r'''4-й кв.''',
     ],
     'QUARTERS': <dynamic>[
       r'''1-й квартал''',
       r'''2-й квартал''',
       r'''3-й квартал''',
-      r'''4-й квартал'''
+      r'''4-й квартал''',
     ],
     'AMPMS': <dynamic>[r'''дп''', r'''пп'''],
     'DATEFORMATS': <dynamic>[
       r"""EEEE, d MMMM y 'р'.""",
       r"""d MMMM y 'р'.""",
       r"""d MMM y 'р'.""",
-      r'''dd.MM.yy'''
+      r'''dd.MM.yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -11026,7 +11026,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r"""{1} 'о' {0}""",
       r"""{1} 'о' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ur': <String, dynamic>{
@@ -11045,7 +11045,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -11059,7 +11059,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''جنوری''',
@@ -11073,7 +11073,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ستمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''جنوری''',
@@ -11087,7 +11087,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ستمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''جنوری''',
@@ -11101,7 +11101,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ستمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''جنوری''',
@@ -11115,7 +11115,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''ستمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''اتوار''',
@@ -11124,7 +11124,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''بدھ''',
       r'''جمعرات''',
       r'''جمعہ''',
-      r'''ہفتہ'''
+      r'''ہفتہ''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''اتوار''',
@@ -11133,7 +11133,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''بدھ''',
       r'''جمعرات''',
       r'''جمعہ''',
-      r'''ہفتہ'''
+      r'''ہفتہ''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''اتوار''',
@@ -11142,7 +11142,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''بدھ''',
       r'''جمعرات''',
       r'''جمعہ''',
-      r'''ہفتہ'''
+      r'''ہفتہ''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''اتوار''',
@@ -11151,7 +11151,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''بدھ''',
       r'''جمعرات''',
       r'''جمعہ''',
-      r'''ہفتہ'''
+      r'''ہفتہ''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -11160,7 +11160,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -11169,32 +11169,32 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'SHORTQUARTERS': <dynamic>[
       r'''پہلی سہ ماہی''',
       r'''دوسری سہ ماہی''',
       r'''تیسری سہ ماہی''',
-      r'''چوتهی سہ ماہی'''
+      r'''چوتهی سہ ماہی''',
     ],
     'QUARTERS': <dynamic>[
       r'''پہلی سہ ماہی''',
       r'''دوسری سہ ماہی''',
       r'''تیسری سہ ماہی''',
-      r'''چوتهی سہ ماہی'''
+      r'''چوتهی سہ ماہی''',
     ],
     'AMPMS': <dynamic>[r'''AM''', r'''PM'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE، d MMMM، y''',
       r'''d MMMM، y''',
       r'''d MMM، y''',
-      r'''d/M/yy'''
+      r'''d/M/yy''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''h:mm:ss a zzzz''',
       r'''h:mm:ss a z''',
       r'''h:mm:ss a''',
-      r'''h:mm a'''
+      r'''h:mm a''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -11204,7 +11204,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'vi': <String, dynamic>{
@@ -11223,7 +11223,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -11237,7 +11237,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''tháng 1''',
@@ -11251,7 +11251,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''tháng 9''',
       r'''tháng 10''',
       r'''tháng 11''',
-      r'''tháng 12'''
+      r'''tháng 12''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Tháng 1''',
@@ -11265,7 +11265,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Tháng 9''',
       r'''Tháng 10''',
       r'''Tháng 11''',
-      r'''Tháng 12'''
+      r'''Tháng 12''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''thg 1''',
@@ -11279,7 +11279,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''thg 9''',
       r'''thg 10''',
       r'''thg 11''',
-      r'''thg 12'''
+      r'''thg 12''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Thg 1''',
@@ -11293,7 +11293,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Thg 9''',
       r'''Thg 10''',
       r'''Thg 11''',
-      r'''Thg 12'''
+      r'''Thg 12''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Chủ Nhật''',
@@ -11302,7 +11302,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Thứ Tư''',
       r'''Thứ Năm''',
       r'''Thứ Sáu''',
-      r'''Thứ Bảy'''
+      r'''Thứ Bảy''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Chủ Nhật''',
@@ -11311,7 +11311,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Thứ Tư''',
       r'''Thứ Năm''',
       r'''Thứ Sáu''',
-      r'''Thứ Bảy'''
+      r'''Thứ Bảy''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''CN''',
@@ -11320,7 +11320,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Th 4''',
       r'''Th 5''',
       r'''Th 6''',
-      r'''Th 7'''
+      r'''Th 7''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''CN''',
@@ -11329,7 +11329,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''Th 4''',
       r'''Th 5''',
       r'''Th 6''',
-      r'''Th 7'''
+      r'''Th 7''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''CN''',
@@ -11338,7 +11338,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''T4''',
       r'''T5''',
       r'''T6''',
-      r'''T7'''
+      r'''T7''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''CN''',
@@ -11347,27 +11347,27 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''T4''',
       r'''T5''',
       r'''T6''',
-      r'''T7'''
+      r'''T7''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[
       r'''Quý 1''',
       r'''Quý 2''',
       r'''Quý 3''',
-      r'''Quý 4'''
+      r'''Quý 4''',
     ],
     'AMPMS': <dynamic>[r'''SA''', r'''CH'''],
     'DATEFORMATS': <dynamic>[
       r'''EEEE, d MMMM, y''',
       r'''d MMMM, y''',
       r'''d MMM, y''',
-      r'''dd/MM/y'''
+      r'''dd/MM/y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''HH:mm:ss zzzz''',
       r'''HH:mm:ss z''',
       r'''HH:mm:ss''',
-      r'''HH:mm'''
+      r'''HH:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 0,
@@ -11377,7 +11377,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{0} {1}''',
       r'''{0} {1}''',
       r'''{0}, {1}''',
-      r'''{0}, {1}'''
+      r'''{0}, {1}''',
     ],
   },
   'zh': <String, dynamic>{
@@ -11396,7 +11396,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -11410,7 +11410,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''一月''',
@@ -11424,7 +11424,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''九月''',
       r'''十月''',
       r'''十一月''',
-      r'''十二月'''
+      r'''十二月''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''一月''',
@@ -11438,7 +11438,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''九月''',
       r'''十月''',
       r'''十一月''',
-      r'''十二月'''
+      r'''十二月''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11452,7 +11452,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11466,7 +11466,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11475,7 +11475,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11484,7 +11484,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''周日''',
@@ -11493,7 +11493,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''周三''',
       r'''周四''',
       r'''周五''',
-      r'''周六'''
+      r'''周六''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''周日''',
@@ -11502,7 +11502,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''周三''',
       r'''周四''',
       r'''周五''',
-      r'''周六'''
+      r'''周六''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11511,7 +11511,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''三''',
       r'''四''',
       r'''五''',
-      r'''六'''
+      r'''六''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11520,7 +11520,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''三''',
       r'''四''',
       r'''五''',
-      r'''六'''
+      r'''六''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''1季度''', r'''2季度''', r'''3季度''', r'''4季度'''],
     'QUARTERS': <dynamic>[r'''第一季度''', r'''第二季度''', r'''第三季度''', r'''第四季度'''],
@@ -11529,13 +11529,13 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''y年M月d日EEEE''',
       r'''y年M月d日''',
       r'''y年M月d日''',
-      r'''y/M/d'''
+      r'''y/M/d''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''zzzz ah:mm:ss''',
       r'''z ah:mm:ss''',
       r'''ah:mm:ss''',
-      r'''ah:mm'''
+      r'''ah:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -11545,7 +11545,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'zh_HK': <String, dynamic>{
@@ -11564,7 +11564,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -11578,7 +11578,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''1月''',
@@ -11592,7 +11592,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''1月''',
@@ -11606,7 +11606,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11620,7 +11620,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11634,7 +11634,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11643,7 +11643,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11652,7 +11652,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''週日''',
@@ -11661,7 +11661,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''週三''',
       r'''週四''',
       r'''週五''',
-      r'''週六'''
+      r'''週六''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''週日''',
@@ -11670,7 +11670,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''週三''',
       r'''週四''',
       r'''週五''',
-      r'''週六'''
+      r'''週六''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11679,7 +11679,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''三''',
       r'''四''',
       r'''五''',
-      r'''六'''
+      r'''六''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11688,7 +11688,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''三''',
       r'''四''',
       r'''五''',
-      r'''六'''
+      r'''六''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''Q1''', r'''Q2''', r'''Q3''', r'''Q4'''],
     'QUARTERS': <dynamic>[r'''第1季''', r'''第2季''', r'''第3季''', r'''第4季'''],
@@ -11697,13 +11697,13 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''y年M月d日EEEE''',
       r'''y年M月d日''',
       r'''y年M月d日''',
-      r'''d/M/y'''
+      r'''d/M/y''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''ah:mm:ss [zzzz]''',
       r'''ah:mm:ss [z]''',
       r'''ah:mm:ss''',
-      r'''ah:mm'''
+      r'''ah:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -11713,7 +11713,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'zh_TW': <String, dynamic>{
@@ -11732,7 +11732,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -11746,7 +11746,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''1月''',
@@ -11760,7 +11760,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''1月''',
@@ -11774,7 +11774,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11788,7 +11788,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11802,7 +11802,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11811,7 +11811,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11820,7 +11820,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''週日''',
@@ -11829,7 +11829,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''週三''',
       r'''週四''',
       r'''週五''',
-      r'''週六'''
+      r'''週六''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''週日''',
@@ -11838,7 +11838,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''週三''',
       r'''週四''',
       r'''週五''',
-      r'''週六'''
+      r'''週六''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11847,7 +11847,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''三''',
       r'''四''',
       r'''五''',
-      r'''六'''
+      r'''六''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11856,7 +11856,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''三''',
       r'''四''',
       r'''五''',
-      r'''六'''
+      r'''六''',
     ],
     'SHORTQUARTERS': <dynamic>[r'''第1季''', r'''第2季''', r'''第3季''', r'''第4季'''],
     'QUARTERS': <dynamic>[r'''第1季''', r'''第2季''', r'''第3季''', r'''第4季'''],
@@ -11865,13 +11865,13 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''y年M月d日 EEEE''',
       r'''y年M月d日''',
       r'''y年M月d日''',
-      r'''y/M/d'''
+      r'''y/M/d''',
     ],
     'TIMEFORMATS': <dynamic>[
       r'''ah:mm:ss [zzzz]''',
       r'''ah:mm:ss [z]''',
       r'''ah:mm:ss''',
-      r'''ah:mm'''
+      r'''ah:mm''',
     ],
     'AVAILABLEFORMATS': null,
     'FIRSTDAYOFWEEK': 6,
@@ -11881,7 +11881,7 @@ const Map<String, dynamic> dateSymbols = <String, dynamic>{
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
 };
diff --git a/packages/flutter_localizations/test/date_picker_test.dart b/packages/flutter_localizations/test/date_picker_test.dart
index dba36d3fa21..ff8f16faa76 100644
--- a/packages/flutter_localizations/test/date_picker_test.dart
+++ b/packages/flutter_localizations/test/date_picker_test.dart
@@ -229,7 +229,7 @@ Future<void> _pumpBoilerplate(
   WidgetTester tester,
   Widget child, {
   Locale locale = const Locale('en', 'US'),
-  TextDirection textDirection = TextDirection.ltr
+  TextDirection textDirection = TextDirection.ltr,
 }) async {
   await tester.pumpWidget(Directionality(
     textDirection: TextDirection.ltr,
diff --git a/packages/flutter_localizations/test/override_test.dart b/packages/flutter_localizations/test/override_test.dart
index 98c742f571d..a36f402051f 100644
--- a/packages/flutter_localizations/test/override_test.dart
+++ b/packages/flutter_localizations/test/override_test.dart
@@ -29,7 +29,7 @@ class FooMaterialLocalizations extends MaterialLocalizationEn {
 class FooMaterialLocalizationsDelegate extends LocalizationsDelegate<MaterialLocalizations> {
   const FooMaterialLocalizationsDelegate({
     this.supportedLanguage = 'en',
-    this.backButtonTooltip = 'foo'
+    this.backButtonTooltip = 'foo',
   });
 
   final String supportedLanguage;
@@ -121,7 +121,7 @@ void main() {
               },
             ),
           );
-        }
+        },
       );
     }
 
@@ -153,7 +153,7 @@ void main() {
               },
             ),
           );
-        }
+        },
       );
     }
 
@@ -186,7 +186,7 @@ void main() {
             MaterialLocalizations.of(context).backButtonTooltip,
             key: textKey,
           );
-        }
+        },
       )
     );
 
@@ -217,7 +217,7 @@ void main() {
             MaterialLocalizations.of(context).backButtonTooltip,
             key: textKey,
           );
-        }
+        },
       )
     );
 
@@ -246,7 +246,7 @@ void main() {
             MaterialLocalizations.of(context).backButtonTooltip,
             key: textKey,
           );
-        }
+        },
       )
     );
 
diff --git a/packages/flutter_localizations/test/time_picker_test.dart b/packages/flutter_localizations/test/time_picker_test.dart
index c7c8207ca91..961dabe1f4e 100644
--- a/packages/flutter_localizations/test/time_picker_test.dart
+++ b/packages/flutter_localizations/test/time_picker_test.dart
@@ -28,14 +28,14 @@ class _TimePickerLauncher extends StatelessWidget {
                 onPressed: () async {
                   onChanged(await showTimePicker(
                     context: context,
-                    initialTime: const TimeOfDay(hour: 7, minute: 0)
+                    initialTime: const TimeOfDay(hour: 7, minute: 0),
                   ));
-                }
+                },
               );
             }
-          )
-        )
-      )
+          ),
+        ),
+      ),
     );
   }
 }
diff --git a/packages/flutter_localizations/test/widgets_test.dart b/packages/flutter_localizations/test/widgets_test.dart
index 0d68d217e48..bdfcdadf839 100644
--- a/packages/flutter_localizations/test/widgets_test.dart
+++ b/packages/flutter_localizations/test/widgets_test.dart
@@ -260,7 +260,7 @@ void main() {
         ],
         buildContent: (BuildContext context) {
           return Text(TestLocalizations.of(context).message);
-        }
+        },
       )
     );
     await tester.pump(const Duration(milliseconds: 50)); // TestLocalizations.loadAsync() takes 100ms
@@ -300,7 +300,7 @@ void main() {
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -324,7 +324,7 @@ void main() {
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -365,7 +365,7 @@ void main() {
               ),
             ],
           );
-        }
+        },
       )
     );
 
@@ -392,7 +392,7 @@ void main() {
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -417,7 +417,7 @@ void main() {
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -443,7 +443,7 @@ void main() {
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -466,7 +466,7 @@ void main() {
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -491,7 +491,7 @@ void main() {
         buildContent: (BuildContext context) {
           pageContext = context;
           return const Text('Hello World');
-        }
+        },
       )
     );
 
@@ -512,7 +512,7 @@ void main() {
         },
         buildContent: (BuildContext context) {
           return Text(Localizations.localeOf(context).toString());
-        }
+        },
       )
     );
 
@@ -535,7 +535,7 @@ void main() {
         ],
         buildContent: (BuildContext context) {
           return Text(Localizations.localeOf(context).toString());
-        }
+        },
       )
     );
 
@@ -577,7 +577,7 @@ void main() {
               },
             ),
           );
-        }
+        },
       )
     );
 
@@ -618,7 +618,7 @@ void main() {
               },
             ),
           );
-        }
+        },
       )
     );
 
@@ -651,7 +651,7 @@ void main() {
           final Locale locale = Localizations.localeOf(context);
           final TextDirection direction = WidgetsLocalizations.of(context).textDirection;
           return Text('$locale $direction');
-        }
+        },
       )
     );
 
@@ -688,7 +688,7 @@ void main() {
           final Locale locale1 = ui.window.locales.first;
           final Locale locale2 = ui.window.locales[1];
           return Text('$locale1 $locale2');
-        }
+        },
       )
     );
      // Initial WidgetTester default locales is `en_US` and `zh_CN`.
@@ -707,7 +707,7 @@ void main() {
         locale: const Locale('en', 'US'),
         buildContent: (BuildContext context) {
           return Text(Localizations.localeOf(context).toString());
-        }
+        },
       )
     );
     await tester.pumpAndSettle();
@@ -723,7 +723,7 @@ void main() {
         locale: const Locale('en', 'US'),
         buildContent: (BuildContext context) {
           return Text(Localizations.localeOf(context).toString());
-        }
+        },
       )
     );
     await tester.pumpAndSettle();
@@ -739,7 +739,7 @@ void main() {
         locale: const Locale('ab', 'CD'),
         buildContent: (BuildContext context) {
           return Text(Localizations.localeOf(context).toString());
-        }
+        },
       )
     );
     await tester.pumpAndSettle();
@@ -758,7 +758,7 @@ void main() {
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
     await tester.binding.setLocales(const <Locale>[
@@ -781,7 +781,7 @@ void main() {
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
     await tester.binding.setLocales(const <Locale>[
@@ -813,7 +813,7 @@ void main() {
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
 
@@ -954,7 +954,7 @@ void main() {
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
 
@@ -1094,7 +1094,7 @@ void main() {
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
     await tester.binding.setLocales(const <Locale>[
@@ -1117,7 +1117,7 @@ void main() {
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
     await tester.binding.setLocales(const <Locale>[
@@ -1150,7 +1150,7 @@ void main() {
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
     await tester.binding.setLocales(const <Locale>[
@@ -1217,7 +1217,7 @@ void main() {
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
 
@@ -1281,7 +1281,7 @@ void main() {
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
 
@@ -1433,7 +1433,7 @@ void main() {
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
 
diff --git a/packages/flutter_test/lib/src/binding.dart b/packages/flutter_test/lib/src/binding.dart
index 05fc840d427..c3767813825 100644
--- a/packages/flutter_test/lib/src/binding.dart
+++ b/packages/flutter_test/lib/src/binding.dart
@@ -311,7 +311,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
   void dispatchEvent(
     PointerEvent event,
     HitTestResult hitTestResult, {
-    TestBindingEventSource source = TestBindingEventSource.device
+    TestBindingEventSource source = TestBindingEventSource.device,
   }) {
     assert(source == TestBindingEventSource.test);
     super.dispatchEvent(event, hitTestResult);
@@ -374,7 +374,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
       'Test starting...',
       style: _messageStyle,
       textDirection: TextDirection.ltr,
-    )
+    ),
   );
 
   static const Widget _postTestMessage = Center(
@@ -382,7 +382,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
       'Test finished.',
       style: _messageStyle,
       textDirection: TextDirection.ltr,
-    )
+    ),
   );
 
   /// Whether to include the output of debugDumpApp() when reporting
@@ -465,7 +465,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
         FlutterError.dumpErrorToConsole(details, forceReport: true);
         _pendingExceptionDetails = FlutterErrorDetails(
           exception: 'Multiple exceptions ($_exceptionCount) were detected during the running of the current test, and at least one was unexpected.',
-          library: 'Flutter test framework'
+          library: 'Flutter test framework',
         );
       } else {
         reportExceptionNoticed(details); // mostly this is just a hook for the LiveTestWidgetsFlutterBinding
@@ -487,7 +487,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
           exception: exception,
           stack: _unmangle(stack),
           context: 'running a test (but after the test had completed)',
-          library: 'Flutter test framework'
+          library: 'Flutter test framework',
         ), forceReport: true);
         return;
       }
@@ -544,7 +544,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
           }
           if (description.isNotEmpty)
             information.writeln('The test description was:\n$description');
-        }
+        },
       ));
       assert(_parentZone != null);
       assert(_pendingExceptionDetails != null, 'A test overrode FlutterError.onError but either failed to return it to its original state, or had unexpected additional errors that it could not handle. Typically, this is caused by using expect() before restoring FlutterError.onError.');
@@ -1193,7 +1193,7 @@ class LiveTestWidgetsFlutterBinding extends TestWidgetsFlutterBinding {
   void dispatchEvent(
     PointerEvent event,
     HitTestResult hitTestResult, {
-    TestBindingEventSource source = TestBindingEventSource.device
+    TestBindingEventSource source = TestBindingEventSource.device,
   }) {
     switch (source) {
       case TestBindingEventSource.test:
@@ -1361,7 +1361,7 @@ class TestViewConfiguration extends ViewConfiguration {
     final Matrix4 matrix = Matrix4.compose(
       Vector3(shiftX, shiftY, 0.0), // translation
       Quaternion.identity(), // rotation
-      Vector3(scale, scale, 1.0) // scale
+      Vector3(scale, scale, 1.0), // scale
     );
     return matrix;
   }
@@ -1391,7 +1391,7 @@ const int _kPointerDecay = -2;
 class _LiveTestPointerRecord {
   _LiveTestPointerRecord(
     this.pointer,
-    this.position
+    this.position,
   ) : color = HSVColor.fromAHSV(0.8, (35.0 * pointer) % 360.0, 1.0, 1.0).toColor(),
       decay = 1;
   final int pointer;
diff --git a/packages/flutter_test/lib/src/finders.dart b/packages/flutter_test/lib/src/finders.dart
index 1b2339bf02f..74801470fe8 100644
--- a/packages/flutter_test/lib/src/finders.dart
+++ b/packages/flutter_test/lib/src/finders.dart
@@ -308,7 +308,7 @@ abstract class Finder {
   Iterable<Element> get allCandidates {
     return collectAllElementsFrom(
       WidgetsBinding.instance.renderViewElement,
-      skipOffstage: skipOffstage
+      skipOffstage: skipOffstage,
     );
   }
 
diff --git a/packages/flutter_test/lib/src/matchers.dart b/packages/flutter_test/lib/src/matchers.dart
index 5e557fc5552..0c3f78a5de7 100644
--- a/packages/flutter_test/lib/src/matchers.dart
+++ b/packages/flutter_test/lib/src/matchers.dart
@@ -607,7 +607,7 @@ class _FindsWidgetMatcher extends Matcher {
     dynamic item,
     Description mismatchDescription,
     Map<dynamic, dynamic> matchState,
-    bool verbose
+    bool verbose,
   ) {
     final Finder finder = matchState[Finder];
     final int count = finder.evaluate().length;
@@ -755,7 +755,7 @@ class _EqualsIgnoringHashCodes extends Matcher {
     dynamic item,
     Description mismatchDescription,
     Map<dynamic, dynamic> matchState,
-    bool verbose
+    bool verbose,
   ) {
     if (matchState.containsKey(_mismatchedValueKey)) {
       final String actualValue = matchState[_mismatchedValueKey];
@@ -888,7 +888,7 @@ class _HasGoodToStringDeep extends Matcher {
     dynamic item,
     Description mismatchDescription,
     Map<dynamic, dynamic> matchState,
-    bool verbose
+    bool verbose,
   ) {
     if (matchState.containsKey(_toStringDeepErrorDescriptionKey)) {
       return mismatchDescription.add(
@@ -1216,7 +1216,7 @@ abstract class _FailWithDescriptionMatcher extends Matcher {
     dynamic item,
     Description mismatchDescription,
     Map<dynamic, dynamic> matchState,
-    bool verbose
+    bool verbose,
   ) {
     return mismatchDescription.add(matchState['failure']);
   }
@@ -1505,7 +1505,7 @@ class _CoversSameAreaAs extends Matcher {
       for (int j = 0; j < sampleSize; j += 1) {
         final Offset offset = Offset(
           i * (areaToCompare.width / sampleSize),
-          j * (areaToCompare.height / sampleSize)
+          j * (areaToCompare.height / sampleSize),
         );
 
         if (!_samplePoint(matchState, actualPath, offset))
@@ -1543,7 +1543,7 @@ class _CoversSameAreaAs extends Matcher {
     dynamic item,
     Description mismatchDescription,
     Map<dynamic, dynamic> matchState,
-    bool verbose
+    bool verbose,
   ) {
     return mismatchDescription.add(matchState['failure']);
   }
@@ -1855,7 +1855,7 @@ class _MatchesSemanticsData extends Matcher {
     dynamic item,
     Description mismatchDescription,
     Map<dynamic, dynamic> matchState,
-    bool verbose
+    bool verbose,
   ) {
     return mismatchDescription.add(matchState['failure']);
   }
diff --git a/packages/flutter_test/lib/src/test_async_utils.dart b/packages/flutter_test/lib/src/test_async_utils.dart
index 2a9c806d999..317ba9b9e03 100644
--- a/packages/flutter_test/lib/src/test_async_utils.dart
+++ b/packages/flutter_test/lib/src/test_async_utils.dart
@@ -61,7 +61,7 @@ class TestAsyncUtils {
     guardSync();
     final Zone zone = Zone.current.fork(
       zoneValues: <dynamic, dynamic>{
-        _scopeStack: true // so we can recognize this as our own zone
+        _scopeStack: true, // so we can recognize this as our own zone
       }
     );
     final _AsyncScope scope = _AsyncScope(StackTrace.current, zone);
@@ -111,7 +111,7 @@ class TestAsyncUtils {
         resultValue = value;
         return completionHandler(null, null);
       },
-      onError: completionHandler
+      onError: completionHandler,
     );
   }
 
diff --git a/packages/flutter_test/lib/src/widget_tester.dart b/packages/flutter_test/lib/src/widget_tester.dart
index fe9ead2de6a..0ff7bd2b554 100644
--- a/packages/flutter_test/lib/src/widget_tester.dart
+++ b/packages/flutter_test/lib/src/widget_tester.dart
@@ -70,7 +70,7 @@ void testWidgets(
   String description,
   WidgetTesterCallback callback, {
   bool skip = false,
-  test_package.Timeout timeout
+  test_package.Timeout timeout,
 }) {
   final TestWidgetsFlutterBinding binding = TestWidgetsFlutterBinding.ensureInitialized();
   final WidgetTester tester = WidgetTester._(binding);
@@ -87,7 +87,7 @@ void testWidgets(
       );
     },
     skip: skip,
-    timeout: timeout
+    timeout: timeout,
   );
 }
 
diff --git a/packages/flutter_test/test/accessibility_test.dart b/packages/flutter_test/test/accessibility_test.dart
index 6fad639affc..058d02b8f25 100644
--- a/packages/flutter_test/test/accessibility_test.dart
+++ b/packages/flutter_test/test/accessibility_test.dart
@@ -163,7 +163,7 @@ void main() {
                   style: TextStyle(fontSize: 14.0, color: Colors.yellowAccent),
                 ),
               ),
-            )
+            ),
           ],
         )
       ));
@@ -349,10 +349,10 @@ void main() {
                 child: GestureDetector(
                   onTap: () {},
                   child: const SizedBox(width: 4.0, height: 4.0),
-                )
-              )
+                ),
+              ),
             ),
-          )
+          ),
         )
       ));
 
diff --git a/packages/flutter_test/test/controller_test.dart b/packages/flutter_test/test/controller_test.dart
index 7a30650a3ef..ddf7855d7fa 100644
--- a/packages/flutter_test/test/controller_test.dart
+++ b/packages/flutter_test/test/controller_test.dart
@@ -214,7 +214,7 @@ void main() {
 
 class WidgetControllerSpy extends WidgetController {
   WidgetControllerSpy(
-    TestWidgetsFlutterBinding binding
+    TestWidgetsFlutterBinding binding,
   ) : super(binding) {
     _binding = binding;
   }
@@ -250,7 +250,7 @@ class WidgetControllerSpy extends WidgetController {
       pointer: pointer ?? _getNextPointer(),
       kind: kind,
       dispatcher: sendEventToBinding,
-      hitTester: hitTestOnBinding
+      hitTester: hitTestOnBinding,
     );
   }
 }
@@ -260,7 +260,7 @@ class TestGestureSpy extends TestGesture {
     int pointer,
     PointerDeviceKind kind,
     EventDispatcher dispatcher,
-    HitTester hitTester
+    HitTester hitTester,
   }) : super(
         pointer: pointer,
         kind: kind,
diff --git a/packages/flutter_test/test/finders_test.dart b/packages/flutter_test/test/finders_test.dart
index bb0d43480f4..222ba05a90c 100644
--- a/packages/flutter_test/test/finders_test.dart
+++ b/packages/flutter_test/test/finders_test.dart
@@ -21,7 +21,7 @@ void main() {
           TextSpan(text: 't', children: <TextSpan>[
             TextSpan(text: 'e'),
             TextSpan(text: 'st'),
-          ]
+          ],
         ),
       )));
 
@@ -68,7 +68,7 @@ void main() {
           ),
           Container(
             child: const Text('2'),
-          )
+          ),
         ],
       )),
     );
diff --git a/packages/flutter_test/test/matchers_test.dart b/packages/flutter_test/test/matchers_test.dart
index 732c835147d..6be8be58988 100644
--- a/packages/flutter_test/test/matchers_test.dart
+++ b/packages/flutter_test/test/matchers_test.dart
@@ -225,7 +225,7 @@ void main() {
         Path(),
         coversSameAreaAs(
           Path(),
-          areaToCompare: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)
+          areaToCompare: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0),
         ),
       );
     });
@@ -237,7 +237,7 @@ void main() {
         Path(),
         isNot(coversSameAreaAs(
           rectPath,
-          areaToCompare: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)
+          areaToCompare: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0),
         )),
       );
     });
@@ -250,7 +250,7 @@ void main() {
         Path(),
         coversSameAreaAs(
           rectPath,
-          areaToCompare: Rect.fromLTRB(0.0, 0.0, 4.0, 4.0)
+          areaToCompare: Rect.fromLTRB(0.0, 0.0, 4.0, 4.0),
         ),
       );
     });
@@ -268,7 +268,7 @@ void main() {
         linePath,
         coversSameAreaAs(
           rectPath,
-          areaToCompare: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)
+          areaToCompare: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0),
         ),
       );
     });
@@ -286,7 +286,7 @@ void main() {
         linePath,
         isNot(coversSameAreaAs(
           rectPath,
-          areaToCompare: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0)
+          areaToCompare: Rect.fromLTRB(0.0, 0.0, 10.0, 10.0),
         )),
       );
     });
@@ -426,7 +426,7 @@ void main() {
           onLongPressHint: 'fill',
           customActions: <CustomSemanticsAction>[
             const CustomSemanticsAction(label: 'foo'),
-            const CustomSemanticsAction(label: 'bar')
+            const CustomSemanticsAction(label: 'bar'),
           ],
         ),
       );
@@ -447,7 +447,7 @@ void main() {
           onLongPressHint: 'fill',
           customActions: <CustomSemanticsAction>[
             const CustomSemanticsAction(label: 'foo'),
-            const CustomSemanticsAction(label: 'barz')
+            const CustomSemanticsAction(label: 'barz'),
           ],
         )),
       );
@@ -468,7 +468,7 @@ void main() {
           onLongPressHint: 'fills',
           customActions: <CustomSemanticsAction>[
             const CustomSemanticsAction(label: 'foo'),
-            const CustomSemanticsAction(label: 'bar')
+            const CustomSemanticsAction(label: 'bar'),
           ],
         )),
       );
diff --git a/packages/flutter_test/test/widget_tester_test.dart b/packages/flutter_test/test/widget_tester_test.dart
index ecab29a7638..1c578a58fe2 100644
--- a/packages/flutter_test/test/widget_tester_test.dart
+++ b/packages/flutter_test/test/widget_tester_test.dart
@@ -223,7 +223,7 @@ void main() {
       try {
         expect(find.descendant(
           of: find.widgetWithText(Column, 'foo'),
-          matching: find.text('bar')
+          matching: find.text('bar'),
         ), findsOneWidget);
       } catch (e) {
         failure = e;
@@ -421,7 +421,7 @@ void main() {
   testWidgets('hasRunningAnimations control test', (WidgetTester tester) async {
     final AnimationController controller = AnimationController(
       duration: const Duration(seconds: 1),
-      vsync: const TestVSync()
+      vsync: const TestVSync(),
     );
     expect(tester.hasRunningAnimations, isFalse);
     controller.forward();
@@ -437,7 +437,7 @@ void main() {
   testWidgets('pumpAndSettle control test', (WidgetTester tester) async {
     final AnimationController controller = AnimationController(
       duration: const Duration(minutes: 525600),
-      vsync: const TestVSync()
+      vsync: const TestVSync(),
     );
     expect(await tester.pumpAndSettle(), 1);
     controller.forward();
@@ -574,7 +574,7 @@ void main() {
             body: Container(
               child: OutlineButton(
                   onPressed: () {},
-                  child: const Text('hello')
+                  child: const Text('hello'),
               ),
             ),
           ),
@@ -605,7 +605,7 @@ void main() {
                   child: Container(),
                 ),
               ),
-            )
+            ),
           ),
         ),
       );
diff --git a/packages/flutter_test/test/window_test.dart b/packages/flutter_test/test/window_test.dart
index 0d603d1ed99..6aad3569376 100644
--- a/packages/flutter_test/test/window_test.dart
+++ b/packages/flutter_test/test/window_test.dart
@@ -20,7 +20,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, double fakeValue) {
         binding.window.devicePixelRatioTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -34,7 +34,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, Size fakeValue) {
         binding.window.physicalSizeTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -48,7 +48,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, WindowPadding fakeValue) {
         binding.window.viewInsetsTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -62,7 +62,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, WindowPadding fakeValue) {
         binding.window.paddingTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -76,7 +76,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, Locale fakeValue) {
         binding.window.localeTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -90,7 +90,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, List<Locale> fakeValue) {
         binding.window.localesTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -104,7 +104,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, double fakeValue) {
         binding.window.textScaleFactorTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -118,7 +118,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, bool fakeValue) {
         binding.window.alwaysUse24HourFormatTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -132,7 +132,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, String fakeValue) {
         binding.window.defaultRouteNameTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -146,7 +146,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, AccessibilityFeatures fakeValue) {
         binding.window.accessibilityFeaturesTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -160,7 +160,7 @@ void main() {
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, Brightness fakeValue) {
         binding.window.platformBrightnessTestValue = fakeValue;
-      }
+      },
     );
   });
 
diff --git a/packages/flutter_tools/bin/fuchsia_attach.dart b/packages/flutter_tools/bin/fuchsia_attach.dart
index 0180b73f925..eb91c2d072e 100644
--- a/packages/flutter_tools/bin/fuchsia_attach.dart
+++ b/packages/flutter_tools/bin/fuchsia_attach.dart
@@ -101,7 +101,7 @@ Future<void> main(List<String> args) async {
         flutterPatchedSdk: flutterPatchedSdk,
       ),
       HotRunnerConfig: () => HotRunnerConfig()..computeDartDependencies = false,
-    }
+    },
   );
 }
 
diff --git a/packages/flutter_tools/lib/runner.dart b/packages/flutter_tools/lib/runner.dart
index 621cf6382a0..90bf4d70d96 100644
--- a/packages/flutter_tools/lib/runner.dart
+++ b/packages/flutter_tools/lib/runner.dart
@@ -53,7 +53,7 @@ Future<int> run(
     final String systemLocale = await intl_standalone.findSystemLocale();
     intl.Intl.defaultLocale = intl.Intl.verifiedLocale(
       systemLocale, intl.NumberFormat.localeExists,
-      onFailure: (String _) => 'en_US'
+      onFailure: (String _) => 'en_US',
     );
 
     try {
diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart
index 45e46bcde89..0a3b8a6733d 100644
--- a/packages/flutter_tools/lib/src/android/android_device.dart
+++ b/packages/flutter_tools/lib/src/android/android_device.dart
@@ -63,7 +63,7 @@ class AndroidDevice extends Device {
     String id, {
     this.productID,
     this.modelID,
-    this.deviceCodeName
+    this.deviceCodeName,
   }) : super(id);
 
   final String productID;
@@ -295,7 +295,7 @@ class AndroidDevice extends Device {
     }
 
     await runCheckedAsync(adbCommandForDevice(<String>[
-      'shell', 'echo', '-n', _getSourceSha1(app), '>', _getDeviceSha1Path(app)
+      'shell', 'echo', '-n', _getSourceSha1(app), '>', _getDeviceSha1Path(app),
     ]));
     return true;
   }
@@ -505,7 +505,7 @@ class AndroidDevice extends Device {
   /// no available timestamp. The format can be passed to logcat's -T option.
   String get lastLogcatTimestamp {
     final String output = runCheckedSync(adbCommandForDevice(<String>[
-      'shell', '-x', 'logcat', '-v', 'time', '-t', '1'
+      'shell', '-x', 'logcat', '-v', 'time', '-t', '1',
     ]));
 
     final Match timeMatch = _timeRegExp.firstMatch(output);
@@ -579,7 +579,7 @@ final RegExp _kDeviceRegex = RegExp(r'^(\S+)\s+(\S+)(.*)');
 void parseADBDeviceOutput(
   String text, {
   List<AndroidDevice> devices,
-  List<String> diagnostics
+  List<String> diagnostics,
 }) {
   // Check for error messages from adb
   if (!text.contains('List of devices')) {
@@ -634,7 +634,7 @@ void parseADBDeviceOutput(
           deviceID,
           productID: info['product'],
           modelID: info['model'] ?? deviceID,
-          deviceCodeName: info['device']
+          deviceCodeName: info['device'],
         ));
       }
     } else {
@@ -651,7 +651,7 @@ class _AdbLogReader extends DeviceLogReader {
   _AdbLogReader(this.device) {
     _linesController = StreamController<String>.broadcast(
       onListen: _start,
-      onCancel: _stop
+      onCancel: _stop,
     );
   }
 
@@ -707,7 +707,7 @@ class _AdbLogReader extends DeviceLogReader {
     RegExp(r'^[WEF]\/AndroidRuntime:\s+'),
     RegExp(r'^[WEF]\/ActivityManager:\s+.*(\bflutter\b|\bdomokit\b|\bsky\b)'),
     RegExp(r'^[WEF]\/System\.err:\s+'),
-    RegExp(r'^[F]\/[\S^:]+:\s+')
+    RegExp(r'^[F]\/[\S^:]+:\s+'),
   ];
 
   // 'F/libc(pid): Fatal signal 11'
diff --git a/packages/flutter_tools/lib/src/android/android_emulator.dart b/packages/flutter_tools/lib/src/android/android_emulator.dart
index 5d6daf854f4..ea5413323a4 100644
--- a/packages/flutter_tools/lib/src/android/android_emulator.dart
+++ b/packages/flutter_tools/lib/src/android/android_emulator.dart
@@ -57,7 +57,7 @@ class AndroidEmulator extends Emulator {
     // seconds won't be recognized as such... :-/
     return Future.any<void>(<Future<void>>[
       launchResult,
-      Future<void>.delayed(const Duration(seconds: 3))
+      Future<void>.delayed(const Duration(seconds: 3)),
     ]);
   }
 }
diff --git a/packages/flutter_tools/lib/src/android/android_sdk.dart b/packages/flutter_tools/lib/src/android/android_sdk.dart
index 73432f0136a..72545e0464e 100644
--- a/packages/flutter_tools/lib/src/android/android_sdk.dart
+++ b/packages/flutter_tools/lib/src/android/android_sdk.dart
@@ -72,7 +72,7 @@ String getEmulatorPath([ AndroidSdk existingSdk ]) {
 String getAvdPath() {
 
   final List<String> searchPaths = <String>[
-    platform.environment['ANDROID_AVD_HOME']
+    platform.environment['ANDROID_AVD_HOME'],
   ];
 
   if (platform.environment['HOME'] != null)
diff --git a/packages/flutter_tools/lib/src/android/apk.dart b/packages/flutter_tools/lib/src/android/apk.dart
index 4a0ded0dcdf..8b5b8d9914c 100644
--- a/packages/flutter_tools/lib/src/android/apk.dart
+++ b/packages/flutter_tools/lib/src/android/apk.dart
@@ -16,7 +16,7 @@ import 'gradle.dart';
 Future<void> buildApk({
   @required FlutterProject project,
   @required String target,
-  BuildInfo buildInfo = BuildInfo.debug
+  BuildInfo buildInfo = BuildInfo.debug,
 }) async {
   if (!project.android.isUsingGradle) {
     throwToolExit(
@@ -35,7 +35,7 @@ Future<void> buildApk({
     project: project,
     buildInfo: buildInfo,
     target: target,
-    isBuildingBundle: false
+    isBuildingBundle: false,
   );
   androidSdk.reinitialize();
 }
diff --git a/packages/flutter_tools/lib/src/android/app_bundle.dart b/packages/flutter_tools/lib/src/android/app_bundle.dart
index c8576c9cb29..c1e94ab6cb4 100644
--- a/packages/flutter_tools/lib/src/android/app_bundle.dart
+++ b/packages/flutter_tools/lib/src/android/app_bundle.dart
@@ -17,7 +17,7 @@ import 'gradle.dart';
 Future<void> buildAppBundle({
   @required FlutterProject project,
   @required String target,
-  BuildInfo buildInfo = BuildInfo.debug
+  BuildInfo buildInfo = BuildInfo.debug,
 }) async {
   if (!project.android.isUsingGradle) {
     throwToolExit(
@@ -44,6 +44,6 @@ Future<void> buildAppBundle({
     project: project,
     buildInfo: buildInfo,
     target: target,
-    isBuildingBundle: true
+    isBuildingBundle: true,
   );
 }
diff --git a/packages/flutter_tools/lib/src/android/gradle.dart b/packages/flutter_tools/lib/src/android/gradle.dart
index 60fb758e7fb..af9b3e8f359 100644
--- a/packages/flutter_tools/lib/src/android/gradle.dart
+++ b/packages/flutter_tools/lib/src/android/gradle.dart
@@ -161,7 +161,7 @@ Future<GradleProject> _readGradleProject() async {
     project = GradleProject(
       <String>['debug', 'profile', 'release'],
       <String>[], flutterProject.android.gradleAppOutV1Directory,
-        flutterProject.android.gradleAppBundleOutV1Directory
+        flutterProject.android.gradleAppBundleOutV1Directory,
     );
   }
   status.stop();
@@ -464,7 +464,7 @@ Future<void> _buildGradleProjectV2(
       }
 
       return line;
-    }
+    },
   );
   status.stop();
 
diff --git a/packages/flutter_tools/lib/src/application_package.dart b/packages/flutter_tools/lib/src/application_package.dart
index 6cd131470b8..82816b7a290 100644
--- a/packages/flutter_tools/lib/src/application_package.dart
+++ b/packages/flutter_tools/lib/src/application_package.dart
@@ -85,7 +85,7 @@ class AndroidApk extends ApplicationPackage {
     String id,
     @required this.file,
     @required this.versionCode,
-    @required this.launchActivity
+    @required this.launchActivity,
   }) : assert(file != null),
        assert(launchActivity != null),
        super(id: id);
@@ -123,7 +123,7 @@ class AndroidApk extends ApplicationPackage {
       id: data.packageName,
       file: apk,
       versionCode: int.tryParse(data.versionCode),
-      launchActivity: '${data.packageName}/${data.launchableActivityName}'
+      launchActivity: '${data.packageName}/${data.launchableActivityName}',
     );
   }
 
@@ -204,7 +204,7 @@ class AndroidApk extends ApplicationPackage {
       id: packageId,
       file: apkFile,
       versionCode: null,
-      launchActivity: launchActivity
+      launchActivity: launchActivity,
     );
   }
 
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
index 574e92d0ac4..2918097b9bc 100644
--- a/packages/flutter_tools/lib/src/asset.dart
+++ b/packages/flutter_tools/lib/src/asset.dart
@@ -44,7 +44,7 @@ abstract class AssetBundle {
     String assetDirPath,
     String packagesPath,
     bool includeDefaultFonts = true,
-    bool reportLicensedPackages = false
+    bool reportLicensedPackages = false,
   });
 }
 
@@ -92,7 +92,7 @@ class _ManifestAssetBundle implements AssetBundle {
     String assetDirPath,
     String packagesPath,
     bool includeDefaultFonts = true,
-    bool reportLicensedPackages = false
+    bool reportLicensedPackages = false,
   }) async {
     assetDirPath ??= getAssetBuildDirectory();
     packagesPath ??= fs.path.absolute(PackageMap.globalPackagesPath);
@@ -128,7 +128,7 @@ class _ManifestAssetBundle implements AssetBundle {
       packageMap,
       flutterManifest,
       assetBasePath,
-      excludeDirs: <String>[assetDirPath, getBuildDirectory()]
+      excludeDirs: <String>[assetDirPath, getBuildDirectory()],
     );
 
     if (assetVariants == null)
@@ -290,7 +290,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
       result.add(_Asset(
         baseDir: fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
         relativeUri: Uri(path: entryUri.pathSegments.last),
-        entryUri: entryUri
+        entryUri: entryUri,
       ));
     }
   }
@@ -395,7 +395,7 @@ List<Map<String, dynamic>> _parseFonts(
   FlutterManifest manifest,
   bool includeDefaultFonts,
   PackageMap packageMap, {
-  String packageName
+  String packageName,
 }) {
   final List<Map<String, dynamic>> fonts = <Map<String, dynamic>>[];
   if (manifest.usesMaterialDesign && includeDefaultFonts) {
@@ -526,7 +526,7 @@ Map<_Asset, List<_Asset>> _parseAssets(
   FlutterManifest flutterManifest,
   String assetBase, {
   List<String> excludeDirs = const <String>[],
-  String packageName
+  String packageName,
 }) {
   final Map<_Asset, List<_Asset>> result = <_Asset, List<_Asset>>{};
 
@@ -572,7 +572,7 @@ void _parseAssetsFromFolder(
   Map<_Asset, List<_Asset>> result,
   Uri assetUri, {
   List<String> excludeDirs = const <String>[],
-  String packageName
+  String packageName,
 }) {
   final String directoryPath = fs.path.join(
       assetBase, assetUri.toFilePath(windows: platform.isWindows));
@@ -604,7 +604,7 @@ void _parseAssetFromFile(
   Map<_Asset, List<_Asset>> result,
   Uri assetUri, {
   List<String> excludeDirs = const <String>[],
-  String packageName
+  String packageName,
 }) {
   final _Asset asset = _resolveAsset(
     packageMap,
diff --git a/packages/flutter_tools/lib/src/base/os.dart b/packages/flutter_tools/lib/src/base/os.dart
index 4cb0e5c2e04..dd7533799a4 100644
--- a/packages/flutter_tools/lib/src/base/os.dart
+++ b/packages/flutter_tools/lib/src/base/os.dart
@@ -62,7 +62,7 @@ abstract class OperatingSystemUtils {
     const Map<String, String> osNames = <String, String>{
       'macos': 'Mac OS',
       'linux': 'Linux',
-      'windows': 'Windows'
+      'windows': 'Windows',
     };
     final String osName = platform.operatingSystem;
     return osNames.containsKey(osName) ? osNames[osName] : osName;
diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart
index fff12526463..c6ab59c3e72 100644
--- a/packages/flutter_tools/lib/src/base/process.dart
+++ b/packages/flutter_tools/lib/src/base/process.dart
@@ -111,7 +111,7 @@ Future<Process> runCommand(
   List<String> cmd, {
   String workingDirectory,
   bool allowReentrantFlutter = false,
-  Map<String, String> environment
+  Map<String, String> environment,
 }) {
   _traceCommand(cmd, workingDirectory: workingDirectory);
   return processManager.start(
@@ -137,13 +137,13 @@ Future<int> runCommandAndStreamOutput(
   bool trace = false,
   RegExp filter,
   StringConverter mapFunction,
-  Map<String, String> environment
+  Map<String, String> environment,
 }) async {
   final Process process = await runCommand(
     cmd,
     workingDirectory: workingDirectory,
     allowReentrantFlutter: allowReentrantFlutter,
-    environment: environment
+    environment: environment,
   );
   final StreamSubscription<String> stdoutSubscription = process.stdout
     .transform<String>(utf8.decoder)
@@ -193,7 +193,7 @@ Future<int> runInteractively(
   List<String> command, {
   String workingDirectory,
   bool allowReentrantFlutter = false,
-  Map<String, String> environment
+  Map<String, String> environment,
 }) async {
   final Process process = await runCommand(
     command,
@@ -226,7 +226,7 @@ Future<RunResult> runAsync(
   List<String> cmd, {
   String workingDirectory,
   bool allowReentrantFlutter = false,
-  Map<String, String> environment
+  Map<String, String> environment,
 }) async {
   _traceCommand(cmd, workingDirectory: workingDirectory);
   final ProcessResult results = await processManager.run(
@@ -243,7 +243,7 @@ Future<RunResult> runCheckedAsync(
   List<String> cmd, {
   String workingDirectory,
   bool allowReentrantFlutter = false,
-  Map<String, String> environment
+  Map<String, String> environment,
 }) async {
   final RunResult result = await runAsync(
     cmd,
@@ -301,12 +301,12 @@ String runCheckedSync(
 String runSync(
   List<String> cmd, {
   String workingDirectory,
-  bool allowReentrantFlutter = false
+  bool allowReentrantFlutter = false,
 }) {
   return _runWithLoggingSync(
     cmd,
     workingDirectory: workingDirectory,
-    allowReentrantFlutter: allowReentrantFlutter
+    allowReentrantFlutter: allowReentrantFlutter,
   );
 }
 
diff --git a/packages/flutter_tools/lib/src/build_runner/build_script_generator.dart b/packages/flutter_tools/lib/src/build_runner/build_script_generator.dart
index 053de6042d7..137ef536060 100644
--- a/packages/flutter_tools/lib/src/build_runner/build_script_generator.dart
+++ b/packages/flutter_tools/lib/src/build_runner/build_script_generator.dart
@@ -40,7 +40,7 @@ class BuildScriptGenerator {
       literalList(builders, refer('BuilderApplication', 'package:build_runner_core/build_runner_core.dart'))
         .assignFinal('_builders')
         .statement,
-      _createMain()
+      _createMain(),
     ]));
     final DartEmitter emitter = DartEmitter(Allocator.simplePrefixing());
     try {
diff --git a/packages/flutter_tools/lib/src/bundle.dart b/packages/flutter_tools/lib/src/bundle.dart
index ac3d2197cdb..def7e442fe2 100644
--- a/packages/flutter_tools/lib/src/bundle.dart
+++ b/packages/flutter_tools/lib/src/bundle.dart
@@ -165,7 +165,7 @@ Future<AssetBundle> buildAssets({
   String assetDirPath,
   String packagesPath,
   bool includeDefaultFonts = true,
-  bool reportLicensedPackages = false
+  bool reportLicensedPackages = false,
 }) async {
   assetDirPath ??= getAssetBuildDirectory();
   packagesPath ??= fs.path.absolute(PackageMap.globalPackagesPath);
@@ -177,7 +177,7 @@ Future<AssetBundle> buildAssets({
     assetDirPath: assetDirPath,
     packagesPath: packagesPath,
     includeDefaultFonts: includeDefaultFonts,
-    reportLicensedPackages: reportLicensedPackages
+    reportLicensedPackages: reportLicensedPackages,
   );
   if (result != 0)
     return null;
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
index e1c16415014..7f3aa7a1404 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart
@@ -622,7 +622,7 @@ final Map<int, List<int>> _flattenNameSubstitutions = <int, List<int>>{
   r'>'.codeUnitAt(0): '@gt@'.codeUnits,
   r'"'.codeUnitAt(0): '@q@'.codeUnits,
   r'|'.codeUnitAt(0): '@pip@'.codeUnits,
-  r'?'.codeUnitAt(0): '@ques@'.codeUnits
+  r'?'.codeUnitAt(0): '@ques@'.codeUnits,
 };
 
 /// Given a name containing slashes, colons, and backslashes, expand it into
diff --git a/packages/flutter_tools/lib/src/codegen.dart b/packages/flutter_tools/lib/src/codegen.dart
index 105aac1e98a..bc5f63b0e15 100644
--- a/packages/flutter_tools/lib/src/codegen.dart
+++ b/packages/flutter_tools/lib/src/codegen.dart
@@ -194,7 +194,7 @@ class CodeGeneratingKernelCompiler implements KernelCompiler {
         trackWidgetCreation: trackWidgetCreation,
         mainPath: mainPath,
         targetProductVm: targetProductVm,
-        extraFrontEndOptions: extraFrontEndOptions
+        extraFrontEndOptions: extraFrontEndOptions,
       );
       final File outputFile = fs.file(outputFilePath);
       if (!await outputFile.exists()) {
diff --git a/packages/flutter_tools/lib/src/commands/analyze_base.dart b/packages/flutter_tools/lib/src/commands/analyze_base.dart
index 2e9acfba12a..00ddbf0316f 100644
--- a/packages/flutter_tools/lib/src/commands/analyze_base.dart
+++ b/packages/flutter_tools/lib/src/commands/analyze_base.dart
@@ -44,7 +44,7 @@ abstract class AnalyzeBase {
     final Map<String, dynamic> data = <String, dynamic>{
       'time': stopwatch.elapsedMilliseconds / 1000.0,
       'issues': errorCount,
-      'missingDartDocs': membersMissingDocumentation
+      'missingDartDocs': membersMissingDocumentation,
     };
     fs.file(benchmarkOut).writeAsStringSync(toPrettyJson(data));
     printStatus('Analysis benchmark written to $benchmarkOut ($data).');
diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart
index f541aae6908..d9243be5ffc 100644
--- a/packages/flutter_tools/lib/src/commands/build_aot.dart
+++ b/packages/flutter_tools/lib/src/commands/build_aot.dart
@@ -25,13 +25,13 @@ class BuildAotCommand extends BuildSubCommand {
       ..addOption('output-dir', defaultsTo: getAotBuildDirectory())
       ..addOption('target-platform',
         defaultsTo: 'android-arm',
-        allowed: <String>['android-arm', 'android-arm64', 'ios']
+        allowed: <String>['android-arm', 'android-arm64', 'ios'],
       )
       ..addFlag('quiet', defaultsTo: false)
       ..addFlag('build-shared-library',
         negatable: false,
         defaultsTo: false,
-        help: 'Compile to a *.so file (requires NDK when building for Android).'
+        help: 'Compile to a *.so file (requires NDK when building for Android).',
       )
       ..addMultiOption('ios-arch',
         splitCommas: true,
diff --git a/packages/flutter_tools/lib/src/commands/build_bundle.dart b/packages/flutter_tools/lib/src/commands/build_bundle.dart
index fed385d73c8..40a027947a1 100644
--- a/packages/flutter_tools/lib/src/commands/build_bundle.dart
+++ b/packages/flutter_tools/lib/src/commands/build_bundle.dart
@@ -28,7 +28,7 @@ class BuildBundleCommand extends BuildSubCommand {
       ..addOption('depfile', defaultsTo: defaultDepfilePath)
       ..addOption('target-platform',
         defaultsTo: 'android-arm',
-        allowed: <String>['android-arm', 'android-arm64', 'android-x86', 'android-x64', 'ios']
+        allowed: <String>['android-arm', 'android-arm64', 'android-x86', 'android-x64', 'ios'],
       )
       ..addFlag('track-widget-creation',
         hide: !verboseHelp,
diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart
index a9eb52743e1..faaf109cf54 100644
--- a/packages/flutter_tools/lib/src/commands/create.dart
+++ b/packages/flutter_tools/lib/src/commands/create.dart
@@ -56,19 +56,19 @@ class CreateCommand extends FlutterCommand {
   CreateCommand() {
     argParser.addFlag('pub',
       defaultsTo: true,
-      help: 'Whether to run "flutter packages get" after the project has been created.'
+      help: 'Whether to run "flutter packages get" after the project has been created.',
     );
     argParser.addFlag('offline',
       defaultsTo: false,
       help: 'When "flutter packages get" is run by the create command, this indicates '
         'whether to run it in offline mode or not. In offline mode, it will need to '
-        'have all dependencies already available in the pub cache to succeed.'
+        'have all dependencies already available in the pub cache to succeed.',
     );
     argParser.addFlag(
       'with-driver-test',
       negatable: true,
       defaultsTo: false,
-      help: "Also add a flutter_driver dependency and generate a sample 'flutter drive' test."
+      help: "Also add a flutter_driver dependency and generate a sample 'flutter drive' test.",
     );
     argParser.addOption(
       'template',
@@ -104,18 +104,18 @@ class CreateCommand extends FlutterCommand {
     argParser.addOption(
       'description',
       defaultsTo: 'A new Flutter project.',
-      help: 'The description to use for your new Flutter project. This string ends up in the pubspec.yaml file.'
+      help: 'The description to use for your new Flutter project. This string ends up in the pubspec.yaml file.',
     );
     argParser.addOption(
       'org',
       defaultsTo: 'com.example',
       help: 'The organization responsible for your new Flutter project, in reverse domain name notation. '
-            'This string is used in Java package names and as prefix in the iOS bundle identifier.'
+            'This string is used in Java package names and as prefix in the iOS bundle identifier.',
     );
     argParser.addOption(
       'project-name',
       defaultsTo: null,
-      help: 'The project name for this new Flutter project. This must be a valid dart package name.'
+      help: 'The project name for this new Flutter project. This must be a valid dart package name.',
     );
     argParser.addOption(
       'ios-language',
@@ -638,7 +638,7 @@ final Set<String> _packageDependencies = Set<String>.from(<String>[
   'test',
   'utf',
   'watcher',
-  'yaml'
+  'yaml',
 ]);
 
 /// Return null if the project name is legal. Return a validation message if
diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart
index e0b8172eb4c..d6364b3349d 100644
--- a/packages/flutter_tools/lib/src/commands/daemon.dart
+++ b/packages/flutter_tools/lib/src/commands/daemon.dart
@@ -95,7 +95,7 @@ class Daemon {
       onDone: () {
         if (!_onExitCompleter.isCompleted)
           _onExitCompleter.complete(0);
-      }
+      },
     );
   }
 
@@ -272,12 +272,12 @@ class DaemonDomain extends Domain {
           sendEvent('daemon.logMessage', <String, dynamic>{
             'level': message.level,
             'message': message.message,
-            'stackTrace': message.stackTrace.toString()
+            'stackTrace': message.stackTrace.toString(),
           });
         } else {
           sendEvent('daemon.logMessage', <String, dynamic>{
             'level': message.level,
-            'message': message.message
+            'message': message.message,
           });
         }
       }
@@ -303,7 +303,7 @@ class DaemonDomain extends Domain {
 
 typedef _RunOrAttach = Future<void> Function({
   Completer<DebugConnectionInfo> connectionInfoCompleter,
-  Completer<void> appStartedCompleter
+  Completer<void> appStartedCompleter,
 });
 
 /// This domain responds to methods like [start] and [stop].
@@ -910,12 +910,12 @@ class _AppRunLogger extends Logger {
         _sendLogEvent(<String, dynamic>{
           'log': message,
           'stackTrace': stackTrace.toString(),
-          'error': true
+          'error': true,
         });
       } else {
         _sendLogEvent(<String, dynamic>{
           'log': message,
-          'error': true
+          'error': true,
         });
       }
     }
diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart
index 217938158ce..8b1c7424201 100644
--- a/packages/flutter_tools/lib/src/commands/drive.dart
+++ b/packages/flutter_tools/lib/src/commands/drive.dart
@@ -295,7 +295,7 @@ Future<void> _runTests(List<String> testArgs, String observatoryUri) async {
         '--packages=${PackageMap.globalPackagesPath}',
         '-rexpanded',
       ]),
-    environment: <String, String>{ 'VM_SERVICE_URL': observatoryUri }
+    environment: <String, String>{ 'VM_SERVICE_URL': observatoryUri },
   );
   if (result != 0)
     throwToolExit('Driver tests failed: $result', exitCode: result);
diff --git a/packages/flutter_tools/lib/src/commands/logs.dart b/packages/flutter_tools/lib/src/commands/logs.dart
index e3d3c2bbb01..3e0ec002151 100644
--- a/packages/flutter_tools/lib/src/commands/logs.dart
+++ b/packages/flutter_tools/lib/src/commands/logs.dart
@@ -16,7 +16,7 @@ class LogsCommand extends FlutterCommand {
     argParser.addFlag('clear',
       negatable: false,
       abbr: 'c',
-      help: 'Clear log history before reading from logs.'
+      help: 'Clear log history before reading from logs.',
     );
   }
 
@@ -57,7 +57,7 @@ class LogsCommand extends FlutterCommand {
       },
       onError: (dynamic error) {
         exitCompleter.complete(error is int ? error : 1);
-      }
+      },
     );
 
     // When terminating, close down the log reader.
diff --git a/packages/flutter_tools/lib/src/commands/packages.dart b/packages/flutter_tools/lib/src/commands/packages.dart
index ab4a24786ce..befbe878ae6 100644
--- a/packages/flutter_tools/lib/src/commands/packages.dart
+++ b/packages/flutter_tools/lib/src/commands/packages.dart
@@ -36,7 +36,7 @@ class PackagesGetCommand extends FlutterCommand {
     requiresPubspecYaml();
     argParser.addFlag('offline',
       negatable: false,
-      help: 'Use cached packages instead of accessing the network.'
+      help: 'Use cached packages instead of accessing the network.',
     );
   }
 
diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart
index 6c59ab07645..c79a8a83c40 100644
--- a/packages/flutter_tools/lib/src/commands/run.dart
+++ b/packages/flutter_tools/lib/src/commands/run.dart
@@ -47,7 +47,7 @@ abstract class RunCommandBase extends FlutterCommand {
               'compiler up to that point. This file can be used in subsequent --dynamic builds '
               'to precompile some code by the offline compiler. '
               'This flag is only allowed when running as --dynamic --profile (recommended) or '
-              '--debug (may include unwanted debug symbols).'
+              '--debug (may include unwanted debug symbols).',
       )
       ..addOption('target-platform',
         defaultsTo: 'default',
@@ -424,7 +424,7 @@ class RunCommand extends RunCommandBase {
         devices.length == 1
             ? getNameForTargetPlatform(await devices[0].targetPlatform)
             : 'multiple',
-        devices.length == 1 && await devices[0].isLocalEmulator ? 'emulator' : null
+        devices.length == 1 && await devices[0].isLocalEmulator ? 'emulator' : null,
       ],
       endTimeOverride: appStartedTime,
     );
diff --git a/packages/flutter_tools/lib/src/commands/upgrade.dart b/packages/flutter_tools/lib/src/commands/upgrade.dart
index f7240e0a389..6ba8ecdac60 100644
--- a/packages/flutter_tools/lib/src/commands/upgrade.dart
+++ b/packages/flutter_tools/lib/src/commands/upgrade.dart
@@ -31,7 +31,7 @@ class UpgradeCommand extends FlutterCommand {
   Future<FlutterCommandResult> runCommand() async {
     try {
       await runCheckedAsync(<String>[
-        'git', 'rev-parse', '@{u}'
+        'git', 'rev-parse', '@{u}',
       ], workingDirectory: Cache.flutterRoot);
     } catch (e) {
       throwToolExit('Unable to upgrade Flutter: no upstream repository configured.');
@@ -46,7 +46,7 @@ class UpgradeCommand extends FlutterCommand {
     int code = await runCommandAndStreamOutput(
       <String>['git', 'pull', '--ff-only'],
       workingDirectory: Cache.flutterRoot,
-      mapFunction: (String line) => matchesGitLine(line) ? null : line
+      mapFunction: (String line) => matchesGitLine(line) ? null : line,
     );
 
     if (code != 0)
@@ -63,7 +63,7 @@ class UpgradeCommand extends FlutterCommand {
         fs.path.join('bin', 'flutter'), '--no-color', '--no-version-check', 'precache',
       ],
       workingDirectory: Cache.flutterRoot,
-      allowReentrantFlutter: true
+      allowReentrantFlutter: true,
     );
 
     printStatus('');
diff --git a/packages/flutter_tools/lib/src/commands/version.dart b/packages/flutter_tools/lib/src/commands/version.dart
index 18b1f434adc..22564deefde 100644
--- a/packages/flutter_tools/lib/src/commands/version.dart
+++ b/packages/flutter_tools/lib/src/commands/version.dart
@@ -36,7 +36,7 @@ class VersionCommand extends FlutterCommand {
   Future<List<String>> getTags() async {
     final RunResult runResult = await runCheckedAsync(
       <String>['git', 'tag', '-l', 'v*'],
-      workingDirectory: Cache.flutterRoot
+      workingDirectory: Cache.flutterRoot,
     );
     return runResult.toString().split('\n');
   }
@@ -71,7 +71,7 @@ class VersionCommand extends FlutterCommand {
     try {
       await runCheckedAsync(
         <String>['git', 'checkout', 'v$version'],
-        workingDirectory: Cache.flutterRoot
+        workingDirectory: Cache.flutterRoot,
       );
     } catch (e) {
       throwToolExit('Unable to checkout version branch for version $version.');
@@ -107,7 +107,7 @@ class VersionCommand extends FlutterCommand {
         context: PubContext.pubUpgrade,
         directory: projectRoot,
         upgrade: true,
-        checkLastModified: false
+        checkLastModified: false,
       );
     }
 
diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart
index 1193a9a1b94..dd255f53aad 100644
--- a/packages/flutter_tools/lib/src/compile.dart
+++ b/packages/flutter_tools/lib/src/compile.dart
@@ -324,7 +324,7 @@ class _CompileExpressionRequest extends _CompilationRequest {
     this.typeDefinitions,
     this.libraryUri,
     this.klass,
-    this.isStatic
+    this.isStatic,
   ) : super(completer);
 
   String expression;
@@ -440,7 +440,7 @@ class ResidentCompiler {
       return _compile(
           _mapFilename(request.mainPath, packageUriMapper),
           request.outputPath,
-          _mapFilename(request.packagesFilePath ?? _packagesPath, /* packageUriMapper= */ null)
+          _mapFilename(request.packagesFilePath ?? _packagesPath, /* packageUriMapper= */ null),
       );
     }
 
diff --git a/packages/flutter_tools/lib/src/dart/analysis.dart b/packages/flutter_tools/lib/src/dart/analysis.dart
index 863d2909ab6..59376bb98e3 100644
--- a/packages/flutter_tools/lib/src/dart/analysis.dart
+++ b/packages/flutter_tools/lib/src/dart/analysis.dart
@@ -54,7 +54,7 @@ class AnalysisServer {
     inStream.listen(_handleServerResponse);
 
     _sendCommand('server.setSubscriptions', <String, dynamic>{
-      'subscriptions': <String>['STATUS']
+      'subscriptions': <String>['STATUS'],
     });
 
     _sendCommand('analysis.setAnalysisRoots',
@@ -70,7 +70,7 @@ class AnalysisServer {
     final String message = json.encode(<String, dynamic>{
       'id': (++_id).toString(),
       'method': method,
-      'params': params
+      'params': params,
     });
     _process.stdin.writeln(message);
     printTrace('==> $message');
diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart
index 4de54f84a81..2f1957b7a96 100644
--- a/packages/flutter_tools/lib/src/dart/pub.dart
+++ b/packages/flutter_tools/lib/src/dart/pub.dart
@@ -75,7 +75,7 @@ Future<void> pubGet({
   bool skipIfAbsent = false,
   bool upgrade = false,
   bool offline = false,
-  bool checkLastModified = true
+  bool checkLastModified = true,
 }) async {
   directory ??= fs.currentDirectory.path;
 
diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart
index 66b473a5fc7..05e9292cfe1 100644
--- a/packages/flutter_tools/lib/src/devfs.dart
+++ b/packages/flutter_tools/lib/src/devfs.dart
@@ -254,7 +254,7 @@ class ServiceProtocolDevFSOperations implements DevFSOperations {
         params: <String, dynamic> {
           'fsName': fsName,
           'uri': deviceUri.toString(),
-          'fileContents': fileContents
+          'fileContents': fileContents,
         },
       );
     } catch (error) {
@@ -384,7 +384,7 @@ class DevFS {
     VMService serviceProtocol,
     this.fsName,
     this.rootDirectory, {
-    String packagesFilePath
+    String packagesFilePath,
   }) : _operations = ServiceProtocolDevFSOperations(serviceProtocol),
        _httpWriter = _DevFSHttpWriter(fsName, serviceProtocol) {
     _packagesFilePath =
diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart
index b65819db880..be1475f276d 100644
--- a/packages/flutter_tools/lib/src/doctor.dart
+++ b/packages/flutter_tools/lib/src/doctor.dart
@@ -467,7 +467,7 @@ class FlutterValidator extends DoctorValidator {
     }
 
     return ValidationResult(valid, messages,
-      statusInfo: userMessages.flutterStatusInfo(version.channel, version.frameworkVersion, os.name, platform.localeName)
+      statusInfo: userMessages.flutterStatusInfo(version.channel, version.frameworkVersion, os.name, platform.localeName),
     );
   }
 }
diff --git a/packages/flutter_tools/lib/src/emulator.dart b/packages/flutter_tools/lib/src/emulator.dart
index 3672d44ff66..61f0c34e075 100644
--- a/packages/flutter_tools/lib/src/emulator.dart
+++ b/packages/flutter_tools/lib/src/emulator.dart
@@ -115,7 +115,7 @@ class EmulatorManager {
       'avd',
       '-n', name,
       '-k', sdkId,
-      '-d', device
+      '-d', device,
     ];
     final ProcessResult runResult = processManager.runSync(args,
         environment: androidSdk?.sdkManagerEnv);
@@ -136,7 +136,7 @@ class EmulatorManager {
       getAvdManagerPath(androidSdk),
       'list',
       'device',
-      '-c'
+      '-c',
     ];
     final ProcessResult runResult = processManager.runSync(args,
         environment: androidSdk?.sdkManagerEnv);
diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart
index bb27e0c6827..ffbe9dda898 100644
--- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart
+++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart
@@ -403,7 +403,7 @@ class _FuchsiaPortForwarder extends DevicePortForwarder {
     // for more explanation.
     final List<String> command = <String>[
       'ssh', '-6', '-F', fuchsiaArtifacts.sshConfig.absolute.path, '-nNT', '-vvv', '-f',
-      '-L', '$hostPort:$_ipv4Loopback:$devicePort', device.id, 'true'
+      '-L', '$hostPort:$_ipv4Loopback:$devicePort', device.id, 'true',
     ];
     final Process process = await processManager.start(command);
     unawaited(process.exitCode.then((int exitCode) {
diff --git a/packages/flutter_tools/lib/src/ios/code_signing.dart b/packages/flutter_tools/lib/src/ios/code_signing.dart
index a29a97e394f..5bda7579688 100644
--- a/packages/flutter_tools/lib/src/ios/code_signing.dart
+++ b/packages/flutter_tools/lib/src/ios/code_signing.dart
@@ -94,7 +94,7 @@ final RegExp _certificateOrganizationalUnitExtractionPattern = RegExp(r'OU=([a-z
 /// project has a development team set in the project's build settings.
 Future<Map<String, String>> getCodeSigningIdentityDevelopmentTeam({
   BuildableIOSApp iosApp,
-  bool usesTerminalUi = true
+  bool usesTerminalUi = true,
 }) async{
   final Map<String, String> buildSettings = iosApp.project.buildSettings;
   if (buildSettings == null)
diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart
index c4e092eaee6..bc0e5ae2750 100644
--- a/packages/flutter_tools/lib/src/ios/devices.dart
+++ b/packages/flutter_tools/lib/src/ios/devices.dart
@@ -166,7 +166,7 @@ class IOSDevice extends Device {
 
   static String _checkForCommand(
     String command, [
-    String macInstructions = _kIdeviceinstallerInstructions
+    String macInstructions = _kIdeviceinstallerInstructions,
   ]) {
     try {
       command = runCheckedSync(<String>['which', command]).trim();
@@ -253,7 +253,7 @@ class IOSDevice extends Device {
           targetOverride: mainPath,
           buildForDevice: true,
           usesTerminalUi: usesTerminalUi,
-          activeArch: iosArch
+          activeArch: iosArch,
       );
       if (!buildResult.success) {
         printError('Could not build the precompiled application for the device.');
@@ -459,7 +459,7 @@ class _IOSDeviceLogReader extends DeviceLogReader {
   _IOSDeviceLogReader(this.device, ApplicationPackage app) {
     _linesController = StreamController<String>.broadcast(
       onListen: _start,
-      onCancel: _stop
+      onCancel: _stop,
     );
 
     // Match for lines for the runner in syslog.
diff --git a/packages/flutter_tools/lib/src/ios/ios_workflow.dart b/packages/flutter_tools/lib/src/ios/ios_workflow.dart
index 98b4ef6e6b3..4ae1173ae7b 100644
--- a/packages/flutter_tools/lib/src/ios/ios_workflow.dart
+++ b/packages/flutter_tools/lib/src/ios/ios_workflow.dart
@@ -157,7 +157,7 @@ class IOSValidator extends DoctorValidator {
     return ValidationResult(
         <ValidationType>[xcodeStatus, packageManagerStatus].reduce(_mergeValidationTypes),
         messages,
-        statusInfo: xcodeVersionInfo
+        statusInfo: xcodeVersionInfo,
     );
   }
 
diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart
index 1468f090619..648547e5531 100644
--- a/packages/flutter_tools/lib/src/ios/mac.dart
+++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -388,7 +388,7 @@ Future<XcodeBuildResult> buildXcodeProject({
       iosProject: project.ios,
       iosEngineDir: flutterFrameworkDir(buildInfo.mode),
       isSwift: project.ios.isSwift,
-      dependenciesChanged: !await fingerprinter.doesFingerprintMatch()
+      dependenciesChanged: !await fingerprinter.doesFingerprintMatch(),
     );
     if (didPodInstall)
       await fingerprinter.writeFingerprint();
@@ -449,7 +449,7 @@ Future<XcodeBuildResult> buildXcodeProject({
       <String>[
         'CODE_SIGNING_ALLOWED=NO',
         'CODE_SIGNING_REQUIRED=NO',
-        'CODE_SIGNING_IDENTITY=""'
+        'CODE_SIGNING_IDENTITY=""',
       ]
     );
   }
@@ -499,7 +499,7 @@ Future<XcodeBuildResult> buildXcodeProject({
   final RunResult buildResult = await runAsync(
     buildCommands,
     workingDirectory: app.project.hostAppRoot.path,
-    allowReentrantFlutter: true
+    allowReentrantFlutter: true,
   );
   // Notifies listener that no more output is coming.
   scriptOutputPipeFile?.writeAsStringSync('all done');
@@ -720,7 +720,7 @@ void _copyServiceDefinitionsManifest(List<Map<String, String>> services, File ma
     'name': service['name'],
     // Since we have already moved it to the Frameworks directory. Strip away
     // the directory and basenames.
-    'framework': fs.path.basenameWithoutExtension(service['ios-framework'])
+    'framework': fs.path.basenameWithoutExtension(service['ios-framework']),
   }).toList();
   final Map<String, dynamic> jsonObject = <String, dynamic>{ 'services' : jsonServices };
   manifest.writeAsStringSync(json.encode(jsonObject), mode: FileMode.write, flush: true);
diff --git a/packages/flutter_tools/lib/src/ios/plist_utils.dart b/packages/flutter_tools/lib/src/ios/plist_utils.dart
index 31bb93482c8..2b3b75c0e88 100644
--- a/packages/flutter_tools/lib/src/ios/plist_utils.dart
+++ b/packages/flutter_tools/lib/src/ios/plist_utils.dart
@@ -27,7 +27,7 @@ String getValueFromFile(String plistFilePath, String key) {
 
   try {
     final List<String> args = <String>[
-      executable, 'read', normalizedPlistPath
+      executable, 'read', normalizedPlistPath,
     ];
     if (key != null && key.isNotEmpty){
       args.add(key);
diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart
index 525a1da86b7..f521871ef5b 100644
--- a/packages/flutter_tools/lib/src/ios/simulators.dart
+++ b/packages/flutter_tools/lib/src/ios/simulators.dart
@@ -322,7 +322,7 @@ class IOSSimulator extends Device {
       if (debuggingOptions.buildInfo.isDebug)
         args.addAll(<String>[
           '--enable-checked-mode',
-          '--verify-entry-points'
+          '--verify-entry-points',
         ]);
       if (debuggingOptions.startPaused)
         args.add('--start-paused');
@@ -500,7 +500,7 @@ class _IOSSimulatorLogReader extends DeviceLogReader {
   _IOSSimulatorLogReader(this.device, IOSApp app) {
     _linesController = StreamController<String>.broadcast(
       onListen: _start,
-      onCancel: _stop
+      onCancel: _stop,
     );
     _appName = app == null ? null : app.name.replaceAll('.app', '');
   }
diff --git a/packages/flutter_tools/lib/src/ios/xcodeproj.dart b/packages/flutter_tools/lib/src/ios/xcodeproj.dart
index 0a32c7fdd26..1f0e0a4f3db 100644
--- a/packages/flutter_tools/lib/src/ios/xcodeproj.dart
+++ b/packages/flutter_tools/lib/src/ios/xcodeproj.dart
@@ -156,7 +156,7 @@ class XcodeProjectInterpreter {
       fs.path.absolute(projectPath),
       '-target',
       target,
-      '-showBuildSettings'
+      '-showBuildSettings',
     ], workingDirectory: projectPath);
     return parseXcodeBuildSettings(out);
   }
diff --git a/packages/flutter_tools/lib/src/linux/linux_device.dart b/packages/flutter_tools/lib/src/linux/linux_device.dart
index c9c991acb34..316b1163bae 100644
--- a/packages/flutter_tools/lib/src/linux/linux_device.dart
+++ b/packages/flutter_tools/lib/src/linux/linux_device.dart
@@ -93,7 +93,7 @@ class LinuxDevices extends PollingDeviceDiscovery {
       return const <Device>[];
     }
     return <Device>[
-      LinuxDevice()
+      LinuxDevice(),
     ];
   }
 
diff --git a/packages/flutter_tools/lib/src/macos/macos_device.dart b/packages/flutter_tools/lib/src/macos/macos_device.dart
index ac4c7bfdf5c..35cad44ef71 100644
--- a/packages/flutter_tools/lib/src/macos/macos_device.dart
+++ b/packages/flutter_tools/lib/src/macos/macos_device.dart
@@ -110,7 +110,7 @@ class MacOSDevice extends Device {
         }
         final String pid = values[1];
         final ProcessResult killResult = await processManager.run(<String>[
-          'kill', pid
+          'kill', pid,
         ]);
         succeeded &= killResult.exitCode == 0;
       }
@@ -145,7 +145,7 @@ class MacOSDevices extends PollingDeviceDiscovery {
       return const <Device>[];
     }
     return <Device>[
-      MacOSDevice()
+      MacOSDevice(),
     ];
   }
 
diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart
index b2a0fde2240..91a0ef87b78 100644
--- a/packages/flutter_tools/lib/src/project.dart
+++ b/packages/flutter_tools/lib/src/project.dart
@@ -332,7 +332,7 @@ class IosProject {
       target,
       <String, dynamic>{
         'projectName': parent.manifest.appName,
-        'iosIdentifier': parent.manifest.iosBundleIdentifier
+        'iosIdentifier': parent.manifest.iosBundleIdentifier,
       },
       printStatusWhenWriting: false,
       overwriteExisting: true,
diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart
index 2addb5929d7..982ca22f9eb 100644
--- a/packages/flutter_tools/lib/src/resident_runner.dart
+++ b/packages/flutter_tools/lib/src/resident_runner.dart
@@ -144,21 +144,21 @@ class FlutterDevice {
   Future<Uri> setupDevFS(
     String fsName,
     Directory rootDirectory, {
-    String packagesFilePath
+    String packagesFilePath,
   }) {
     // One devFS per device. Shared by all running instances.
     devFS = DevFS(
       vmServices[0],
       fsName,
       rootDirectory,
-      packagesFilePath: packagesFilePath
+      packagesFilePath: packagesFilePath,
     );
     return devFS.create();
   }
 
   List<Future<Map<String, dynamic>>> reloadSources(
     String entryPath, {
-    bool pause = false
+    bool pause = false,
   }) {
     final Uri deviceEntryUri = devFS.baseUri.resolveUri(fs.path.toUri(entryPath));
     final Uri devicePackagesUri = devFS.baseUri.resolve('.packages');
@@ -167,7 +167,7 @@ class FlutterDevice {
       final Future<Map<String, dynamic>> report = view.uiIsolate.reloadSources(
         pause: pause,
         rootLibUri: deviceEntryUri,
-        packagesUri: devicePackagesUri
+        packagesUri: devicePackagesUri,
       );
       reports.add(report);
     }
@@ -289,7 +289,7 @@ class FlutterDevice {
     final TargetPlatform targetPlatform = await device.targetPlatform;
     package = await ApplicationPackageFactory.instance.getPackageForPlatform(
       targetPlatform,
-      applicationBinary: hotRunner.applicationBinary
+      applicationBinary: hotRunner.applicationBinary,
     );
 
     if (package == null) {
@@ -343,7 +343,7 @@ class FlutterDevice {
     final TargetPlatform targetPlatform = await device.targetPlatform;
     package = await ApplicationPackageFactory.instance.getPackageForPlatform(
       targetPlatform,
-      applicationBinary: coldRunner.applicationBinary
+      applicationBinary: coldRunner.applicationBinary,
     );
 
     final String modeName = coldRunner.debuggingOptions.buildInfo.friendlyModeName;
@@ -427,7 +427,7 @@ class FlutterDevice {
         dillOutputPath: dillOutputPath,
         trackWidgetCreation: trackWidgetCreation,
         projectRootPath: projectRootPath,
-        pathToReload: pathToReload
+        pathToReload: pathToReload,
       );
     } on DevFSException {
       devFSStatus.cancel();
@@ -751,7 +751,7 @@ abstract class ResidentRunner {
         // futures either because they just print to logger and is not critical.
         unawaited(service.done.then<void>(
           _serviceProtocolDone,
-          onError: _serviceProtocolError
+          onError: _serviceProtocolError,
         ).whenComplete(_serviceDisconnected));
       }
     }
diff --git a/packages/flutter_tools/lib/src/run_cold.dart b/packages/flutter_tools/lib/src/run_cold.dart
index 87b6213266c..a6ef97adc3c 100644
--- a/packages/flutter_tools/lib/src/run_cold.dart
+++ b/packages/flutter_tools/lib/src/run_cold.dart
@@ -44,7 +44,7 @@ class ColdRunner extends ResidentRunner {
     Completer<DebugConnectionInfo> connectionInfoCompleter,
     Completer<void> appStartedCompleter,
     String route,
-    bool shouldBuild = true
+    bool shouldBuild = true,
   }) async {
     final bool prebuiltMode = applicationBinary != null;
     if (!prebuiltMode) {
diff --git a/packages/flutter_tools/lib/src/run_hot.dart b/packages/flutter_tools/lib/src/run_hot.dart
index cae7e4f8b2c..53a4f3681e2 100644
--- a/packages/flutter_tools/lib/src/run_hot.dart
+++ b/packages/flutter_tools/lib/src/run_hot.dart
@@ -217,7 +217,7 @@ class HotRunner extends ResidentRunner {
           DebugConnectionInfo(
             httpUri: flutterDevices.first.observatoryUris.first,
             wsUri: flutterDevices.first.vmServices.first.wsAddress,
-            baseUri: baseUris.first.toString()
+            baseUri: baseUris.first.toString(),
           )
         );
       }
@@ -286,7 +286,7 @@ class HotRunner extends ResidentRunner {
     Completer<DebugConnectionInfo> connectionInfoCompleter,
     Completer<void> appStartedCompleter,
     String route,
-    bool shouldBuild = true
+    bool shouldBuild = true,
   }) async {
     if (!fs.isFileSync(mainPath)) {
       String message = 'Tried to run $mainPath, but that file does not exist.';
@@ -356,7 +356,7 @@ class HotRunner extends ResidentRunner {
       final Uri uri = await device.setupDevFS(
         fsName,
         fs.directory(projectRootPath),
-        packagesFilePath: packagesFilePath
+        packagesFilePath: packagesFilePath,
       );
       devFSUris.add(uri);
     }
@@ -700,7 +700,7 @@ class HotRunner extends ResidentRunner {
         final Completer<DeviceReloadReport> completer = Completer<DeviceReloadReport>();
         allReportsFutures.add(completer.future);
         final List<Future<Map<String, dynamic>>> reportFutures = device.reloadSources(
-          entryPath, pause: pause
+          entryPath, pause: pause,
         );
         unawaited(Future.wait(reportFutures).then(
           (List<Map<String, dynamic>> reports) async {
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
index a92cb7e134c..2d93bfb571c 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
@@ -168,7 +168,7 @@ abstract class FlutterCommand extends Command<void> {
   void usesPortOptions() {
     argParser.addOption(observatoryPortOption,
         help: 'Listen to the given port for an observatory debugger connection.\n'
-              'Specifying port 0 (the default) will find a random free port.'
+              'Specifying port 0 (the default) will find a random free port.',
     );
     _usesPortOption = true;
   }
@@ -253,14 +253,14 @@ abstract class FlutterCommand extends Command<void> {
         help: 'Filename of Dart compilation trace file. This file will be produced\n'
               'by \'flutter run --dynamic --profile --train\' and consumed by subsequent\n'
               '--dynamic builds such as \'flutter build apk --dynamic\' to precompile\n'
-              'some code by the offline compiler.'
+              'some code by the offline compiler.',
     );
     argParser.addFlag('patch',
         hide: !verboseHelp,
         negatable: false,
         help: 'Generate dynamic patch for current changes from baseline.\n'
               'Dynamic patch is generated relative to baseline package.\n'
-              'This flag is only allowed when using --dynamic.\n'
+              'This flag is only allowed when using --dynamic.\n',
     );
   }
 
@@ -273,7 +273,7 @@ abstract class FlutterCommand extends Command<void> {
               'This optional setting allows several dynamic patches to coexist\n'
               'for same baseline build, and is useful for canary and A-B testing\n'
               'of dynamic patches.\n'
-              'This flag is only used when --dynamic --patch is specified.\n'
+              'This flag is only used when --dynamic --patch is specified.\n',
     );
     argParser.addOption('patch-dir',
         defaultsTo: 'public',
@@ -281,7 +281,7 @@ abstract class FlutterCommand extends Command<void> {
         help: 'The directory where to store generated dynamic patches.\n'
               'This directory can be deployed to a CDN such as Firebase Hosting.\n'
               'It is recommended to store this directory in version control.\n'
-              'This flag is only used when --dynamic --patch is specified.\n'
+              'This flag is only used when --dynamic --patch is specified.\n',
     );
     argParser.addFlag('baseline',
         hide: !verboseHelp,
@@ -289,7 +289,7 @@ abstract class FlutterCommand extends Command<void> {
         help: 'Save built package as baseline for future dynamic patching.\n'
             'Built package, such as APK file on Android, is saved and '
             'can be used to generate dynamic patches in later builds.\n'
-            'This flag is only allowed when using --dynamic.\n'
+            'This flag is only allowed when using --dynamic.\n',
     );
 
     addDynamicBaselineFlags(verboseHelp: verboseHelp);
@@ -301,7 +301,7 @@ abstract class FlutterCommand extends Command<void> {
         hide: !verboseHelp,
         help: 'The directory where to store and find generated baseline packages.\n'
               'It is recommended to store this directory in version control.\n'
-              'This flag is only used when --dynamic --baseline is specified.\n'
+              'This flag is only used when --dynamic --baseline is specified.\n',
     );
   }
 
@@ -359,7 +359,7 @@ abstract class FlutterCommand extends Command<void> {
       'flavor',
       help: 'Build a custom app flavor as defined by platform-specific build setup.\n'
         'Supports the use of product flavors in Android Gradle scripts.\n'
-        'Supports the use of custom Xcode schemes.'
+        'Supports the use of custom Xcode schemes.',
     );
   }
 
diff --git a/packages/flutter_tools/lib/src/services.dart b/packages/flutter_tools/lib/src/services.dart
index 2eb5560d82d..1a717579679 100644
--- a/packages/flutter_tools/lib/src/services.dart
+++ b/packages/flutter_tools/lib/src/services.dart
@@ -64,7 +64,7 @@ Future<void> parseServiceConfigs(
         'root': serviceRoot,
         'name': service['name'],
         'android-class': service['android-class'],
-        'ios-framework': service['ios-framework']
+        'ios-framework': service['ios-framework'],
       });
     }
 
@@ -102,7 +102,7 @@ File generateServiceDefinitions(
   final List<Map<String, String>> services =
       servicesIn.map<Map<String, String>>((Map<String, String> service) => <String, String>{
         'name': service['name'],
-        'class': service['android-class']
+        'class': service['android-class'],
       }).toList();
 
   final Map<String, dynamic> jsonObject = <String, dynamic>{ 'services': services };
diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart
index 451cf1ac386..a17c008eb2a 100644
--- a/packages/flutter_tools/lib/src/test/flutter_platform.dart
+++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart
@@ -963,7 +963,7 @@ class _FlutterPlatform extends PlatformPlugin {
     const String observatoryString = 'Observatory listening on ';
     for (Stream<List<int>> stream in <Stream<List<int>>>[
       process.stderr,
-      process.stdout
+      process.stdout,
     ]) {
       stream
           .transform<String>(utf8.decoder)
diff --git a/packages/flutter_tools/lib/src/tracing.dart b/packages/flutter_tools/lib/src/tracing.dart
index 485fb30e9a8..a4559f81522 100644
--- a/packages/flutter_tools/lib/src/tracing.dart
+++ b/packages/flutter_tools/lib/src/tracing.dart
@@ -35,7 +35,7 @@ class Tracing {
 
   /// Stops tracing; optionally wait for first frame.
   Future<Map<String, dynamic>> stopTracingAndDownloadTimeline({
-    bool awaitFirstFrame = false
+    bool awaitFirstFrame = false,
   }) async {
     if (awaitFirstFrame) {
       final Status status = logger.startProgress(
@@ -96,7 +96,7 @@ Future<void> downloadStartupTrace(VMService observatory, { bool awaitFirstFrame
     final List<Map<String, dynamic>> events =
         List<Map<String, dynamic>>.from(timeline['traceEvents']);
     final Map<String, dynamic> event = events.firstWhere(
-      (Map<String, dynamic> event) => event['name'] == eventName, orElse: () => null
+      (Map<String, dynamic> event) => event['name'] == eventName, orElse: () => null,
     );
     return event == null ? null : event['ts'];
   }
diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart
index 9fe973e4a1b..f0d69ebeecb 100644
--- a/packages/flutter_tools/lib/src/vmservice.dart
+++ b/packages/flutter_tools/lib/src/vmservice.dart
@@ -206,7 +206,7 @@ class VMService {
 
       _peer.sendNotification('_registerService', <String, String>{
         'service': 'compileExpression',
-        'alias': 'Flutter Tools'
+        'alias': 'Flutter Tools',
       });
     }
   }
@@ -885,7 +885,7 @@ class VM extends ServiceObjectOwner {
   Future<Map<String, dynamic>> writeDevFSFile(
     String fsName, {
     @required String path,
-    @required List<int> fileContents
+    @required List<int> fileContents,
   }) {
     assert(path != null);
     assert(fileContents != null);
@@ -932,7 +932,7 @@ class VM extends ServiceObjectOwner {
         'viewId': viewId,
         'mainScript': main.toString(),
         'packagesFile': packages.toString(),
-        'assetDirectory': assetsDirectory.toString()
+        'assetDirectory': assetsDirectory.toString(),
     });
   }
 
@@ -1109,7 +1109,7 @@ class Isolate extends ServiceObjectOwner {
     // Inject the 'isolateId' parameter.
     if (params == null) {
       params = <String, dynamic>{
-        'isolateId': id
+        'isolateId': id,
       };
     } else {
       params['isolateId'] = id;
@@ -1154,7 +1154,7 @@ class Isolate extends ServiceObjectOwner {
   }) async {
     try {
       final Map<String, dynamic> arguments = <String, dynamic>{
-        'pause': pause
+        'pause': pause,
       };
       if (rootLibUri != null) {
         arguments['rootLibUri'] = rootLibUri.toString();
@@ -1311,7 +1311,7 @@ class Isolate extends ServiceObjectOwner {
       'ext.flutter.evict',
       params: <String, dynamic>{
         'value': assetPath,
-      }
+      },
     );
   }
 
@@ -1451,7 +1451,7 @@ class FlutterView extends ServiceObject {
         params: <String, dynamic>{
           'isolateId': _uiIsolate.id,
           'viewId': id,
-          'assetDirectory': assetsDirectory.toFilePath(windows: false)
+          'assetDirectory': assetsDirectory.toFilePath(windows: false),
         });
   }
 
diff --git a/packages/flutter_tools/lib/src/vscode/vscode.dart b/packages/flutter_tools/lib/src/vscode/vscode.dart
index 94c9a048f27..f2fac47b7dc 100644
--- a/packages/flutter_tools/lib/src/vscode/vscode.dart
+++ b/packages/flutter_tools/lib/src/vscode/vscode.dart
@@ -121,7 +121,7 @@ class VsCode {
         fs.path.join(homeDirPath, 'Applications', 'Visual Studio Code - Insiders.app', 'Contents'),
         '.vscode-insiders',
         isInsiders: true,
-      )
+      ),
     ]);
   }
 
diff --git a/packages/flutter_tools/lib/src/windows/windows_device.dart b/packages/flutter_tools/lib/src/windows/windows_device.dart
index 005e100aaf5..5698952b19a 100644
--- a/packages/flutter_tools/lib/src/windows/windows_device.dart
+++ b/packages/flutter_tools/lib/src/windows/windows_device.dart
@@ -93,7 +93,7 @@ class WindowsDevices extends PollingDeviceDiscovery {
       return const <Device>[];
     }
     return <Device>[
-      WindowsDevice()
+      WindowsDevice(),
     ];
   }
 
diff --git a/packages/flutter_tools/test/analytics_test.dart b/packages/flutter_tools/test/analytics_test.dart
index a2befddffc0..79d9c26fd26 100644
--- a/packages/flutter_tools/test/analytics_test.dart
+++ b/packages/flutter_tools/test/analytics_test.dart
@@ -107,7 +107,7 @@ void main() {
 
       expect(
         verify(mockUsage.sendTiming(captureAny, captureAny, captureAny, label: captureAnyNamed('label'))).captured,
-        <dynamic>['flutter', 'doctor', const Duration(milliseconds: 1000), 'success']
+        <dynamic>['flutter', 'doctor', const Duration(milliseconds: 1000), 'success'],
       );
     }, overrides: <Type, Generator>{
       SystemClock: () => mockClock,
@@ -126,7 +126,7 @@ void main() {
 
       expect(
         verify(mockUsage.sendTiming(captureAny, captureAny, captureAny, label: captureAnyNamed('label'))).captured,
-        <dynamic>['flutter', 'doctor', const Duration(milliseconds: 1000), 'warning']
+        <dynamic>['flutter', 'doctor', const Duration(milliseconds: 1000), 'warning'],
       );
     }, overrides: <Type, Generator>{
       SystemClock: () => mockClock,
diff --git a/packages/flutter_tools/test/android/android_emulator_test.dart b/packages/flutter_tools/test/android/android_emulator_test.dart
index 28046c1249e..0e2a3a0ad00 100644
--- a/packages/flutter_tools/test/android/android_emulator_test.dart
+++ b/packages/flutter_tools/test/android/android_emulator_test.dart
@@ -30,7 +30,7 @@ void main() {
       final Map<String, String> properties = <String, String>{
         'hw.device.name': name,
         'hw.device.manufacturer': manufacturer,
-        'avd.ini.displayname': label
+        'avd.ini.displayname': label,
       };
       final AndroidEmulator emulator =
           AndroidEmulator(emulatorID, properties);
diff --git a/packages/flutter_tools/test/android/android_workflow_test.dart b/packages/flutter_tools/test/android/android_workflow_test.dart
index c98847449ca..7a5e2c89eda 100644
--- a/packages/flutter_tools/test/android/android_workflow_test.dart
+++ b/packages/flutter_tools/test/android/android_workflow_test.dart
@@ -75,7 +75,7 @@ void main() {
     when(sdk.sdkManagerPath).thenReturn('/foo/bar/sdkmanager');
     processManager.processFactory = processMetaFactory(<String>[
        '[=======================================] 100% Computing updates...             ',
-       'All SDK package licenses accepted.'
+       'All SDK package licenses accepted.',
     ]);
 
     final AndroidLicenseValidator licenseValidator = AndroidLicenseValidator();
diff --git a/packages/flutter_tools/test/artifacts_test.dart b/packages/flutter_tools/test/artifacts_test.dart
index 987546f8a92..986bff073c6 100644
--- a/packages/flutter_tools/test/artifacts_test.dart
+++ b/packages/flutter_tools/test/artifacts_test.dart
@@ -29,33 +29,33 @@ void main() {
     testUsingContext('getArtifactPath', () {
       expect(
           artifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, BuildMode.release),
-          fs.path.join(tempDir.path, 'bin', 'cache', 'artifacts', 'engine', 'ios-release', 'Flutter.framework')
+          fs.path.join(tempDir.path, 'bin', 'cache', 'artifacts', 'engine', 'ios-release', 'Flutter.framework'),
       );
       expect(
           artifacts.getArtifactPath(Artifact.flutterTester),
-          fs.path.join(tempDir.path, 'bin', 'cache', 'artifacts', 'engine', 'linux-x64', 'flutter_tester')
+          fs.path.join(tempDir.path, 'bin', 'cache', 'artifacts', 'engine', 'linux-x64', 'flutter_tester'),
       );
     }, overrides: <Type, Generator> {
       Cache: () => Cache(rootOverride: tempDir),
-      Platform: () => FakePlatform(operatingSystem: 'linux')
+      Platform: () => FakePlatform(operatingSystem: 'linux'),
     });
 
     testUsingContext('getEngineType', () {
       expect(
           artifacts.getEngineType(TargetPlatform.android_arm, BuildMode.debug),
-          'android-arm'
+          'android-arm',
       );
       expect(
           artifacts.getEngineType(TargetPlatform.ios, BuildMode.release),
-          'ios-release'
+          'ios-release',
       );
       expect(
           artifacts.getEngineType(TargetPlatform.darwin_x64),
-          'darwin-x64'
+          'darwin-x64',
       );
     }, overrides: <Type, Generator> {
       Cache: () => Cache(rootOverride: tempDir),
-      Platform: () => FakePlatform(operatingSystem: 'linux')
+      Platform: () => FakePlatform(operatingSystem: 'linux'),
     });
   });
 
@@ -79,35 +79,35 @@ void main() {
     testUsingContext('getArtifactPath', () {
       expect(
           artifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, BuildMode.release),
-          fs.path.join(tempDir.path, 'out', 'android_debug_unopt', 'Flutter.framework')
+          fs.path.join(tempDir.path, 'out', 'android_debug_unopt', 'Flutter.framework'),
       );
       expect(
           artifacts.getArtifactPath(Artifact.flutterTester),
-          fs.path.join(tempDir.path, 'out', 'android_debug_unopt', 'flutter_tester')
+          fs.path.join(tempDir.path, 'out', 'android_debug_unopt', 'flutter_tester'),
       );
       expect(
         artifacts.getArtifactPath(Artifact.engineDartSdkPath),
-        fs.path.join(tempDir.path, 'out', 'host_debug_unopt', 'dart-sdk')
+        fs.path.join(tempDir.path, 'out', 'host_debug_unopt', 'dart-sdk'),
       );
     }, overrides: <Type, Generator> {
-      Platform: () => FakePlatform(operatingSystem: 'linux')
+      Platform: () => FakePlatform(operatingSystem: 'linux'),
     });
 
     testUsingContext('getEngineType', () {
       expect(
           artifacts.getEngineType(TargetPlatform.android_arm, BuildMode.debug),
-          'android_debug_unopt'
+          'android_debug_unopt',
       );
       expect(
           artifacts.getEngineType(TargetPlatform.ios, BuildMode.release),
-          'android_debug_unopt'
+          'android_debug_unopt',
       );
       expect(
           artifacts.getEngineType(TargetPlatform.darwin_x64),
-          'android_debug_unopt'
+          'android_debug_unopt',
       );
     }, overrides: <Type, Generator> {
-      Platform: () => FakePlatform(operatingSystem: 'linux')
+      Platform: () => FakePlatform(operatingSystem: 'linux'),
     });
   });
 }
diff --git a/packages/flutter_tools/test/base/file_system_test.dart b/packages/flutter_tools/test/base/file_system_test.dart
index 3652e7970a0..80cca02f4cd 100644
--- a/packages/flutter_tools/test/base/file_system_test.dart
+++ b/packages/flutter_tools/test/base/file_system_test.dart
@@ -92,7 +92,7 @@ void main() {
       expect(escapePath('foo\\bar\\cool.dart'), 'foo\\\\bar\\\\cool.dart');
       expect(escapePath('C:/foo/bar/cool.dart'), 'C:/foo/bar/cool.dart');
     }, overrides: <Type, Generator>{
-      Platform: () => FakePlatform(operatingSystem: 'windows')
+      Platform: () => FakePlatform(operatingSystem: 'windows'),
     });
 
     testUsingContext('on Linux', () {
@@ -100,7 +100,7 @@ void main() {
       expect(escapePath('foo/bar/cool.dart'), 'foo/bar/cool.dart');
       expect(escapePath('foo\\cool.dart'), 'foo\\cool.dart');
     }, overrides: <Type, Generator>{
-      Platform: () => FakePlatform(operatingSystem: 'linux')
+      Platform: () => FakePlatform(operatingSystem: 'linux'),
     });
   });
 }
diff --git a/packages/flutter_tools/test/base/net_test.dart b/packages/flutter_tools/test/base/net_test.dart
index dd867ed505d..b379352615d 100644
--- a/packages/flutter_tools/test/base/net_test.dart
+++ b/packages/flutter_tools/test/base/net_test.dart
@@ -26,7 +26,7 @@ void main() {
         'Download failed -- attempting retry 1 in 1 second...\n'
         'Download failed -- attempting retry 2 in 2 seconds...\n'
         'Download failed -- attempting retry 3 in 4 seconds...\n'
-        'Download failed -- attempting retry 4 in 8 seconds...\n'
+        'Download failed -- attempting retry 4 in 8 seconds...\n',
       );
     });
     expect(testLogger.errorText, isEmpty);
@@ -49,7 +49,7 @@ void main() {
         'Download failed -- attempting retry 1 in 1 second...\n'
         'Download failed -- attempting retry 2 in 2 seconds...\n'
         'Download failed -- attempting retry 3 in 4 seconds...\n'
-        'Download failed -- attempting retry 4 in 8 seconds...\n'
+        'Download failed -- attempting retry 4 in 8 seconds...\n',
       );
     });
     expect(testLogger.errorText, isEmpty);
@@ -72,7 +72,7 @@ void main() {
         'Download failed -- attempting retry 1 in 1 second...\n'
         'Download failed -- attempting retry 2 in 2 seconds...\n'
         'Download failed -- attempting retry 3 in 4 seconds...\n'
-        'Download failed -- attempting retry 4 in 8 seconds...\n'
+        'Download failed -- attempting retry 4 in 8 seconds...\n',
       );
     });
     expect(testLogger.errorText, isEmpty);
diff --git a/packages/flutter_tools/test/base/os_test.dart b/packages/flutter_tools/test/base/os_test.dart
index 21752a4bdac..dcacba9ee8c 100644
--- a/packages/flutter_tools/test/base/os_test.dart
+++ b/packages/flutter_tools/test/base/os_test.dart
@@ -32,7 +32,7 @@ void main() {
       expect(utils.which(kExecutable), isNull);
     }, overrides: <Type, Generator>{
       ProcessManager: () => mockProcessManager,
-      Platform: () => FakePlatform(operatingSystem: 'linux')
+      Platform: () => FakePlatform(operatingSystem: 'linux'),
     });
 
     testUsingContext('returns exactly one result', () async {
@@ -42,7 +42,7 @@ void main() {
       expect(utils.which(kExecutable).path, kPath1);
     }, overrides: <Type, Generator>{
       ProcessManager: () => mockProcessManager,
-      Platform: () => FakePlatform(operatingSystem: 'linux')
+      Platform: () => FakePlatform(operatingSystem: 'linux'),
     });
 
     testUsingContext('returns all results for whichAll', () async {
@@ -55,7 +55,7 @@ void main() {
       expect(result[1].path, kPath2);
     }, overrides: <Type, Generator>{
       ProcessManager: () => mockProcessManager,
-      Platform: () => FakePlatform(operatingSystem: 'linux')
+      Platform: () => FakePlatform(operatingSystem: 'linux'),
     });
   });
 
@@ -68,7 +68,7 @@ void main() {
       expect(utils.which(kExecutable), isNull);
     }, overrides: <Type, Generator>{
       ProcessManager: () => mockProcessManager,
-      Platform: () => FakePlatform(operatingSystem: 'windows')
+      Platform: () => FakePlatform(operatingSystem: 'windows'),
     });
 
     testUsingContext('returns exactly one result', () async {
@@ -78,7 +78,7 @@ void main() {
       expect(utils.which(kExecutable).path, kPath1);
     }, overrides: <Type, Generator>{
       ProcessManager: () => mockProcessManager,
-      Platform: () => FakePlatform(operatingSystem: 'windows')
+      Platform: () => FakePlatform(operatingSystem: 'windows'),
     });
 
     testUsingContext('returns all results for whichAll', () async {
@@ -91,7 +91,7 @@ void main() {
       expect(result[1].path, kPath2);
     }, overrides: <Type, Generator>{
       ProcessManager: () => mockProcessManager,
-      Platform: () => FakePlatform(operatingSystem: 'windows')
+      Platform: () => FakePlatform(operatingSystem: 'windows'),
     });
   });
 }
diff --git a/packages/flutter_tools/test/base/process_test.dart b/packages/flutter_tools/test/base/process_test.dart
index 2139a5457d0..c4be308c5ab 100644
--- a/packages/flutter_tools/test/base/process_test.dart
+++ b/packages/flutter_tools/test/base/process_test.dart
@@ -87,7 +87,7 @@ void main() {
       Logger: () => mockLogger,
       ProcessManager: () => mockProcessManager,
       OutputPreferences: () => OutputPreferences(wrapText: true, wrapColumn: 40),
-      Platform: () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false
+      Platform: () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false,
     });
   });
 }
diff --git a/packages/flutter_tools/test/build_runner/code_generating_kernel_compiler.dart b/packages/flutter_tools/test/build_runner/code_generating_kernel_compiler.dart
index 4dbd4d558fc..c5381a286fa 100644
--- a/packages/flutter_tools/test/build_runner/code_generating_kernel_compiler.dart
+++ b/packages/flutter_tools/test/build_runner/code_generating_kernel_compiler.dart
@@ -35,7 +35,7 @@ void main() {
         linkPlatformKernelIn: anyNamed('linkPlatformKernelIn'),
         mainPath: anyNamed('mainPath'),
         targetProductVm: anyNamed('targetProductVm'),
-        trackWidgetCreation: anyNamed('trackWidgetCreation')
+        trackWidgetCreation: anyNamed('trackWidgetCreation'),
       )).thenAnswer((Invocation invocation) async {
         return CodeGenerationResult(fs.file('.packages'), fs.file('main.app.dill'));
       });
diff --git a/packages/flutter_tools/test/cache_test.dart b/packages/flutter_tools/test/cache_test.dart
index 41840a38341..079b0451e63 100644
--- a/packages/flutter_tools/test/cache_test.dart
+++ b/packages/flutter_tools/test/cache_test.dart
@@ -63,7 +63,7 @@ void main() {
       expect(gradleWrapper.isUpToDateInner(), false);
     }, overrides: <Type, Generator>{
       Cache: ()=> mockCache,
-      FileSystem: () => fs
+      FileSystem: () => fs,
     });
 
     testUsingContext('Gradle wrapper should be up to date, only if all cached artifact are available', () {
@@ -78,7 +78,7 @@ void main() {
       expect(gradleWrapper.isUpToDateInner(), true);
     }, overrides: <Type, Generator>{
       Cache: ()=> mockCache,
-      FileSystem: () => fs
+      FileSystem: () => fs,
     });
 
     test('should not be up to date, if some cached artifact is not', () {
diff --git a/packages/flutter_tools/test/commands/analyze_continuously_test.dart b/packages/flutter_tools/test/commands/analyze_continuously_test.dart
index d03cf66a6ef..7fa979af86d 100644
--- a/packages/flutter_tools/test/commands/analyze_continuously_test.dart
+++ b/packages/flutter_tools/test/commands/analyze_continuously_test.dart
@@ -45,7 +45,7 @@ void main() {
 
       expect(errorCount, 0);
     }, overrides: <Type, Generator>{
-      OperatingSystemUtils: () => os
+      OperatingSystemUtils: () => os,
     });
   });
 
@@ -67,7 +67,7 @@ void main() {
 
     expect(errorCount, greaterThan(0));
   }, overrides: <Type, Generator>{
-    OperatingSystemUtils: () => os
+    OperatingSystemUtils: () => os,
   });
 
   testUsingContext('Returns no errors when source is error-free', () async {
@@ -84,7 +84,7 @@ void main() {
     await onDone;
     expect(errorCount, 0);
   }, overrides: <Type, Generator>{
-    OperatingSystemUtils: () => os
+    OperatingSystemUtils: () => os,
   });
 }
 
diff --git a/packages/flutter_tools/test/commands/create_test.dart b/packages/flutter_tools/test/commands/create_test.dart
index 21fa2938457..8bf16040304 100644
--- a/packages/flutter_tools/test/commands/create_test.dart
+++ b/packages/flutter_tools/test/commands/create_test.dart
@@ -86,7 +86,7 @@ void main() {
 
   testUsingContext('creates a module project correctly', () async {
     await _createAndAnalyzeProject(projectDir, <String>[
-      '--template=module'
+      '--template=module',
     ], <String>[
       '.android/app/',
       '.gitignore',
@@ -341,7 +341,7 @@ void main() {
 
   testUsingContext('module project with pub', () async {
     return _createProject(projectDir, <String>[
-      '--template=module'
+      '--template=module',
     ], <String>[
       '.android/build.gradle',
       '.android/Flutter/build.gradle',
@@ -531,11 +531,11 @@ void main() {
     FlutterProject project = await FlutterProject.fromDirectory(fs.directory(tmpProjectDir));
     expect(
         project.ios.productBundleIdentifier,
-        'com.example.helloFlutter'
+        'com.example.helloFlutter',
     );
     expect(
         project.android.applicationId,
-        'com.example.hello_flutter'
+        'com.example.hello_flutter',
     );
 
     tmpProjectDir = fs.path.join(tempDir.path, 'test_abc');
@@ -543,11 +543,11 @@ void main() {
     project = await FlutterProject.fromDirectory(fs.directory(tmpProjectDir));
     expect(
         project.ios.productBundleIdentifier,
-        'abc.1.testAbc'
+        'abc.1.testAbc',
     );
     expect(
         project.android.applicationId,
-        'abc.u1.test_abc'
+        'abc.u1.test_abc',
     );
 
     tmpProjectDir = fs.path.join(tempDir.path, 'flutter_project');
@@ -555,11 +555,11 @@ void main() {
     project = await FlutterProject.fromDirectory(fs.directory(tmpProjectDir));
     expect(
         project.ios.productBundleIdentifier,
-        'flutterProject.untitled'
+        'flutterProject.untitled',
     );
     expect(
         project.android.applicationId,
-        'flutter_project.untitled'
+        'flutter_project.untitled',
     );
   }, overrides: <Type, Generator>{
     FlutterVersion: () => mockFlutterVersion,
@@ -1061,7 +1061,7 @@ class MockHttpClientResponse extends Stream<List<int>> implements HttpClientResp
     void onData(List<int> event), {
     Function onError,
     void onDone(),
-    bool cancelOnError
+    bool cancelOnError,
   }) {
     return Stream<List<int>>.fromIterable(<List<int>>[result.codeUnits])
       .listen(onData, onError: onError, onDone: onDone, cancelOnError: cancelOnError);
diff --git a/packages/flutter_tools/test/commands/daemon_test.dart b/packages/flutter_tools/test/commands/daemon_test.dart
index 4a1c26b8eef..043de1ec690 100644
--- a/packages/flutter_tools/test/commands/daemon_test.dart
+++ b/packages/flutter_tools/test/commands/daemon_test.dart
@@ -37,7 +37,7 @@ void main() {
       daemon = Daemon(
         commands.stream,
         responses.add,
-        notifyingLogger: notifyingLogger
+        notifyingLogger: notifyingLogger,
       );
       commands.add(<String, dynamic>{'id': 0, 'method': 'daemon.version'});
       final Map<String, dynamic> response = await responses.stream.firstWhere(_notEvent);
@@ -101,7 +101,7 @@ void main() {
       daemon = Daemon(
         commands.stream,
         responses.add,
-        notifyingLogger: notifyingLogger
+        notifyingLogger: notifyingLogger,
       );
       commands.add(<String, dynamic>{'id': 0, 'method': 'daemon.shutdown'});
       return daemon.onExit.then<void>((int code) async {
@@ -148,8 +148,8 @@ void main() {
         'id': 0,
         'method': 'app.callServiceExtension',
         'params': <String, String> {
-          'methodName': 'ext.flutter.debugPaint'
-        }
+          'methodName': 'ext.flutter.debugPaint',
+        },
       });
       final Map<String, dynamic> response = await responses.stream.firstWhere(_notEvent);
       expect(response['id'], 0);
@@ -185,7 +185,7 @@ void main() {
       daemon = Daemon(
         commands.stream,
         responses.add,
-        notifyingLogger: notifyingLogger
+        notifyingLogger: notifyingLogger,
       );
       commands.add(<String, dynamic>{'id': 0, 'method': 'device.getDevices'});
       final Map<String, dynamic> response = await responses.stream.firstWhere(_notEvent);
@@ -222,7 +222,7 @@ void main() {
       daemon = Daemon(
           commands.stream,
           responses.add,
-          notifyingLogger: notifyingLogger
+          notifyingLogger: notifyingLogger,
       );
 
       final MockPollingDeviceDiscovery discoverer = MockPollingDeviceDiscovery();
@@ -255,7 +255,7 @@ void main() {
         commands.stream,
         responses.add,
         daemonCommand: command,
-        notifyingLogger: notifyingLogger
+        notifyingLogger: notifyingLogger,
       );
 
       commands.add(<String, dynamic>{ 'id': 0, 'method': 'emulator.launch' });
@@ -272,7 +272,7 @@ void main() {
       daemon = Daemon(
         commands.stream,
         responses.add,
-        notifyingLogger: notifyingLogger
+        notifyingLogger: notifyingLogger,
       );
       commands.add(<String, dynamic>{'id': 0, 'method': 'emulator.getEmulators'});
       final Map<String, dynamic> response = await responses.stream.firstWhere(_notEvent);
@@ -287,15 +287,15 @@ void main() {
     test('OperationResult', () {
       expect(
         jsonEncodeObject(OperationResult.ok),
-        '{"code":0,"message":""}'
+        '{"code":0,"message":""}',
       );
       expect(
         jsonEncodeObject(OperationResult(1, 'foo')),
-        '{"code":1,"message":"foo"}'
+        '{"code":1,"message":"foo"}',
       );
       expect(
         jsonEncodeObject(OperationResult(0, 'foo', hintMessage: 'my hint', hintId: 'myId')),
-        '{"code":0,"message":"foo","hintMessage":"my hint","hintId":"myId"}'
+        '{"code":0,"message":"foo","hintMessage":"my hint","hintId":"myId"}',
       );
     });
   });
diff --git a/packages/flutter_tools/test/commands/doctor_test.dart b/packages/flutter_tools/test/commands/doctor_test.dart
index 32a6e5cf161..dfa032e0450 100644
--- a/packages/flutter_tools/test/commands/doctor_test.dart
+++ b/packages/flutter_tools/test/commands/doctor_test.dart
@@ -24,7 +24,7 @@ import '../src/context.dart';
 
 final Generator _kNoColorOutputPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
 final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{
-  Platform: _kNoColorOutputPlatform
+  Platform: _kNoColorOutputPlatform,
 };
 
 void main() {
@@ -144,7 +144,7 @@ void main() {
       Platform: () => FakePlatform()
         ..environment = <String, String>{
           'HTTP_PROXY': 'fakeproxy.local',
-          'NO_PROXY': 'localhost,127.0.0.1'
+          'NO_PROXY': 'localhost,127.0.0.1',
         },
     });
 
@@ -159,7 +159,7 @@ void main() {
       Platform: () => FakePlatform()
         ..environment = <String, String>{
           'http_proxy': 'fakeproxy.local',
-          'no_proxy': 'localhost,127.0.0.1'
+          'no_proxy': 'localhost,127.0.0.1',
         },
     });
 
@@ -174,7 +174,7 @@ void main() {
       Platform: () => FakePlatform()
         ..environment = <String, String>{
           'HTTP_PROXY': 'fakeproxy.local',
-          'NO_PROXY': '127.0.0.1'
+          'NO_PROXY': '127.0.0.1',
         },
     });
 
@@ -189,7 +189,7 @@ void main() {
       Platform: () => FakePlatform()
         ..environment = <String, String>{
           'HTTP_PROXY': 'fakeproxy.local',
-          'NO_PROXY': 'localhost'
+          'NO_PROXY': 'localhost',
         },
     });
   });
@@ -635,7 +635,7 @@ class FakeDoctorValidatorsProvider implements DoctorValidatorsProvider {
     return <DoctorValidator>[
       PassingValidator('Passing Validator'),
       PassingValidator('Another Passing Validator'),
-      PassingValidator('Providing validators is fun')
+      PassingValidator('Providing validators is fun'),
     ];
   }
 
@@ -699,11 +699,11 @@ class FakeGroupedDoctor extends Doctor {
       _validators = <DoctorValidator>[];
       _validators.add(GroupedValidator(<DoctorValidator>[
         PassingGroupedValidator('Category 1'),
-        PassingGroupedValidator('Category 1')
+        PassingGroupedValidator('Category 1'),
       ]));
       _validators.add(GroupedValidator(<DoctorValidator>[
         PassingGroupedValidator('Category 2'),
-        MissingGroupedValidator('Category 2')
+        MissingGroupedValidator('Category 2'),
       ]));
     }
     return _validators;
diff --git a/packages/flutter_tools/test/commands/format_test.dart b/packages/flutter_tools/test/commands/format_test.dart
index f3878cf9e67..d20c73d14f5 100644
--- a/packages/flutter_tools/test/commands/format_test.dart
+++ b/packages/flutter_tools/test/commands/format_test.dart
@@ -68,7 +68,7 @@ void main() {
       final CommandRunner<void> runner = createTestCommandRunner(command);
 
       expect(runner.run(<String>[
-        'format', '--dry-run', '--set-exit-if-changed', srcFile.path
+        'format', '--dry-run', '--set-exit-if-changed', srcFile.path,
       ]), throwsException);
 
       final String shouldNotFormatted = srcFile.readAsStringSync();
diff --git a/packages/flutter_tools/test/commands/packages_test.dart b/packages/flutter_tools/test/commands/packages_test.dart
index d7a471895c3..2d37e95c03c 100644
--- a/packages/flutter_tools/test/commands/packages_test.dart
+++ b/packages/flutter_tools/test/commands/packages_test.dart
@@ -82,7 +82,7 @@ void main() {
       expect(
         fs.file(fs.path.join(projectPath, relPath)).readAsStringSync(),
         contains(substring),
-        reason: '$projectPath/$relPath has unexpected content'
+        reason: '$projectPath/$relPath has unexpected content',
       );
     }
 
diff --git a/packages/flutter_tools/test/crash_reporting_test.dart b/packages/flutter_tools/test/crash_reporting_test.dart
index cac269ef77b..3d49ff244bd 100644
--- a/packages/flutter_tools/test/crash_reporting_test.dart
+++ b/packages/flutter_tools/test/crash_reporting_test.dart
@@ -70,12 +70,12 @@ void main() {
           value: (dynamic value) {
             final List<String> pair = value;
             return pair[1];
-          }
+          },
         );
 
         return Response(
             'test-report-id',
-            200
+            200,
         );
       }));
 
diff --git a/packages/flutter_tools/test/dart/pub_get_test.dart b/packages/flutter_tools/test/dart/pub_get_test.dart
index f3552c2c8d6..eb09f26a377 100644
--- a/packages/flutter_tools/test/dart/pub_get_test.dart
+++ b/packages/flutter_tools/test/dart/pub_get_test.dart
@@ -40,7 +40,7 @@ void main() {
       time.elapse(const Duration(milliseconds: 500));
       expect(testLogger.statusText,
         'Running "flutter packages get" in /...\n'
-        'pub get failed (69) -- attempting retry 1 in 1 second...\n'
+        'pub get failed (69) -- attempting retry 1 in 1 second...\n',
       );
       expect(processMock.lastPubEnvironment, contains('flutter_cli:flutter_tests'));
       expect(processMock.lastPubCache, isNull);
@@ -48,13 +48,13 @@ void main() {
       expect(testLogger.statusText,
         'Running "flutter packages get" in /...\n'
         'pub get failed (69) -- attempting retry 1 in 1 second...\n'
-        'pub get failed (69) -- attempting retry 2 in 2 seconds...\n'
+        'pub get failed (69) -- attempting retry 2 in 2 seconds...\n',
       );
       time.elapse(const Duration(seconds: 1));
       expect(testLogger.statusText,
         'Running "flutter packages get" in /...\n'
         'pub get failed (69) -- attempting retry 1 in 1 second...\n'
-        'pub get failed (69) -- attempting retry 2 in 2 seconds...\n'
+        'pub get failed (69) -- attempting retry 2 in 2 seconds...\n',
       );
       time.elapse(const Duration(seconds: 100)); // from t=0 to t=100
       expect(testLogger.statusText,
@@ -65,7 +65,7 @@ void main() {
         'pub get failed (69) -- attempting retry 4 in 8 seconds...\n' // at t=5
         'pub get failed (69) -- attempting retry 5 in 16 seconds...\n' // at t=13
         'pub get failed (69) -- attempting retry 6 in 32 seconds...\n' // at t=29
-        'pub get failed (69) -- attempting retry 7 in 64 seconds...\n' // at t=61
+        'pub get failed (69) -- attempting retry 7 in 64 seconds...\n', // at t=61
       );
       time.elapse(const Duration(seconds: 200)); // from t=0 to t=200
       expect(testLogger.statusText,
@@ -79,7 +79,7 @@ void main() {
         'pub get failed (69) -- attempting retry 7 in 64 seconds...\n'
         'pub get failed (69) -- attempting retry 8 in 64 seconds...\n' // at t=39
         'pub get failed (69) -- attempting retry 9 in 64 seconds...\n' // at t=103
-        'pub get failed (69) -- attempting retry 10 in 64 seconds...\n' // at t=167
+        'pub get failed (69) -- attempting retry 10 in 64 seconds...\n', // at t=167
       );
     });
     expect(testLogger.errorText, isEmpty);
diff --git a/packages/flutter_tools/test/devfs_test.dart b/packages/flutter_tools/test/devfs_test.dart
index 16ccf408491..db86a6bad72 100644
--- a/packages/flutter_tools/test/devfs_test.dart
+++ b/packages/flutter_tools/test/devfs_test.dart
@@ -432,7 +432,7 @@ void main() {
         'writeFile test lib/foo.txt.dill build/app.dill',
       ]);
       expect(devFS.assetPathsToEvict, unorderedMatches(<String>[
-        'a.txt', 'b.txt'
+        'a.txt', 'b.txt',
       ]));
       devFS.assetPathsToEvict.clear();
       expect(report.syncedBytes, 22);
diff --git a/packages/flutter_tools/test/emulator_test.dart b/packages/flutter_tools/test/emulator_test.dart
index 71469fb357e..2fdef5b4464 100644
--- a/packages/flutter_tools/test/emulator_test.dart
+++ b/packages/flutter_tools/test/emulator_test.dart
@@ -53,7 +53,7 @@ void main() {
       final List<Emulator> emulators = <Emulator>[
         emulator1,
         emulator2,
-        emulator3
+        emulator3,
       ];
       final TestEmulatorManager testEmulatorManager =
           TestEmulatorManager(emulators);
@@ -204,7 +204,7 @@ class MockProcessManager extends Mock implements ProcessManager {
     bool includeParentEnvironment = true,
     bool runInShell = false,
     Encoding stdoutEncoding = systemEncoding,
-    Encoding stderrEncoding = systemEncoding
+    Encoding stderrEncoding = systemEncoding,
   }) {
     final String program = command[0];
     final List<String> args = command.sublist(1);
diff --git a/packages/flutter_tools/test/flutter_manifest_test.dart b/packages/flutter_tools/test/flutter_manifest_test.dart
index b4f45087302..828bc6f331d 100644
--- a/packages/flutter_tools/test/flutter_manifest_test.dart
+++ b/packages/flutter_tools/test/flutter_manifest_test.dart
@@ -506,7 +506,7 @@ flutter:
       },
           overrides: <Type, Generator>{
             FileSystem: () => filesystem,
-          }
+          },
       );
     }
 
@@ -517,13 +517,13 @@ flutter:
     testUsingContextAndFs('Validate manifest on Posix FS',
         MemoryFileSystem(style: FileSystemStyle.posix), () {
           assertSchemaIsReadable();
-        }
+        },
     );
 
     testUsingContextAndFs('Validate manifest on Windows FS',
         MemoryFileSystem(style: FileSystemStyle.windows), () {
           assertSchemaIsReadable();
-        }
+        },
     );
 
   });
diff --git a/packages/flutter_tools/test/forbidden_imports_test.dart b/packages/flutter_tools/test/forbidden_imports_test.dart
index 4a6fa029ac2..7b8168be976 100644
--- a/packages/flutter_tools/test/forbidden_imports_test.dart
+++ b/packages/flutter_tools/test/forbidden_imports_test.dart
@@ -83,7 +83,7 @@ void main() {
     final List<String> whitelistedPaths = <String>[
       fs.path.join(flutterTools, 'test', 'src', 'build_runner'),
       fs.path.join(flutterTools, 'lib', 'src', 'build_runner'),
-      fs.path.join(flutterTools, 'lib', 'executable.dart')
+      fs.path.join(flutterTools, 'lib', 'executable.dart'),
     ];
     bool _isNotWhitelisted(FileSystemEntity entity) => whitelistedPaths.every((String path) => !entity.path.contains(path));
 
diff --git a/packages/flutter_tools/test/fuchsia/fuchsa_device_test.dart b/packages/flutter_tools/test/fuchsia/fuchsa_device_test.dart
index 452fde7c1e9..7654d85314f 100644
--- a/packages/flutter_tools/test/fuchsia/fuchsa_device_test.dart
+++ b/packages/flutter_tools/test/fuchsia/fuchsa_device_test.dart
@@ -224,7 +224,7 @@ void main() {
         fuchsiaDevice,
         expectedIsolateName,
         (Uri uri) async => vmService,
-        true // only poll once.
+        true, // only poll once.
       );
       when(fuchsiaDevice.servicePorts()).thenAnswer((Invocation invocation) async => <int>[1]);
       when(portForwarder.forward(1)).thenAnswer((Invocation invocation) async => 2);
diff --git a/packages/flutter_tools/test/hot_test.dart b/packages/flutter_tools/test/hot_test.dart
index c14b4582f6d..f681f424758 100644
--- a/packages/flutter_tools/test/hot_test.dart
+++ b/packages/flutter_tools/test/hot_test.dart
@@ -54,7 +54,7 @@ void main() {
         'success': false,
         'details': <String, dynamic>{
           'notices': <Map<String, dynamic>>[
-            <String, dynamic>{ 'message': false, }
+            <String, dynamic>{ 'message': false, },
           ],
         },
       }), false);
@@ -141,7 +141,7 @@ void main() {
       when(mockDevice.supportsHotRestart).thenReturn(false);
       // Trigger hot restart.
       final List<FlutterDevice> devices = <FlutterDevice>[
-        FlutterDevice(mockDevice, generator: residentCompiler, trackWidgetCreation: false)..devFS = mockDevFs
+        FlutterDevice(mockDevice, generator: residentCompiler, trackWidgetCreation: false)..devFS = mockDevFs,
       ];
       final OperationResult result = await HotRunner(devices).restart(fullRestart: true);
       // Expect hot restart failed.
@@ -201,7 +201,7 @@ void main() {
       when(mockDevice.supportsHotReload).thenReturn(true);
       when(mockDevice.supportsHotRestart).thenReturn(true);
       final List<FlutterDevice> devices = <FlutterDevice>[
-        FlutterDevice(mockDevice, generator: residentCompiler, trackWidgetCreation: false)
+        FlutterDevice(mockDevice, generator: residentCompiler, trackWidgetCreation: false),
       ];
       final OperationResult result = await HotRunner(devices).restart(fullRestart: true);
       expect(result.isOk, false);
@@ -218,7 +218,7 @@ void main() {
       when(mockDevice.supportsHotRestart).thenReturn(true);
       // Trigger hot restart.
       final List<FlutterDevice> devices = <FlutterDevice>[
-        FlutterDevice(mockDevice, generator: residentCompiler, trackWidgetCreation: false)..devFS = mockDevFs
+        FlutterDevice(mockDevice, generator: residentCompiler, trackWidgetCreation: false)..devFS = mockDevFs,
       ];
       final OperationResult result = await HotRunner(devices).restart(fullRestart: true);
       // Expect hot restart successful.
@@ -245,7 +245,7 @@ void main() {
         when(mockDevice.supportsHotRestart).thenReturn(true);
         when(mockDevice.supportsStopApp).thenReturn(false);
         final List<FlutterDevice> devices = <FlutterDevice>[
-          FlutterDevice(mockDevice, generator: residentCompiler, trackWidgetCreation: false)
+          FlutterDevice(mockDevice, generator: residentCompiler, trackWidgetCreation: false),
         ];
         await HotRunner(devices).cleanupAfterSignal();
         expect(shutdownTestingConfig.shutdownHookCalled, true);
@@ -260,7 +260,7 @@ void main() {
         when(mockDevice.supportsHotRestart).thenReturn(true);
         when(mockDevice.supportsStopApp).thenReturn(false);
         final List<FlutterDevice> devices = <FlutterDevice>[
-          FlutterDevice(mockDevice, generator: residentCompiler, trackWidgetCreation: false)
+          FlutterDevice(mockDevice, generator: residentCompiler, trackWidgetCreation: false),
         ];
         await HotRunner(devices).preStop();
         expect(shutdownTestingConfig.shutdownHookCalled, true);
diff --git a/packages/flutter_tools/test/integration/flutter_run_test.dart b/packages/flutter_tools/test/integration/flutter_run_test.dart
index be1150caeae..55d9db3b790 100644
--- a/packages/flutter_tools/test/integration/flutter_run_test.dart
+++ b/packages/flutter_tools/test/integration/flutter_run_test.dart
@@ -39,7 +39,7 @@ void main() {
       const ProcessManager _processManager = LocalProcessManager();
       final ProcessResult _proc = await _processManager.run(
         <String>[flutterBin, 'run', '-d', 'invalid-device-id'],
-        workingDirectory: tempDir.path
+        workingDirectory: tempDir.path,
       );
 
       expect(_proc.stdout, isNot(contains('flutter has exited unexpectedly')));
diff --git a/packages/flutter_tools/test/integration/test_data/hot_reload_project.dart b/packages/flutter_tools/test/integration/test_data/hot_reload_project.dart
index ef85ac8298f..68de1d40ebe 100644
--- a/packages/flutter_tools/test/integration/test_data/hot_reload_project.dart
+++ b/packages/flutter_tools/test/integration/test_data/hot_reload_project.dart
@@ -77,7 +77,7 @@ class HotReloadProject extends Project {
   void uncommentHotReloadPrint() {
     final String newMainContents = main.replaceAll(
       '// printHotReloadWorked();',
-      'printHotReloadWorked();'
+      'printHotReloadWorked();',
     );
     writeFile(fs.path.join(dir.path, 'lib', 'main.dart'), newMainContents);
   }
diff --git a/packages/flutter_tools/test/integration/test_driver.dart b/packages/flutter_tools/test/integration/test_driver.dart
index dcb011d2cfe..a688cb497ec 100644
--- a/packages/flutter_tools/test/integration/test_driver.dart
+++ b/packages/flutter_tools/test/integration/test_driver.dart
@@ -502,7 +502,7 @@ class FlutterRunTestDriver extends FlutterTestDriver {
     _debugPrint('Performing ${ pause ? "paused " : "" }${ fullRestart ? "hot restart" : "hot reload" }...');
     final dynamic hotReloadResponse = await _sendRequest(
       'app.restart',
-      <String, dynamic>{'appId': _currentRunningAppId, 'fullRestart': fullRestart, 'pause': pause}
+      <String, dynamic>{'appId': _currentRunningAppId, 'fullRestart': fullRestart, 'pause': pause},
     );
     _debugPrint('${ fullRestart ? "Hot restart" : "Hot reload" } complete.');
 
@@ -565,7 +565,7 @@ class FlutterRunTestDriver extends FlutterTestDriver {
     final Map<String, dynamic> request = <String, dynamic>{
       'id': requestId,
       'method': method,
-      'params': params
+      'params': params,
     };
     final String jsonEncoded = json.encode(<Map<String, dynamic>>[request]);
     _debugPrint(jsonEncoded, topic: '=stdin=>');
@@ -606,7 +606,7 @@ class FlutterTestTestDriver extends FlutterTestDriver {
         'test',
         '--machine',
         '-d',
-        'flutter-tester'
+        'flutter-tester',
     ], script: testFile, withDebugger: withDebugger, pauseOnExceptions: pauseOnExceptions, pidFile: pidFile, beforeStart: beforeStart);
   }
 
diff --git a/packages/flutter_tools/test/integration/test_utils.dart b/packages/flutter_tools/test/integration/test_utils.dart
index c3128970d93..4af1c03b160 100644
--- a/packages/flutter_tools/test/integration/test_utils.dart
+++ b/packages/flutter_tools/test/integration/test_utils.dart
@@ -44,7 +44,7 @@ Future<void> getPackages(String folder) async {
   final List<String> command = <String>[
     fs.path.join(getFlutterRoot(), 'bin', 'flutter'),
     'packages',
-    'get'
+    'get',
   ];
   final Process process = await processManager.start(command, workingDirectory: folder);
   final StringBuffer errorOutput = StringBuffer();
diff --git a/packages/flutter_tools/test/ios/cocoapods_test.dart b/packages/flutter_tools/test/ios/cocoapods_test.dart
index 78454d749c0..9bb196391bf 100644
--- a/packages/flutter_tools/test/ios/cocoapods_test.dart
+++ b/packages/flutter_tools/test/ios/cocoapods_test.dart
@@ -62,12 +62,12 @@ void main() {
     cocoaPodsUnderTest = CocoaPods();
     pretendPodVersionIs('1.5.0');
     fs.file(fs.path.join(
-      Cache.flutterRoot, 'packages', 'flutter_tools', 'templates', 'cocoapods', 'Podfile-objc'
+      Cache.flutterRoot, 'packages', 'flutter_tools', 'templates', 'cocoapods', 'Podfile-objc',
     ))
         ..createSync(recursive: true)
         ..writeAsStringSync('Objective-C podfile template');
     fs.file(fs.path.join(
-      Cache.flutterRoot, 'packages', 'flutter_tools', 'templates', 'cocoapods', 'Podfile-swift'
+      Cache.flutterRoot, 'packages', 'flutter_tools', 'templates', 'cocoapods', 'Podfile-swift',
     ))
         ..createSync(recursive: true)
         ..writeAsStringSync('Swift podfile template');
diff --git a/packages/flutter_tools/test/ios/code_signing_test.dart b/packages/flutter_tools/test/ios/code_signing_test.dart
index 8c1fc5d86fc..b205fde0f2a 100644
--- a/packages/flutter_tools/test/ios/code_signing_test.dart
+++ b/packages/flutter_tools/test/ios/code_signing_test.dart
@@ -108,7 +108,7 @@ void main() {
         '''
 1) 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 "iPhone Developer: Profile 1 (1111AAAA11)"
     1 valid identities found''',
-        ''
+        '',
       ));
       when(mockProcessManager.runSync(
         <String>['security', 'find-certificate', '-c', '1111AAAA11', '-p'],
@@ -170,7 +170,7 @@ void main() {
 2) da4b9237bacccdf19c0760cab7aec4a8359010b0 "iPhone Developer: Profile 2 (2222BBBB22)"
 3) 5bf1fd927dfb8679496a2e6cf00cbe50c1c87145 "iPhone Developer: Profile 3 (3333CCCC33)"
     3 valid identities found''',
-        ''
+        '',
       ));
       mockTerminalStdInStream =
           Stream<String>.fromFuture(Future<String>.value('3'));
@@ -209,11 +209,11 @@ void main() {
 
       expect(
         testLogger.statusText,
-        contains('Please select a certificate for code signing [<bold>1</bold>|2|3|a]: 3')
+        contains('Please select a certificate for code signing [<bold>1</bold>|2|3|a]: 3'),
       );
       expect(
         testLogger.statusText,
-        contains('Signing iOS app for device deployment using developer identity: "iPhone Developer: Profile 3 (3333CCCC33)"')
+        contains('Signing iOS app for device deployment using developer identity: "iPhone Developer: Profile 3 (3333CCCC33)"'),
       );
       expect(testLogger.errorText, isEmpty);
       verify(mockOpenSslStdIn.write('This is a mock certificate'));
@@ -245,7 +245,7 @@ void main() {
 2) da4b9237bacccdf19c0760cab7aec4a8359010b0 "iPhone Developer: Profile 2 (2222BBBB22)"
 3) 5bf1fd927dfb8679496a2e6cf00cbe50c1c87145 "iPhone Developer: Profile 3 (3333CCCC33)"
     3 valid identities found''',
-          ''
+          '',
       ));
       mockTerminalStdInStream =
         Stream<String>.fromFuture(Future<String>.error(Exception('Cannot read from StdIn')));
@@ -314,7 +314,7 @@ void main() {
 2) da4b9237bacccdf19c0760cab7aec4a8359010b0 "iPhone Developer: Profile 2 (2222BBBB22)"
 3) 5bf1fd927dfb8679496a2e6cf00cbe50c1c87145 "iPhone Developer: Profile 3 (3333CCCC33)"
     3 valid identities found''',
-        ''
+        '',
       ));
       when(mockProcessManager.runSync(
         <String>['security', 'find-certificate', '-c', '3333CCCC33', '-p'],
@@ -352,11 +352,11 @@ void main() {
 
       expect(
         testLogger.statusText,
-        contains('Found saved certificate choice "iPhone Developer: Profile 3 (3333CCCC33)". To clear, use "flutter config"')
+        contains('Found saved certificate choice "iPhone Developer: Profile 3 (3333CCCC33)". To clear, use "flutter config"'),
       );
       expect(
         testLogger.statusText,
-        contains('Signing iOS app for device deployment using developer identity: "iPhone Developer: Profile 3 (3333CCCC33)"')
+        contains('Signing iOS app for device deployment using developer identity: "iPhone Developer: Profile 3 (3333CCCC33)"'),
       );
       expect(testLogger.errorText, isEmpty);
       verify(mockOpenSslStdIn.write('This is a mock certificate'));
@@ -385,7 +385,7 @@ void main() {
 2) da4b9237bacccdf19c0760cab7aec4a8359010b0 "iPhone Developer: Profile 2 (2222BBBB22)"
 3) 5bf1fd927dfb8679496a2e6cf00cbe50c1c87145 "iPhone Developer: Profile 3 (3333CCCC33)"
     3 valid identities found''',
-        ''
+        '',
       ));
       mockTerminalStdInStream =
           Stream<String>.fromFuture(Future<String>.value('3'));
@@ -426,11 +426,11 @@ void main() {
 
       expect(
         testLogger.errorText,
-        contains('Saved signing certificate "iPhone Developer: Invalid Profile" is not a valid development certificate')
+        contains('Saved signing certificate "iPhone Developer: Invalid Profile" is not a valid development certificate'),
       );
       expect(
         testLogger.statusText,
-        contains('Certificate choice "iPhone Developer: Profile 3 (3333CCCC33)"')
+        contains('Certificate choice "iPhone Developer: Profile 3 (3333CCCC33)"'),
       );
       expect(signingConfigs, <String, String> {'DEVELOPMENT_TEAM':'4444DDDD44'});
       verify(config.setValue('ios-signing-cert', 'iPhone Developer: Profile 3 (3333CCCC33)'));
diff --git a/packages/flutter_tools/test/ios/ios_workflow_test.dart b/packages/flutter_tools/test/ios/ios_workflow_test.dart
index 179799d8616..46926562a28 100644
--- a/packages/flutter_tools/test/ios/ios_workflow_test.dart
+++ b/packages/flutter_tools/test/ios/ios_workflow_test.dart
@@ -386,7 +386,7 @@ class IOSWorkflowTestTarget extends IOSValidator {
 
 class CocoaPodsTestTarget extends CocoaPodsValidator {
   CocoaPodsTestTarget({
-    this.hasHomebrew = true
+    this.hasHomebrew = true,
   });
 
   @override
diff --git a/packages/flutter_tools/test/ios/mac_test.dart b/packages/flutter_tools/test/ios/mac_test.dart
index 83fd8611f46..7f232e82110 100644
--- a/packages/flutter_tools/test/ios/mac_test.dart
+++ b/packages/flutter_tools/test/ios/mac_test.dart
@@ -153,7 +153,7 @@ void main() {
         // Let `idevicescreenshot` fail with exit code 1.
         when(mockProcessManager.run(<String>['idevicescreenshot', outputPath],
             environment: null,
-            workingDirectory: null
+            workingDirectory: null,
         )).thenAnswer((_) => Future<ProcessResult>.value(ProcessResult(4, 1, '', '')));
 
         expect(() async => await iMobileDevice.takeScreenshot(mockOutputFile), throwsA(anything));
@@ -170,7 +170,7 @@ void main() {
         await iMobileDevice.takeScreenshot(mockOutputFile);
         verify(mockProcessManager.run(<String>['idevicescreenshot', outputPath],
             environment: null,
-            workingDirectory: null
+            workingDirectory: null,
         ));
       }, overrides: <Type, Generator>{
         ProcessManager: () => mockProcessManager,
@@ -442,7 +442,7 @@ Could not build the precompiled application for the device.''',
     const List<String> flutterAssetPbxProjLines = <String>[
       '/* flutter_assets */',
       '/* App.framework',
-      'another line'
+      'another line',
     ];
 
     const List<String> appFlxPbxProjLines = <String>[
diff --git a/packages/flutter_tools/test/ios/simulators_test.dart b/packages/flutter_tools/test/ios/simulators_test.dart
index dcadc726822..ba2d8be81ab 100644
--- a/packages/flutter_tools/test/ios/simulators_test.dart
+++ b/packages/flutter_tools/test/ios/simulators_test.dart
@@ -195,7 +195,7 @@ void main() {
         when(mockXcode.minorVersion).thenReturn(1);
         expect(deviceUnderTest.supportsScreenshot, false);
       },
-      overrides: <Type, Generator>{Xcode: () => mockXcode}
+      overrides: <Type, Generator>{Xcode: () => mockXcode},
     );
 
     testUsingContext(
@@ -217,7 +217,7 @@ void main() {
               fs.path.join('some', 'path', 'to', 'screenshot.png'),
           ],
           environment: null,
-          workingDirectory: null
+          workingDirectory: null,
         ));
       },
       overrides: <Type, Generator>{
@@ -225,7 +225,7 @@ void main() {
         // Test a real one. Screenshot doesn't require instance states.
         SimControl: () => SimControl(),
         Xcode: () => mockXcode,
-      }
+      },
     );
   });
 
diff --git a/packages/flutter_tools/test/ios/xcode_backend_test.dart b/packages/flutter_tools/test/ios/xcode_backend_test.dart
index 26d0c63c402..4d4e958123c 100644
--- a/packages/flutter_tools/test/ios/xcode_backend_test.dart
+++ b/packages/flutter_tools/test/ios/xcode_backend_test.dart
@@ -32,7 +32,7 @@ const Map<String, String> localEngineDebugBuildModeRelease = <String, String>{
   'SOURCE_ROOT': '../../examples/hello_world',
   'FLUTTER_ROOT': '../..',
   'LOCAL_ENGINE': '/engine/src/out/ios_debug_unopt',
-  'CONFIGURATION': 'Release'
+  'CONFIGURATION': 'Release',
 };
 
 // Can't use a debug build with a profile engine.
diff --git a/packages/flutter_tools/test/ios/xcodeproj_test.dart b/packages/flutter_tools/test/ios/xcodeproj_test.dart
index 2769cdc6fc8..ed4fa5e07e4 100644
--- a/packages/flutter_tools/test/ios/xcodeproj_test.dart
+++ b/packages/flutter_tools/test/ios/xcodeproj_test.dart
@@ -110,7 +110,7 @@ void main() {
       fs.file(xcodebuild).deleteSync();
       expect(xcodeProjectInterpreter.isInstalled, isFalse);
     }, overrides: <Type, Generator>{
-      Platform: () => fakePlatform('notMacOS')
+      Platform: () => fakePlatform('notMacOS'),
     });
 
     testUsingOsxContext('isInstalled is false when xcodebuild does not exist', () {
diff --git a/packages/flutter_tools/test/linux/linux_workflow_test.dart b/packages/flutter_tools/test/linux/linux_workflow_test.dart
index 8961a5c57b9..2cd86f16d41 100644
--- a/packages/flutter_tools/test/linux/linux_workflow_test.dart
+++ b/packages/flutter_tools/test/linux/linux_workflow_test.dart
@@ -35,7 +35,7 @@ void main() {
       expect(linuxWorkflow.canLaunchDevices, true);
       expect(linuxWorkflow.canListDevices, true);
     }, overrides: <Type, Generator>{
-      Platform: () => linuxWithFde
+      Platform: () => linuxWithFde,
     });
   });
 }
diff --git a/packages/flutter_tools/test/runner/flutter_command_test.dart b/packages/flutter_tools/test/runner/flutter_command_test.dart
index 3b144478e40..f98371a0951 100644
--- a/packages/flutter_tools/test/runner/flutter_command_test.dart
+++ b/packages/flutter_tools/test/runner/flutter_command_test.dart
@@ -60,7 +60,7 @@ void main() {
         verify(usage.sendTiming(
                 captureAny, captureAny, captureAny,
                 label: captureAnyNamed('label'))).captured,
-        <dynamic>['flutter', 'dummy', const Duration(milliseconds: 1000), null]
+        <dynamic>['flutter', 'dummy', const Duration(milliseconds: 1000), null],
       );
     },
     overrides: <Type, Generator>{
@@ -93,7 +93,7 @@ void main() {
         ExitStatus.success,
         // nulls should be cleaned up.
         timingLabelParts: <String> ['blah1', 'blah2', null, 'blah3'],
-        endTimeOverride: DateTime.fromMillisecondsSinceEpoch(1500)
+        endTimeOverride: DateTime.fromMillisecondsSinceEpoch(1500),
       );
 
       final DummyFlutterCommand flutterCommand = DummyFlutterCommand(
@@ -144,8 +144,8 @@ void main() {
             'flutter',
             'dummy',
             const Duration(milliseconds: 1000),
-            'fail'
-          ]
+            'fail',
+          ],
         );
       }
     },
diff --git a/packages/flutter_tools/test/src/mocks.dart b/packages/flutter_tools/test/src/mocks.dart
index 0150d4cd1bd..b440e3f1d20 100644
--- a/packages/flutter_tools/test/src/mocks.dart
+++ b/packages/flutter_tools/test/src/mocks.dart
@@ -31,7 +31,7 @@ class MockApplicationPackageStore extends ApplicationPackageStore {
       id: 'io.flutter.android.mock',
       file: fs.file('/mock/path/to/android/SkyShell.apk'),
       versionCode: 1,
-      launchActivity: 'io.flutter.android.mock.MockActivity'
+      launchActivity: 'io.flutter.android.mock.MockActivity',
     ),
     iOS: BuildableIOSApp(MockIosProject())
   );
@@ -488,7 +488,7 @@ class MockResidentCompiler extends BasicMock implements ResidentCompiler {
     List<String> typeDefinitions,
     String libraryUri,
     String klass,
-    bool isStatic
+    bool isStatic,
   ) async {
     return null;
   }
diff --git a/packages/flutter_tools/test/tester/flutter_tester_test.dart b/packages/flutter_tools/test/tester/flutter_tester_test.dart
index 5b7aa26d8c5..a78f70f4f97 100644
--- a/packages/flutter_tools/test/tester/flutter_tester_test.dart
+++ b/packages/flutter_tools/test/tester/flutter_tester_test.dart
@@ -161,7 +161,7 @@ void main() {
 Observatory listening on $observatoryUri
 Hello!
 '''
-              .codeUnits
+              .codeUnits,
         ]));
 
         when(mockKernelCompiler.compile(
diff --git a/packages/flutter_tools/tool/daemon_client.dart b/packages/flutter_tools/tool/daemon_client.dart
index 9acd3b29bef..00bc4e3217f 100644
--- a/packages/flutter_tools/tool/daemon_client.dart
+++ b/packages/flutter_tools/tool/daemon_client.dart
@@ -44,13 +44,13 @@ Future<void> main() async {
           'deviceId': words[1],
           'projectDirectory': words[2],
           'launchMode': words[3],
-        }
+        },
       });
     } else if (words.first == 'stop') {
       if (words.length > 1) {
         _send(<String, dynamic>{
           'method': 'app.stop',
-          'params': <String, dynamic> { 'appId': words[1] }
+          'params': <String, dynamic> { 'appId': words[1] },
         });
       } else {
         _send(<String, dynamic>{'method': 'app.stop'});
@@ -59,7 +59,7 @@ Future<void> main() async {
       if (words.length > 1) {
         _send(<String, dynamic>{
           'method': 'app.restart',
-          'params': <String, dynamic> { 'appId': words[1] }
+          'params': <String, dynamic> { 'appId': words[1] },
         });
       } else {
         _send(<String, dynamic>{'method': 'app.restart'});
@@ -72,8 +72,8 @@ Future<void> main() async {
       _send(<String, dynamic>{
         'method': 'emulator.launch',
         'params': <String, dynamic>{
-          'emulatorId': words[1]
-        }
+          'emulatorId': words[1],
+        },
       });
     } else if (line == 'enable') {
       _send(<String, dynamic>{'method': 'device.enable'});
diff --git a/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart b/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart
index 66c48136140..d668dbdfe03 100644
--- a/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart
+++ b/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart
@@ -70,7 +70,7 @@ void main() {
                 'name': 'file://flutterBinary1',
                 'number': '1',
               },
-            }
+            },
           ],
         },
         <String, dynamic>{
@@ -85,7 +85,7 @@ void main() {
                 'name': 'file://flutterBinary2',
                 'number': '2',
               },
-            }
+            },
           ],
         },
       ];
diff --git a/packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart b/packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart
index 7c5a07c12a2..979698854aa 100644
--- a/packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart
+++ b/packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart
@@ -195,7 +195,7 @@ void main() {
           <String, dynamic>{
             'type': 'FlutterView',
           },
-        ]
+        ],
       };
 
       Future<json_rpc.Peer> mockVmConnectionFunction(