Add missing trailing commas (#28673)

* add trailing commas on list/map/parameters

* add trailing commas on Invocation with nb of arg>1

* add commas for widget containing widgets

* add trailing commas if instantiation contains trailing comma

* revert bad change
diff --git a/packages/flutter/lib/src/animation/animations.dart b/packages/flutter/lib/src/animation/animations.dart
index 2187219..80cc60e 100644
--- a/packages/flutter/lib/src/animation/animations.dart
+++ b/packages/flutter/lib/src/animation/animations.dart
@@ -373,7 +373,7 @@
   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 906a70b..751f5c9 100644
--- a/packages/flutter/lib/src/animation/listener_helpers.dart
+++ b/packages/flutter/lib/src/animation/listener_helpers.dart
@@ -133,7 +133,7 @@
           informationCollector: (StringBuffer information) {
             information.writeln('The $runtimeType notifying listeners was:');
             information.write('  $this');
-          }
+          },
         ));
       }
     }
@@ -199,7 +199,7 @@
           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 5482aa9..878106c 100644
--- a/packages/flutter/lib/src/cupertino/activity_indicator.dart
+++ b/packages/flutter/lib/src/cupertino/activity_indicator.dart
@@ -104,7 +104,7 @@
            -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 34ae20f..fb820e7 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 @@
     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 e7029dd..361589c 100644
--- a/packages/flutter/lib/src/cupertino/nav_bar.dart
+++ b/packages/flutter/lib/src/cupertino/nav_bar.dart
@@ -1676,7 +1676,7 @@
           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 1c6707a..0426341 100644
--- a/packages/flutter/lib/src/cupertino/picker.dart
+++ b/packages/flutter/lib/src/cupertino/picker.dart
@@ -267,7 +267,7 @@
               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 @@
         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 1a65ad4..d5721a3 100644
--- a/packages/flutter/lib/src/cupertino/refresh.dart
+++ b/packages/flutter/lib/src/cupertino/refresh.dart
@@ -532,7 +532,7 @@
           }
           return Container();
         },
-      )
+      ),
     );
   }
 }
diff --git a/packages/flutter/lib/src/cupertino/route.dart b/packages/flutter/lib/src/cupertino/route.dart
index e203df4..f7f6c3c 100644
--- a/packages/flutter/lib/src/cupertino/route.dart
+++ b/packages/flutter/lib/src/cupertino/route.dart
@@ -61,7 +61,7 @@
         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 90173d8..0972175 100644
--- a/packages/flutter/lib/src/cupertino/scrollbar.dart
+++ b/packages/flutter/lib/src/cupertino/scrollbar.dart
@@ -68,7 +68,7 @@
     );
     _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 56414a4..82ee261 100644
--- a/packages/flutter/lib/src/cupertino/switch.dart
+++ b/packages/flutter/lib/src/cupertino/switch.dart
@@ -165,7 +165,7 @@
       onChanged: onChanged,
       textDirection: Directionality.of(context),
       vsync: vsync,
-      dragStartBehavior: dragStartBehavior
+      dragStartBehavior: dragStartBehavior,
     );
   }
 
@@ -477,7 +477,7 @@
         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 4e56f5a..043fda3 100644
--- a/packages/flutter/lib/src/cupertino/tab_scaffold.dart
+++ b/packages/flutter/lib/src/cupertino/tab_scaffold.dart
@@ -255,7 +255,7 @@
             // 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 df4d461..f2b8ac6 100644
--- a/packages/flutter/lib/src/cupertino/text_selection.dart
+++ b/packages/flutter/lib/src/cupertino/text_selection.dart
@@ -107,7 +107,7 @@
       size: _kToolbarTriangleSize,
       child: CustomPaint(
         painter: _TextSelectionToolbarNotchPainter(),
-      )
+      ),
     );
 
     return Column(
@@ -252,7 +252,7 @@
           handlePaste: canPaste(delegate) ? () => handlePaste(delegate) : null,
           handleSelectAll: canSelectAll(delegate) ? () => handleSelectAll(delegate) : null,
         ),
-      )
+      ),
     );
   }
 
@@ -263,7 +263,7 @@
     // 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 @@
         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 0d88801..1499855 100644
--- a/packages/flutter/lib/src/foundation/assertions.dart
+++ b/packages/flutter/lib/src/foundation/assertions.dart
@@ -32,7 +32,7 @@
     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 88f21c2..aaca66d 100644
--- a/packages/flutter/lib/src/foundation/binding.dart
+++ b/packages/flutter/lib/src/foundation/binding.dart
@@ -143,7 +143,7 @@
           return <String, dynamic> {
             'value': ui.saveCompilationTrace(),
           };
-        }
+        },
       );
     }
 
@@ -178,7 +178,7 @@
                      .toString()
                      .substring('$TargetPlatform.'.length),
           };
-        }
+        },
       );
       return true;
     }());
@@ -280,7 +280,7 @@
   @protected
   void registerSignalServiceExtension({
     @required String name,
-    @required AsyncCallback callback
+    @required AsyncCallback callback,
   }) {
     assert(name != null);
     assert(callback != null);
@@ -289,7 +289,7 @@
       callback: (Map<String, String> parameters) async {
         await callback();
         return <String, dynamic>{};
-      }
+      },
     );
   }
 
@@ -311,7 +311,7 @@
   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 @@
           _postExtensionStateChangedEvent(name, await getter() ? 'true' : 'false');
         }
         return <String, dynamic>{ 'enabled': await getter() ? 'true' : 'false' };
-      }
+      },
     );
   }
 
@@ -345,7 +345,7 @@
   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 @@
           _postExtensionStateChangedEvent(name, (await getter()).toString());
         }
         return <String, dynamic>{ name: (await getter()).toString() };
-      }
+      },
     );
   }
 
@@ -407,7 +407,7 @@
   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 @@
           _postExtensionStateChangedEvent(name, await getter());
         }
         return <String, dynamic>{ 'value': await getter() };
-      }
+      },
     );
   }
 
@@ -478,7 +478,7 @@
   @protected
   void registerServiceExtension({
     @required String name,
-    @required ServiceExtensionCallback callback
+    @required ServiceExtensionCallback callback,
   }) {
     assert(name != null);
     assert(callback != null);
@@ -522,7 +522,7 @@
         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 @@
             '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 7a53b0e..8a27022 100644
--- a/packages/flutter/lib/src/foundation/change_notifier.dart
+++ b/packages/flutter/lib/src/foundation/change_notifier.dart
@@ -213,7 +213,7 @@
             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 ba56ff0..f955377 100644
--- a/packages/flutter/lib/src/foundation/debug.dart
+++ b/packages/flutter/lib/src/foundation/debug.dart
@@ -71,5 +71,5 @@
 ///  * [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 56ea434..796d33c 100644
--- a/packages/flutter/lib/src/gestures/binding.dart
+++ b/packages/flutter/lib/src/gestures/binding.dart
@@ -239,7 +239,7 @@
     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 7b16650..ddb7321 100644
--- a/packages/flutter/lib/src/gestures/converter.dart
+++ b/packages/flutter/lib/src/gestures/converter.dart
@@ -61,7 +61,7 @@
   static _PointerState _ensureStateForPointer(ui.PointerData datum, Offset position) {
     return _pointers.putIfAbsent(
       datum.device,
-      () => _PointerState(position)
+      () => _PointerState(position),
     );
   }
 
@@ -100,7 +100,7 @@
             radiusMin: radiusMin,
             radiusMax: radiusMax,
             orientation: datum.orientation,
-            tilt: datum.tilt
+            tilt: datum.tilt,
           );
           break;
         case ui.PointerChange.hover:
@@ -122,7 +122,7 @@
               radiusMin: radiusMin,
               radiusMax: radiusMax,
               orientation: datum.orientation,
-              tilt: datum.tilt
+              tilt: datum.tilt,
             );
           }
           final Offset offset = position - state.lastPosition;
@@ -145,7 +145,7 @@
             radiusMin: radiusMin,
             radiusMax: radiusMax,
             orientation: datum.orientation,
-            tilt: datum.tilt
+            tilt: datum.tilt,
           );
           state.lastPosition = position;
           break;
@@ -168,7 +168,7 @@
               radiusMin: radiusMin,
               radiusMax: radiusMax,
               orientation: datum.orientation,
-              tilt: datum.tilt
+              tilt: datum.tilt,
             );
           }
           if (state.lastPosition != position) {
@@ -220,7 +220,7 @@
             radiusMin: radiusMin,
             radiusMax: radiusMax,
             orientation: datum.orientation,
-            tilt: datum.tilt
+            tilt: datum.tilt,
           );
           break;
         case ui.PointerChange.move:
@@ -314,7 +314,7 @@
               radiusMin: radiusMin,
               radiusMax: radiusMax,
               orientation: datum.orientation,
-              tilt: datum.tilt
+              tilt: datum.tilt,
             );
           } else {
             yield PointerCancelEvent(
@@ -335,7 +335,7 @@
               radiusMin: radiusMin,
               radiusMax: radiusMax,
               orientation: datum.orientation,
-              tilt: datum.tilt
+              tilt: datum.tilt,
             );
           }
           break;
@@ -361,7 +361,7 @@
               radiusMin: radiusMin,
               radiusMax: radiusMax,
               orientation: datum.orientation,
-              tilt: datum.tilt
+              tilt: datum.tilt,
             );
           }
           _pointers.remove(datum.device);
@@ -374,7 +374,7 @@
             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 eebf316..9d2665b 100644
--- a/packages/flutter/lib/src/gestures/drag_details.dart
+++ b/packages/flutter/lib/src/gestures/drag_details.dart
@@ -103,7 +103,7 @@
     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 f2de126..099ef69 100644
--- a/packages/flutter/lib/src/gestures/events.dart
+++ b/packages/flutter/lib/src/gestures/events.dart
@@ -344,7 +344,7 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 509d7ea..599aa6a 100644
--- a/packages/flutter/lib/src/gestures/lsq_solver.dart
+++ b/packages/flutter/lib/src/gestures/lsq_solver.dart
@@ -55,7 +55,7 @@
   _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 ab34379..be2b1a5 100644
--- a/packages/flutter/lib/src/gestures/multitap.dart
+++ b/packages/flutter/lib/src/gestures/multitap.dart
@@ -108,7 +108,7 @@
     _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 @@
   _TapGesture({
     this.gestureRecognizer,
     PointerEvent event,
-    Duration longTapDelay
+    Duration longTapDelay,
   }) : _lastPosition = event.position,
        super(
     event: event,
@@ -350,7 +350,7 @@
     _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 fc252d7..5240dac 100644
--- a/packages/flutter/lib/src/gestures/pointer_router.dart
+++ b/packages/flutter/lib/src/gestures/pointer_router.dart
@@ -83,7 +83,7 @@
         informationCollector: (StringBuffer information) {
           information.writeln('Event:');
           information.write('  $event');
-        }
+        },
       ));
     }
   }
@@ -128,7 +128,7 @@
     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 7950484..3f01c4c 100644
--- a/packages/flutter/lib/src/gestures/recognizer.dart
+++ b/packages/flutter/lib/src/gestures/recognizer.dart
@@ -128,7 +128,7 @@
           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 320dd5c..34da3b9 100644
--- a/packages/flutter/lib/src/gestures/scale.dart
+++ b/packages/flutter/lib/src/gestures/scale.dart
@@ -158,7 +158,7 @@
     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 @@
         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 @@
         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 e9a1e3a..31a5d6c 100644
--- a/packages/flutter/lib/src/material/about.dart
+++ b/packages/flutter/lib/src/material/about.dart
@@ -47,7 +47,7 @@
     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 @@
           applicationVersion: applicationVersion,
           applicationIcon: applicationIcon,
           applicationLegalese: applicationLegalese,
-          children: aboutBoxChildren
+          children: aboutBoxChildren,
         );
-      }
+      },
     );
   }
 }
@@ -163,7 +163,7 @@
         applicationLegalese: applicationLegalese,
         children: children,
       );
-    }
+    },
   );
 }
 
@@ -185,14 +185,14 @@
   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 @@
             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 @@
               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 @@
     Key key,
     this.applicationName,
     this.applicationVersion,
-    this.applicationLegalese
+    this.applicationLegalese,
   }) : super(key: key);
 
   /// The name of the application.
@@ -398,8 +398,8 @@
           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 @@
           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 @@
               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 @@
       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 15286d0..cd14e3b 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 _PathFrames {
   const _PathFrames({
     @required this.commands,
-    @required this.opacities
+    @required this.opacities,
   });
 
   final List<_PathCommand> commands;
@@ -248,7 +248,7 @@
     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 edaf96f..99d24fa 100644
--- a/packages/flutter/lib/src/material/arc.dart
+++ b/packages/flutter/lib/src/material/arc.dart
@@ -248,11 +248,11 @@
     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 31504b5..0c16f49 100644
--- a/packages/flutter/lib/src/material/back_button.dart
+++ b/packages/flutter/lib/src/material/back_button.dart
@@ -89,7 +89,7 @@
       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 fb6cb59..7458be9 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 @@
             ),
             Semantics(
               label: indexLabel,
-            )
+            ),
           ],
         ),
       ),
diff --git a/packages/flutter/lib/src/material/bottom_sheet.dart b/packages/flutter/lib/src/material/bottom_sheet.dart
index 0f0a8da..ae837ca 100644
--- a/packages/flutter/lib/src/material/bottom_sheet.dart
+++ b/packages/flutter/lib/src/material/bottom_sheet.dart
@@ -57,7 +57,7 @@
     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 @@
       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 @@
               ),
             ),
           );
-        }
-      )
+        },
+      ),
     );
   }
 }
diff --git a/packages/flutter/lib/src/material/button_bar.dart b/packages/flutter/lib/src/material/button_bar.dart
index c1476d9..2e4ed41 100644
--- a/packages/flutter/lib/src/material/button_bar.dart
+++ b/packages/flutter/lib/src/material/button_bar.dart
@@ -60,16 +60,16 @@
       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 00a4cdc..0fa9eba 100644
--- a/packages/flutter/lib/src/material/data_table.dart
+++ b/packages/flutter/lib/src/material/data_table.dart
@@ -362,7 +362,7 @@
     Color color,
     bool checked,
     VoidCallback onRowTap,
-    ValueChanged<bool> onCheckboxChanged
+    ValueChanged<bool> onCheckboxChanged,
   }) {
     Widget contents = Semantics(
       container: true,
@@ -481,8 +481,8 @@
             color: isLightTheme ? Colors.black54 : Colors.white70,
           ),
           child: DropdownButtonHideUnderline(child: label),
-        )
-      )
+        ),
+      ),
     );
     if (onTap != null) {
       label = InkWell(
@@ -523,7 +523,7 @@
           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 @@
         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 8ba509d..d038f8e 100644
--- a/packages/flutter/lib/src/material/date_picker.dart
+++ b/packages/flutter/lib/src/material/date_picker.dart
@@ -431,7 +431,7 @@
           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 @@
 
     // 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 @@
           }
           return null;
         }
-      )
+      ),
     );
 
     return Theme(
diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart
index 01c1cad..642d0f0 100644
--- a/packages/flutter/lib/src/material/dialog.dart
+++ b/packages/flutter/lib/src/material/dialog.dart
@@ -361,7 +361,7 @@
       dialogChild = Semantics(
         namesRoute: true,
         label: label,
-        child: dialogChild
+        child: dialogChild,
       );
 
     return Dialog(
@@ -430,7 +430,7 @@
       onTap: onPressed,
       child: Padding(
         padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24.0),
-        child: child
+        child: child,
       ),
     );
   }
@@ -595,7 +595,7 @@
         child: DefaultTextStyle(
           style: Theme.of(context).textTheme.title,
           child: Semantics(namesRoute: true, child: title),
-        )
+        ),
       ));
     } else {
       switch (defaultTargetPlatform) {
@@ -613,7 +613,7 @@
         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 3f24311..3fd0b79 100644
--- a/packages/flutter/lib/src/material/dialog_theme.dart
+++ b/packages/flutter/lib/src/material/dialog_theme.dart
@@ -96,7 +96,7 @@
       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 ba57fcd..74ac02a 100644
--- a/packages/flutter/lib/src/material/divider.dart
+++ b/packages/flutter/lib/src/material/divider.dart
@@ -36,7 +36,7 @@
     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 @@
     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 f1c4f15..5da068a 100644
--- a/packages/flutter/lib/src/material/dropdown.dart
+++ b/packages/flutter/lib/src/material/dropdown.dart
@@ -40,7 +40,7 @@
          // 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 @@
       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 ec884ac..7eac3fe 100644
--- a/packages/flutter/lib/src/material/expand_icon.dart
+++ b/packages/flutter/lib/src/material/expand_icon.dart
@@ -30,7 +30,7 @@
     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 @@
         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 a817536..e3cd7d8 100644
--- a/packages/flutter/lib/src/material/expansion_panel.dart
+++ b/packages/flutter/lib/src/material/expansion_panel.dart
@@ -67,7 +67,7 @@
   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 5e9778f..4eaed6a 100644
--- a/packages/flutter/lib/src/material/expansion_tile.dart
+++ b/packages/flutter/lib/src/material/expansion_tile.dart
@@ -149,7 +149,7 @@
         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 7476f88..cbef109 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 @@
     this.background,
     this.centerTitle,
     this.titlePadding,
-    this.collapseMode = CollapseMode.parallax
+    this.collapseMode = CollapseMode.parallax,
   }) : assert(collapseMode != null),
        super(key: key);
 
@@ -192,8 +192,8 @@
           height: settings.maxExtent,
           child: Opacity(
             opacity: opacity,
-            child: widget.background
-          )
+            child: widget.background,
+          ),
         ));
       }
     }
@@ -223,7 +223,7 @@
         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 @@
               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 2500b11..1df0ae8 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 @@
     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 @@
     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 @@
                 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 @@
             style: darkTheme.textTheme.subhead,
             softWrap: false,
             overflow: TextOverflow.ellipsis,
-            child: title ?? subtitle
-          )
+            child: title ?? subtitle,
+          ),
         )
       );
     }
@@ -126,10 +126,10 @@
           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 3c1dd4d..23b26f2 100644
--- a/packages/flutter/lib/src/material/icon_button.dart
+++ b/packages/flutter/lib/src/material/icon_button.dart
@@ -146,7 +146,7 @@
     this.splashColor,
     this.disabledColor,
     @required this.onPressed,
-    this.tooltip
+    this.tooltip,
   }) : assert(iconSize != null),
        assert(padding != null),
        assert(alignment != null),
@@ -272,9 +272,9 @@
               child: IconTheme.merge(
                 data: IconThemeData(
                   size: iconSize,
-                  color: currentColor
+                  color: currentColor,
                 ),
-                child: icon
+                child: icon,
               ),
             ),
           ),
@@ -285,7 +285,7 @@
     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 a8eedd4..580d456 100644
--- a/packages/flutter/lib/src/material/input_decorator.dart
+++ b/packages/flutter/lib/src/material/input_decorator.dart
@@ -1408,7 +1408,7 @@
     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 bce2c08..94ce0ae 100644
--- a/packages/flutter/lib/src/material/list_tile.dart
+++ b/packages/flutter/lib/src/material/list_tile.dart
@@ -444,7 +444,7 @@
     final Widget titleText = AnimatedDefaultTextStyle(
       style: titleStyle,
       duration: kThemeChangeDuration,
-      child: title ?? const SizedBox()
+      child: title ?? const SizedBox(),
     );
 
     Widget subtitleText;
@@ -883,7 +883,7 @@
   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 00c1ed8..a5c7f27 100644
--- a/packages/flutter/lib/src/material/material.dart
+++ b/packages/flutter/lib/src/material/material.dart
@@ -326,7 +326,7 @@
       contents = AnimatedDefaultTextStyle(
         style: widget.textStyle ?? Theme.of(context).textTheme.body1,
         duration: widget.animationDuration,
-        child: contents
+        child: contents,
       );
     }
     contents = NotificationListener<LayoutChangedNotification>(
@@ -340,7 +340,7 @@
         color: backgroundColor,
         child: contents,
         vsync: this,
-      )
+      ),
     );
 
     // PhysicalModel has a temporary workaround for a performance issue that
@@ -713,7 +713,7 @@
       ),
       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 757b6d3..9bab283 100644
--- a/packages/flutter/lib/src/material/mergeable_material.dart
+++ b/packages/flutter/lib/src/material/mergeable_material.dart
@@ -62,7 +62,7 @@
   /// 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 @@
     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 @@
     this.startAnimation,
     this.endAnimation,
     this.gapAnimation,
-    this.gapStart = 0.0
+    this.gapStart = 0.0,
   });
 
   final AnimationController controller;
@@ -177,15 +177,15 @@
 
     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 @@
       controller: controller,
       startAnimation: startAnimation,
       endAnimation: endAnimation,
-      gapAnimation: gapAnimation
+      gapAnimation: gapAnimation,
     );
   }
 
@@ -413,7 +413,7 @@
             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 @@
       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 @@
     return lerpDouble(
       _animationTuples[gap.key].gapStart,
       gap.size,
-      _animationTuples[gap.key].gapAnimation.value
+      _animationTuples[gap.key].gapAnimation.value,
     );
   }
 
@@ -528,12 +528,12 @@
             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 @@
         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 @@
           } else {
             border = Border(
               top: hasTopDivider ? divider : BorderSide.none,
-              bottom: hasBottomDivider ? divider : BorderSide.none
+              bottom: hasBottomDivider ? divider : BorderSide.none,
             );
           }
 
@@ -580,14 +580,14 @@
             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 @@
           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 @@
       mainAxis: widget.mainAxis,
       boxShadows: kElevationToShadow[widget.elevation],
       items: _children,
-      children: widgets
+      children: widgets,
     );
   }
 }
@@ -648,7 +648,7 @@
     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 @@
   _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 8437954..e845022 100644
--- a/packages/flutter/lib/src/material/outline_button.dart
+++ b/packages/flutter/lib/src/material/outline_button.dart
@@ -303,7 +303,7 @@
 
     _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 a996344..3f4ee28 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 @@
       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 162e8db..46fa134 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 @@
     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 @@
   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 @@
     }
     return DataRow.byIndex(
       index: index,
-      cells: cells
+      cells: cells,
     );
   }
 
@@ -336,7 +336,7 @@
         .map<DropdownMenuItem<int>>((int value) {
           return DropdownMenuItem<int>(
             value: value,
-            child: Text('$value')
+            child: Text('$value'),
           );
         })
         .toList();
@@ -367,7 +367,7 @@
           _firstRowIndex + 1,
           _firstRowIndex + widget.rowsPerPage,
           _rowCount,
-          _rowCountApproximate
+          _rowCountApproximate,
         )
       ),
       Container(width: 32.0),
@@ -375,14 +375,14 @@
         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 @@
                       padding: EdgeInsetsDirectional.only(start: startPadding, end: 14.0),
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.end,
-                        children: headerWidgets
+                        children: headerWidgets,
                       ),
                     ),
                   ),
@@ -430,8 +430,8 @@
               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 a9eca72..b1b47fc 100644
--- a/packages/flutter/lib/src/material/popup_menu.dart
+++ b/packages/flutter/lib/src/material/popup_menu.dart
@@ -256,7 +256,7 @@
         baseline: widget.height - _kBaselineOffsetFromBottom,
         baselineType: style.textBaseline,
         child: buildChild(),
-      )
+      ),
     );
     if (!widget.enabled) {
       final bool isDark = theme.brightness == Brightness.dark;
@@ -412,7 +412,7 @@
       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 @@
       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 @@
     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 98ddb65..b2b95ad 100644
--- a/packages/flutter/lib/src/material/refresh_indicator.dart
+++ b/packages/flutter/lib/src/material/refresh_indicator.dart
@@ -189,7 +189,7 @@
     _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 3890f4f..7127695 100644
--- a/packages/flutter/lib/src/material/reorderable_list.dart
+++ b/packages/flutter/lib/src/material/reorderable_list.dart
@@ -492,7 +492,7 @@
           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 fe134ea..3c5b4a8 100644
--- a/packages/flutter/lib/src/material/scaffold.dart
+++ b/packages/flutter/lib/src/material/scaffold.dart
@@ -220,7 +220,7 @@
     final Rect scaledButton = Rect.lerp(
       floatingActionButtonArea.center & Size.zero,
       floatingActionButtonArea,
-      scaleFactor
+      scaleFactor,
     );
     return copyWith(floatingActionButtonArea: scaledButton);
   }
@@ -1368,7 +1368,7 @@
         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 @@
           });
         }
       },
-      builder: builder
+      builder: builder,
     );
 
     if (isLocalHistoryEntry)
@@ -1855,7 +1855,7 @@
               child: SafeArea(
                 top: false,
                 child: ButtonBar(
-                  children: widget.persistentFooterButtons
+                  children: widget.persistentFooterButtons,
                 ),
               ),
             ),
@@ -2008,7 +2008,7 @@
     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 @@
         return Align(
           alignment: AlignmentDirectional.topStart,
           heightFactor: widget.animationController.value,
-          child: child
+          child: child,
         );
       },
       child: Semantics(
@@ -2066,9 +2066,9 @@
           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 7b03fb8..d91048b 100644
--- a/packages/flutter/lib/src/material/scrollbar.dart
+++ b/packages/flutter/lib/src/material/scrollbar.dart
@@ -70,7 +70,7 @@
     );
     _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 50f12cc..19263a6 100644
--- a/packages/flutter/lib/src/material/slider.dart
+++ b/packages/flutter/lib/src/material/slider.dart
@@ -967,7 +967,7 @@
       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 @@
       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 c4e0b07..4a731cd 100644
--- a/packages/flutter/lib/src/material/slider_theme.dart
+++ b/packages/flutter/lib/src/material/slider_theme.dart
@@ -1040,7 +1040,7 @@
         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 @@
   // 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 7664186..3764e0b 100644
--- a/packages/flutter/lib/src/material/stepper.dart
+++ b/packages/flutter/lib/src/material/stepper.dart
@@ -505,7 +505,7 @@
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       mainAxisSize: MainAxisSize.min,
-      children: children
+      children: children,
     );
   }
 
@@ -521,14 +521,14 @@
               _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 @@
                 if (widget.onStepTapped != null)
                   widget.onStepTapped(i);
               } : null,
-              child: _buildVerticalHeader(i)
+              child: _buildVerticalHeader(i),
             ),
-            _buildVerticalBody(i)
-          ]
+            _buildVerticalBody(i),
+          ],
         )
       );
     }
@@ -709,7 +709,7 @@
 // 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 65fc798..bad1185 100644
--- a/packages/flutter/lib/src/material/switch.dart
+++ b/packages/flutter/lib/src/material/switch.dart
@@ -508,7 +508,7 @@
       color: color,
       image: image == null ? null : DecorationImage(image: image),
       shape: BoxShape.circle,
-      boxShadow: kElevationToShadow[1]
+      boxShadow: kElevationToShadow[1],
     );
   }
 
@@ -565,14 +565,14 @@
       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 @@
       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 9c40c88..986cfc3 100644
--- a/packages/flutter/lib/src/material/tab_controller.dart
+++ b/packages/flutter/lib/src/material/tab_controller.dart
@@ -86,7 +86,7 @@
       _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 @@
     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 5a6ac3f..005a6ea 100644
--- a/packages/flutter/lib/src/material/tabs.dart
+++ b/packages/flutter/lib/src/material/tabs.dart
@@ -108,8 +108,8 @@
             child: icon,
             margin: const EdgeInsets.only(bottom: 10.0),
           ),
-          _buildLabelText()
-        ]
+          _buildLabelText(),
+        ],
       );
     }
 
@@ -1005,7 +1005,7 @@
                 selected: index == _currentIndex,
                 label: localizations.tabLabel(tabIndex: index + 1, tabCount: tabCount),
               ),
-            ]
+            ],
           ),
         ),
       );
@@ -1388,7 +1388,7 @@
             }).toList(),
           ),
         );
-      }
+      },
     );
   }
 }
diff --git a/packages/flutter/lib/src/material/text_field.dart b/packages/flutter/lib/src/material/text_field.dart
index fabe631..083665b 100644
--- a/packages/flutter/lib/src/material/text_field.dart
+++ b/packages/flutter/lib/src/material/text_field.dart
@@ -495,7 +495,7 @@
       .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 5f0ee5f..9024b5a 100644
--- a/packages/flutter/lib/src/material/text_selection.dart
+++ b/packages/flutter/lib/src/material/text_selection.dart
@@ -51,8 +51,8 @@
       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 @@
           handlePaste: canPaste(delegate) ? () => handlePaste(delegate) : null,
           handleSelectAll: canSelectAll(delegate) ? () => handleSelectAll(delegate) : null,
         ),
-      )
+      ),
     );
   }
 
@@ -174,14 +174,14 @@
       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 1170478..cb62cae 100644
--- a/packages/flutter/lib/src/material/theme.dart
+++ b/packages/flutter/lib/src/material/theme.dart
@@ -168,7 +168,7 @@
   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 @@
     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 4abb7ed..8caa644 100644
--- a/packages/flutter/lib/src/material/theme_data.dart
+++ b/packages/flutter/lib/src/material/theme_data.dart
@@ -160,7 +160,7 @@
     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 8a2952d..077d6b3 100644
--- a/packages/flutter/lib/src/material/time_picker.dart
+++ b/packages/flutter/lib/src/material/time_picker.dart
@@ -792,7 +792,7 @@
             );
           })
           .toList(),
-      )
+      ),
     );
   }
 }
@@ -895,7 +895,7 @@
     canvas.drawLine(centerPoint, focusedPoint, selectorPaint);
 
     final Rect focusedRect = Rect.fromCircle(
-      center: focusedPoint, radius: focusedRadius
+      center: focusedPoint, radius: focusedRadius,
     );
     canvas
       ..save()
@@ -999,7 +999,7 @@
     @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 @@
           activeRing: _activeRing,
           textDirection: Directionality.of(context),
         ),
-      )
+      ),
     );
   }
 }
@@ -1425,7 +1425,7 @@
   /// [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 @@
           use24HourDials: use24HourDials,
           selectedTime: _selectedTime,
           onChanged: _handleTimeChanged,
-        )
-      )
+        ),
+      ),
     );
 
     final Widget actions = ButtonTheme.bar(
@@ -1556,14 +1556,14 @@
         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 @@
                     Expanded(
                       child: pickerAndActions,
                     ),
-                  ]
-                )
+                  ],
+                ),
               );
             case Orientation.landscape:
               return SizedBox(
@@ -1631,13 +1631,13 @@
                     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 3953586..8341b24 100644
--- a/packages/flutter/lib/src/material/tooltip.dart
+++ b/packages/flutter/lib/src/material/tooltip.dart
@@ -137,11 +137,11 @@
       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 f9a608b..0efde2b 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 @@
                     height: 48.0,
                     child: picture,
                  ),
-                )
+                ),
               );
             }).toList(),
           ),
@@ -56,7 +56,7 @@
             child: SizedBox(
               width: 72.0,
               height: 72.0,
-              child: currentAccountPicture
+              child: currentAccountPicture,
             ),
           ),
         ),
@@ -309,7 +309,7 @@
     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 @@
                     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 b944a44..150d03d 100644
--- a/packages/flutter/lib/src/painting/borders.dart
+++ b/packages/flutter/lib/src/painting/borders.dart
@@ -121,7 +121,7 @@
   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 f0cb446..1b2715b 100644
--- a/packages/flutter/lib/src/painting/box_shadow.dart
+++ b/packages/flutter/lib/src/painting/box_shadow.dart
@@ -33,7 +33,7 @@
     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 @@
       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 18462ea..b3bdc09 100644
--- a/packages/flutter/lib/src/painting/decoration_image.dart
+++ b/packages/flutter/lib/src/painting/decoration_image.dart
@@ -261,7 +261,7 @@
       centerSlice: _details.centerSlice,
       repeat: _details.repeat,
       flipHorizontally: flipHorizontally,
-      filterQuality: FilterQuality.low
+      filterQuality: FilterQuality.low,
     );
 
     if (clipPath != null)
@@ -373,7 +373,7 @@
   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 @@
   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 @@
   }
   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 4c16dcd..dbafafe 100644
--- a/packages/flutter/lib/src/painting/edge_insets.dart
+++ b/packages/flutter/lib/src/painting/edge_insets.dart
@@ -349,7 +349,7 @@
     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 @@
     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 8811f70..4673335 100644
--- a/packages/flutter/lib/src/painting/flutter_logo.dart
+++ b/packages/flutter/lib/src/painting/flutter_logo.dart
@@ -228,7 +228,7 @@
       darkColor,
       textColor,
       _position,
-      _opacity
+      _opacity,
     );
   }
 
@@ -418,7 +418,7 @@
       offset.dx + (canvasSize.width - centerSquareHeight) / 2.0,
       offset.dy + (canvasSize.height - centerSquareHeight) / 2.0,
       centerSquareHeight,
-      centerSquareHeight
+      centerSquareHeight,
     );
 
     Rect logoTargetSquare;
@@ -432,7 +432,7 @@
         rect.left + (rect.width - logoHeight) / 2.0,
         rect.top,
         logoHeight,
-        logoHeight
+        logoHeight,
       );
     } else {
       // only the mark
@@ -447,7 +447,7 @@
           ..colorFilter = ColorFilter.mode(
             const Color(0xFFFFFFFF).withOpacity(_config._opacity),
             BlendMode.modulate,
-          )
+          ),
       );
     }
     if (_config._position != 0.0) {
@@ -462,7 +462,7 @@
           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 @@
         }
         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 @@
               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 9dd4784..cba3411 100644
--- a/packages/flutter/lib/src/painting/gradient.dart
+++ b/packages/flutter/lib/src/painting/gradient.dart
@@ -32,7 +32,7 @@
   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 @@
     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 @@
       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 4c27b26..4d7ec57 100644
--- a/packages/flutter/lib/src/painting/image_provider.dart
+++ b/packages/flutter/lib/src/painting/image_provider.dart
@@ -277,7 +277,7 @@
           if (obtainedKey != null) {
             information.writeln('Image key: $obtainedKey');
           }
-        }
+        },
       );
     }
 
@@ -381,7 +381,7 @@
   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 @@
       informationCollector: (StringBuffer information) {
         information.writeln('Image provider: $this');
         information.write('Image key: $key');
-      }
+      },
     );
   }
 
@@ -492,7 +492,7 @@
       informationCollector: (StringBuffer information) {
         information.writeln('Image provider: $this');
         information.write('Image key: $key');
-      }
+      },
     );
   }
 
@@ -565,7 +565,7 @@
       scale: key.scale,
       informationCollector: (StringBuffer information) {
         information.writeln('Path: ${file?.path}');
-      }
+      },
     );
   }
 
@@ -630,7 +630,7 @@
   ImageStreamCompleter load(MemoryImage key) {
     return MultiFrameImageStreamCompleter(
       codec: _loadAsync(key),
-      scale: key.scale
+      scale: key.scale,
     );
   }
 
@@ -772,7 +772,7 @@
     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 73f38e0..7d2d59a 100644
--- a/packages/flutter/lib/src/painting/image_resolution.dart
+++ b/packages/flutter/lib/src/painting/image_resolution.dart
@@ -176,13 +176,13 @@
         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 72d837e..792852a 100644
--- a/packages/flutter/lib/src/painting/image_stream.dart
+++ b/packages/flutter/lib/src/painting/image_stream.dart
@@ -505,7 +505,7 @@
   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 8700781..31164ac 100644
--- a/packages/flutter/lib/src/painting/matrix_utils.dart
+++ b/packages/flutter/lib/src/painting/matrix_utils.dart
@@ -144,7 +144,7 @@
         _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 03051e6..d52d030 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 @@
       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 ab6d007..e4a308a 100644
--- a/packages/flutter/lib/src/painting/stadium_border.dart
+++ b/packages/flutter/lib/src/painting/stadium_border.dart
@@ -363,7 +363,7 @@
     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 667e11e..4444ac6 100644
--- a/packages/flutter/lib/src/painting/text_style.dart
+++ b/packages/flutter/lib/src/painting/text_style.dart
@@ -990,7 +990,7 @@
       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 d922410..69f5147 100644
--- a/packages/flutter/lib/src/physics/clamped_simulation.dart
+++ b/packages/flutter/lib/src/physics/clamped_simulation.dart
@@ -25,7 +25,7 @@
     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 8403d36..10125a4 100644
--- a/packages/flutter/lib/src/physics/friction_simulation.dart
+++ b/packages/flutter/lib/src/physics/friction_simulation.dart
@@ -104,7 +104,7 @@
     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 0128d2a..3c3ee4b 100644
--- a/packages/flutter/lib/src/physics/gravity_simulation.dart
+++ b/packages/flutter/lib/src/physics/gravity_simulation.dart
@@ -55,7 +55,7 @@
     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 f662281..660394f 100644
--- a/packages/flutter/lib/src/physics/spring_simulation.dart
+++ b/packages/flutter/lib/src/physics/spring_simulation.dart
@@ -18,7 +18,7 @@
   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 @@
   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 @@
   factory _SpringSolution(
     SpringDescription spring,
     double initialPosition,
-    double initialVelocity
+    double initialVelocity,
   ) {
     assert(spring != null);
     assert(spring.mass != null);
@@ -174,7 +174,7 @@
   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 @@
   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 @@
   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 1ec77a9..056c83d 100644
--- a/packages/flutter/lib/src/physics/tolerance.dart
+++ b/packages/flutter/lib/src/physics/tolerance.dart
@@ -12,7 +12,7 @@
   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 3e161ee..c9456b8 100644
--- a/packages/flutter/lib/src/rendering/animated_size.dart
+++ b/packages/flutter/lib/src/rendering/animated_size.dart
@@ -94,7 +94,7 @@
     });
     _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 f6f9bcd..eb4d494 100644
--- a/packages/flutter/lib/src/rendering/box.dart
+++ b/packages/flutter/lib/src/rendering/box.dart
@@ -89,7 +89,7 @@
     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 @@
   ///    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 @@
   ///    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 @@
   /// 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 @@
     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 @@
       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 @@
       minWidth: 0.0,
       maxWidth: maxWidth,
       minHeight: 0.0,
-      maxHeight: maxHeight
+      maxHeight: maxHeight,
     );
   }
 
@@ -213,7 +213,7 @@
       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 @@
       minWidth: minHeight,
       maxWidth: maxHeight,
       minHeight: minWidth,
-      maxHeight: maxWidth
+      maxHeight: maxWidth,
     );
   }
 
@@ -410,7 +410,7 @@
       minWidth: minWidth * factor,
       maxWidth: maxWidth * factor,
       minHeight: minHeight * factor,
-      maxHeight: maxHeight * factor
+      maxHeight: maxHeight * factor,
     );
   }
 
@@ -420,7 +420,7 @@
       minWidth: minWidth / factor,
       maxWidth: maxWidth / factor,
       minHeight: minHeight / factor,
-      maxHeight: maxHeight / factor
+      maxHeight: maxHeight / factor,
     );
   }
 
@@ -430,7 +430,7 @@
       minWidth: (minWidth ~/ factor).toDouble(),
       maxWidth: (maxWidth ~/ factor).toDouble(),
       minHeight: (minHeight ~/ factor).toDouble(),
-      maxHeight: (maxHeight ~/ factor).toDouble()
+      maxHeight: (maxHeight ~/ factor).toDouble(),
     );
   }
 
@@ -440,7 +440,7 @@
       minWidth: minWidth % value,
       maxWidth: maxWidth % value,
       minHeight: minHeight % value,
-      maxHeight: maxHeight % value
+      maxHeight: maxHeight % value,
     );
   }
 
@@ -565,7 +565,7 @@
       minWidth: minWidth,
       maxWidth: minWidth > maxWidth ? minWidth : maxWidth,
       minHeight: minHeight,
-      maxHeight: minHeight > maxHeight ? minHeight : maxHeight
+      maxHeight: minHeight > maxHeight ? minHeight : maxHeight,
     );
   }
 
@@ -1096,7 +1096,7 @@
       _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 6f5ec14..e8a53c8 100644
--- a/packages/flutter/lib/src/rendering/custom_layout.dart
+++ b/packages/flutter/lib/src/rendering/custom_layout.dart
@@ -285,7 +285,7 @@
   /// 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 66a74bc..cbb9492 100644
--- a/packages/flutter/lib/src/rendering/editable.dart
+++ b/packages/flutter/lib/src/rendering/editable.dart
@@ -415,7 +415,7 @@
         onSelectionChanged(
           TextSelection(
             baseOffset: _baseOffset,
-            extentOffset: newOffset
+            extentOffset: newOffset,
           ),
           this,
           SelectionChangedCause.keyboard,
@@ -424,7 +424,7 @@
         onSelectionChanged(
           TextSelection(
             baseOffset: newOffset,
-            extentOffset: _baseOffset
+            extentOffset: _baseOffset,
           ),
           this,
           SelectionChangedCause.keyboard,
@@ -511,12 +511,12 @@
       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 @@
       _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 a8552b3..d34c5f4 100644
--- a/packages/flutter/lib/src/rendering/error.dart
+++ b/packages/flutter/lib/src/rendering/error.dart
@@ -90,7 +90,7 @@
     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 71b2af6..5468ee3 100644
--- a/packages/flutter/lib/src/rendering/flex.dart
+++ b/packages/flutter/lib/src/rendering/flex.dart
@@ -480,7 +480,7 @@
   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 @@
     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 @@
     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 @@
     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 @@
     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 d035571..d9ebec0 100644
--- a/packages/flutter/lib/src/rendering/flow.dart
+++ b/packages/flutter/lib/src/rendering/flow.dart
@@ -181,7 +181,7 @@
   /// [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 6f12dfa..73d9bd4 100644
--- a/packages/flutter/lib/src/rendering/image.dart
+++ b/packages/flutter/lib/src/rendering/image.dart
@@ -38,7 +38,7 @@
     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 @@
     // be treated uniformly.
     constraints = BoxConstraints.tightFor(
       width: _width,
-      height: _height
+      height: _height,
     ).enforce(constraints);
 
     if (_image == null)
@@ -307,7 +307,7 @@
 
     return constraints.constrainSizeAndAttemptToPreserveAspectRatio(Size(
       _image.width.toDouble() / _scale,
-      _image.height.toDouble() / _scale
+      _image.height.toDouble() / _scale,
     ));
   }
 
@@ -366,7 +366,7 @@
       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 bd3b4c5..a222826 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 @@
     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 @@
               child,
               cylindricalTransform,
               offsetToCenter);
-          }
+          },
       );
     } else {
       _paintChildCylindrically(
diff --git a/packages/flutter/lib/src/rendering/object.dart b/packages/flutter/lib/src/rendering/object.dart
index a6520b1..69df942 100644
--- a/packages/flutter/lib/src/rendering/object.dart
+++ b/packages/flutter/lib/src/rendering/object.dart
@@ -577,7 +577,7 @@
   /// 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 @@
           information.writeln('This RenderObject has no descendants.');
         }
         information.writeAll(descendants, '\n');
-      }
+      },
     ));
   }
 
@@ -1570,7 +1570,7 @@
             information.writeln(stack[targetFrame]);
           }
         }
-      }
+      },
     ));
     assert(!_debugDoingThisResize);
     assert(!_debugDoingThisLayout);
@@ -1735,7 +1735,7 @@
   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 @@
     String context,
     this.renderObject,
     InformationCollector informationCollector,
-    bool silent = false
+    bool silent = false,
   }) : super(
     exception: exception,
     stack: stack,
@@ -3180,7 +3180,7 @@
 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 fef206d..d5345aa 100644
--- a/packages/flutter/lib/src/rendering/platform_view.dart
+++ b/packages/flutter/lib/src/rendering/platform_view.dart
@@ -610,7 +610,7 @@
         deviceId: 0,
         edgeFlags: 0,
         source: 0,
-        flags: 0
+        flags: 0,
     );
     viewController.sendMotionEvent(androidMotionEvent);
   }
@@ -626,7 +626,7 @@
         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 5d4e48f..58eb19d 100644
--- a/packages/flutter/lib/src/rendering/proxy_box.dart
+++ b/packages/flutter/lib/src/rendering/proxy_box.dart
@@ -148,7 +148,7 @@
   /// 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 @@
   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 @@
       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 @@
   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 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 @@
     AlignmentGeometry alignment,
     TextDirection textDirection,
     this.transformHitTests = true,
-    RenderBox child
+    RenderBox child,
   }) : assert(transform != null),
        super(child) {
     this.transform = transform;
@@ -2393,7 +2393,7 @@
   RenderFractionalTranslation({
     @required Offset translation,
     this.transformHitTests = true,
-    RenderBox child
+    RenderBox child,
   }) : assert(translation != null),
        _translation = translation,
        super(child);
@@ -2883,7 +2883,7 @@
   RenderIgnorePointer({
     RenderBox child,
     bool ignoring = true,
-    bool ignoringSemantics
+    bool ignoringSemantics,
   }) : _ignoring = ignoring,
        _ignoringSemantics = ignoringSemantics,
        super(child) {
@@ -2958,7 +2958,7 @@
   /// Creates an offstage render object.
   RenderOffstage({
     bool offstage = true,
-    RenderBox child
+    RenderBox child,
   }) : assert(offstage != null),
        _offstage = offstage,
        super(child);
@@ -3169,7 +3169,7 @@
   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 @@
     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 a19acc9..ec989e6 100644
--- a/packages/flutter/lib/src/rendering/rotated_box.dart
+++ b/packages/flutter/lib/src/rendering/rotated_box.dart
@@ -25,7 +25,7 @@
   /// 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 169ef74..f5dc34c 100644
--- a/packages/flutter/lib/src/rendering/shifted_box.dart
+++ b/packages/flutter/lib/src/rendering/shifted_box.dart
@@ -191,7 +191,7 @@
     if (child == null) {
       size = constraints.constrain(Size(
         _resolvedPadding.left + _resolvedPadding.right,
-        _resolvedPadding.top + _resolvedPadding.bottom
+        _resolvedPadding.top + _resolvedPadding.bottom,
       ));
       return;
     }
@@ -201,7 +201,7 @@
     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 @@
       minWidth: _minWidth ?? constraints.minWidth,
       maxWidth: _maxWidth ?? constraints.maxWidth,
       minHeight: _minHeight ?? constraints.minHeight,
-      maxHeight: _maxHeight ?? constraints.maxHeight
+      maxHeight: _maxHeight ?? constraints.maxHeight,
     );
   }
 
@@ -869,7 +869,7 @@
       minWidth: minWidth,
       maxWidth: maxWidth,
       minHeight: minHeight,
-      maxHeight: maxHeight
+      maxHeight: maxHeight,
     );
   }
 
@@ -1032,7 +1032,7 @@
   /// 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 a493cd2..c09253d 100644
--- a/packages/flutter/lib/src/rendering/sliver.dart
+++ b/packages/flutter/lib/src/rendering/sliver.dart
@@ -724,7 +724,7 @@
         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 @@
         result.add(SliverHitTestEntry(
           this,
           mainAxisPosition: mainAxisPosition,
-          crossAxisPosition: crossAxisPosition
+          crossAxisPosition: crossAxisPosition,
         ));
         return true;
       }
@@ -1369,7 +1369,7 @@
           ..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 f2de999..e950078 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 @@
   ///
   /// 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 360d32e..94cac93 100644
--- a/packages/flutter/lib/src/rendering/stack.dart
+++ b/packages/flutter/lib/src/rendering/stack.dart
@@ -50,7 +50,7 @@
       rect.left - container.left,
       rect.top - container.top,
       container.right - rect.right,
-      container.bottom - rect.bottom
+      container.bottom - rect.bottom,
     );
   }
 
@@ -104,7 +104,7 @@
       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 c68dd1b..4ae4b5a 100644
--- a/packages/flutter/lib/src/rendering/table.dart
+++ b/packages/flutter/lib/src/rendering/table.dart
@@ -237,7 +237,7 @@
   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 @@
   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 @@
   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 @@
   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 @@
     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 @@
           _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 6764873..233afcc 100644
--- a/packages/flutter/lib/src/rendering/viewport.dart
+++ b/packages/flutter/lib/src/rendering/viewport.dart
@@ -576,7 +576,7 @@
       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 1a7f950..d0b8385 100644
--- a/packages/flutter/lib/src/scheduler/binding.dart
+++ b/packages/flutter/lib/src/scheduler/binding.dart
@@ -379,7 +379,7 @@
               'exception was thrown), this was the stack:'
             );
             FlutterError.defaultStackFilter(callbackStack.toString().trimRight().split('\n')).forEach(information.writeln);
-          }
+          },
         ));
       }
       return _taskQueue.isNotEmpty;
@@ -488,7 +488,7 @@
               information.writeln('── callback $id ──');
               FlutterError.defaultStackFilter(entry.debugStack.toString().trimRight().split('\n')).forEach(information.writeln);
             }
-          }
+          },
         ));
       }
       return true;
@@ -957,7 +957,7 @@
     postEvent('Flutter.Frame', <String, dynamic>{
       'number': _profileFrameNumber,
       'startTime': _currentFrameTimeStamp.inMicroseconds,
-      'elapsed': _profileFrameStopwatch.elapsedMicroseconds
+      'elapsed': _profileFrameStopwatch.elapsedMicroseconds,
     });
   }
 
@@ -1001,7 +1001,7 @@
             '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 ee8478a..828c399 100644
--- a/packages/flutter/lib/src/semantics/semantics.dart
+++ b/packages/flutter/lib/src/semantics/semantics.dart
@@ -3698,7 +3698,7 @@
   @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 d9b011b..a1e5554 100644
--- a/packages/flutter/lib/src/services/binding.dart
+++ b/packages/flutter/lib/src/services/binding.dart
@@ -78,7 +78,7 @@
       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 a2057de..c990f47 100644
--- a/packages/flutter/lib/src/services/platform_views.dart
+++ b/packages/flutter/lib/src/services/platform_views.dart
@@ -143,7 +143,7 @@
   /// 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 @@
     @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 @@
     @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 a1798be..6b365e8 100644
--- a/packages/flutter/lib/src/services/text_editing.dart
+++ b/packages/flutter/lib/src/services/text_editing.dart
@@ -20,7 +20,7 @@
   /// 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 @@
   @override
   int get hashCode => hashValues(
     start.hashCode,
-    end.hashCode
+    end.hashCode,
   );
 
   @override
@@ -103,7 +103,7 @@
     @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 @@
   /// 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 @@
     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 5d5392d..c92dd70 100644
--- a/packages/flutter/lib/src/services/text_formatter.dart
+++ b/packages/flutter/lib/src/services/text_formatter.dart
@@ -39,13 +39,13 @@
   /// [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 @@
   @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 07fe9f7..70c467e 100644
--- a/packages/flutter/lib/src/services/text_input.dart
+++ b/packages/flutter/lib/src/services/text_input.dart
@@ -487,7 +487,7 @@
   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 @@
   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 @@
   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 c211361..ccb2a5b 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 @@
         Positioned(
           key: topChildKey,
           child: topChild,
-        )
+        ),
       ],
     );
   }
diff --git a/packages/flutter/lib/src/widgets/app.dart b/packages/flutter/lib/src/widgets/app.dart
index 05e6b8f..15d4468 100644
--- a/packages/flutter/lib/src/widgets/app.dart
+++ b/packages/flutter/lib/src/widgets/app.dart
@@ -1135,7 +1135,7 @@
         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 5ac59b9..3e833d0 100644
--- a/packages/flutter/lib/src/widgets/async.dart
+++ b/packages/flutter/lib/src/widgets/async.dart
@@ -380,7 +380,7 @@
     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 @@
     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 a9b3c76..38d184d 100644
--- a/packages/flutter/lib/src/widgets/banner.dart
+++ b/packages/flutter/lib/src/widgets/banner.dart
@@ -21,7 +21,7 @@
   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 @@
   /// 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 02a8aa2..9ffdbab 100644
--- a/packages/flutter/lib/src/widgets/basic.dart
+++ b/packages/flutter/lib/src/widgets/basic.dart
@@ -86,7 +86,7 @@
   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 @@
     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 @@
   const BackdropFilter({
     Key key,
     @required this.filter,
-    Widget child
+    Widget child,
   }) : assert(filter != null),
        super(key: key, child: child);
 
@@ -984,7 +984,7 @@
       clipBehavior: clipBehavior,
       elevation: elevation,
       color: color,
-      shadowColor: shadowColor
+      shadowColor: shadowColor,
     );
   }
 
@@ -1182,7 +1182,7 @@
       origin: origin,
       alignment: alignment,
       textDirection: Directionality.of(context),
-      transformHitTests: transformHitTests
+      transformHitTests: transformHitTests,
     );
   }
 
@@ -1652,7 +1652,7 @@
     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 @@
   const CustomSingleChildLayout({
     Key key,
     @required this.delegate,
-    Widget child
+    Widget child,
   }) : assert(delegate != null),
        super(key: key, child: child);
 
@@ -1792,7 +1792,7 @@
   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 @@
   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 @@
   RenderLimitedBox createRenderObject(BuildContext context) {
     return RenderLimitedBox(
       maxWidth: maxWidth,
-      maxHeight: maxHeight
+      maxHeight: maxHeight,
     );
   }
 
@@ -2577,7 +2577,7 @@
   const AspectRatio({
     Key key,
     @required this.aspectRatio,
-    Widget child
+    Widget child,
   }) : assert(aspectRatio != null),
        super(key: key, child: child);
 
@@ -2713,7 +2713,7 @@
     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 @@
   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 @@
     this.onPointerUp,
     this.onPointerCancel,
     this.behavior = HitTestBehavior.deferToChild,
-    Widget child
+    Widget child,
   }) : assert(behavior != null),
        super(key: key, child: child);
 
@@ -5252,7 +5252,7 @@
       onPointerExit: onPointerExit,
       onPointerUp: onPointerUp,
       onPointerCancel: onPointerCancel,
-      behavior: behavior
+      behavior: behavior,
     );
   }
 
@@ -5397,7 +5397,7 @@
     Key key,
     this.ignoring = true,
     this.ignoringSemantics,
-    Widget child
+    Widget child,
   }) : assert(ignoring != null),
        super(key: key, child: child);
 
@@ -5418,7 +5418,7 @@
   RenderIgnorePointer createRenderObject(BuildContext context) {
     return RenderIgnorePointer(
       ignoring: ignoring,
-      ignoringSemantics: ignoringSemantics
+      ignoringSemantics: ignoringSemantics,
     );
   }
 
@@ -5513,7 +5513,7 @@
     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 @@
   RenderMetaData createRenderObject(BuildContext context) {
     return RenderMetaData(
       metaData: metaData,
-      behavior: behavior
+      behavior: behavior,
     );
   }
 
@@ -6030,7 +6030,7 @@
   /// 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 @@
   /// 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 @@
   /// 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 5e8ec04..4c2b11f 100644
--- a/packages/flutter/lib/src/widgets/binding.dart
+++ b/packages/flutter/lib/src/widgets/binding.dart
@@ -298,7 +298,7 @@
             // 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 @@
               return Future<void>.value();
             WidgetsApp.debugShowWidgetInspectorOverride = value;
             return _forceRebuild();
-          }
+          },
       );
 
       WidgetInspectorService.instance.initServiceExtensions(registerServiceExtension);
@@ -732,7 +732,7 @@
     _renderViewElement = RenderObjectToWidgetAdapter<RenderBox>(
       container: renderView,
       debugShortDescription: '[root]',
-      child: rootWidget
+      child: rootWidget,
     ).attachToRenderTree(buildOwner, renderViewElement);
   }
 
@@ -809,7 +809,7 @@
   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 @@
         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 10a298f..203191a 100644
--- a/packages/flutter/lib/src/widgets/container.dart
+++ b/packages/flutter/lib/src/widgets/container.dart
@@ -62,7 +62,7 @@
     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 @@
       current = LimitedBox(
         maxWidth: 0.0,
         maxHeight: 0.0,
-        child: ConstrainedBox(constraints: const BoxConstraints.expand())
+        child: ConstrainedBox(constraints: const BoxConstraints.expand()),
       );
     }
 
@@ -373,7 +373,7 @@
       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 d575711..a275aa4 100644
--- a/packages/flutter/lib/src/widgets/dismissible.dart
+++ b/packages/flutter/lib/src/widgets/dismissible.dart
@@ -186,7 +186,7 @@
 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 @@
         ).drive(
           Tween<double>(
             begin: 1.0,
-            end: 0.0
+            end: 0.0,
           ),
         );
       });
@@ -536,14 +536,14 @@
         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 @@
               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 5059e3b..fa8f4ad 100644
--- a/packages/flutter/lib/src/widgets/drag_target.dart
+++ b/packages/flutter/lib/src/widgets/drag_target.dart
@@ -398,14 +398,14 @@
           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 @@
     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 @@
   DraggableDetails({
     this.wasAccepted = false,
     @required this.velocity,
-    @required this.offset
+    @required this.offset,
   }) : assert(velocity != null),
        assert(offset != null);
 
@@ -556,7 +556,7 @@
     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 @@
         _enteredTargets.add(target);
         return target.didEnter(this);
       },
-      orElse: () => null
+      orElse: () => null,
     );
 
     _activeTarget = newTarget;
@@ -703,7 +703,7 @@
       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 d93a038..dbe9fe0 100644
--- a/packages/flutter/lib/src/widgets/editable_text.dart
+++ b/packages/flutter/lib/src/widgets/editable_text.dart
@@ -142,7 +142,7 @@
     value = value.copyWith(
       text: newText,
       selection: const TextSelection.collapsed(offset: -1),
-      composing: TextRange.empty
+      composing: TextRange.empty,
     );
   }
 
@@ -939,7 +939,7 @@
               ),
               textCapitalization: widget.textCapitalization,
               keyboardAppearance: widget.keyboardAppearance,
-          )
+          ),
       )..setEditingState(localValue);
     }
     _textInputConnection.show();
@@ -1065,7 +1065,7 @@
           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 @@
     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 5cb2150..0eefe13 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 @@
     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 1d2f9e1..96844dd 100644
--- a/packages/flutter/lib/src/widgets/form.dart
+++ b/packages/flutter/lib/src/widgets/form.dart
@@ -162,7 +162,7 @@
     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 f3aa9be..cbdea16 100644
--- a/packages/flutter/lib/src/widgets/framework.dart
+++ b/packages/flutter/lib/src/widgets/framework.dart
@@ -2277,7 +2277,7 @@
             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 @@
           description: '$this',
           ownershipChain: parent.debugGetCreatorChain(10),
           foundValidAncestor: ancestor != null,
-          badAncestors: badAncestors
+          badAncestors: badAncestors,
         )
       );
     }());
@@ -5005,7 +5005,7 @@
   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 3279519..861d90c 100644
--- a/packages/flutter/lib/src/widgets/gesture_detector.dart
+++ b/packages/flutter/lib/src/widgets/gesture_detector.dart
@@ -868,7 +868,7 @@
     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 @@
   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 516348d..6f3cc61 100644
--- a/packages/flutter/lib/src/widgets/grid_paper.dart
+++ b/packages/flutter/lib/src/widgets/grid_paper.dart
@@ -12,7 +12,7 @@
     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 5c163a6..c6feb06 100644
--- a/packages/flutter/lib/src/widgets/heroes.dart
+++ b/packages/flutter/lib/src/widgets/heroes.dart
@@ -265,7 +265,7 @@
       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 c1d12a8..0b8cfbc 100644
--- a/packages/flutter/lib/src/widgets/icon.dart
+++ b/packages/flutter/lib/src/widgets/icon.dart
@@ -141,7 +141,7 @@
     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 827cfca..785b82f 100644
--- a/packages/flutter/lib/src/widgets/image.dart
+++ b/packages/flutter/lib/src/widgets/image.dart
@@ -631,7 +631,7 @@
     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 af93e7a..65b1b04 100644
--- a/packages/flutter/lib/src/widgets/image_icon.dart
+++ b/packages/flutter/lib/src/widgets/image_icon.dart
@@ -73,7 +73,7 @@
     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 4c0357b..815b5df 100644
--- a/packages/flutter/lib/src/widgets/implicit_animations.dart
+++ b/packages/flutter/lib/src/widgets/implicit_animations.dart
@@ -218,7 +218,7 @@
   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 @@
     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 @@
   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 eb7b2bf..3c16754 100644
--- a/packages/flutter/lib/src/widgets/layout_builder.dart
+++ b/packages/flutter/lib/src/widgets/layout_builder.dart
@@ -34,7 +34,7 @@
   /// 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 @@
     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 c71246f..50c8574 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 @@
 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 b11132d..567a7f9 100644
--- a/packages/flutter/lib/src/widgets/modal_barrier.dart
+++ b/packages/flutter/lib/src/widgets/modal_barrier.dart
@@ -95,12 +95,12 @@
               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 6a86bdb..13c9224 100644
--- a/packages/flutter/lib/src/widgets/navigator.dart
+++ b/packages/flutter/lib/src/widgets/navigator.dart
@@ -741,7 +741,7 @@
     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 479df85..aab056f 100644
--- a/packages/flutter/lib/src/widgets/overlay.dart
+++ b/packages/flutter/lib/src/widgets/overlay.dart
@@ -202,7 +202,7 @@
   /// 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 103e6dc..93b801f 100644
--- a/packages/flutter/lib/src/widgets/page_storage.dart
+++ b/packages/flutter/lib/src/widgets/page_storage.dart
@@ -139,7 +139,7 @@
   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 329a0cd..9193ed2 100644
--- a/packages/flutter/lib/src/widgets/page_view.dart
+++ b/packages/flutter/lib/src/widgets/page_view.dart
@@ -582,7 +582,7 @@
             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 cef825b..b49912b 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 @@
   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 74df8f7..b571702 100644
--- a/packages/flutter/lib/src/widgets/routes.dart
+++ b/packages/flutter/lib/src/widgets/routes.dart
@@ -237,7 +237,7 @@
               assert(newAnimation.currentTrain == nextRoute._animation);
               _secondaryAnimation.parent = newAnimation.currentTrain;
               newAnimation.dispose();
-            }
+            },
           );
           _secondaryAnimation.parent = newAnimation;
           current.dispose();
@@ -535,7 +535,7 @@
     @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 da63935..3054899 100644
--- a/packages/flutter/lib/src/widgets/scroll_activity.dart
+++ b/packages/flutter/lib/src/widgets/scroll_activity.dart
@@ -341,7 +341,7 @@
               // 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 @@
     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 c9eb76d..089b407 100644
--- a/packages/flutter/lib/src/widgets/scroll_physics.dart
+++ b/packages/flutter/lib/src/widgets/scroll_physics.dart
@@ -175,7 +175,7 @@
     // 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 @@
         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 949c87c..0dbec87 100644
--- a/packages/flutter/lib/src/widgets/scroll_view.dart
+++ b/packages/flutter/lib/src/widgets/scroll_view.dart
@@ -978,7 +978,7 @@
          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 4dad42f..f6c344e 100644
--- a/packages/flutter/lib/src/widgets/scrollable.dart
+++ b/packages/flutter/lib/src/widgets/scrollable.dart
@@ -266,7 +266,7 @@
     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 @@
     @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 90be139..645bdd8 100644
--- a/packages/flutter/lib/src/widgets/semantics_debugger.dart
+++ b/packages/flutter/lib/src/widgets/semantics_debugger.dart
@@ -261,7 +261,7 @@
 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 cc87648..81bbac5 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 @@
   /// 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 _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 081bab4..dafa146 100644
--- a/packages/flutter/lib/src/widgets/status_transitions.dart
+++ b/packages/flutter/lib/src/widgets/status_transitions.dart
@@ -12,7 +12,7 @@
   /// 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 85257f1..acc21f2 100644
--- a/packages/flutter/lib/src/widgets/table.dart
+++ b/packages/flutter/lib/src/widgets/table.dart
@@ -261,7 +261,7 @@
         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 @@
       }
       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 @@
           final RenderBox box = child.renderObject;
           return box;
         });
-      }).toList()
+      }).toList(),
     );
   }
 
@@ -375,7 +375,7 @@
   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 7e851a7..33687c0 100644
--- a/packages/flutter/lib/src/widgets/text.dart
+++ b/packages/flutter/lib/src/widgets/text.dart
@@ -375,7 +375,7 @@
         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 931b52e..c3e35cd 100644
--- a/packages/flutter/lib/src/widgets/text_selection.dart
+++ b/packages/flutter/lib/src/widgets/text_selection.dart
@@ -207,7 +207,7 @@
       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 @@
         selectionControls: selectionControls,
         position: position,
         dragStartBehavior: dragStartBehavior,
-      )
+      ),
     );
   }
 
@@ -504,13 +504,13 @@
       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 @@
   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 5fa7c9f..2eb79ca 100644
--- a/packages/flutter/lib/src/widgets/ticker_provider.dart
+++ b/packages/flutter/lib/src/widgets/ticker_provider.dart
@@ -22,7 +22,7 @@
   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 fabeb13..358c229 100644
--- a/packages/flutter/lib/src/widgets/transitions.dart
+++ b/packages/flutter/lib/src/widgets/transitions.dart
@@ -91,7 +91,7 @@
   /// 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 @@
         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 c558e2c..9777959 100644
--- a/packages/flutter/lib/src/widgets/widget_inspector.dart
+++ b/packages/flutter/lib/src/widgets/widget_inspector.dart
@@ -42,7 +42,7 @@
 
 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 @@
   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 @@
       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 @@
     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 8eb5814..2175587 100644
--- a/packages/flutter/test/animation/animations_test.dart
+++ b/packages/flutter/test/animation/animations_test.dart
@@ -23,7 +23,7 @@
     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 @@
     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 fda95dc..9103fc1 100644
--- a/packages/flutter/test/animation/tween_test.dart
+++ b/packages/flutter/test/animation/tween_test.dart
@@ -73,7 +73,7 @@
     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 @@
       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 b682b92..2a0cb58 100644
--- a/packages/flutter/test/cupertino/action_sheet_test.dart
+++ b/packages/flutter/test/cupertino/action_sheet_test.dart
@@ -88,7 +88,7 @@
       createAppWithButtonThatLaunchesActionSheet(
         const CupertinoActionSheet(
           title: Text('Action Sheet'),
-          message: Text('An action sheet')
+          message: Text('An action sheet'),
         ),
       ),
     );
@@ -918,7 +918,7 @@
                         SemanticsAction.tap,
                       ],
                       label: 'Cancel',
-                    )
+                    ),
                   ],
                 ),
               ],
diff --git a/packages/flutter/test/cupertino/app_test.dart b/packages/flutter/test/cupertino/app_test.dart
index 1ebca96..e7e9bee 100644
--- a/packages/flutter/test/cupertino/app_test.dart
+++ b/packages/flutter/test/cupertino/app_test.dart
@@ -28,7 +28,7 @@
               );
             }),
           ],
-        )
+        ),
     ));
 
     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 5db9440..aa99959 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 @@
 
     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 dafc643..a15cc20 100644
--- a/packages/flutter/test/cupertino/button_test.dart
+++ b/packages/flutter/test/cupertino/button_test.dart
@@ -176,7 +176,7 @@
           child: Center(
             child: CupertinoButton(
               onPressed: () { },
-              child: const Text('ABC')
+              child: const Text('ABC'),
             ),
           ),
       ),
@@ -189,7 +189,7 @@
             actions: SemanticsAction.tap.index,
             label: 'ABC',
             flags: SemanticsFlag.isButton.index,
-          )
+          ),
         ],
       ),
       ignoreId: true,
@@ -261,7 +261,7 @@
     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 @@
     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 8050b97..eb4fb45 100644
--- a/packages/flutter/test/cupertino/dialog_test.dart
+++ b/packages/flutter/test/cupertino/dialog_test.dart
@@ -74,7 +74,7 @@
           CupertinoDialogAction(child: Text('Cancel')),
           CupertinoDialogAction(child: Text('OK')),
         ],
-      )
+      ),
     )));
 
     expect(
@@ -126,7 +126,7 @@
       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 be4b587..b59da69 100644
--- a/packages/flutter/test/cupertino/nav_bar_test.dart
+++ b/packages/flutter/test/cupertino/nav_bar_test.dart
@@ -89,7 +89,7 @@
               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 @@
     // 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 @@
     // 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 246b4b8..8c23ccc 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 @@
                               navigationBar: CupertinoNavigationBar(),
                               child: Placeholder(),
                             );
-                          }
+                          },
                         ));
                       },
                     ),
diff --git a/packages/flutter/test/cupertino/page_test.dart b/packages/flutter/test/cupertino/page_test.dart
index a012042..e7f3de5 100644
--- a/packages/flutter/test/cupertino/page_test.dart
+++ b/packages/flutter/test/cupertino/page_test.dart
@@ -15,7 +15,7 @@
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -91,7 +91,7 @@
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -219,7 +219,7 @@
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -375,7 +375,7 @@
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -437,7 +437,7 @@
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -472,7 +472,7 @@
             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 115b3a4..1a53eb7 100644
--- a/packages/flutter/test/cupertino/refresh_test.dart
+++ b/packages/flutter/test/cupertino/refresh_test.dart
@@ -935,7 +935,7 @@
         );
 
         debugDefaultTargetPlatformOverride = null;
-      }
+      },
     );
   };
 
@@ -1312,7 +1312,7 @@
         );
 
         debugDefaultTargetPlatformOverride = null;
-      }
+      },
     );
   };
 
diff --git a/packages/flutter/test/cupertino/route_test.dart b/packages/flutter/test/cupertino/route_test.dart
index 3954464..1c2dd12 100644
--- a/packages/flutter/test/cupertino/route_test.dart
+++ b/packages/flutter/test/cupertino/route_test.dart
@@ -22,7 +22,7 @@
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
+        },
       )
     );
 
@@ -55,7 +55,7 @@
               ],
             ),
           );
-        }
+        },
       )
     );
 
@@ -117,7 +117,7 @@
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
+        },
       )
     );
 
@@ -132,7 +132,7 @@
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
+        },
       )
     );
 
@@ -163,7 +163,7 @@
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
+        },
       )
     );
 
@@ -178,7 +178,7 @@
             navigationBar: CupertinoNavigationBar(),
             child: Placeholder(),
           );
-        }
+        },
       )
     );
 
@@ -205,7 +205,7 @@
           navigationBar: CupertinoNavigationBar(),
           child: Placeholder(),
         );
-      }
+      },
     );
 
     final CupertinoPageRoute<void> route3 = CupertinoPageRoute<void>(
@@ -215,7 +215,7 @@
           navigationBar: CupertinoNavigationBar(),
           child: Placeholder(),
         );
-      }
+      },
     );
 
     tester.state<NavigatorState>(find.byType(Navigator)).push(route2);
@@ -237,8 +237,8 @@
             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 7dc7ee0..e42ec03 100644
--- a/packages/flutter/test/cupertino/scaffold_test.dart
+++ b/packages/flutter/test/cupertino/scaffold_test.dart
@@ -155,7 +155,7 @@
                     ),
                   )
                   : Stack();
-            }
+            },
           ),
         ),
       ),
diff --git a/packages/flutter/test/cupertino/slider_test.dart b/packages/flutter/test/cupertino/slider_test.dart
index 4112c64..eec5499 100644
--- a/packages/flutter/test/cupertino/slider_test.dart
+++ b/packages/flutter/test/cupertino/slider_test.dart
@@ -109,7 +109,7 @@
                 },
                 onChangeStart: (double value) {
                   numberOfTimesOnChangeStartIsCalled++;
-                }
+                },
               ),
             ),
           );
@@ -148,7 +148,7 @@
                 },
                 onChangeEnd: (double value) {
                   numberOfTimesOnChangeEndIsCalled++;
-                }
+                },
               ),
             ),
           );
@@ -191,7 +191,7 @@
                 },
                 onChangeEnd: (double value) {
                   endValue = value;
-                }
+                },
               ),
             ),
           );
@@ -247,7 +247,7 @@
                   setState(() {
                     endValue = value;
                   });
-                }
+                },
               ),
             ),
           );
diff --git a/packages/flutter/test/cupertino/switch_test.dart b/packages/flutter/test/cupertino/switch_test.dart
index 6bdb36d..6417b1f 100644
--- a/packages/flutter/test/cupertino/switch_test.dart
+++ b/packages/flutter/test/cupertino/switch_test.dart
@@ -118,7 +118,7 @@
                       });
                     },
                   ),
-                ]
+                ],
               ),
             );
           },
@@ -226,7 +226,7 @@
                       });
                     },
                   ),
-                ]
+                ],
               ),
             );
           },
diff --git a/packages/flutter/test/cupertino/tab_scaffold_test.dart b/packages/flutter/test/cupertino/tab_scaffold_test.dart
index 5e57787..71291e1 100644
--- a/packages/flutter/test/cupertino/tab_scaffold_test.dart
+++ b/packages/flutter/test/cupertino/tab_scaffold_test.dart
@@ -28,7 +28,7 @@
               child: Text('Page ${index + 1}'),
               painter: TestCallbackPainter(
                 onPaint: () { tabsPainted.add(index); }
-              )
+              ),
             );
           },
         ),
@@ -218,7 +218,7 @@
               child: Text('Page ${index + 1}'),
               painter: TestCallbackPainter(
                 onPaint: () { tabsPainted.add(index); }
-              )
+              ),
             );
           },
         ),
@@ -236,7 +236,7 @@
               child: Text('Page ${index + 1}'),
               painter: TestCallbackPainter(
                 onPaint: () { tabsPainted.add(index); }
-              )
+              ),
             );
           },
         ),
@@ -354,7 +354,7 @@
             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 ce17615..d58fb53 100644
--- a/packages/flutter/test/cupertino/tab_test.dart
+++ b/packages/flutter/test/cupertino/tab_test.dart
@@ -68,7 +68,7 @@
                 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 566eb4f..7e9af7f 100644
--- a/packages/flutter/test/cupertino/text_field_test.dart
+++ b/packages/flutter/test/cupertino/text_field_test.dart
@@ -186,7 +186,7 @@
       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 @@
       expect(
         find.descendant(
           of: find.byType(CupertinoTextField),
-          matching: find.byType(DecoratedBox)
+          matching: find.byType(DecoratedBox),
         ),
         findsNothing,
       );
@@ -1008,7 +1008,7 @@
 
     await tester.enterText(
       find.widgetWithText(CupertinoTextField, 'field 1'),
-      "j'aime la poutine"
+      "j'aime la poutine",
     );
     await tester.pump();
 
@@ -1632,7 +1632,7 @@
         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 @@
       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 725e5c4..de9166f 100644
--- a/packages/flutter/test/cupertino/theme_test.dart
+++ b/packages/flutter/test/cupertino/theme_test.dart
@@ -55,7 +55,7 @@
       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 972d938..ea380aa 100644
--- a/packages/flutter/test/engine/rrect_test.dart
+++ b/packages/flutter/test/engine/rrect_test.dart
@@ -13,7 +13,7 @@
       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 @@
       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 4a2d859..9c1dddf 100644
--- a/packages/flutter/test/foundation/assertions_test.dart
+++ b/packages/flutter/test/foundation/assertions_test.dart
@@ -84,12 +84,12 @@
         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 3ab3963..49f84cd 100644
--- a/packages/flutter/test/foundation/consolidate_response_test.dart
+++ b/packages/flutter/test/foundation/consolidate_response_test.dart
@@ -22,7 +22,7 @@
          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 @@
         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 44d2c36..294070d 100644
--- a/packages/flutter/test/foundation/diagnostics_test.dart
+++ b/packages/flutter/test/foundation/diagnostics_test.dart
@@ -629,7 +629,7 @@
                 StringProperty('node_type', '<leaf node>', showName: false, quoted: false),
                 IntProperty('foo', 42),
               ],
-              style: DiagnosticsTreeStyle.dense
+              style: DiagnosticsTreeStyle.dense,
             ),
           ],
         ),
@@ -1244,7 +1244,7 @@
       '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 90e4a1c..d0d97d9 100644
--- a/packages/flutter/test/foundation/error_reporting_test.dart
+++ b/packages/flutter/test/foundation/error_reporting_test.dart
@@ -126,7 +126,7 @@
       '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 94de468..4234103 100644
--- a/packages/flutter/test/foundation/print_test.dart
+++ b/packages/flutter/test/foundation/print_test.dart
@@ -12,29 +12,29 @@
   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 9cfbe8e..34b5805 100644
--- a/packages/flutter/test/foundation/service_extensions_test.dart
+++ b/packages/flutter/test/foundation/service_extensions_test.dart
@@ -31,7 +31,7 @@
   @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 43ca2b9..a606287 100644
--- a/packages/flutter/test/gestures/double_tap_test.dart
+++ b/packages/flutter/test/gestures/double_tap_test.dart
@@ -29,61 +29,61 @@
   // 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 08f817b..14195d0 100644
--- a/packages/flutter/test/gestures/drag_test.dart
+++ b/packages/flutter/test/gestures/drag_test.dart
@@ -319,7 +319,7 @@
       '-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 8c0beb2..f76f8ee 100644
--- a/packages/flutter/test/gestures/tap_test.dart
+++ b/packages/flutter/test/gestures/tap_test.dart
@@ -22,55 +22,55 @@
   // 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 @@
   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 78363f8..1158fce 100644
--- a/packages/flutter/test/gestures/velocity_tracker_data.dart
+++ b/packages/flutter/test/gestures/velocity_tracker_data.dart
@@ -8,1532 +8,1532 @@
   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 @@
   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 @@
   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 4977be0..a8da27f 100644
--- a/packages/flutter/test/material/about_test.dart
+++ b/packages/flutter/test/material/about_test.dart
@@ -26,7 +26,7 @@
                   applicationLegalese: 'I am the very model of a modern major general.',
                   aboutBoxChildren: <Widget>[
                     Text('About box'),
-                  ]
+                  ],
                 ),
               ],
             ),
@@ -55,7 +55,7 @@
 
     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 @@
   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 @@
 
     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 b90e32d..f845aae 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 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       final _AnimatedIconPainter painter2 = _AnimatedIconPainter(
@@ -266,7 +266,7 @@
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       expect(painter1.shouldRepaint(painter2), false);
@@ -279,7 +279,7 @@
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       final _AnimatedIconPainter painter2 = _AnimatedIconPainter(
@@ -288,7 +288,7 @@
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       expect(painter1.shouldRepaint(painter2), true);
@@ -301,7 +301,7 @@
         color: const Color(0xFF00FF00),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       final _AnimatedIconPainter painter2 = _AnimatedIconPainter(
@@ -310,7 +310,7 @@
         color: const Color(0xFFFF0000),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       expect(painter1.shouldRepaint(painter2), true);
@@ -323,7 +323,7 @@
         color: const Color(0xFF0000FF),
         scale: 1.0,
         shouldMirror: false,
-        uiPathFactory: pathFactory
+        uiPathFactory: pathFactory,
       );
 
       final _AnimatedIconPainter painter2 = _AnimatedIconPainter(
@@ -332,7 +332,7 @@
         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 8ad20d6..34f7e2d 100644
--- a/packages/flutter/test/material/animated_icons_test.dart
+++ b/packages/flutter/test/material/animated_icons_test.dart
@@ -24,7 +24,7 @@
           child: AnimatedIcon(
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
-          )
+          ),
         ),
       ),
     );
@@ -46,7 +46,7 @@
           child: AnimatedIcon(
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
-          )
+          ),
         ),
       ),
     );
@@ -68,7 +68,7 @@
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
             color: Color(0xFF0000FF),
-          )
+          ),
         ),
       ),
     );
@@ -90,7 +90,7 @@
           child: AnimatedIcon(
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
-          )
+          ),
         ),
       ),
     );
@@ -114,7 +114,7 @@
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
             size: 96.0,
-          )
+          ),
         ),
       ),
     );
@@ -156,7 +156,7 @@
           child: AnimatedIcon(
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
-          )
+          ),
         ),
       ),
     );
@@ -165,7 +165,7 @@
     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 @@
           child: AnimatedIcon(
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
-          )
+          ),
         ),
       ),
     );
@@ -203,7 +203,7 @@
             progress: AlwaysStoppedAnimation<double>(0.0),
             icon: AnimatedIcons.arrow_menu,
             textDirection: TextDirection.rtl,
-          )
+          ),
         ),
       ),
     );
@@ -212,7 +212,7 @@
     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 8459d20..e9b9846 100644
--- a/packages/flutter/test/material/app_bar_test.dart
+++ b/packages/flutter/test/material/app_bar_test.dart
@@ -153,8 +153,8 @@
           appBar: AppBar(
             centerTitle: true,
             title: const Text('X'),
-          )
-        )
+          ),
+        ),
       )
     );
 
@@ -318,7 +318,7 @@
 
     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 @@
     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 @@
     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 @@
             data: topPadding100,
             child: Scaffold(
               primary: true,
-              appBar: AppBar(title: const Text('title'))
+              appBar: AppBar(title: const Text('title')),
           ),
         ),
       ),
@@ -1396,7 +1396,7 @@
     await tester.pumpWidget(MaterialApp(
       theme: darkTheme,
       home: Scaffold(
-        appBar: AppBar(title: const Text('test'))
+        appBar: AppBar(title: const Text('test')),
       ),
     ));
 
@@ -1412,7 +1412,7 @@
     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 57b4001..2f854c7 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 @@
     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 @@
       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 @@
         actionsIconTheme: actionsIconThemeData,
         textTheme: textTheme,
         actions: <Widget>[
-          IconButton(icon: const Icon(Icons.share), onPressed: () {})
+          IconButton(icon: const Icon(Icons.share), onPressed: () {}),
         ],
       )),
     ));
@@ -118,7 +118,7 @@
         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 @@
       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 @@
       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 @@
     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 fa68c30a2..64e605d 100644
--- a/packages/flutter/test/material/app_test.dart
+++ b/packages/flutter/test/material/app_test.dart
@@ -256,7 +256,7 @@
                       child: const Text('X'),
                       onPressed: () async {
                         result = Navigator.of(context).pushNamed('/a');
-                      }
+                      },
                   ),
                 );
               }
@@ -271,7 +271,7 @@
                   },
                 ),
               );
-            }
+            },
           },
         )
     );
diff --git a/packages/flutter/test/material/arc_test.dart b/packages/flutter/test/material/arc_test.dart
index 48776da..acd2e52 100644
--- a/packages/flutter/test/material/arc_test.dart
+++ b/packages/flutter/test/material/arc_test.dart
@@ -9,12 +9,12 @@
   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 @@
   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 @@
   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 @@
   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 dab5b65..083777f 100644
--- a/packages/flutter/test/material/back_button_test.dart
+++ b/packages/flutter/test/material/back_button_test.dart
@@ -16,10 +16,10 @@
             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 53e4de7..5455c4f 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 @@
           bottomNavigationBar: ShapeListener(
             BottomAppBar(
               child: SizedBox(height: 100.0),
-            )
+            ),
           ),
         ),
       ),
@@ -34,7 +34,7 @@
       coversSameAreaAs(
         expectedPath,
         areaToCompare: (Offset.zero & renderBox.size).inflate(5.0),
-      )
+      ),
     );
   });
 
@@ -196,7 +196,7 @@
       coversSameAreaAs(
         expectedPath,
         areaToCompare: (Offset.zero & renderBox.size).inflate(5.0),
-      )
+      ),
     );
   });
 
@@ -209,7 +209,7 @@
               child: SizedBox(height: 100.0),
               shape: RectangularNotch(),
               notchMargin: 0.0,
-            )
+            ),
           ),
           floatingActionButton: FloatingActionButton(
             onPressed: null,
@@ -248,7 +248,7 @@
       coversSameAreaAs(
         expectedPath,
         areaToCompare: (Offset.zero & babSize).inflate(5.0),
-      )
+      ),
     );
   });
 
@@ -261,7 +261,7 @@
               child: SizedBox(height: 100.0),
               shape: RectangularNotch(),
               notchMargin: 6.0,
-            )
+            ),
           ),
           floatingActionButton: FloatingActionButton(
             onPressed: null,
@@ -300,7 +300,7 @@
       coversSameAreaAs(
         expectedPath,
         areaToCompare: (Offset.zero & babSize).inflate(5.0),
-      )
+      ),
     );
   });
 
@@ -415,7 +415,7 @@
   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 238c894..0dd0fb7 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 @@
               ],
             ),
           ),
-        )
+        ),
     ),
   );
 }
diff --git a/packages/flutter/test/material/bottom_navigation_bar_test.dart b/packages/flutter/test/material/bottom_navigation_bar_test.dart
index d2312a5..6d28346 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 @@
             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 @@
             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 @@
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -128,9 +128,9 @@
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -171,9 +171,9 @@
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -220,9 +220,9 @@
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -247,9 +247,9 @@
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -275,9 +275,9 @@
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -304,9 +304,9 @@
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -353,9 +353,9 @@
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -380,9 +380,9 @@
                 icon: Icon(Icons.access_alarm),
                 title: Text('Alarm'),
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -399,16 +399,16 @@
               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 @@
             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 @@
             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 @@
             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 @@
               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 @@
               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 @@
           ..restore()
           ..circle(x: 200.0)
           ..translate(x: 400.0)
-          ..circle(x: 200.0)
+          ..circle(x: 200.0),
     );
   });
 
@@ -1168,7 +1168,7 @@
             ),
             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 070f2e8..1b16af1 100644
--- a/packages/flutter/test/material/buttons_test.dart
+++ b/packages/flutter/test/material/buttons_test.dart
@@ -24,7 +24,7 @@
           child: Center(
             child: FlatButton(
               onPressed: () { },
-              child: const Text('ABC')
+              child: const Text('ABC'),
             ),
           ),
         ),
@@ -46,7 +46,7 @@
               SemanticsFlag.hasEnabledState,
               SemanticsFlag.isEnabled,
             ],
-          )
+          ),
         ],
       ),
       ignoreId: true,
@@ -64,7 +64,7 @@
           child: Center(
             child: RaisedButton(
               onPressed: () { },
-              child: const Text('ABC')
+              child: const Text('ABC'),
             ),
           ),
         ),
@@ -86,7 +86,7 @@
               SemanticsFlag.hasEnabledState,
               SemanticsFlag.isEnabled,
             ],
-          )
+          ),
         ]
       ),
       ignoreId: true,
@@ -214,7 +214,7 @@
             areaToCompare: expectedClipRect.inflate(10.0),
         ))
         ..circle(color: directSplashColor)
-        ..rect(color: directHighlightColor)
+        ..rect(color: directHighlightColor),
     );
 
     const Color themeSplashColor1 = Color(0xFF001100);
@@ -251,7 +251,7 @@
             areaToCompare: expectedClipRect.inflate(10.0),
         ))
         ..circle(color: themeSplashColor1)
-        ..rect(color: themeHighlightColor1)
+        ..rect(color: themeHighlightColor1),
     );
 
     const Color themeSplashColor2 = Color(0xFF002200);
@@ -275,7 +275,7 @@
       Material.of(tester.element(find.byType(MaterialButton))),
       paints
         ..circle(color: themeSplashColor2)
-        ..rect(color: themeHighlightColor2)
+        ..rect(color: themeHighlightColor2),
     );
 
     await gesture.up();
@@ -306,7 +306,7 @@
 
     expect(
         tester.renderObject(find.byKey(buttonKey)),
-        paintsExactlyCountTimes(#clipPath, 0)
+        paintsExactlyCountTimes(#clipPath, 0),
     );
   });
 
@@ -616,13 +616,13 @@
             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 e2e4251..0e9e73c 100644
--- a/packages/flutter/test/material/card_test.dart
+++ b/packages/flutter/test/material/card_test.dart
@@ -26,9 +26,9 @@
                   MaterialButton(
                     child: const Text('Button'),
                     onPressed: () { },
-                  )
+                  ),
                 ],
-              )
+              ),
             ),
           ),
         ),
@@ -67,7 +67,7 @@
                 ],
               ),
             ],
-          )
+          ),
         ],
       ),
       ignoreTransform: true,
@@ -91,9 +91,9 @@
               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 fa943a9..d45de99 100644
--- a/packages/flutter/test/material/card_theme_test.dart
+++ b/packages/flutter/test/material/card_theme_test.dart
@@ -17,7 +17,7 @@
   testWidgets('Passing no CardTheme returns defaults', (WidgetTester tester) async {
     await tester.pumpWidget(const MaterialApp(
       home: Scaffold(
-        body: Card()
+        body: Card(),
       ),
     ));
 
@@ -39,7 +39,7 @@
     await tester.pumpWidget(MaterialApp(
       theme: ThemeData(cardTheme: cardTheme),
       home: const Scaffold(
-        body: Card()
+        body: Card(),
       ),
     ));
 
@@ -71,7 +71,7 @@
           elevation: elevation,
           margin: margin,
           shape: shape,
-        )
+        ),
       ),
     ));
 
@@ -92,7 +92,7 @@
     await tester.pumpWidget(MaterialApp(
       theme: themeData,
       home: const Scaffold(
-        body: Card()
+        body: Card(),
       ),
     ));
 
@@ -106,7 +106,7 @@
     await tester.pumpWidget(MaterialApp(
       theme: themeData,
       home: const Scaffold(
-        body: Card()
+        body: Card(),
       ),
     ));
 
@@ -131,9 +131,9 @@
           child: Center(
             child: Card(
               child: SizedBox.fromSize(size: const Size(200, 300),),
-            )
-          )
-        )
+            ),
+          ),
+        ),
       ),
     ));
 
@@ -153,7 +153,7 @@
     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 6429fb6..bd11a6c 100644
--- a/packages/flutter/test/material/checkbox_test.dart
+++ b/packages/flutter/test/material/checkbox_test.dart
@@ -201,7 +201,7 @@
       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 f542d80..7b3006e 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart
@@ -1639,7 +1639,7 @@
         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 ccd6bea..752cf82 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 @@
             SemanticsFlag.hasToggledState,
             SemanticsFlag.isToggled,
             SemanticsFlag.hasEnabledState,
-            SemanticsFlag.isEnabled
+            SemanticsFlag.isEnabled,
           ],
           actions: SemanticsAction.tap.index,
           label: 'aaa\nAAA',
@@ -117,7 +117,7 @@
             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 9d99a1e..5b3fb03 100644
--- a/packages/flutter/test/material/data_table_test.dart
+++ b/packages/flutter/test/material/data_table_test.dart
@@ -29,7 +29,7 @@
             numeric: true,
             onSort: (int columnIndex, bool ascending) {
               log.add('column-sort: $columnIndex $ascending');
-            }
+            },
           ),
         ],
         rows: kDesserts.map<DataRow>((Dessert dessert) {
@@ -56,7 +56,7 @@
     }
 
     await tester.pumpWidget(MaterialApp(
-      home: Material(child: buildTable())
+      home: Material(child: buildTable()),
     ));
 
     await tester.tap(find.byType(Checkbox).first);
@@ -75,7 +75,7 @@
     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 @@
     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 28adf61..856c38e 100644
--- a/packages/flutter/test/material/dialog_test.dart
+++ b/packages/flutter/test/material/dialog_test.dart
@@ -27,11 +27,11 @@
                         return dialog;
                     },
                   );
-                }
-              )
+                },
+              ),
             );
           }
-        )
+        ),
       ),
   );
 }
@@ -60,8 +60,8 @@
             onPressed: () {
               didPressOk = true;
             },
-            child: const Text('OK')
-        )
+            child: const Text('OK'),
+        ),
       ],
     );
     await tester.pumpWidget(_appWithAlertDialog(tester, dialog));
@@ -463,7 +463,7 @@
 
     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 bddbe9e..cdcc622 100644
--- a/packages/flutter/test/material/dialog_theme_test.dart
+++ b/packages/flutter/test/material/dialog_theme_test.dart
@@ -24,11 +24,11 @@
                             return RepaintBoundary(key: _painterKey, child: dialog);
                           },
                         );
-                      }
-                  )
+                      },
+                  ),
               );
             }
-        )
+        ),
     ),
   );
 }
@@ -51,7 +51,7 @@
       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 9a542eb..086e30c 100644
--- a/packages/flutter/test/material/drawer_test.dart
+++ b/packages/flutter/test/material/drawer_test.dart
@@ -63,7 +63,7 @@
     await tester.pumpWidget(
       const MaterialApp(
         home: Scaffold(
-          drawer: Drawer()
+          drawer: Drawer(),
         ),
       ),
     );
@@ -88,7 +88,7 @@
     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 da06396..6d60a98 100644
--- a/packages/flutter/test/material/dropdown_test.dart
+++ b/packages/flutter/test/material/dropdown_test.dart
@@ -17,7 +17,7 @@
 
 final Type dropdownButtonType = DropdownButton<String>(
   onChanged: (_) { },
-  items: const <DropdownMenuItem<String>>[]
+  items: const <DropdownMenuItem<String>>[],
 ).runtimeType;
 
 Widget buildFrame({
@@ -53,7 +53,7 @@
                 child: Text(item, key: ValueKey<String>(item + 'Text')),
               );
             }).toList(),
-          )
+          ),
         ),
       ),
     ),
@@ -254,7 +254,7 @@
                 items: menuItems.map((String val) {
                   return DropdownMenuItem<String>(
                     value: val,
-                    child: Text(val)
+                    child: Text(val),
                   );
                 }).toList(),
                 onChanged: (String v) {
@@ -491,7 +491,7 @@
     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 @@
     // 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 57e0a2a..bfe8587 100644
--- a/packages/flutter/test/material/expand_icon_test.dart
+++ b/packages/flutter/test/material/expand_icon_test.dart
@@ -49,7 +49,7 @@
             isExpanded: false,
             onPressed: (bool isExpanded) {
               expanded = !expanded;
-            }
+            },
           )
       )
     );
@@ -60,7 +60,7 @@
             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 00956c0..96db2dc 100644
--- a/packages/flutter/test/material/expansion_tile_test.dart
+++ b/packages/flutter/test/material/expansion_tile_test.dart
@@ -74,9 +74,9 @@
                 children: <Widget>[
                   ListTile(
                     key: tileKey,
-                    title: const Text('0')
-                  )
-                ]
+                    title: const Text('0'),
+                  ),
+                ],
               ),
               ExpansionTile(
                 key: collapsedKey,
@@ -85,21 +85,21 @@
                 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 8fd9ae3..0079c9c 100644
--- a/packages/flutter/test/material/flat_button_test.dart
+++ b/packages/flutter/test/material/flat_button_test.dart
@@ -41,13 +41,13 @@
             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 52aef0f..079c284 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 @@
         home: Scaffold(
           appBar: AppBar(
             flexibleSpace: const FlexibleSpaceBar(
-              title: Text('X')
-            )
-          )
-        )
+              title: Text('X'),
+            ),
+          ),
+        ),
       )
     );
 
@@ -34,10 +34,10 @@
         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 64a5a67..9ecd7b6 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 @@
         home: Scaffold(
           floatingActionButton: FloatingActionButton(
             onPressed: () { },
-            highlightElevation: 20.0
+            highlightElevation: 20.0,
           ),
         ),
       ),
@@ -477,7 +477,7 @@
             SemanticsFlag.isEnabled,
           ],
           actions: <SemanticsAction>[
-            SemanticsAction.tap
+            SemanticsAction.tap,
           ],
         ),
       ],
@@ -543,7 +543,7 @@
                 TestSemantics(
                   label: 'Add Photo',
                   actions: <SemanticsAction>[
-                    SemanticsAction.tap
+                    SemanticsAction.tap,
                   ],
                   flags: <SemanticsFlag>[
                     SemanticsFlag.isButton,
@@ -663,13 +663,13 @@
             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 1e3fdc7..dce6cc5 100644
--- a/packages/flutter/test/material/icon_button_test.dart
+++ b/packages/flutter/test/material/icon_button_test.dart
@@ -222,7 +222,7 @@
       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 @@
       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 @@
       Material.of(tester.element(find.byType(IconButton))),
       paints
         ..circle(color: themeSplashColor2)
-        ..circle(color: themeHighlightColor2)
+        ..circle(color: themeHighlightColor2),
     );
 
     await gesture.up();
@@ -292,15 +292,15 @@
         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 @@
             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 6ff12c0..a3c4093 100644
--- a/packages/flutter/test/material/ink_paint_test.dart
+++ b/packages/flutter/test/material/ink_paint_test.dart
@@ -52,7 +52,7 @@
         ..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 @@
       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 @@
       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 fb2d040..ec5bad4 100644
--- a/packages/flutter/test/material/ink_well_test.dart
+++ b/packages/flutter/test/material/ink_well_test.dart
@@ -38,7 +38,7 @@
               },
             ),
           ),
-        )
+        ),
       )
     );
 
@@ -83,7 +83,7 @@
         child: Center(
           child: InkWell(),
         ),
-      )
+      ),
     ));
     await tester.tap(find.byType(InkWell), pointer: 1);
     await tester.pump(const Duration(seconds: 1));
@@ -141,7 +141,7 @@
               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 b6671ae..1cc5a4c 100644
--- a/packages/flutter/test/material/input_decorator_test.dart
+++ b/packages/flutter/test/material/input_decorator_test.dart
@@ -1630,7 +1630,7 @@
       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 814c7cc..7192fe4 100644
--- a/packages/flutter/test/material/list_tile_test.dart
+++ b/packages/flutter/test/material/list_tile_test.dart
@@ -364,7 +364,7 @@
               ],
             ),
           ),
-        )
+        ),
       ),
     );
 
@@ -405,7 +405,7 @@
       return MediaQuery(
         data: const MediaQueryData(
           padding: EdgeInsets.zero,
-          textScaleFactor: 1.0
+          textScaleFactor: 1.0,
         ),
         child: Directionality(
           textDirection: textDirection,
@@ -450,7 +450,7 @@
       return MediaQuery(
         data: const MediaQueryData(
           padding: EdgeInsets.zero,
-          textScaleFactor: 1.0
+          textScaleFactor: 1.0,
         ),
         child: Directionality(
           textDirection: textDirection,
@@ -497,7 +497,7 @@
       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 282f0be..2299e9b 100644
--- a/packages/flutter/test/material/material_test.dart
+++ b/packages/flutter/test/material/material_test.dart
@@ -89,7 +89,7 @@
       'color: Color(0xffffffff)',
       'textStyle.inherit: true',
       'textStyle.color: Color(0xff00ff00)',
-      'borderRadius: BorderRadiusDirectional.circular(10.0)'
+      'borderRadius: BorderRadiusDirectional.circular(10.0)',
     ]);
   });
 
@@ -349,7 +349,7 @@
         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 @@
             side: BorderSide(
               width: 2.0,
               color: Color(0xFF0000FF),
-            )
+            ),
           ),
         )
       );
@@ -559,7 +559,7 @@
             side: BorderSide(
               width: 2.0,
               color: Color(0xFF0000FF),
-            )
+            ),
           ),
         )
       );
@@ -606,13 +606,13 @@
                       Container(
                         color: Colors.green,
                         height: 150,
-                      )
+                      ),
                     ],
                   ),
                 ),
               ),
-            )
-          )
+            ),
+          ),
         ),
       ));
 
@@ -647,13 +647,13 @@
                       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 30d6c46..a1e6fa2 100644
--- a/packages/flutter/test/material/mergeable_material_test.dart
+++ b/packages/flutter/test/material/mergeable_material_test.dart
@@ -70,7 +70,7 @@
       const MaterialApp(
         home: Scaffold(
           body: SingleChildScrollView(
-            child: MergeableMaterial()
+            child: MergeableMaterial(),
           ),
         ),
       ),
@@ -91,7 +91,7 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -114,7 +114,7 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 200.0
+                    height: 200.0,
                   ),
                 ),
               ],
@@ -139,14 +139,14 @@
                   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 @@
                   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 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -241,8 +241,8 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -251,7 +251,7 @@
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -277,14 +277,14 @@
                   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 @@
                   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 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -360,7 +360,7 @@
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
+                    height: 100.0,
                   ),
                 ),
               ],
@@ -394,20 +394,20 @@
                   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 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -436,13 +436,13 @@
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -468,20 +468,20 @@
                   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 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -517,13 +517,13 @@
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -551,20 +551,20 @@
                   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 @@
                   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 @@
                   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 @@
                   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 @@
                   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 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -738,8 +738,8 @@
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('y')
@@ -748,13 +748,13 @@
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -784,8 +784,8 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -794,8 +794,8 @@
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('y')
@@ -804,13 +804,13 @@
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -831,20 +831,20 @@
                   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 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -882,13 +882,13 @@
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -908,8 +908,8 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('y')
@@ -918,8 +918,8 @@
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('z')
@@ -928,13 +928,13 @@
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -964,8 +964,8 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('x')
@@ -974,8 +974,8 @@
                   key: ValueKey<String>('B'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('y')
@@ -984,13 +984,13 @@
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -1011,8 +1011,8 @@
                   key: ValueKey<String>('A'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
+                    height: 100.0,
+                  ),
                 ),
                 MaterialGap(
                   key: ValueKey<String>('z')
@@ -1021,13 +1021,13 @@
                   key: ValueKey<String>('C'),
                   child: SizedBox(
                     width: 100.0,
-                    height: 100.0
-                  )
-                )
+                    height: 100.0,
+                  ),
+                ),
               ]
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -1051,8 +1051,8 @@
     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 @@
                   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 @@
                   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 @@
                   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 8123958..88e0b88 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 @@
           savedContext = context;
           return Container();
         }
-      )
+      ),
     ));
 
     await tester.pump();
@@ -28,7 +28,7 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 75debbf..7bd7e48 100644
--- a/packages/flutter/test/material/outline_button_test.dart
+++ b/packages/flutter/test/material/outline_button_test.dart
@@ -178,7 +178,7 @@
 
     expect(
         tester.renderObject(find.byKey(buttonKey)),
-        paintsExactlyCountTimes(#clipPath, 0)
+        paintsExactlyCountTimes(#clipPath, 0),
     );
   });
 
@@ -213,7 +213,7 @@
               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 8a41013..237b11a 100644
--- a/packages/flutter/test/material/page_selector_test.dart
+++ b/packages/flutter/test/material/page_selector_test.dart
@@ -49,7 +49,7 @@
   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 172bab3..23b0654 100644
--- a/packages/flutter/test/material/page_test.dart
+++ b/packages/flutter/test/material/page_test.dart
@@ -481,7 +481,7 @@
             builder: (BuildContext context) {
               final String pageNumber = settings.name == '/' ? '1' : '2';
               return Center(child: Text('Page $pageNumber'));
-            }
+            },
           );
         },
       ),
@@ -517,7 +517,7 @@
             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 c1d833e..b7ae49d 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 @@
           DataColumn(label: Text('Calories'), numeric: true),
           DataColumn(label: Text('Generation')),
         ],
-      )
+      ),
     ));
 
     await tester.tap(find.byTooltip('Next page'));
@@ -130,7 +130,7 @@
             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 388b5b2..604bacb 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 @@
     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 @@
     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 @@
     await tester.pumpWidget(MaterialApp(
       home: Scaffold(
         body: Placeholder(key: key),
-      )
+      ),
     ));
 
     int buildCount = 0;
@@ -109,7 +109,7 @@
             }
           ),
         ),
-      )
+      ),
     ));
 
     await tester.pump();
diff --git a/packages/flutter/test/material/popup_menu_test.dart b/packages/flutter/test/material/popup_menu_test.dart
index bf42c47..a08af4d 100644
--- a/packages/flutter/test/material/popup_menu_test.dart
+++ b/packages/flutter/test/material/popup_menu_test.dart
@@ -32,7 +32,7 @@
                     return <PopupMenuItem<int>>[
                       const PopupMenuItem<int>(
                         value: 1,
-                        child: Text('One')
+                        child: Text('One'),
                       ),
                     ];
                   },
@@ -138,7 +138,7 @@
                   return <PopupMenuItem<int>>[
                     const PopupMenuItem<int>(
                       value: 1,
-                      child: Text('One')
+                      child: Text('One'),
                     ),
                   ];
                 },
@@ -420,7 +420,7 @@
             ),
           ),
         ),
-      )
+      ),
     ));
 
     await tester.tap(find.text('XXX'));
@@ -457,7 +457,7 @@
             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 0117ed5..6430d1c 100644
--- a/packages/flutter/test/material/progress_indicator_test.dart
+++ b/packages/flutter/test/material/progress_indicator_test.dart
@@ -66,7 +66,7 @@
       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 @@
       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 @@
       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 @@
       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 @@
       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 @@
       const Directionality(
         textDirection: TextDirection.ltr,
         child: Center(
-          child: CircularProgressIndicator(value: 0.0)
-        )
+          child: CircularProgressIndicator(value: 0.0),
+        ),
       )
     );
 
@@ -196,7 +196,7 @@
     final SemanticsHandle handle = tester.ensureSemantics();
     await tester.pumpWidget(
       const Center(
-        child: CircularProgressIndicator(value: null)
+        child: CircularProgressIndicator(value: null),
       )
     );
 
@@ -295,7 +295,7 @@
         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 @@
         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 @@
         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 29ef186..97e7e94 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 @@
               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 646bec1..1ca11ee 100644
--- a/packages/flutter/test/material/reorderable_list_test.dart
+++ b/packages/flutter/test/material/reorderable_list_test.dart
@@ -129,7 +129,7 @@
               key: Key('Last item'),
               height: itemHeight,
               child: Text('Last item'),
-            )
+            ),
           ],
           scrollDirection: Axis.vertical,
           onReorder: (int oldIndex, int newIndex) {},
@@ -557,7 +557,7 @@
               key: Key('Last item'),
               width: itemHeight,
               child: Text('Last item'),
-            )
+            ),
           ],
           scrollDirection: Axis.horizontal,
           onReorder: (int oldIndex, int newIndex) {},
@@ -914,7 +914,7 @@
           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 ad0b8c4..44e75e8 100644
--- a/packages/flutter/test/material/scaffold_test.dart
+++ b/packages/flutter/test/material/scaffold_test.dart
@@ -218,9 +218,9 @@
               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 @@
               ),
             ],
           ),
-        )
+        ),
       )
     );
 
@@ -272,7 +272,7 @@
             primary: true,
             slivers: <Widget>[
               const SliverAppBar(
-                title: Text('Title')
+                title: Text('Title'),
               ),
               SliverList(
                 delegate: SliverChildListDelegate(List<Widget>.generate(
@@ -367,7 +367,7 @@
                 didPressButton = true;
               },
               child: const Text('X'),
-            )
+            ),
           ],
         ),
       ),
@@ -412,7 +412,7 @@
         '/scaffold': (_) => Scaffold(
             appBar: AppBar(),
             body: const Text('Scaffold'),
-        )
+        ),
       };
       await tester.pumpWidget(
         MaterialApp(theme: ThemeData(platform: platform), routes: routes)
@@ -887,7 +887,7 @@
 
       expect(
         geometry.bottomNavigationBarTop,
-        appBox.size.height - navigationBox.size.height
+        appBox.size.height - navigationBox.size.height,
       );
     });
 
@@ -904,7 +904,7 @@
 
       expect(
         geometry.bottomNavigationBarTop,
-        null
+        null,
       );
     });
 
@@ -927,7 +927,7 @@
 
       expect(
         geometry.floatingActionButtonArea,
-        fabRect
+        fabRect,
       );
     });
 
@@ -944,7 +944,7 @@
 
       expect(
           geometry.floatingActionButtonArea,
-          null
+          null,
       );
     });
 
@@ -991,22 +991,22 @@
 
       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 @@
               body: const Text('scaffold body'),
               appBar: AppBar(
                 centerTitle: true,
-                title: const Text('Title')
+                title: const Text('Title'),
               ),
             ),
           ),
@@ -1153,8 +1153,8 @@
               body: const Text('scaffold body'),
               appBar: AppBar(
                 centerTitle: true,
-                title: const Text('Title')
-              )
+                title: const Text('Title'),
+              ),
             ),
           ),
         ),
@@ -1200,7 +1200,7 @@
             body: const Text('scaffold body'),
             appBar: AppBar(
               centerTitle: true,
-              title: const Text('Title')
+              title: const Text('Title'),
             ),
           ),
         ),
@@ -1228,7 +1228,7 @@
               body: const Text('scaffold body'),
               appBar: AppBar(
                 centerTitle: true,
-                title: const Text('Title')
+                title: const Text('Title'),
               ),
             ),
           ),
@@ -1263,7 +1263,7 @@
                 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 a608643..bb108e3 100644
--- a/packages/flutter/test/material/scrollbar_test.dart
+++ b/packages/flutter/test/material/scrollbar_test.dart
@@ -94,7 +94,7 @@
       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 afaefbb..4f2e034 100644
--- a/packages/flutter/test/material/search_test.dart
+++ b/packages/flutter/test/material/search_test.dart
@@ -355,7 +355,7 @@
               },
             );
           },
-        )
+        ),
       ],
     );
 
@@ -412,7 +412,7 @@
               },
             );
           },
-        )
+        ),
       ],
     );
 
@@ -433,7 +433,7 @@
               },
             );
           },
-        )
+        ),
       ],
     );
 
diff --git a/packages/flutter/test/material/slider_theme_test.dart b/packages/flutter/test/material/slider_theme_test.dart
index edae4e3..acd5211 100644
--- a/packages/flutter/test/material/slider_theme_test.dart
+++ b/packages/flutter/test/material/slider_theme_test.dart
@@ -153,7 +153,7 @@
       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 @@
       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 @@
           x: 208.0,
           y: 300.0,
           radius: 6.0,
-        )
+        ),
     );
 
     final Offset center = tester.getCenter(find.byType(Slider));
@@ -215,7 +215,7 @@
           x: 208.0,
           y: 300.0,
           radius: 6.0,
-        )
+        ),
     );
 
     await gesture.up();
@@ -230,7 +230,7 @@
           x: 208.0,
           y: 300.0,
           radius: 6.0,
-        )
+        ),
     );
   });
 
@@ -261,7 +261,7 @@
         ..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 @@
         ..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 @@
             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 @@
             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 @@
             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 @@
             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 @@
             const Offset(90.1, -49.0),
             const Offset(-24.1, -49.0),
           ],
-        )
+        ),
     );
     await gesture.up();
 
@@ -445,7 +445,7 @@
             const Offset(98.5, -38.8),
             const Offset(-16.1, -38.8),
           ],
-        )
+        ),
     );
     await gesture.up();
   });
@@ -462,7 +462,7 @@
       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 @@
       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 @@
 
     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 @@
 
     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 @@
 
     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 @@
     // 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 @@
       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 @@
       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 @@
         y: center.dy,
         radius: uniqueOverlayRadius,
         color: sliderTheme.overlayColor,
-      )
+      ),
     );
   });
 
@@ -609,7 +609,7 @@
         showValueIndicator: ShowValueIndicator.never,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
@@ -627,7 +627,7 @@
         showValueIndicator: ShowValueIndicator.never,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
@@ -648,7 +648,7 @@
         showValueIndicator: ShowValueIndicator.never,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
@@ -669,7 +669,7 @@
         showValueIndicator: ShowValueIndicator.never,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
@@ -690,7 +690,7 @@
         showValueIndicator: ShowValueIndicator.never,
       ),
       value: 0.5,
-      divisions: 4
+      divisions: 4,
     ));
 
     final RenderBox sliderBox = tester.firstRenderObject<RenderBox>(find.byType(Slider));
@@ -719,7 +719,7 @@
         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 1a719bf..5c7f0e7 100644
--- a/packages/flutter/test/material/snack_bar_test.dart
+++ b/packages/flutter/test/material/snack_bar_test.dart
@@ -17,19 +17,19 @@
               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 @@
                 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 @@
                 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 @@
                 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 @@
                     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 @@
                     ),
                   );
                 },
-                child: const Text('X')
+                child: const Text('X'),
               );
             }
           ),
@@ -359,10 +359,10 @@
                   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 @@
                   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 @@
                     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 @@
                       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 @@
                             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 @@
                   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 @@
                             child: const Text('X'),
                         );
                       }
-                  )
-              )
-          )
+                  ),
+              ),
+          ),
       ));
     }
 
@@ -723,7 +723,7 @@
               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 a4ce394..53a729e 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 @@
         ..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 @@
         ..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 84b8beb..4214de4 100644
--- a/packages/flutter/test/material/switch_test.dart
+++ b/packages/flutter/test/material/switch_test.dart
@@ -153,7 +153,7 @@
                         value = newValue;
                       }
                     );
-                  }
+                  },
                 ),
               ),
             );
@@ -189,7 +189,7 @@
                       setState(() {
                         value = newValue;
                       });
-                    }
+                    },
                 ),
               ),
             );
@@ -428,7 +428,7 @@
         ..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 @@
         ..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 dce4d0b..7eb7493 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 @@
             labelStyle: labelStyle,
             unselectedLabelStyle: unselectedLabelStyle,
           ),
-        )
+        ),
       ),
     );
 
@@ -152,7 +152,7 @@
       indicator: BoxDecoration(
         border: Border.all(color: Colors.black),
         shape: BoxShape.rectangle,
-      )
+      ),
     );
 
     await tester.pumpWidget(_withTheme(tabBarTheme));
@@ -168,7 +168,7 @@
     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 83a7f4e..58aab75 100644
--- a/packages/flutter/test/material/tabs_test.dart
+++ b/packages/flutter/test/material/tabs_test.dart
@@ -140,11 +140,11 @@
         body: const TabBarView(
           children: <Widget>[
             Center(child: Text('LEFT CHILD')),
-            Center(child: Text('RIGHT CHILD'))
-          ]
-        )
-      )
-    )
+            Center(child: Text('RIGHT CHILD')),
+          ],
+        ),
+      ),
+    ),
   );
 }
 
@@ -359,9 +359,9 @@
           child: TabBarView(
             children: tabs.map<Widget>((String name) {
               return StateMarker(
-                child: Text(name)
+                child: Text(name),
               );
-            }).toList()
+            }).toList(),
           ),
         ),
       );
@@ -619,8 +619,8 @@
             controller: controller,
             children: const <Widget>[
               Center(child: Text('LEFT CHILD')),
-              Center(child: Text('RIGHT CHILD'))
-            ]
+              Center(child: Text('RIGHT CHILD')),
+            ],
           ),
         ),
       );
@@ -680,7 +680,7 @@
               Center(child: Text('CHILD A')),
               Center(child: Text('CHILD B')),
               Center(child: Text('CHILD C')),
-            ]
+            ],
           ),
         ),
       );
@@ -1544,8 +1544,8 @@
                         rect: Rect.fromLTRB(0.0, 0.0, 116.0, kTextTabBarHeight),
                         transform: Matrix4.translationValues(116.0, 276.0, 0.0),
                       ),
-                    ]
-                )
+                    ],
+                ),
               ],
             ),
           ],
@@ -1808,8 +1808,8 @@
                         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 811a2b8..4a0b579 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 @@
     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 8477b3d..198941e 100644
--- a/packages/flutter/test/material/text_field_test.dart
+++ b/packages/flutter/test/material/text_field_test.dart
@@ -207,7 +207,7 @@
           ),
           onChanged: (String value) {
             textFieldValue = value;
-          }
+          },
         ),
       )
     );
@@ -1880,7 +1880,7 @@
           children: <Widget>[
             TextField(
               key: key1,
-              controller: controller1
+              controller: controller1,
             ),
             TextField(key: key2),
           ],
@@ -2699,7 +2699,7 @@
                 controller: controllerA,
                 style: const TextStyle(fontSize: 10.0),
                 strutStyle: StrutStyle.disabled,
-              )
+              ),
             ),
             const Text(
               'abc',
@@ -2751,7 +2751,7 @@
                 decoration: null,
                 controller: controllerA,
                 style: const TextStyle(fontSize: 10.0),
-              )
+              ),
             ),
             const Text(
               'abc',
@@ -4582,7 +4582,7 @@
           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 @@
         position: offset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
 
@@ -4745,7 +4745,7 @@
       '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 8ac2db3..75612a1 100644
--- a/packages/flutter/test/material/text_theme_test.dart
+++ b/packages/flutter/test/material/text_theme_test.dart
@@ -81,7 +81,7 @@
     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 d04b4ad..f893337 100644
--- a/packages/flutter/test/material/theme_defaults_test.dart
+++ b/packages/flutter/test/material/theme_defaults_test.dart
@@ -20,7 +20,7 @@
             child: RaisedButton(
               onPressed: () { }, // button.enabled == true
               child: const Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -48,7 +48,7 @@
             child: RaisedButton(
               onPressed: null, // button.enabled == false
               child: Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -78,7 +78,7 @@
             child: FlatButton(
               onPressed: () { }, // button.enabled == true
               child: const Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -106,7 +106,7 @@
             child: FlatButton(
               onPressed: null, // button.enabled == false
               child: Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -140,7 +140,7 @@
               // elevation is animated to 2.0.
               highlightElevation: 2.0,
               child: const Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -167,7 +167,7 @@
             child: OutlineButton(
               onPressed: () { }, // button.enabled == true
               child: const Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -194,7 +194,7 @@
             child: OutlineButton(
               onPressed: null, // button.enabled == false
               child: Text('button'),
-            )
+            ),
           ),
         ),
       );
@@ -227,7 +227,7 @@
               child: FloatingActionButton(
                 onPressed: () { }, // button.enabled == true
                 child: const Icon(Icons.add),
-              )
+              ),
           ),
         ),
       );
@@ -254,7 +254,7 @@
               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 518a8da..83ebe09 100644
--- a/packages/flutter/test/material/theme_test.dart
+++ b/packages/flutter/test/material/theme_test.dart
@@ -31,13 +31,13 @@
                 key: popupMenuButtonKey,
                 itemBuilder: (BuildContext context) {
                   return <PopupMenuItem<String>>[
-                    const PopupMenuItem<String>(child: Text('menuItem'))
+                    const PopupMenuItem<String>(child: Text('menuItem')),
                   ];
-                }
+                },
               ),
-            ]
-          )
-        )
+            ],
+          ),
+        ),
       )
     );
 
@@ -100,14 +100,14 @@
                   key: popupMenuButtonKey,
                   itemBuilder: (BuildContext context) {
                     return <PopupMenuItem<String>>[
-                      const PopupMenuItem<String>(child: Text('menuItem'))
+                      const PopupMenuItem<String>(child: Text('menuItem')),
                     ];
-                  }
+                  },
                 ),
-              ]
-            )
-          )
-        )
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -137,11 +137,11 @@
                       child: Text('menuItem'),
                     ),
                   ],
-                )
-              ]
-            )
-          )
-        )
+                ),
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -172,10 +172,10 @@
                     child: const Text('SHOW'),
                   );
                 }
-              )
-            )
-          )
-        )
+              ),
+            ),
+          ),
+        ),
       )
     );
 
@@ -209,10 +209,10 @@
                     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 55a9cea..93f4ab2 100644
--- a/packages/flutter/test/material/time_picker_test.dart
+++ b/packages/flutter/test/material/time_picker_test.dart
@@ -40,12 +40,12 @@
                     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 edeaaa9..5fe5571 100644
--- a/packages/flutter/test/material/tooltip_test.dart
+++ b/packages/flutter/test/material/tooltip_test.dart
@@ -432,9 +432,9 @@
               width: 100.0,
               height: 100.0,
               color: Colors.green[500],
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -520,9 +520,9 @@
               width: 100.0,
               height: 100.0,
               color: Colors.green[500],
-            )
-          )
-        )
+            ),
+          ),
+        ),
       );
     }
 
@@ -630,7 +630,7 @@
                 TestSemantics(
                   label: 'Foo\nBar',
                   textDirection: TextDirection.ltr,
-                )
+                ),
               ],
             ),
           ],
@@ -666,7 +666,7 @@
                 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 c563272..91fca26 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 @@
                 ),
                 CircleAvatar(
                   child: Text('E'),
-                )
+                ),
               ],
               accountName: withName ? const Text('name') : null,
               accountEmail: withEmail ? const Text('email') : null,
@@ -221,11 +221,11 @@
     ));
     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 @@
     ));
     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 @@
     ));
     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 @@
     ));
     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 @@
     ));
     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 @@
     ));
     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 @@
     ));
     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 @@
     ));
     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 a80a02c..704f1eb 100644
--- a/packages/flutter/test/painting/border_rtl_test.dart
+++ b/packages/flutter/test/painting/border_rtl_test.dart
@@ -181,7 +181,7 @@
           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 @@
           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 @@
           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 @@
         ..path(
           includes: <Offset>[const Offset(49.0, 10.0)],
           excludes: <Offset>[const Offset(31.0, 10.0)],
-        )
+        ),
     );
     expect(
       (Canvas canvas) {
@@ -663,7 +663,7 @@
         ..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 2906be3..c472833 100644
--- a/packages/flutter/test/painting/box_decoration_test.dart
+++ b/packages/flutter/test/painting/box_decoration_test.dart
@@ -24,7 +24,7 @@
         );
       },
       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 @@
         );
       },
       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 6cb4d4b..db4a91d 100644
--- a/packages/flutter/test/painting/circle_border_test.dart
+++ b/packages/flutter/test/painting/circle_border_test.dart
@@ -24,7 +24,7 @@
     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 7583358..40350c2 100644
--- a/packages/flutter/test/painting/decoration_test.dart
+++ b/packages/flutter/test/painting/decoration_test.dart
@@ -240,7 +240,7 @@
         const BoxDecoration(shape: BoxShape.circle),
         -1.0,
       ),
-      const BoxDecoration(shape: BoxShape.rectangle)
+      const BoxDecoration(shape: BoxShape.rectangle),
     );
     expect(
       BoxDecoration.lerp(
@@ -248,7 +248,7 @@
         const BoxDecoration(shape: BoxShape.circle),
         0.0,
       ),
-      const BoxDecoration(shape: BoxShape.rectangle)
+      const BoxDecoration(shape: BoxShape.rectangle),
     );
     expect(
       BoxDecoration.lerp(
@@ -256,7 +256,7 @@
         const BoxDecoration(shape: BoxShape.circle),
         0.25,
       ),
-      const BoxDecoration(shape: BoxShape.rectangle)
+      const BoxDecoration(shape: BoxShape.rectangle),
     );
     expect(
       BoxDecoration.lerp(
@@ -264,7 +264,7 @@
         const BoxDecoration(shape: BoxShape.circle),
         0.75,
       ),
-      const BoxDecoration(shape: BoxShape.circle)
+      const BoxDecoration(shape: BoxShape.circle),
     );
     expect(
       BoxDecoration.lerp(
@@ -272,7 +272,7 @@
         const BoxDecoration(shape: BoxShape.circle),
         1.0,
       ),
-      const BoxDecoration(shape: BoxShape.circle)
+      const BoxDecoration(shape: BoxShape.circle),
     );
     expect(
       BoxDecoration.lerp(
@@ -280,7 +280,7 @@
         const BoxDecoration(shape: BoxShape.circle),
         2.0,
       ),
-      const BoxDecoration(shape: BoxShape.circle)
+      const BoxDecoration(shape: BoxShape.circle),
     );
   });
 
@@ -292,7 +292,7 @@
         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 @@
         const BoxDecoration(gradient: gradient),
         0.0,
       ),
-      const BoxDecoration()
+      const BoxDecoration(),
     );
     expect(
       BoxDecoration.lerp(
@@ -308,7 +308,7 @@
         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 @@
         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 @@
         const BoxDecoration(gradient: gradient),
         1.0,
       ),
-      const BoxDecoration(gradient: gradient)
+      const BoxDecoration(gradient: gradient),
     );
     expect(
       BoxDecoration.lerp(
@@ -332,7 +332,7 @@
         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 c7d6489..58ebb1a 100644
--- a/packages/flutter/test/painting/fake_image_provider.dart
+++ b/packages/flutter/test/painting/fake_image_provider.dart
@@ -30,7 +30,7 @@
     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 963ffc2..60ab8c7 100644
--- a/packages/flutter/test/painting/gradient_test.dart
+++ b/packages/flutter/test/painting/gradient_test.dart
@@ -195,7 +195,7 @@
       () {
         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 @@
       () {
         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 @@
       () {
         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 @@
       () {
         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 @@
       () {
         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 @@
       () {
         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 @@
       () {
         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 @@
       () {
         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 @@
       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 3d9edf3..7fcc5da 100644
--- a/packages/flutter/test/painting/notched_shapes_test.dart
+++ b/packages/flutter/test/painting/notched_shapes_test.dart
@@ -23,7 +23,7 @@
           expectedPath,
           areaToCompare: host.inflate(5.0),
           sampleSize: 40,
-        )
+        ),
       );
     });
 
@@ -55,7 +55,7 @@
           Path()..addRect(host),
           areaToCompare: host.inflate(800.0),
           sampleSize: 100,
-        )
+        ),
       );
     });
 
@@ -79,7 +79,7 @@
             ..close(),
           areaToCompare: Rect.fromLTWH(-300.0, -300.0, 600.0, 600.0),
           sampleSize: 100,
-        )
+        ),
       );
     });
 
@@ -101,7 +101,7 @@
             ..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 9a9657d..ef3dbbb 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 @@
           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 2532520..52e35cf 100644
--- a/packages/flutter/test/painting/shape_border_test.dart
+++ b/packages/flutter/test/painting/shape_border_test.dart
@@ -55,19 +55,19 @@
     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 @@
     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 784c290..e1e06ec 100644
--- a/packages/flutter/test/painting/shape_decoration_test.dart
+++ b/packages/flutter/test/painting/shape_decoration_test.dart
@@ -81,7 +81,7 @@
         );
       },
       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 @@
           ),
         );
       },
-      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 6d71e3a..58e694e 100644
--- a/packages/flutter/test/painting/stadium_border_test.dart
+++ b/packages/flutter/test/painting/stadium_border_test.dart
@@ -31,7 +31,7 @@
           ..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 e1d56c4..e6d9aca 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 @@
       <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 47d8f58..7fd3690 100644
--- a/packages/flutter/test/rendering/aspect_ratio_test.dart
+++ b/packages/flutter/test/rendering/aspect_ratio_test.dart
@@ -53,7 +53,7 @@
   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 @@
   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 @@
       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 b9b15ec..f762b61 100644
--- a/packages/flutter/test/rendering/baseline_test.dart
+++ b/packages/flutter/test/rendering/baseline_test.dart
@@ -17,8 +17,8 @@
       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 952c769..c9effda 100644
--- a/packages/flutter/test/rendering/box_constraints_test.dart
+++ b/packages/flutter/test/rendering/box_constraints_test.dart
@@ -17,7 +17,7 @@
       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 @@
       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 @@
       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 @@
       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 @@
       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 @@
       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 ea85b1a..e487668 100644
--- a/packages/flutter/test/rendering/constraints_test.dart
+++ b/packages/flutter/test/rendering/constraints_test.dart
@@ -18,9 +18,9 @@
           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 a8c0387..f82d4dc 100644
--- a/packages/flutter/test/rendering/dynamic_intrinsics_test.dart
+++ b/packages/flutter/test/rendering/dynamic_intrinsics_test.dart
@@ -51,7 +51,7 @@
     child.layout(constraints);
     size = Size(
       child.getMinIntrinsicWidth(double.infinity),
-      child.getMinIntrinsicHeight(double.infinity)
+      child.getMinIntrinsicHeight(double.infinity),
     );
   }
 }
@@ -70,8 +70,8 @@
         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 235805a..1e0e36f 100644
--- a/packages/flutter/test/rendering/editable_test.dart
+++ b/packages/flutter/test/rendering/editable_test.dart
@@ -92,7 +92,7 @@
     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 295ddfb..852c64f 100644
--- a/packages/flutter/test/rendering/flex_test.dart
+++ b/packages/flutter/test/rendering/flex_test.dart
@@ -13,7 +13,7 @@
     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 @@
       children: <RenderBox>[
         RenderConstrainedBox(additionalConstraints: const BoxConstraints.tightFor(height: 200.0)),
         flexible,
-      ]
+      ],
     );
     final FlexParentData flexParentData = flexible.parentData;
     flexParentData.flex = 1;
@@ -53,7 +53,7 @@
       children: <RenderBox>[
         RenderConstrainedBox(additionalConstraints: const BoxConstraints.tightFor(width: 200.0)),
         flexible,
-      ]
+      ],
     );
     final FlexParentData flexParentData = flexible.parentData;
     flexParentData.flex = 1;
@@ -72,7 +72,7 @@
       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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     );
     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 4a063f7..a421224 100644
--- a/packages/flutter/test/rendering/independent_layout_test.dart
+++ b/packages/flutter/test/rendering/independent_layout_test.dart
@@ -33,7 +33,7 @@
 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 bb75387..a3f4ffd 100644
--- a/packages/flutter/test/rendering/intrinsic_width_test.dart
+++ b/packages/flutter/test/rendering/intrinsic_width_test.dart
@@ -52,8 +52,8 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
   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 @@
         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 @@
         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 @@
         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 @@
         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 bcd4012..d1541d6 100644
--- a/packages/flutter/test/rendering/limited_box_test.dart
+++ b/packages/flutter/test/rendering/limited_box_test.dart
@@ -21,8 +21,8 @@
       child: RenderLimitedBox(
         maxWidth: 100.0,
         maxHeight: 200.0,
-        child: child
-      )
+        child: child,
+      ),
     );
     layout(parent);
     expect(child.size.width, 100.0);
@@ -70,8 +70,8 @@
       child: RenderLimitedBox(
         maxWidth: 100.0,
         maxHeight: 200.0,
-        child: child
-      )
+        child: child,
+      ),
     );
     layout(parent);
     expect(child.size.width, 100.0);
@@ -90,8 +90,8 @@
       child: RenderLimitedBox(
         maxWidth: 100.0,
         maxHeight: 200.0,
-        child: child
-      )
+        child: child,
+      ),
     );
     layout(parent);
 
@@ -109,7 +109,7 @@
       child: box = RenderLimitedBox(
         maxWidth: 100.0,
         maxHeight: 200.0,
-      )
+      ),
     );
     layout(parent);
     expect(box.size, const Size(10.0, 0.0));
@@ -145,7 +145,7 @@
         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 8cbac03..2fd33df 100644
--- a/packages/flutter/test/rendering/mock_canvas.dart
+++ b/packages/flutter/test/rendering/mock_canvas.dart
@@ -867,7 +867,7 @@
 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 @@
     @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 @@
     @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 d2e587f..8e90bd2 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 @@
     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 da3bf08..7161844 100644
--- a/packages/flutter/test/rendering/paragraph_test.dart
+++ b/packages/flutter/test/rendering/paragraph_test.dart
@@ -250,7 +250,7 @@
     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 9e10235..09d6e0b 100644
--- a/packages/flutter/test/rendering/positioned_box_test.dart
+++ b/packages/flutter/test/rendering/positioned_box_test.dart
@@ -11,7 +11,7 @@
   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 @@
   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 @@
   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 0e927a3..d808549 100644
--- a/packages/flutter/test/rendering/reattach_test.dart
+++ b/packages/flutter/test/rendering/reattach_test.dart
@@ -29,7 +29,7 @@
                 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 bcaf4a6..bb9810b 100644
--- a/packages/flutter/test/rendering/rendering_tester.dart
+++ b/packages/flutter/test/rendering/rendering_tester.dart
@@ -70,8 +70,8 @@
       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 fe8c1e3..18e8671 100644
--- a/packages/flutter/test/rendering/repaint_boundary_test.dart
+++ b/packages/flutter/test/rendering/repaint_boundary_test.dart
@@ -19,9 +19,9 @@
             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 706737b..05ccc77 100644
--- a/packages/flutter/test/rendering/stack_test.dart
+++ b/packages/flutter/test/rendering/stack_test.dart
@@ -17,7 +17,7 @@
       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 36fe089..f383dfa 100644
--- a/packages/flutter/test/rendering/viewport_test.dart
+++ b/packages/flutter/test/rendering/viewport_test.dart
@@ -208,7 +208,7 @@
                   child: Container(
                     height: 100.0,
                     child: Text('Tile $i'),
-                  )
+                  ),
                 );
                 children.add(sliver);
                 return SliverPadding(
@@ -249,7 +249,7 @@
                     child: Container(
                       width: 100.0,
                       child: Text('Tile $i'),
-                    )
+                    ),
                 );
                 children.add(sliver);
                 return SliverPadding(
@@ -290,7 +290,7 @@
                     child: Container(
                       height: 100.0,
                       child: Text('Tile $i'),
-                    )
+                    ),
                 );
                 children.add(sliver);
                 return SliverPadding(
@@ -332,7 +332,7 @@
                     child: Container(
                       width: 100.0,
                       child: Text('Tile $i'),
-                    )
+                    ),
                 );
                 children.add(sliver);
                 return SliverPadding(
@@ -547,7 +547,7 @@
                   ),
                   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 e8a87ee..20864ba 100644
--- a/packages/flutter/test/semantics/semantics_elevation_test.dart
+++ b/packages/flutter/test/semantics/semantics_elevation_test.dart
@@ -50,20 +50,20 @@
                             Card(
                               elevation: 8.0,
                               child: Text('absolute elevation: 30'),
-                            )
+                            ),
                           ],
                         ),
-                      )
+                      ),
                     ],
                   ),
                 ),
                 const Card(
                   elevation: 15.0,
                   child: Text('absolute elevation: 25'),
-                )
+                ),
               ],
             ),
-          )
+          ),
         ],
       ),
     ));
@@ -129,17 +129,17 @@
                             Card(
                               elevation: 8.0,
                               child: Text('absolute elevation: 30'),
-                            )
+                            ),
                           ],
                         ),
-                      )
+                      ),
                     ],
                   ),
                 ),
                 const Text('absolute elevation: 10'),
               ],
             ),
-          )
+          ),
         ],
       ),
     ));
@@ -182,8 +182,8 @@
             child: Material(
               elevation: 24.0,
               child: Text('Hello'),
-            )
-        )
+            ),
+        ),
     ));
 
     final SemanticsNode node = tester.getSemantics(find.text('Hello'));
@@ -221,8 +221,8 @@
                 ),
               ),
             ],
-          )
-        )
+          ),
+        ),
     ));
 
 
@@ -276,8 +276,8 @@
                   ),
                 ),
               ],
-            )
-        )
+            ),
+        ),
     ));
 
 
diff --git a/packages/flutter/test/semantics/semantics_test.dart b/packages/flutter/test/semantics/semantics_test.dart
index 9d85309..d7afc13 100644
--- a/packages/flutter/test/semantics/semantics_test.dart
+++ b/packages/flutter/test/semantics/semantics_test.dart
@@ -84,10 +84,10 @@
               child: TestRender(
                 hasScrollUpAction: true,
                 isSemanticBoundary: true,
-              )
-            )
-          )
-        )
+              ),
+            ),
+          ),
+        ),
       );
 
       layout(root);
@@ -139,7 +139,7 @@
       ' └─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 @@
       ' └─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 @@
       ' └─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 @@
       ..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 @@
       '   └─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 @@
       '   └─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 @@
       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 @@
       '   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 @@
       '   scrollPosition: null\n'
       '   scrollExtentMax: null\n'
       '   elevation: 0.0\n'
-      '   thicknes: 0.0\n'
+      '   thicknes: 0.0\n',
     );
 
   });
@@ -551,7 +551,7 @@
     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 ab60c0d..8df9863 100644
--- a/packages/flutter/test/services/message_codecs_test.dart
+++ b/packages/flutter/test/services/message_codecs_test.dart
@@ -32,7 +32,7 @@
       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 @@
           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 c9d218b..36f25ea 100644
--- a/packages/flutter/test/services/platform_channel_test.dart
+++ b/packages/flutter/test/services/platform_channel_test.dart
@@ -28,7 +28,7 @@
         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 b435ac9..8f1da81 100644
--- a/packages/flutter/test/services/text_input_test.dart
+++ b/packages/flutter/test/services/text_input_test.dart
@@ -26,7 +26,7 @@
       );
       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 @@
       );
       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 c8054f7..6ed0810 100644
--- a/packages/flutter/test/widgets/align_test.dart
+++ b/packages/flutter/test/widgets/align_test.dart
@@ -99,7 +99,7 @@
           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 5684601..e19de9d 100644
--- a/packages/flutter/test/widgets/animated_container_test.dart
+++ b/packages/flutter/test/widgets/animated_container_test.dart
@@ -41,7 +41,7 @@
       AnimatedContainer(
         key: key,
         duration: const Duration(milliseconds: 200),
-        decoration: decorationA
+        decoration: decorationA,
       )
     );
 
@@ -53,7 +53,7 @@
       AnimatedContainer(
         key: key,
         duration: const Duration(milliseconds: 200),
-        decoration: decorationB
+        decoration: decorationB,
       )
     );
 
@@ -224,8 +224,8 @@
           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 @@
           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 @@
           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 e9db7ce..b56b147 100644
--- a/packages/flutter/test/widgets/aspect_ratio_test.dart
+++ b/packages/flutter/test/widgets/aspect_ratio_test.dart
@@ -16,9 +16,9 @@
           aspectRatio: aspectRatio,
           child: Container(
             key: childKey
-          )
-        )
-      )
+          ),
+        ),
+      ),
     )
   );
   final RenderBox box = tester.renderObject(find.byKey(childKey));
@@ -42,10 +42,10 @@
             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 92bc5a8..d8af97a 100644
--- a/packages/flutter/test/widgets/async_test.dart
+++ b/packages/flutter/test/widgets/async_test.dart
@@ -35,14 +35,14 @@
     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 @@
     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 @@
       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 @@
       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 @@
     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 @@
     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 @@
     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 @@
       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 @@
       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 @@
       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 68bfe86..d9a60c9 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 @@
     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 58eb350..7e44033 100644
--- a/packages/flutter/test/widgets/banner_test.dart
+++ b/packages/flutter/test/widgets/banner_test.dart
@@ -262,7 +262,7 @@
       ..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 @@
       ..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 3c7b894..a1d6b91 100644
--- a/packages/flutter/test/widgets/basic_test.dart
+++ b/packages/flutter/test/widgets/basic_test.dart
@@ -76,8 +76,8 @@
                   color: const Color(0xFF0000FF)
                 ),
               ),
-            )
-          )
+            ),
+          ),
         )
       );
       expect(_pointerDown, isFalse);
@@ -106,8 +106,8 @@
                   color: const Color(0xFF0000FF)
                 ),
               ),
-            )
-          )
+            ),
+          ),
         )
       );
       expect(_pointerDown, isFalse);
@@ -136,8 +136,8 @@
                   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 b41b7ed..91098b4 100644
--- a/packages/flutter/test/widgets/box_decoration_test.dart
+++ b/packages/flutter/test/widgets/box_decoration_test.dart
@@ -98,8 +98,8 @@
         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 @@
           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 @@
           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 @@
           onTap: () {
             itemsTapped.add(1);
           },
-        )
+        ),
       );
     }
 
@@ -321,7 +321,7 @@
           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 c1407d7..fbcebb8 100644
--- a/packages/flutter/test/widgets/build_scope_test.dart
+++ b/packages/flutter/test/widgets/build_scope_test.dart
@@ -140,7 +140,7 @@
     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 47e9766..dfbd0e5 100644
--- a/packages/flutter/test/widgets/center_test.dart
+++ b/packages/flutter/test/widgets/center_test.dart
@@ -10,7 +10,7 @@
     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 bfb6929..006c099 100644
--- a/packages/flutter/test/widgets/clip_test.dart
+++ b/packages/flutter/test/widgets/clip_test.dart
@@ -48,7 +48,7 @@
         child: GestureDetector(
           behavior: HitTestBehavior.opaque,
           onTap: () { log.add('tap'); },
-        )
+        ),
       )
     );
     expect(log, equals(<String>['getClip']));
@@ -68,7 +68,7 @@
         child: GestureDetector(
           behavior: HitTestBehavior.opaque,
           onTap: () { log.add('tap'); },
-        )
+        ),
       )
     );
     expect(log, equals(<String>[]));
@@ -90,8 +90,8 @@
           child: GestureDetector(
             behavior: HitTestBehavior.opaque,
             onTap: () { log.add('tap'); },
-          )
-        )
+          ),
+        ),
       )
     );
     expect(log, equals(<String>[]));
@@ -117,9 +117,9 @@
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a']));
@@ -141,9 +141,9 @@
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a', 'tap']));
@@ -159,9 +159,9 @@
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a', 'tap', 'a']));
@@ -177,9 +177,9 @@
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a', 'tap', 'a']));
@@ -195,9 +195,9 @@
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a', 'tap', 'a', 'b']));
@@ -213,9 +213,9 @@
             child: GestureDetector(
               behavior: HitTestBehavior.opaque,
               onTap: () { log.add('tap'); },
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
     expect(log, equals(<String>['a', 'tap', 'a', 'b', 'c']));
@@ -239,12 +239,12 @@
       ..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 18168cf..0fbfa79 100644
--- a/packages/flutter/test/widgets/column_test.dart
+++ b/packages/flutter/test/widgets/column_test.dart
@@ -25,8 +25,8 @@
           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 @@
           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 @@
         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 @@
           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 @@
           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 @@
           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 @@
           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 @@
         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 @@
         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 @@
             Container(
               key: childKey,
               width: 100.0,
-              height: 100.0
-            )
-          ]
-        )
-      )
+              height: 100.0,
+            ),
+          ],
+        ),
+      ),
     ));
 
     final RenderBox renderBox = tester.renderObject(find.byKey(childKey));
@@ -409,8 +409,8 @@
           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 @@
           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 @@
         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 @@
           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 @@
           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 @@
           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 @@
           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 @@
         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 @@
         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 @@
             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 84947e6..f784853 100644
--- a/packages/flutter/test/widgets/container_test.dart
+++ b/packages/flutter/test/widgets/container_test.dart
@@ -38,7 +38,7 @@
 
     await tester.pumpWidget(Align(
       alignment: Alignment.topLeft,
-      child: container
+      child: container,
     ));
 
     final RenderBox box = tester.renderObject(find.byType(Container));
@@ -47,7 +47,7 @@
     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 f7782f2..1aa0398 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 @@
         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 @@
                 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 @@
     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 @@
     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 6877fd3..26e5859 100644
--- a/packages/flutter/test/widgets/custom_paint_test.dart
+++ b/packages/flutter/test/widgets/custom_paint_test.dart
@@ -27,18 +27,18 @@
     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 @@
     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 2f73063..cc968fb 100644
--- a/packages/flutter/test/widgets/custom_painter_test.dart
+++ b/packages/flutter/test/widgets/custom_painter_test.dart
@@ -365,7 +365,7 @@
               rect: TestSemantics.fullScreen,
               actions: allActions.fold<int>(0, (int previous, SemanticsAction action) => previous | action.index),
             ),
-          ]
+          ],
         ),
       ],
     );
@@ -440,7 +440,7 @@
                 rect: TestSemantics.fullScreen,
                 flags: flags,
               ),
-            ]
+            ],
         ),
       ],
     );
@@ -487,7 +487,7 @@
                 rect: TestSemantics.fullScreen,
                 flags: flags,
               ),
-            ]
+            ],
         ),
       ],
     );
@@ -753,7 +753,7 @@
         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 cc1feb6..65265d5 100644
--- a/packages/flutter/test/widgets/dismissible_test.dart
+++ b/packages/flutter/test/widgets/dismissible_test.dart
@@ -160,7 +160,7 @@
   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 @@
   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 8592050..54bc5c5 100644
--- a/packages/flutter/test/widgets/draggable_test.dart
+++ b/packages/flutter/test/widgets/draggable_test.dart
@@ -391,7 +391,7 @@
             },
             onAccept: (int data) {
               events.add('drop $data');
-            }
+            },
           ),
           Container(height: 400.0),
           const Draggable<int>(
@@ -499,7 +499,7 @@
             },
             onAccept: (int data) {
               events.add('drop $data');
-            }
+            },
           ),
           Container(width: 400.0),
           const Draggable<int>(
@@ -606,7 +606,7 @@
               },
               onAccept: (int data) {
                 events.add('drop $data');
-              }
+              },
             ),
             Container(width: 400.0),
             const Draggable<int>(
@@ -733,7 +733,7 @@
             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 @@
             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 @@
               Draggable<int>(
                   data: 1,
                   child: Text('Source'),
-                  feedback: Text('Dragging')
+                  feedback: Text('Dragging'),
               ),
-            ]
-        )
+            ],
+        ),
     ));
 
     expect(events, isEmpty);
@@ -1594,7 +1594,7 @@
           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 @@
           Draggable<int>(
             data: 1,
             child: Text('Source'),
-            feedback: Text('Dragging')
+            feedback: Text('Dragging'),
           ),
-        ]
-      )
+        ],
+      ),
     ));
 
     expect(events, isEmpty);
@@ -1652,7 +1652,7 @@
           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 3578619..53754db 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 @@
     editableTextState.updateFloatingCursor(
       RawFloatingCursorPoint(
         state: FloatingCursorDragState.Update,
-        offset: const Offset(20, 20)
+        offset: const Offset(20, 20),
       ),
     );
     await tester.pump();
@@ -556,7 +556,7 @@
       ..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 @@
           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 @@
       ..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 2772703..ade64bd 100644
--- a/packages/flutter/test/widgets/editable_text_test.dart
+++ b/packages/flutter/test/widgets/editable_text_test.dart
@@ -905,7 +905,7 @@
       semantics,
       includesNodeWith(flags: <SemanticsFlag>[
         SemanticsFlag.isTextField,
-        SemanticsFlag.isFocused
+        SemanticsFlag.isFocused,
       ]),
     );
 
@@ -1517,7 +1517,7 @@
                     TestSemantics(
                       flags: <SemanticsFlag>[
                         SemanticsFlag.isTextField,
-                        SemanticsFlag.isObscured
+                        SemanticsFlag.isObscured,
                       ],
                       value: expectedValue,
                       textDirection: TextDirection.ltr,
@@ -1781,7 +1781,7 @@
                         id: expectedNodeId,
                         flags: <SemanticsFlag>[
                           SemanticsFlag.isTextField,
-                          SemanticsFlag.isFocused
+                          SemanticsFlag.isFocused,
                         ],
                         actions: <SemanticsAction>[
                           SemanticsAction.moveCursorBackwardByCharacter,
@@ -1789,7 +1789,7 @@
                           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 6c65499..dbc8baa 100644
--- a/packages/flutter/test/widgets/ensure_visible_test.dart
+++ b/packages/flutter/test/widgets/ensure_visible_test.dart
@@ -466,7 +466,7 @@
               ],
             ),
           ),
-        )
+        ),
       ));
 
       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 9612c67..fa05086 100644
--- a/packages/flutter/test/widgets/fitted_box_test.dart
+++ b/packages/flutter/test/widgets/fitted_box_test.dart
@@ -21,9 +21,9 @@
               key: inside,
               width: 100.0,
               height: 50.0,
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -57,9 +57,9 @@
               key: inside,
               width: 100.0,
               height: 50.0,
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -93,9 +93,9 @@
               key: inside,
               width: 100.0,
               height: 50.0,
-            )
-          )
-        )
+            ),
+          ),
+        ),
       )
     );
 
@@ -461,11 +461,11 @@
                 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 90c31f3..26654b48 100644
--- a/packages/flutter/test/widgets/flow_test.dart
+++ b/packages/flutter/test/widgets/flow_test.dart
@@ -61,8 +61,8 @@
           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 @@
           buildBox(4),
           buildBox(5),
           buildBox(6),
-        ]
+        ],
       )
     );
 
@@ -107,7 +107,7 @@
         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 55606f1..73cf030 100644
--- a/packages/flutter/test/widgets/form_test.dart
+++ b/packages/flutter/test/widgets/form_test.dart
@@ -431,7 +431,7 @@
                 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 b0579d7..1bde2dc 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 @@
           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 91b1f68..e616be3 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 @@
     );
 
     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 @@
     );
 
     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 773d9d2..bb4235d 100644
--- a/packages/flutter/test/widgets/gesture_detector_test.dart
+++ b/packages/flutter/test/widgets/gesture_detector_test.dart
@@ -378,7 +378,7 @@
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
 
@@ -452,7 +452,7 @@
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: maxPressure,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
 
@@ -504,7 +504,7 @@
         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 1e838b5..b881a43 100644
--- a/packages/flutter/test/widgets/gesture_disambiguation_test.dart
+++ b/packages/flutter/test/widgets/gesture_disambiguation_test.dart
@@ -23,10 +23,10 @@
           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 45caace..0b9ca28 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 @@
       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 23e6460..403d139 100644
--- a/packages/flutter/test/widgets/heroes_test.dart
+++ b/packages/flutter/test/widgets/heroes_test.dart
@@ -30,14 +30,14 @@
         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 @@
       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 @@
           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 @@
       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 @@
               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 @@
           child: const Text('three'),
           onPressed: () { Navigator.push(context, ThreeRoute()); },
         ),
-      ]
-    )
+      ],
+    ),
   ),
 };
 
@@ -103,8 +103,8 @@
           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 @@
             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 @@
     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 @@
             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 @@
                 child: Container(
                   width: 100.0,
                   height: 150.0,
-                  child: const Text('bar')
-                )
-              )
-            )
+                  child: const Text('bar'),
+                ),
+              ),
+            ),
           );
-        }
-      }
+        },
+      },
     ));
 
     expect(log, isEmpty);
@@ -627,10 +627,10 @@
               ),
               FlatButton(
                 child: const Text('POP'),
-                onPressed: () { Navigator.pop(context); }
+                onPressed: () { Navigator.pop(context); },
               ),
             ],
-          )
+          ),
         );
       },
     );
@@ -648,7 +648,7 @@
                   ),
                   FlatButton(
                     child: const Text('PUSH'),
-                    onPressed: () { Navigator.push(context, route); }
+                    onPressed: () { Navigator.push(context, route); },
                   ),
                 ],
               );
@@ -721,15 +721,15 @@
               // 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 @@
                   ),
                   FlatButton(
                     child: const Text('PUSH'),
-                    onPressed: () { Navigator.push(context, route); }
+                    onPressed: () { Navigator.push(context, route); },
                   ),
                   const SizedBox(height: 600.0),
                 ],
@@ -804,11 +804,11 @@
               // 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 @@
                   ),
                   FlatButton(
                     child: const Text('PUSH'),
-                    onPressed: () { Navigator.push(context, route); }
+                    onPressed: () { Navigator.push(context, route); },
                   ),
                 ],
               );
@@ -880,11 +880,11 @@
             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 @@
               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 @@
                   ),
                   FlatButton(
                     child: const Text('PUSH B'),
-                    onPressed: () { Navigator.push(context, routeB); }
+                    onPressed: () { Navigator.push(context, routeB); },
                   ),
                 ],
               );
@@ -990,10 +990,10 @@
               ),
               FlatButton(
                 child: const Text('POP'),
-                onPressed: () { Navigator.pop(context); }
+                onPressed: () { Navigator.pop(context); },
               ),
             ],
-          )
+          ),
         );
       },
     );
@@ -1016,7 +1016,7 @@
                   ),
                   FlatButton(
                     child: const Text('PUSH'),
-                    onPressed: () { Navigator.push(context, route); }
+                    onPressed: () { Navigator.push(context, route); },
                   ),
                 ],
               );
@@ -1073,10 +1073,10 @@
             ),
             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 @@
               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 65992b9..122f2cd 100644
--- a/packages/flutter/test/widgets/hyperlink_test.dart
+++ b/packages/flutter/test/widgets/hyperlink_test.dart
@@ -31,16 +31,16 @@
             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 f9d11b9..0d9e5f2 100644
--- a/packages/flutter/test/widgets/icon_test.dart
+++ b/packages/flutter/test/widgets/icon_test.dart
@@ -16,9 +16,9 @@
         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 676c530..706de55 100644
--- a/packages/flutter/test/widgets/image_icon_test.dart
+++ b/packages/flutter/test/widgets/image_icon_test.dart
@@ -14,7 +14,7 @@
   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 @@
       const Center(
         child: ImageIcon(
           null,
-          size: 96.0
-        )
+          size: 96.0,
+        ),
       )
     );
 
@@ -57,8 +57,8 @@
       const Center(
         child: IconTheme(
           data: IconThemeData(size: 36.0),
-          child: ImageIcon(null)
-        )
+          child: ImageIcon(null),
+        ),
       )
     );
 
@@ -73,9 +73,9 @@
           data: IconThemeData(size: 36.0),
           child: ImageIcon(
             null,
-            size: 48.0
-          )
-        )
+            size: 48.0,
+          ),
+        ),
       )
     );
 
@@ -88,8 +88,8 @@
       const Center(
         child: IconTheme(
           data: IconThemeData(),
-          child: ImageIcon(null)
-        )
+          child: ImageIcon(null),
+        ),
       )
     );
 
@@ -105,7 +105,7 @@
         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 b342585..0592624 100644
--- a/packages/flutter/test/widgets/image_resolution_test.dart
+++ b/packages/flutter/test/widgets/image_resolution_test.dart
@@ -125,7 +125,7 @@
     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 @@
           Image(
             key: key,
             excludeFromSemantics: true,
-            image: TestAssetImage(image)
+            image: TestAssetImage(image),
           ) :
           Image(
             key: key,
@@ -142,10 +142,10 @@
             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 f338f18..6eb3d26 100644
--- a/packages/flutter/test/widgets/image_rtl_test.dart
+++ b/packages/flutter/test/widgets/image_rtl_test.dart
@@ -77,7 +77,7 @@
       ..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 @@
       ..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 @@
       ..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 @@
       ..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 @@
       ..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 @@
       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 @@
               image: DecorationImage(
                 image: TestImageProvider(),
                 alignment: Alignment.centerRight,
-                matchTextDirection: true
+                matchTextDirection: true,
               ),
             ),
           ),
@@ -269,7 +269,7 @@
       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 @@
               image: DecorationImage(
                 image: TestImageProvider(),
                 alignment: Alignment.centerRight,
-                matchTextDirection: true
+                matchTextDirection: true,
               ),
             ),
           ),
@@ -297,7 +297,7 @@
       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 @@
       ..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 @@
       ..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 @@
       ..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 @@
       ..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 @@
       ..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 @@
       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 @@
             child: Image(
               image: TestImageProvider(),
               alignment: Alignment.centerRight,
-              matchTextDirection: true
+              matchTextDirection: true,
             ),
           ),
         ),
@@ -515,7 +515,7 @@
       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 @@
             child: Image(
               image: TestImageProvider(),
               alignment: Alignment.centerRight,
-              matchTextDirection: true
+              matchTextDirection: true,
             ),
           ),
         ),
@@ -541,7 +541,7 @@
       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 943c9b1..a45eea9 100644
--- a/packages/flutter/test/widgets/image_test.dart
+++ b/packages/flutter/test/widgets/image_test.dart
@@ -24,7 +24,7 @@
         child: Image(
           image: imageProvider1,
           excludeFromSemantics: true,
-        )
+        ),
       ),
       null,
       EnginePhase.layout,
@@ -46,10 +46,10 @@
         child: Image(
           image: imageProvider2,
           excludeFromSemantics: true,
-        )
+        ),
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
 
     renderImage = key.currentContext.findRenderObject();
@@ -66,10 +66,10 @@
           gaplessPlayback: true,
           image: imageProvider1,
           excludeFromSemantics: true,
-        )
+        ),
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
     RenderImage renderImage = key.currentContext.findRenderObject();
     expect(renderImage.image, isNull);
@@ -89,10 +89,10 @@
           gaplessPlayback: true,
           image: imageProvider2,
           excludeFromSemantics: true,
-        )
+        ),
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
 
     renderImage = key.currentContext.findRenderObject();
@@ -109,7 +109,7 @@
         excludeFromSemantics: true,
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
     RenderImage renderImage = key.currentContext.findRenderObject();
     expect(renderImage.image, isNull);
@@ -129,7 +129,7 @@
         excludeFromSemantics: true,
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
 
     renderImage = key.currentContext.findRenderObject();
@@ -147,7 +147,7 @@
         excludeFromSemantics: true,
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
     RenderImage renderImage = key.currentContext.findRenderObject();
     expect(renderImage.image, isNull);
@@ -165,10 +165,10 @@
         key: key,
         gaplessPlayback: true,
         excludeFromSemantics: true,
-        image: imageProvider2
+        image: imageProvider2,
       ),
       null,
-      EnginePhase.layout
+      EnginePhase.layout,
     );
 
     renderImage = key.currentContext.findRenderObject();
@@ -199,9 +199,9 @@
           child: Image(
             excludeFromSemantics: true,
             key: imageKey,
-            image: imageProvider
+            image: imageProvider,
           ),
-        )
+        ),
       )
     );
 
@@ -226,9 +226,9 @@
           child: Image(
             excludeFromSemantics: true,
             key: imageKey,
-            image: imageProvider
+            image: imageProvider,
           ),
-        )
+        ),
       )
     );
 
@@ -256,8 +256,8 @@
             child: Image(
               excludeFromSemantics: true,
               key: imageKey,
-              image: imageProvider
-            )
+              image: imageProvider,
+            ),
           ),
           MediaQuery(
             key: mediaQueryKey1,
@@ -265,9 +265,9 @@
               devicePixelRatio: 10.0,
               padding: EdgeInsets.zero,
             ),
-            child: Container(width: 100.0)
-          )
-        ]
+            child: Container(width: 100.0),
+          ),
+        ],
       )
     );
 
@@ -283,7 +283,7 @@
               devicePixelRatio: 5.0,
               padding: EdgeInsets.zero,
             ),
-            child: Container(width: 100.0)
+            child: Container(width: 100.0),
           ),
           MediaQuery(
             key: mediaQueryKey1,
@@ -294,10 +294,10 @@
             child: Image(
               excludeFromSemantics: true,
               key: imageKey,
-              image: imageProvider
-            )
-          )
-        ]
+              image: imageProvider,
+            ),
+          ),
+        ],
       )
     );
 
@@ -643,7 +643,7 @@
         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 @@
             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 @@
             key: key,
             child: Image(
               excludeFromSemantics: true,
-              image: imageProvider2
-            )
+              image: imageProvider2,
+            ),
         ),
         null,
-        EnginePhase.layout
+        EnginePhase.layout,
     );
 
     renderImage = key.currentContext.findRenderObject();
@@ -838,7 +838,7 @@
           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 73e6e82..9759fb5 100644
--- a/packages/flutter/test/widgets/implicit_animations_test.dart
+++ b/packages/flutter/test/widgets/implicit_animations_test.dart
@@ -9,7 +9,7 @@
   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 @@
   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 @@
   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 @@
   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 b1861fd..19d45dd 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 @@
     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 91a162b..c8e64ea 100644
--- a/packages/flutter/test/widgets/inherited_test.dart
+++ b/packages/flutter/test/widgets/inherited_test.dart
@@ -98,8 +98,8 @@
               log.add(context.inheritFromWidgetOfExactType(TestInherited));
               return Container();
             }
-          )
-        )
+          ),
+        ),
       );
     }
 
@@ -136,11 +136,11 @@
                             log.add('a: ${v.value}');
                             return const Text('', textDirection: TextDirection.ltr);
                           }
-                        )
-                      )
-                    )
-                  )
-                )
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
               ),
               right: Container(
                 child: ValueInherited(
@@ -153,14 +153,14 @@
                           log.add('b: ${v.value}');
                           return const Text('', textDirection: TextDirection.ltr);
                         }
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
       )
     );
 
@@ -211,11 +211,11 @@
                             log.add('a: ${v.value}');
                             return const Text('', textDirection: TextDirection.ltr);
                           }
-                        )
-                      )
-                    )
-                  )
-                )
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
               ),
               right: Container(
                 child: ValueInherited(
@@ -229,14 +229,14 @@
                           log.add('b: ${v.value}');
                           return const Text('', textDirection: TextDirection.ltr);
                         }
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
       )
     );
 
@@ -288,11 +288,11 @@
                       value: 3,
                       child: Container(
                         key: key,
-                        child: child
-                      )
-                    )
-                  )
-                )
+                        child: child,
+                      ),
+                    ),
+                  ),
+                ),
               ),
               right: Container(
                 child: ValueInherited(
@@ -300,14 +300,14 @@
                   child: Container(
                     child: Container(
                       key: key,
-                      child: child
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
+                      child: child,
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
       )
     );
 
@@ -342,7 +342,7 @@
         final ValueInherited v = context.inheritFromWidgetOfExactType(ValueInherited);
         log.add(v.value);
         return const Text('', textDirection: TextDirection.ltr);
-      }
+      },
     );
 
     await tester.pumpWidget(
@@ -351,10 +351,10 @@
         child: FlipWidget(
           left: ValueInherited(
             value: 3,
-            child: child
+            child: child,
           ),
-          right: child
-        )
+          right: child,
+        ),
       )
     );
 
@@ -390,7 +390,7 @@
           inheritedValue = widget?.value;
           return Container();
         }
-      )
+      ),
     );
 
     await tester.pumpWidget(
@@ -402,7 +402,7 @@
     await tester.pumpWidget(
       ValueInherited(
         value: 3,
-        child: inner
+        child: inner,
       )
     );
     expect(inheritedValue, equals(3));
@@ -418,7 +418,7 @@
           buildCount += 1;
           return Container();
         }
-      )
+      ),
     );
 
     await tester.pumpWidget(
@@ -429,7 +429,7 @@
     await tester.pumpWidget(
       ValueInherited(
         value: 3,
-        child: inner
+        child: inner,
       )
     );
     expect(buildCount, equals(1));
@@ -448,8 +448,8 @@
             buildCount += 1;
             return Container();
           }
-        )
-      )
+        ),
+      ),
     );
 
     await tester.pumpWidget(
@@ -460,7 +460,7 @@
     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 d5d7d64..7a10975 100644
--- a/packages/flutter/test/widgets/invert_colors_test.dart
+++ b/packages/flutter/test/widgets/invert_colors_test.dart
@@ -53,7 +53,7 @@
   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 1d717e7..bd0002d 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 @@
         SizedBox(
           height: _flag ? 50.0 : 100.0,
           width: 100.0,
-          child: widget.child
-        )
+          child: widget.child,
+        ),
       ],
     );
   }
@@ -64,7 +64,7 @@
           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 19e6b0d..28788a8 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 @@
 class Wrapper extends StatelessWidget {
   const Wrapper({
     Key key,
-    @required this.child
+    @required this.child,
   }) : assert(child != null),
        super(key: key);
 
@@ -36,10 +36,10 @@
           child: Wrapper(
             child: LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
               return Wrapper(
-                child: SizedBox(key: victimKey)
+                child: SizedBox(key: victimKey),
               );
-            })
-          )
+            }),
+          ),
         ),
       ],
     ));
@@ -50,16 +50,16 @@
         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 1babfa4..9cc7a98 100644
--- a/packages/flutter/test/widgets/layout_builder_test.dart
+++ b/packages/flutter/test/widgets/layout_builder_test.dart
@@ -23,11 +23,11 @@
               return SizedBox(
                 key: childKey,
                 width: layoutBuilderSize.width / 2.0,
-                height: layoutBuilderSize.height / 2.0
+                height: layoutBuilderSize.height / 2.0,
               );
-            }
-          )
-        )
+            },
+          ),
+        ),
       )
     );
 
@@ -58,12 +58,12 @@
                 return SizedBox(
                   key: childKey,
                   width: childWidth,
-                  height: childHeight
+                  height: childHeight,
                 );
               }
             );
-          }
-        )
+          },
+        ),
       )
     );
 
@@ -105,13 +105,13 @@
                   return SizedBox(
                     key: childKey,
                     width: layoutBuilderSize.width,
-                    height: layoutBuilderSize.height
+                    height: layoutBuilderSize.height,
                   );
                 }
-              )
+              ),
             );
           }
-        )
+        ),
       )
     );
 
@@ -141,13 +141,13 @@
 
     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 @@
 
     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 d50e3e2..52261c5 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 @@
         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 6e3174c..b8a5862 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 @@
           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 d275594..4b1ba5c8 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 @@
               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 @@
       firstIndex: 3,
       lastIndex: 4,
       leadingScrollOffset: 25.0,
-      trailingScrollOffset: 26.0
+      trailingScrollOffset: 26.0,
     );
     expect(maxScrollOffset, equals(26.0));
   });
@@ -182,19 +182,19 @@
                   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 d56b385..0c8c856 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 @@
       Directionality(
         textDirection: TextDirection.ltr,
         child: ListView(
-          children: const <Widget>[]
+          children: const <Widget>[],
         ),
       ),
     );
@@ -138,7 +138,7 @@
       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 5c1c420..d7d1f26 100644
--- a/packages/flutter/test/widgets/list_view_test.dart
+++ b/packages/flutter/test/widgets/list_view_test.dart
@@ -324,7 +324,7 @@
             child: Text('$i', textDirection: TextDirection.ltr),
           );
         },
-      )
+      ),
     );
 
     await tester.pumpWidget(
@@ -526,7 +526,7 @@
       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 617be7e..362fc34 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 @@
       scrollDirection: Axis.vertical,
       children: items.map<Widget>((int item) {
         return Container(
-          child: Text('$item')
+          child: Text('$item'),
         );
       }).toList(),
     ),
@@ -76,7 +76,7 @@
           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 e655acb..84199cf 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 @@
 
     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 @@
     expect(callbackTracker, equals(<int>[
       0, 1, 2,
       3, 4, 5, //visible
-      6, 7
+      6, 7,
     ]));
     callbackTracker.clear();
 
@@ -189,7 +189,7 @@
         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 @@
                       Container(height: 80.0, child: text),
                       Container(height: 70.0, child: text),
                     ],
-                  )
+                  ),
               ),
-            )
+            ),
         )
     );
 
@@ -483,9 +483,9 @@
                                   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 e699aa2..86539a3 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 @@
     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 a374b9b..65a5ba8 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 @@
       // 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 @@
       // 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 @@
       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 @@
       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 5331598..1cde7a9 100644
--- a/packages/flutter/test/widgets/listener_test.dart
+++ b/packages/flutter/test/widgets/listener_test.dart
@@ -25,10 +25,10 @@
               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 725043c..5198718 100644
--- a/packages/flutter/test/widgets/modal_barrier_test.dart
+++ b/packages/flutter/test/widgets/modal_barrier_test.dart
@@ -23,8 +23,8 @@
       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 @@
       children: <Widget>[
         tapTarget,
         const ModalBarrier(dismissible: false),
-      ]
+      ],
     );
 
     await tester.pumpWidget(subject);
@@ -50,7 +50,7 @@
       children: <Widget>[
         const ModalBarrier(dismissible: false),
         tapTarget,
-      ]
+      ],
     );
 
     await tester.pumpWidget(subject);
@@ -222,8 +222,8 @@
       Navigator.pushNamed(context, '/modal');
     },
     child: Container(
-      child: const Text('X')
-    )
+      child: const Text('X'),
+    ),
   );
   }
 }
@@ -233,7 +233,7 @@
   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 6845f93..ad37aee 100644
--- a/packages/flutter/test/widgets/multichild_test.dart
+++ b/packages/flutter/test/widgets/multichild_test.dart
@@ -138,7 +138,7 @@
         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 d524d3a..e676ae6 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 @@
                   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 f7d96b6..54e3886 100644
--- a/packages/flutter/test/widgets/navigator_test.dart
+++ b/packages/flutter/test/widgets/navigator_test.dart
@@ -62,7 +62,7 @@
           onException(e);
         }
       },
-      behavior: HitTestBehavior.opaque
+      behavior: HitTestBehavior.opaque,
     );
   }
 }
@@ -190,7 +190,7 @@
       targetKey: targetKey,
       onException: (dynamic e) {
         exception = e;
-      }
+      },
     );
     await tester.pumpWidget(widget);
     await tester.tap(find.byKey(targetKey));
@@ -277,13 +277,13 @@
                 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 @@
           },
         );
         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 5d40073..1d45aa7 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 @@
               }).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 1af690a..cc339bb 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 @@
       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 c32aae4..c28892b 100644
--- a/packages/flutter/test/widgets/opacity_test.dart
+++ b/packages/flutter/test/widgets/opacity_test.dart
@@ -30,7 +30,7 @@
             rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0),
             label: 'a',
             textDirection: TextDirection.rtl,
-          )
+          ),
         ],
       ),
     ));
@@ -64,7 +64,7 @@
             rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0),
             label: 'a',
             textDirection: TextDirection.rtl,
-          )
+          ),
         ],
       ),
     ));
@@ -98,7 +98,7 @@
             rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0),
             label: 'a',
             textDirection: TextDirection.rtl,
-          )
+          ),
         ],
       ),
     ));
@@ -120,7 +120,7 @@
             rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0),
             label: 'a',
             textDirection: TextDirection.rtl,
-          )
+          ),
         ],
       ),
     ));
@@ -142,7 +142,7 @@
             rect: Rect.fromLTRB(0.0, 0.0, 800.0, 600.0),
             label: 'a',
             textDirection: TextDirection.rtl,
-          )
+          ),
         ],
       ),
     ));
@@ -166,15 +166,15 @@
                       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 e6c0517..fac1be0 100644
--- a/packages/flutter/test/widgets/overflow_box_test.dart
+++ b/packages/flutter/test/widgets/overflow_box_test.dart
@@ -21,9 +21,9 @@
           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 @@
       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 91d0d01..2c78b24 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 @@
     Key key,
     this.childFirstHalf,
     this.childSecondHalf,
-    Animation<double> animation
+    Animation<double> animation,
   }) : super(key: key, listenable: animation);
 
   final Widget childFirstHalf;
@@ -92,17 +92,17 @@
                         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 b77f629..f72cd0a 100644
--- a/packages/flutter/test/widgets/page_storage_test.dart
+++ b/packages/flutter/test/widgets/page_storage_test.dart
@@ -19,10 +19,10 @@
             PageStorage.of(context).writeState(context, storedValue);
             setState = setter;
             return Center(
-              child: Text('storedValue: $storedValue')
+              child: Text('storedValue: $storedValue'),
             );
-          }
-        )
+          },
+        ),
       )
     );
 
@@ -49,10 +49,10 @@
             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 a910bd9..04e66f9 100644
--- a/packages/flutter/test/widgets/page_transitions_test.dart
+++ b/packages/flutter/test/widgets/page_transitions_test.dart
@@ -41,7 +41,7 @@
   Widget build(BuildContext context) {
     return Scaffold(
       key: _scaffoldKey,
-      body: const Text('Sheet')
+      body: const Text('Sheet'),
     );
   }
 }
@@ -140,9 +140,9 @@
           color: const Color(0xff00ffff),
           child: const Hero(
             tag: kHeroTag,
-            child: Text('Home')
-          )
-        )
+            child: Text('Home'),
+          ),
+        ),
       ),
       '/settings': (_) => Scaffold(
         key: containerKey2,
@@ -151,9 +151,9 @@
           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 59574de..3196197 100644
--- a/packages/flutter/test/widgets/page_view_test.dart
+++ b/packages/flutter/test/widgets/page_view_test.dart
@@ -172,7 +172,7 @@
           child: PageView(
             children: kStates.map<Widget>((String state) => Text(state)).toList(),
           ),
-        )
+        ),
       ),
     ));
 
@@ -690,7 +690,7 @@
               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 c966b5b..7c6f9cb 100644
--- a/packages/flutter/test/widgets/pageable_list_test.dart
+++ b/packages/flutter/test/widgets/pageable_list_test.dart
@@ -17,7 +17,7 @@
     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 bd2847b..5892c28 100644
--- a/packages/flutter/test/widgets/parent_data_test.dart
+++ b/packages/flutter/test/widgets/parent_data_test.dart
@@ -359,7 +359,7 @@
         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 ba64212..3eb017a 100644
--- a/packages/flutter/test/widgets/platform_view_test.dart
+++ b/packages/flutter/test/widgets/platform_view_test.dart
@@ -36,7 +36,7 @@
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'webview', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -66,7 +66,7 @@
       final ByteData byteData = ByteData.view(
           rawCreationParams.buffer,
           rawCreationParams.offsetInBytes,
-          rawCreationParams.lengthInBytes
+          rawCreationParams.lengthInBytes,
       );
       final dynamic actualParams = const StringCodec().decodeMessage(byteData);
 
@@ -75,7 +75,7 @@
         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 @@
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'webview', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
 
@@ -145,7 +145,7 @@
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'webview', const Size(100.0, 50.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -179,7 +179,7 @@
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 2, 'maps', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -243,7 +243,7 @@
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'webview', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -318,7 +318,7 @@
       );
       expect(
           numPointerDownsOnParent,
-          1
+          1,
       );
     });
 
@@ -366,7 +366,7 @@
       );
       expect(
           numPointerDownsOnParent,
-          1
+          1,
       );
     });
 
@@ -414,7 +414,7 @@
       );
       expect(
           numPointerDownsOnParent,
-          0
+          0,
       );
     });
 
@@ -468,7 +468,7 @@
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'maps', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionRtl)
+              AndroidViewController.kAndroidLayoutDirectionRtl),
         ]),
       );
 
@@ -486,7 +486,7 @@
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'maps', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -512,7 +512,7 @@
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'maps', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionRtl)
+              AndroidViewController.kAndroidLayoutDirectionRtl),
         ]),
       );
 
@@ -533,7 +533,7 @@
         viewsController.views,
         unorderedEquals(<FakeAndroidPlatformView>[
           FakeAndroidPlatformView(currentViewId + 1, 'maps', const Size(200.0, 100.0),
-              AndroidViewController.kAndroidLayoutDirectionLtr)
+              AndroidViewController.kAndroidLayoutDirectionLtr),
         ]),
       );
     });
@@ -827,7 +827,7 @@
       expect(
         viewsController.views,
         unorderedEquals(<FakeUiKitView>[
-          FakeUiKitView(currentViewId + 1, 'webview')
+          FakeUiKitView(currentViewId + 1, 'webview'),
         ]),
       );
     });
@@ -860,7 +860,7 @@
       expect(
         viewsController.views,
         unorderedEquals(<FakeUiKitView>[
-          FakeUiKitView(currentViewId + 2, 'maps')
+          FakeUiKitView(currentViewId + 2, 'maps'),
         ]),
       );
     });
@@ -954,7 +954,7 @@
       expect(
         viewsController.views,
         unorderedEquals(<FakeUiKitView>[
-          FakeUiKitView(currentViewId + 1, 'webview')
+          FakeUiKitView(currentViewId + 1, 'webview'),
         ]),
       );
     });
@@ -984,7 +984,7 @@
       final ByteData byteData = ByteData.view(
           rawCreationParams.buffer,
           rawCreationParams.offsetInBytes,
-          rawCreationParams.lengthInBytes
+          rawCreationParams.lengthInBytes,
       );
       final dynamic actualParams = const StringCodec().decodeMessage(byteData);
 
@@ -992,7 +992,7 @@
       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 371a828..d22b1ca 100644
--- a/packages/flutter/test/widgets/positioned_test.dart
+++ b/packages/flutter/test/widgets/positioned_test.dart
@@ -65,7 +65,7 @@
       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 adc74ba..b4d540a 100644
--- a/packages/flutter/test/widgets/reassemble_test.dart
+++ b/packages/flutter/test/widgets/reassemble_test.dart
@@ -8,7 +8,7 @@
 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 36c0aaf..2966a2f 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 @@
       controller: _controller,
       itemBuilder: (BuildContext context, int index) {
         return Text('${index + from}', key: ValueKey<int>(index));
-      }
+      },
     );
   }
 }
@@ -50,7 +50,7 @@
             );
           }
           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 1270df4..9488e12 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 @@
       decoration: kBoxDecorationA,
       child: DecoratedBox(
         decoration: kBoxDecorationB
-      )
+      ),
     ));
 
     checkFullTree();
@@ -106,8 +106,8 @@
       child: TestWidget(
         child: DecoratedBox(
           decoration: kBoxDecorationB
-        )
-      )
+        ),
+      ),
     ));
 
     checkFullTree();
@@ -116,7 +116,7 @@
       decoration: kBoxDecorationA,
       child: DecoratedBox(
         decoration: kBoxDecorationB
-      )
+      ),
     ));
 
     checkFullTree();
@@ -133,9 +133,9 @@
         child: TestWidget(
           child: DecoratedBox(
             decoration: kBoxDecorationB
-          )
-        )
-      )
+          ),
+        ),
+      ),
     ));
 
     checkFullTree();
@@ -155,8 +155,8 @@
         decoration: kBoxDecorationB,
         child: DecoratedBox(
           decoration: kBoxDecorationC
-        )
-      )
+        ),
+      ),
     ));
 
     SingleChildRenderObjectElement element =
@@ -195,7 +195,7 @@
 
     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 @@
 
     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 5967b5f..8f48b30 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 @@
               }
             );
           }
-        )
+        ),
       ),
     ));
 
diff --git a/packages/flutter/test/widgets/reparent_state_test.dart b/packages/flutter/test/widgets/reparent_state_test.dart
index eec6c1f..450cf05 100644
--- a/packages/flutter/test/widgets/reparent_state_test.dart
+++ b/packages/flutter/test/widgets/reparent_state_test.dart
@@ -59,15 +59,15 @@
         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 @@
           Container(
             child: StateMarker(
               key: right,
-              child: newGrandchild
-            )
+              child: newGrandchild,
+            ),
           ),
           Container(
-            child: StateMarker(key: left)
+            child: StateMarker(key: left),
           ),
-        ]
+        ],
       )
     );
 
@@ -113,9 +113,9 @@
         child: Container(
           child: StateMarker(
             key: left,
-            child: Container()
-          )
-        )
+            child: Container(),
+          ),
+        ),
       )
     );
 
@@ -136,9 +136,9 @@
           StateMarker(key: left),
           StateMarker(
             key: right,
-            child: grandchild
-          )
-        ]
+            child: grandchild,
+          ),
+        ],
       )
     );
 
@@ -158,10 +158,10 @@
         children: <Widget>[
           StateMarker(
             key: right,
-            child: newGrandchild
+            child: newGrandchild,
           ),
-          StateMarker(key: left)
-        ]
+          StateMarker(key: left),
+        ],
       )
     );
 
@@ -180,9 +180,9 @@
         child: Container(
           child: StateMarker(
             key: left,
-            child: Container()
-          )
-        )
+            child: Container(),
+          ),
+        ),
       )
     );
 
@@ -232,7 +232,7 @@
       children: <Widget>[
         StateMarker(key: key),
         Container(width: 100.0, height: 100.0),
-      ]
+      ],
     ));
 
     final StateMarkerState keyState = key.currentState;
@@ -243,7 +243,7 @@
       children: <Widget>[
         Container(width: 100.0, height: 100.0),
         StateMarker(key: key),
-      ]
+      ],
     ));
 
     expect(key.currentState, equals(keyState));
@@ -254,7 +254,7 @@
       children: <Widget>[
         StateMarker(key: key),
         Container(width: 100.0, height: 100.0),
-      ]
+      ],
     ));
 
     expect(key.currentState, equals(keyState));
@@ -270,7 +270,7 @@
         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 @@
       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 @@
         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 @@
       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 @@
         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 @@
               key: key2,
               child: StateMarker(
                 key: key3,
-                child: StateMarker(child: Container(width: 100.0))
-              )
-            )
-          )
-        ]
+                child: StateMarker(child: Container(width: 100.0)),
+              ),
+            ),
+          ),
+        ],
       )
     );
 
@@ -374,16 +374,16 @@
         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 b4f4f20..0ffbbf7 100644
--- a/packages/flutter/test/widgets/routes_test.dart
+++ b/packages/flutter/test/widgets/routes_test.dart
@@ -31,7 +31,7 @@
     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 @@
   WidgetTester tester,
   NavigatorState host,
   VoidCallback test,
-  List<String> expectations
+  List<String> expectations,
 ) async {
   expect(host, isNotNull);
   test();
@@ -152,7 +152,7 @@
         'initial: install',
         'initial: didPush',
         'initial: didChangeNext null',
-      ]
+      ],
     );
     TestRoute second;
     await runNavigatorTest(
@@ -164,7 +164,7 @@
         'second: didPush',
         'second: didChangeNext null',
         'initial: didChangeNext second',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -175,7 +175,7 @@
         'third: didPush',
         'third: didChangeNext null',
         'second: didChangeNext third',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -187,7 +187,7 @@
         'two: didChangeNext third',
         'initial: didChangeNext two',
         'second: dispose',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -197,7 +197,7 @@
         'third: didPop hello',
         'third: dispose',
         'two: didPopNext third',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -207,7 +207,7 @@
         'two: didPop good bye',
         'two: dispose',
         'initial: didPopNext two',
-      ]
+      ],
     );
     await tester.pumpWidget(Container());
     expect(results, equals(<String>['initial: dispose']));
@@ -222,7 +222,7 @@
         textDirection: TextDirection.ltr,
         child: Navigator(
           key: navigatorKey,
-          onGenerateRoute: (_) => TestRoute('first')
+          onGenerateRoute: (_) => TestRoute('first'),
         ),
       ),
     );
@@ -235,7 +235,7 @@
         'first: install',
         'first: didPush',
         'first: didChangeNext null',
-      ]
+      ],
     );
     TestRoute second;
     await runNavigatorTest(
@@ -247,7 +247,7 @@
         'second: didPush',
         'second: didChangeNext null',
         'first: didChangeNext second',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -258,7 +258,7 @@
         'third: didPush',
         'third: didChangeNext null',
         'second: didChangeNext third',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -266,7 +266,7 @@
       () { host.removeRouteBelow(second); },
       <String>[
         'first: dispose',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -276,7 +276,7 @@
         'third: didPop good bye',
         'third: dispose',
         'second: didPopNext third',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -287,7 +287,7 @@
         'three: didPush',
         'three: didChangeNext null',
         'second: didChangeNext three',
-      ]
+      ],
     );
     TestRoute four;
     await runNavigatorTest(
@@ -299,7 +299,7 @@
         'four: didPush',
         'four: didChangeNext null',
         'three: didChangeNext four',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -308,7 +308,7 @@
       <String>[
         'second: didChangeNext four',
         'three: dispose',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -318,7 +318,7 @@
         'four: didPop the end',
         'four: dispose',
         'second: didPopNext four',
-      ]
+      ],
     );
     await tester.pumpWidget(Container());
     expect(results, equals(<String>['second: dispose']));
@@ -333,7 +333,7 @@
         textDirection: TextDirection.ltr,
         child: Navigator(
           key: navigatorKey,
-          onGenerateRoute: (_) => TestRoute('A')
+          onGenerateRoute: (_) => TestRoute('A'),
         ),
       ),
     );
@@ -346,7 +346,7 @@
         'A: install',
         'A: didPush',
         'A: didChangeNext null',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -357,7 +357,7 @@
         'B: didPush',
         'B: didChangeNext null',
         'A: didChangeNext B',
-      ]
+      ],
     );
     TestRoute routeC;
     await runNavigatorTest(
@@ -369,7 +369,7 @@
         'C: didPush',
         'C: didChangeNext null',
         'B: didChangeNext C',
-      ]
+      ],
     );
     expect(routeC.isActive, isTrue);
     TestRoute routeB;
@@ -383,7 +383,7 @@
         'b: didChangeNext C',
         'A: didChangeNext b',
         'B: dispose',
-      ]
+      ],
     );
     await runNavigatorTest(
       tester,
@@ -393,7 +393,7 @@
         'C: didPop null',
         'C: dispose',
         'b: didPopNext C',
-      ]
+      ],
     );
     await tester.pumpWidget(Container());
     expect(results, equals(<String>['A: dispose', 'b: dispose']));
@@ -415,7 +415,7 @@
         textDirection: TextDirection.ltr,
         child: Navigator(
           key: navigatorKey,
-          onGenerateRoute: (_) => routeA
+          onGenerateRoute: (_) => routeA,
         ),
       ),
     );
@@ -432,7 +432,7 @@
         'A: onRemove 1',
         'A: didPop null',
         'A: onRemove 0',
-      ]
+      ],
     );
 
     await runNavigatorTest(
@@ -440,7 +440,7 @@
       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 777fb08..2fa7589 100644
--- a/packages/flutter/test/widgets/run_app_test.dart
+++ b/packages/flutter/test/widgets/run_app_test.dart
@@ -15,9 +15,9 @@
             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 0779eef..4f9f47a 100644
--- a/packages/flutter/test/widgets/scroll_interaction_test.dart
+++ b/packages/flutter/test/widgets/scroll_interaction_test.dart
@@ -12,7 +12,7 @@
         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 b4cdcec..f0e9b49 100644
--- a/packages/flutter/test/widgets/scroll_notification_test.dart
+++ b/packages/flutter/test/widgets/scroll_notification_test.dart
@@ -17,8 +17,8 @@
         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 f8dc2578..e0d01ff 100644
--- a/packages/flutter/test/widgets/scrollable_dispose_test.dart
+++ b/packages/flutter/test/widgets/scrollable_dispose_test.dart
@@ -19,7 +19,7 @@
         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 68b8ba6..fa99a48 100644
--- a/packages/flutter/test/widgets/scrollable_fling_test.dart
+++ b/packages/flutter/test/widgets/scrollable_fling_test.dart
@@ -66,7 +66,7 @@
     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 @@
     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 ebd8881..013b3a4 100644
--- a/packages/flutter/test/widgets/scrollable_of_test.dart
+++ b/packages/flutter/test/widgets/scrollable_of_test.dart
@@ -92,8 +92,8 @@
         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 986eb6b..253d7c7 100644
--- a/packages/flutter/test/widgets/scrollable_semantics_test.dart
+++ b/packages/flutter/test/widgets/scrollable_semantics_test.dart
@@ -129,7 +129,7 @@
                   ),
                   SliverList(
                     delegate: SliverChildListDelegate(containers),
-                  )
+                  ),
                 ],
               );
             }),
@@ -539,7 +539,7 @@
                   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 9d74679..d54c6ed 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 @@
                             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 9075db7..f809a64 100644
--- a/packages/flutter/test/widgets/semantics_11_test.dart
+++ b/packages/flutter/test/widgets/semantics_11_test.dart
@@ -42,11 +42,11 @@
                   id: 3,
                   actions: SemanticsAction.tap.index,
                   label: 'foo',
-                )
+                ),
               ],
             ),
           ],
-        )
+        ),
       ],
     ), ignoreRect: true, ignoreTransform: true));
 
@@ -82,11 +82,11 @@
                   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 a887b7d..185b294 100644
--- a/packages/flutter/test/widgets/semantics_1_test.dart
+++ b/packages/flutter/test/widgets/semantics_1_test.dart
@@ -35,7 +35,7 @@
           label: 'test1',
           rect: TestSemantics.fullScreen,
           flags: SemanticsFlag.isSelected.index,
-        )
+        ),
       ]
     )));
 
@@ -77,7 +77,7 @@
           label: 'child1',
           rect: TestSemantics.fullScreen,
           flags: SemanticsFlag.isSelected.index,
-        )
+        ),
       ],
     )));
 
@@ -173,7 +173,7 @@
           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 17c1ef4..920769a 100644
--- a/packages/flutter/test/widgets/semantics_2_test.dart
+++ b/packages/flutter/test/widgets/semantics_2_test.dart
@@ -109,7 +109,7 @@
           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 3f68fd3..f282183 100644
--- a/packages/flutter/test/widgets/semantics_3_test.dart
+++ b/packages/flutter/test/widgets/semantics_3_test.dart
@@ -38,7 +38,7 @@
             flags: SemanticsFlag.hasCheckedState.index | SemanticsFlag.isChecked.index,
             label: 'test',
             rect: TestSemantics.fullScreen,
-          )
+          ),
         ]
       )
     ));
@@ -117,7 +117,7 @@
             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 1cb51d1..da85ebb 100644
--- a/packages/flutter/test/widgets/semantics_4_test.dart
+++ b/packages/flutter/test/widgets/semantics_4_test.dart
@@ -70,7 +70,7 @@
                 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 682eea1..c3d8122 100644
--- a/packages/flutter/test/widgets/semantics_5_test.dart
+++ b/packages/flutter/test/widgets/semantics_5_test.dart
@@ -28,7 +28,7 @@
             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 e49231c..7aca6d2 100644
--- a/packages/flutter/test/widgets/semantics_6_test.dart
+++ b/packages/flutter/test/widgets/semantics_6_test.dart
@@ -21,7 +21,7 @@
           label: 'hello',
           textDirection: TextDirection.ltr,
           rect: TestSemantics.fullScreen,
-        )
+        ),
       ],
     );
 
@@ -71,7 +71,7 @@
               container: true,
             ),
           ),
-        ]
+        ],
     ),
   );
 }
diff --git a/packages/flutter/test/widgets/semantics_8_test.dart b/packages/flutter/test/widgets/semantics_8_test.dart
index 07231cd..52aee78 100644
--- a/packages/flutter/test/widgets/semantics_8_test.dart
+++ b/packages/flutter/test/widgets/semantics_8_test.dart
@@ -27,11 +27,11 @@
                 Semantics(
                   label: 'label',
                   textDirection: TextDirection.ltr,
-                )
-              ]
-            )
-          )
-        )
+                ),
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -44,7 +44,7 @@
             label: 'label',
             textDirection: TextDirection.ltr,
             rect: TestSemantics.fullScreen,
-          )
+          ),
         ]
       )
     ));
@@ -65,11 +65,11 @@
                 ),
                 Semantics(
                   checked: true
-                )
-              ]
-            )
-          )
-        )
+                ),
+              ],
+            ),
+          ),
+        ),
       )
     );
 
@@ -82,7 +82,7 @@
             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 bff31ce..ed8676e 100644
--- a/packages/flutter/test/widgets/semantics_9_test.dart
+++ b/packages/flutter/test/widgets/semantics_9_test.dart
@@ -118,7 +118,7 @@
             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 330d8cd..e2da9c0 100644
--- a/packages/flutter/test/widgets/semantics_clipping_test.dart
+++ b/packages/flutter/test/widgets/semantics_clipping_test.dart
@@ -89,8 +89,8 @@
                       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 eb342dc..035ab3d 100644
--- a/packages/flutter/test/widgets/semantics_event_test.dart
+++ b/packages/flutter/test/widgets/semantics_event_test.dart
@@ -31,9 +31,9 @@
         'type': 'TestEvent',
         'data': <String, dynamic> {
           'text': 'hi',
-          'number': 11
-        }
-      }
+          'number': 11,
+        },
+      },
     );
     expect(
       TestSemanticsEvent(text: 'hi', number: 11).toMap(nodeId: 123),
@@ -42,9 +42,9 @@
         '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 6f27b26..018eab4 100644
--- a/packages/flutter/test/widgets/semantics_test.dart
+++ b/packages/flutter/test/widgets/semantics_test.dart
@@ -26,7 +26,7 @@
         TestSemantics.rootChild(
           label: 'test1',
           textDirection: TextDirection.ltr,
-        )
+        ),
       ],
     );
 
@@ -35,8 +35,8 @@
         child: Semantics(
           label: 'test1',
           textDirection: TextDirection.ltr,
-          child: Container()
-        )
+          child: Container(),
+        ),
       )
     );
 
@@ -77,10 +77,10 @@
             key: key,
             container: true,
             label: 'test2a',
-            child: Container()
-          )
-        )
-      )
+            child: Container(),
+          ),
+        ),
+      ),
     ));
 
     expect(semantics, hasSemantics(
@@ -91,9 +91,9 @@
             children: <TestSemantics>[
               TestSemantics(
                 label: 'test2a',
-              )
-            ]
-          )
+              ),
+            ],
+          ),
         ]
       ),
       ignoreId: true,
@@ -113,11 +113,11 @@
               key: key,
               container: true,
               label: 'test2b',
-              child: Container()
-            )
-          )
-        )
-      )
+              child: Container(),
+            ),
+          ),
+        ),
+      ),
     ));
 
     expect(semantics, hasSemantics(
@@ -133,9 +133,9 @@
                     label: 'test2b',
                   ),
                 ],
-              )
-            ]
-          )
+              ),
+            ],
+          ),
         ]
       ),
       ignoreId: true,
@@ -188,7 +188,7 @@
         TestSemantics.rootChild(
           label: 'test1',
           textDirection: TextDirection.ltr,
-        )
+        ),
       ]
     );
 
@@ -215,7 +215,7 @@
         TestSemantics.rootChild(
           label: 'test1',
           textDirection: TextDirection.rtl,
-        )
+        ),
       ]
     );
 
@@ -256,7 +256,7 @@
           hint: 'hint',
           value: 'value',
           textDirection: TextDirection.ltr,
-        )
+        ),
       ]
     );
 
@@ -279,7 +279,7 @@
               ),
               Semantics(
                 hint: 'hint two',
-              )
+              ),
 
             ],
           ),
@@ -292,7 +292,7 @@
         TestSemantics.rootChild(
           hint: 'hint one\nhint two',
           textDirection: TextDirection.ltr,
-        )
+        ),
       ]
     );
 
@@ -315,15 +315,15 @@
                 child: Container(
                   height: 10.0,
                   width: 10.0,
-                )
+                ),
               ),
               Semantics(
                 value: 'value two',
                 child: Container(
                   height: 10.0,
                   width: 10.0,
-                )
-              )
+                ),
+              ),
             ],
           ),
         ),
@@ -343,7 +343,7 @@
               textDirection: TextDirection.ltr,
             ),
           ]
-        )
+        ),
       ],
     );
 
@@ -379,7 +379,7 @@
           hint: 'hint',
           value: 'value',
           textDirection: TextDirection.ltr,
-        )
+        ),
       ]
     );
 
@@ -645,7 +645,7 @@
 
     expect(tester.getSemantics(find.byType(Semantics)), matchesSemantics(
       hasTapAction: true,
-      onTapHint: 'test'
+      onTapHint: 'test',
     ));
 
     await tester.pumpWidget(Semantics(
@@ -656,7 +656,7 @@
 
     expect(tester.getSemantics(find.byType(Semantics)), matchesSemantics(
       hasLongPressAction: true,
-      onLongPressHint: 'foo'
+      onLongPressHint: 'foo',
     ));
     semantics.dispose();
   });
@@ -667,7 +667,7 @@
       container: true,
       customSemanticsActions: <CustomSemanticsAction, VoidCallback>{
         const CustomSemanticsAction(label: 'foo'): () {},
-        const CustomSemanticsAction(label: 'bar'): () {}
+        const CustomSemanticsAction(label: 'bar'): () {},
       },
     ));
 
@@ -1089,7 +1089,7 @@
             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 1620274..66e656c 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 @@
         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 0c19849..56464fd 100644
--- a/packages/flutter/test/widgets/semantics_traversal_test.dart
+++ b/packages/flutter/test/widgets/semantics_traversal_test.dart
@@ -317,7 +317,7 @@
                   }).toList(),
                 ),
               ),
-            )
+            ),
         )
     );
 
@@ -331,7 +331,7 @@
                 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 674169c..645fe10 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 @@
                   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 6d0de8a..d672bf2 100644
--- a/packages/flutter/test/widgets/shader_mask_test.dart
+++ b/packages/flutter/test/widgets/shader_mask_test.dart
@@ -12,7 +12,7 @@
     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 @@
         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 dc82976..0ef27a9 100644
--- a/packages/flutter/test/widgets/shape_decoration_test.dart
+++ b/packages/flutter/test/widgets/shape_decoration_test.dart
@@ -36,7 +36,7 @@
       paints
         ..drawImageRect(image: rawImage)
         ..rect(color: Colors.black)
-        ..rect(color: Colors.white)
+        ..rect(color: Colors.white),
     );
   });
 
@@ -57,7 +57,7 @@
       paints
         ..path(color: Color(Colors.blue.value))
         ..rect(color: Colors.black)
-        ..rect(color: Colors.white)
+        ..rect(color: Colors.white),
     );
   });
 
@@ -77,7 +77,7 @@
       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 @@
       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 9d5db74..2f2fc09 100644
--- a/packages/flutter/test/widgets/simple_semantics_test.dart
+++ b/packages/flutter/test/widgets/simple_semantics_test.dart
@@ -17,7 +17,7 @@
 
     await tester.pumpWidget(
       const Center(
-          child: Text('Hello!', textDirection: TextDirection.ltr)
+          child: Text('Hello!', textDirection: TextDirection.ltr),
       ),
     );
 
@@ -29,7 +29,7 @@
           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 @@
                   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 f28cfb8..b1aa815 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 @@
                           height: 100.0,
                           width: 100.0,
                         );
-                      })
+                      }),
                     );
                   }),
                 ),
@@ -739,7 +739,7 @@
                     ),
                     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 4d5ca9e..9b8b667 100644
--- a/packages/flutter/test/widgets/sized_box_test.dart
+++ b/packages/flutter/test/widgets/sized_box_test.dart
@@ -43,7 +43,7 @@
       Center(
         child: SizedBox(
           key: patient,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
@@ -53,7 +53,7 @@
         child: SizedBox(
           key: patient,
           height: 0.0,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
@@ -64,7 +64,7 @@
           key: patient,
           width: 0.0,
           height: 0.0,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
@@ -75,7 +75,7 @@
           key: patient,
           width: 100.0,
           height: 100.0,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(100.0, 100.0)));
@@ -86,7 +86,7 @@
           key: patient,
           width: 1000.0,
           height: 1000.0,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 600.0)));
@@ -95,7 +95,7 @@
       Center(
         child: SizedBox.expand(
           key: patient,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 600.0)));
@@ -104,7 +104,7 @@
       Center(
         child: SizedBox.shrink(
           key: patient,
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
@@ -118,7 +118,7 @@
         child: SizedBox(
           key: patient,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 600.0)));
@@ -129,7 +129,7 @@
           key: patient,
           height: 0.0,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 0.0)));
@@ -141,7 +141,7 @@
           width: 0.0,
           height: 0.0,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(0.0, 0.0)));
@@ -153,7 +153,7 @@
           width: 100.0,
           height: 100.0,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(100.0, 100.0)));
@@ -165,7 +165,7 @@
           width: 1000.0,
           height: 1000.0,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 600.0)));
@@ -175,7 +175,7 @@
         child: SizedBox.expand(
           key: patient,
           child: Container(),
-        )
+        ),
       )
     );
     expect(patient.currentContext.size, equals(const Size(800.0, 600.0)));
@@ -185,7 +185,7 @@
         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 385a14d..a22bf34 100644
--- a/packages/flutter/test/widgets/sliver_appbar_opacity.dart
+++ b/packages/flutter/test/widgets/sliver_appbar_opacity.dart
@@ -196,7 +196,7 @@
                 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 563920b..d0f2468 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 @@
                       height: 100.0,
                     );
                   })),
-                )
+                ),
               ],
             ),
           ),
diff --git a/packages/flutter/test/widgets/stack_test.dart b/packages/flutter/test/widgets/stack_test.dart
index 39e6226..96381c8 100644
--- a/packages/flutter/test/widgets/stack_test.dart
+++ b/packages/flutter/test/widgets/stack_test.dart
@@ -535,7 +535,7 @@
       '=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 3b7b060..8796c92 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 @@
                   child: SizedBox(
                     height: 200.0,
                   ),
-                )
+                ),
               ),
               const DecoratedBox(
                 decoration: BoxDecoration(color: Color(0)),
@@ -65,7 +65,7 @@
                 ),
               ),
             ],
-          )
+          ),
         );
       }
     );
diff --git a/packages/flutter/test/widgets/stateful_component_test.dart b/packages/flutter/test/widgets/stateful_component_test.dart
index 6363f05..9a63eeb 100644
--- a/packages/flutter/test/widgets/stateful_component_test.dart
+++ b/packages/flutter/test/widgets/stateful_component_test.dart
@@ -24,7 +24,7 @@
     await tester.pumpWidget(
       const FlipWidget(
         left: DecoratedBox(decoration: kBoxDecorationA),
-        right: DecoratedBox(decoration: kBoxDecorationB)
+        right: DecoratedBox(decoration: kBoxDecorationB),
       )
     );
 
@@ -33,7 +33,7 @@
     await tester.pumpWidget(
       const FlipWidget(
         left: DecoratedBox(decoration: kBoxDecorationB),
-        right: DecoratedBox(decoration: kBoxDecorationA)
+        right: DecoratedBox(decoration: kBoxDecorationA),
       )
     );
 
@@ -48,7 +48,7 @@
     await tester.pumpWidget(
       const FlipWidget(
         left: DecoratedBox(decoration: kBoxDecorationA),
-        right: DecoratedBox(decoration: kBoxDecorationB)
+        right: DecoratedBox(decoration: kBoxDecorationB),
       )
     );
 
@@ -60,7 +60,7 @@
       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 e6b6296..a0d4490 100644
--- a/packages/flutter/test/widgets/syncing_test.dart
+++ b/packages/flutter/test/widgets/syncing_test.dart
@@ -49,9 +49,9 @@
         child: Container(
           child: TestWidget(
             persistentState: 1,
-            child: Container()
-          )
-        )
+            child: Container(),
+          ),
+        ),
       )
     );
 
@@ -65,9 +65,9 @@
         child: Container(
           child: TestWidget(
             persistentState: 2,
-            child: Container()
-          )
-        )
+            child: Container(),
+          ),
+        ),
       )
     );
 
@@ -83,9 +83,9 @@
         child: Container(
           child: TestWidget(
             persistentState: 10,
-            child: Container()
-          )
-        )
+            child: Container(),
+          ),
+        ),
       )
     );
 
@@ -98,8 +98,8 @@
       Container(
         child: TestWidget(
           persistentState: 11,
-          child: Container()
-        )
+          child: Container(),
+        ),
       )
     );
 
@@ -124,13 +124,13 @@
         children: <Widget>[
           Container(
             key: keyA,
-            child: a
+            child: a,
           ),
           Container(
             key: keyB,
-            child: b
-          )
-        ]
+            child: b,
+          ),
+        ],
       )
     );
 
@@ -151,13 +151,13 @@
         children: <Widget>[
           Container(
             key: keyA,
-            child: a
+            child: a,
           ),
           Container(
             key: keyB,
-            child: b
-          )
-        ]
+            child: b,
+          ),
+        ],
       )
     );
 
@@ -180,13 +180,13 @@
         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 e47e197..b12d1cf 100644
--- a/packages/flutter/test/widgets/table_test.dart
+++ b/packages/flutter/test/widgets/table_test.dart
@@ -524,7 +524,7 @@
               ],
             ),
           ],
-        )
+        ),
       ),
     );
     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 aee652d..9f78795 100644
--- a/packages/flutter/test/widgets/text_golden_test.dart
+++ b/packages/flutter/test/widgets/text_golden_test.dart
@@ -160,7 +160,7 @@
                 style: TextStyle(
                   color: translucentGreen,
                   background: Paint()
-                    ..color = red.withOpacity(0.5)
+                    ..color = red.withOpacity(0.5),
                 ),
                 children: <TextSpan>[
                   TextSpan(
@@ -168,8 +168,8 @@
                     style: TextStyle(
                       color: translucentDarkRed,
                       background: Paint()
-                        ..color = blue.withOpacity(0.5)
-                    )
+                        ..color = blue.withOpacity(0.5),
+                    ),
                   ),
                 ],
               ),
@@ -211,7 +211,7 @@
                 ),
               ),
             ),
-          )
+          ),
         )
     );
 
@@ -319,7 +319,7 @@
                 text: 'Hello\n',
                 style: TextStyle(
                   color: Colors.red,
-                  fontSize: 30
+                  fontSize: 30,
                 ),
                 children: <TextSpan>[
                   TextSpan(
@@ -376,7 +376,7 @@
                   'FakeFont 2',
                   'EvilFont 3',
                   'Nice Font 4',
-                  'ahem'
+                  'ahem',
                 ],
                 fontSize: 14,
               ),
@@ -407,7 +407,7 @@
                 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 c4df7c5..1d112dc 100644
--- a/packages/flutter/test/widgets/text_selection_test.dart
+++ b/packages/flutter/test/widgets/text_selection_test.dart
@@ -167,7 +167,7 @@
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
 
@@ -182,7 +182,7 @@
         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 @@
         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 @@
         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 @@
           position: forcePressOffset,
           pressure: 0.0,
           pressureMax: 6.0,
-          pressureMin: 0.0
+          pressureMin: 0.0,
       ),
 
     );
@@ -242,7 +242,7 @@
         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 @@
         position: forcePressOffset,
         pressure: 0.0,
         pressureMax: 6.0,
-        pressureMin: 0.0
+        pressureMin: 0.0,
       ),
     );
     await gesture.updateWithCustomEvent(const PointerMoveEvent(
@@ -264,7 +264,7 @@
       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 504ddad..8943f11 100644
--- a/packages/flutter/test/widgets/text_test.dart
+++ b/packages/flutter/test/widgets/text_test.dart
@@ -15,8 +15,8 @@
     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 @@
     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 @@
     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 @@
   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 @@
       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 @@
             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 4cec82d..2cc8eb7 100644
--- a/packages/flutter/test/widgets/ticker_provider_test.dart
+++ b/packages/flutter/test/widgets/ticker_provider_test.dart
@@ -9,7 +9,7 @@
   testWidgets('TickerMode', (WidgetTester tester) async {
     const Widget widget = TickerMode(
       enabled: false,
-      child: CircularProgressIndicator()
+      child: CircularProgressIndicator(),
     );
     expect(widget.toString, isNot(throwsException));
 
@@ -19,14 +19,14 @@
 
     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 81afd85..1e17e9b 100644
--- a/packages/flutter/test/widgets/transform_test.dart
+++ b/packages/flutter/test/widgets/transform_test.dart
@@ -349,9 +349,9 @@
             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 4f97dd3..a1403b3 100644
--- a/packages/flutter/test/widgets/transitions_test.dart
+++ b/packages/flutter/test/widgets/transitions_test.dart
@@ -99,7 +99,7 @@
 
         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 18afe63..bf339cf 100644
--- a/packages/flutter/test/widgets/visibility_test.dart
+++ b/packages/flutter/test/widgets/visibility_test.dart
@@ -53,7 +53,7 @@
             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 5e6acde..1bb2a20 100644
--- a/packages/flutter/test/widgets/wrap_test.dart
+++ b/packages/flutter/test/widgets/wrap_test.dart
@@ -848,7 +848,7 @@
       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 2023476..46ad6fd 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 @@
   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 718253c..6bd827e 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 @@
 
   @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 528ecd7..7152c8c 100644
--- a/packages/flutter_driver/lib/src/driver/driver.dart
+++ b/packages/flutter_driver/lib/src/driver/driver.dart
@@ -322,7 +322,7 @@
         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 @@
     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 @@
   /// 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 6bb3087..1273156 100644
--- a/packages/flutter_driver/lib/src/driver/timeline.dart
+++ b/packages/flutter_driver/lib/src/driver/timeline.dart
@@ -42,7 +42,7 @@
         : null,
       json['ts'],
       json['tts'],
-      json['args']
+      json['args'],
     );
   }
 
@@ -57,7 +57,7 @@
     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 c5e23ca..a9f5278 100644
--- a/packages/flutter_driver/test/flutter_driver_test.dart
+++ b/packages/flutter_driver/test/flutter_driver_test.dart
@@ -150,7 +150,7 @@
             'timeout': _kSerializedTestTimeout,
             'finderType': 'ByValueKey',
             'keyValueString': 'foo',
-            'keyValueType': 'String'
+            'keyValueType': 'String',
           });
           return makeMockResponse(<String, dynamic>{});
         });
@@ -189,10 +189,10 @@
             '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 @@
           return <String, dynamic> {
             'traceEvents': <dynamic>[
               <String, String>{
-                'name': 'test event'
-              }
+                'name': 'test event',
+              },
             ],
           };
         });
@@ -333,8 +333,8 @@
           return <String, dynamic> {
             'traceEvents': <dynamic>[
               <String, String>{
-                'name': 'test event'
-              }
+                'name': 'test event',
+              },
             ],
           };
         });
@@ -345,7 +345,7 @@
         streams: const <TimelineStream>[
           TimelineStream.dart,
           TimelineStream.gc,
-          TimelineStream.compiler
+          TimelineStream.compiler,
         ],
         retainPriorEvents: true);
 
@@ -376,7 +376,7 @@
       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 @@
 }) {
   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 151b4cf..4ab98fd 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 @@
     }
 
     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 @@
             build(1000, 1000),
             build(3000, 2000),
           ]).countFrames(),
-          2
+          2,
         );
       });
     });
@@ -59,7 +59,7 @@
       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 @@
             build(1000, 1000),
             build(3000, 2000),
           ]).computeAverageFrameBuildTimeMillis(),
-          1.5
+          1.5,
         );
       });
     });
@@ -78,7 +78,7 @@
       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 @@
             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 @@
       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 @@
               begin(1000), end(2000),
               begin(3000), end(5000),
             ]).computeAverageFrameRasterizerTimeMillis(),
-            1.5
+            1.5,
         );
       });
 
@@ -137,7 +137,7 @@
               end(1000),
               begin(2000), end(4000),
             ]).computeAverageFrameRasterizerTimeMillis(),
-            2.0
+            2.0,
         );
       });
 
@@ -147,7 +147,7 @@
               begin(2000), end(4000),
               begin(5000),
             ]).computeAverageFrameRasterizerTimeMillis(),
-            2.0
+            2.0,
         );
       });
     });
@@ -156,7 +156,7 @@
       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 @@
               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 @@
               end(1000),
               begin(2000), end(4000),
             ]).computeWorstFrameRasterizerTimeMillis(),
-            2.0
+            2.0,
         );
       });
 
@@ -194,7 +194,7 @@
               begin(2000), end(4000),
               begin(5000),
             ]).computeWorstFrameRasterizerTimeMillis(),
-            2.0
+            2.0,
         );
       });
     });
@@ -203,7 +203,7 @@
       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 @@
       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 @@
         }
         expect(
           summarize(rasterizeTimeSequenceInMillis(sequence)).computePercentileFrameRasterizerTimeMillis(99.0),
-          99
+          99,
         );
       });
     });
@@ -278,7 +278,7 @@
             '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 5f031cf..d89940c 100644
--- a/packages/flutter_driver/test/src/timeline_test.dart
+++ b/packages/flutter_driver/test/src/timeline_test.dart
@@ -23,11 +23,11 @@
             '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 c2a0f5f..fcb0eaa 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 @@
       r'''س''',
       r'''ك''',
       r'''ب''',
-      r'''د'''
+      r'''د''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ي''',
@@ -39,7 +39,7 @@
       r'''س''',
       r'''ك''',
       r'''ب''',
-      r'''د'''
+      r'''د''',
     ],
     'MONTHS': <dynamic>[
       r'''يناير''',
@@ -53,7 +53,7 @@
       r'''سبتمبر''',
       r'''أكتوبر''',
       r'''نوفمبر''',
-      r'''ديسمبر'''
+      r'''ديسمبر''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''يناير''',
@@ -67,7 +67,7 @@
       r'''سبتمبر''',
       r'''أكتوبر''',
       r'''نوفمبر''',
-      r'''ديسمبر'''
+      r'''ديسمبر''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''يناير''',
@@ -81,7 +81,7 @@
       r'''سبتمبر''',
       r'''أكتوبر''',
       r'''نوفمبر''',
-      r'''ديسمبر'''
+      r'''ديسمبر''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''يناير''',
@@ -95,7 +95,7 @@
       r'''سبتمبر''',
       r'''أكتوبر''',
       r'''نوفمبر''',
-      r'''ديسمبر'''
+      r'''ديسمبر''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''الأحد''',
@@ -104,7 +104,7 @@
       r'''الأربعاء''',
       r'''الخميس''',
       r'''الجمعة''',
-      r'''السبت'''
+      r'''السبت''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''الأحد''',
@@ -113,7 +113,7 @@
       r'''الأربعاء''',
       r'''الخميس''',
       r'''الجمعة''',
-      r'''السبت'''
+      r'''السبت''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''الأحد''',
@@ -122,7 +122,7 @@
       r'''الأربعاء''',
       r'''الخميس''',
       r'''الجمعة''',
-      r'''السبت'''
+      r'''السبت''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''الأحد''',
@@ -131,7 +131,7 @@
       r'''الأربعاء''',
       r'''الخميس''',
       r'''الجمعة''',
-      r'''السبت'''
+      r'''السبت''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''ح''',
@@ -140,7 +140,7 @@
       r'''ر''',
       r'''خ''',
       r'''ج''',
-      r'''س'''
+      r'''س''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''ح''',
@@ -149,32 +149,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
     'ZERODIGIT': r'''٠''',
   },
@@ -204,7 +204,7 @@
       r'''с''',
       r'''о''',
       r'''н''',
-      r'''д'''
+      r'''д''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''я''',
@@ -218,7 +218,7 @@
       r'''с''',
       r'''о''',
       r'''н''',
-      r'''д'''
+      r'''д''',
     ],
     'MONTHS': <dynamic>[
       r'''януари''',
@@ -232,7 +232,7 @@
       r'''септември''',
       r'''октомври''',
       r'''ноември''',
-      r'''декември'''
+      r'''декември''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''януари''',
@@ -246,7 +246,7 @@
       r'''септември''',
       r'''октомври''',
       r'''ноември''',
-      r'''декември'''
+      r'''декември''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''яну''',
@@ -260,7 +260,7 @@
       r'''сеп''',
       r'''окт''',
       r'''ное''',
-      r'''дек'''
+      r'''дек''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''яну''',
@@ -274,7 +274,7 @@
       r'''сеп''',
       r'''окт''',
       r'''ное''',
-      r'''дек'''
+      r'''дек''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''неделя''',
@@ -283,7 +283,7 @@
       r'''сряда''',
       r'''четвъртък''',
       r'''петък''',
-      r'''събота'''
+      r'''събота''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''неделя''',
@@ -292,7 +292,7 @@
       r'''сряда''',
       r'''четвъртък''',
       r'''петък''',
-      r'''събота'''
+      r'''събота''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''нд''',
@@ -301,7 +301,7 @@
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''нд''',
@@ -310,7 +310,7 @@
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''н''',
@@ -319,7 +319,7 @@
       r'''с''',
       r'''ч''',
       r'''п''',
-      r'''с'''
+      r'''с''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''н''',
@@ -328,32 +328,32 @@
       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 @@
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'bs': <String, dynamic>{
@@ -382,7 +382,7 @@
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''j''',
@@ -396,7 +396,7 @@
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'MONTHS': <dynamic>[
       r'''januar''',
@@ -410,7 +410,7 @@
       r'''septembar''',
       r'''oktobar''',
       r'''novembar''',
-      r'''decembar'''
+      r'''decembar''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januar''',
@@ -424,7 +424,7 @@
       r'''septembar''',
       r'''oktobar''',
       r'''novembar''',
-      r'''decembar'''
+      r'''decembar''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -438,7 +438,7 @@
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -452,7 +452,7 @@
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''nedjelja''',
@@ -461,7 +461,7 @@
       r'''srijeda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''nedjelja''',
@@ -470,7 +470,7 @@
       r'''srijeda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -479,7 +479,7 @@
       r'''sri''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -488,7 +488,7 @@
       r'''sri''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''N''',
@@ -497,7 +497,7 @@
       r'''S''',
       r'''Č''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -506,27 +506,27 @@
       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 @@
       r"""{1} 'u' {0}""",
       r"""{1} 'u' {0}""",
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'ca': <String, dynamic>{
@@ -555,7 +555,7 @@
       r'''ST''',
       r'''OC''',
       r'''NV''',
-      r'''DS'''
+      r'''DS''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''GN''',
@@ -569,7 +569,7 @@
       r'''ST''',
       r'''OC''',
       r'''NV''',
-      r'''DS'''
+      r'''DS''',
     ],
     'MONTHS': <dynamic>[
       r'''de gener''',
@@ -583,7 +583,7 @@
       r'''de setembre''',
       r'''d’octubre''',
       r'''de novembre''',
-      r'''de desembre'''
+      r'''de desembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''gener''',
@@ -597,7 +597,7 @@
       r'''setembre''',
       r'''octubre''',
       r'''novembre''',
-      r'''desembre'''
+      r'''desembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''de gen.''',
@@ -611,7 +611,7 @@
       r'''de set.''',
       r'''d’oct.''',
       r'''de nov.''',
-      r'''de des.'''
+      r'''de des.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''gen.''',
@@ -625,7 +625,7 @@
       r'''set.''',
       r'''oct.''',
       r'''nov.''',
-      r'''des.'''
+      r'''des.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''diumenge''',
@@ -634,7 +634,7 @@
       r'''dimecres''',
       r'''dijous''',
       r'''divendres''',
-      r'''dissabte'''
+      r'''dissabte''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''diumenge''',
@@ -643,7 +643,7 @@
       r'''dimecres''',
       r'''dijous''',
       r'''divendres''',
-      r'''dissabte'''
+      r'''dissabte''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dg.''',
@@ -652,7 +652,7 @@
       r'''dc.''',
       r'''dj.''',
       r'''dv.''',
-      r'''ds.'''
+      r'''ds.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dg.''',
@@ -661,7 +661,7 @@
       r'''dc.''',
       r'''dj.''',
       r'''dv.''',
-      r'''ds.'''
+      r'''ds.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''dg''',
@@ -670,7 +670,7 @@
       r'''dc''',
       r'''dj''',
       r'''dv''',
-      r'''ds'''
+      r'''ds''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''dg''',
@@ -679,27 +679,27 @@
       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 @@
       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 @@
     '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 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -745,7 +745,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''ledna''',
@@ -759,7 +759,7 @@
       r'''září''',
       r'''října''',
       r'''listopadu''',
-      r'''prosince'''
+      r'''prosince''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''leden''',
@@ -773,7 +773,7 @@
       r'''září''',
       r'''říjen''',
       r'''listopad''',
-      r'''prosinec'''
+      r'''prosinec''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''led''',
@@ -787,7 +787,7 @@
       r'''zář''',
       r'''říj''',
       r'''lis''',
-      r'''pro'''
+      r'''pro''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''led''',
@@ -801,7 +801,7 @@
       r'''zář''',
       r'''říj''',
       r'''lis''',
-      r'''pro'''
+      r'''pro''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''neděle''',
@@ -810,7 +810,7 @@
       r'''středa''',
       r'''čtvrtek''',
       r'''pátek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''neděle''',
@@ -819,7 +819,7 @@
       r'''středa''',
       r'''čtvrtek''',
       r'''pátek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ne''',
@@ -828,7 +828,7 @@
       r'''st''',
       r'''čt''',
       r'''pá''',
-      r'''so'''
+      r'''so''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ne''',
@@ -837,7 +837,7 @@
       r'''st''',
       r'''čt''',
       r'''pá''',
-      r'''so'''
+      r'''so''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''N''',
@@ -846,7 +846,7 @@
       r'''S''',
       r'''Č''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''N''',
@@ -855,27 +855,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'da': <String, dynamic>{
@@ -904,7 +904,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -918,7 +918,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''januar''',
@@ -932,7 +932,7 @@
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januar''',
@@ -946,7 +946,7 @@
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -960,7 +960,7 @@
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -974,7 +974,7 @@
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''søndag''',
@@ -983,7 +983,7 @@
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lørdag'''
+      r'''lørdag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''søndag''',
@@ -992,7 +992,7 @@
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lørdag'''
+      r'''lørdag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''søn.''',
@@ -1001,7 +1001,7 @@
       r'''ons.''',
       r'''tor.''',
       r'''fre.''',
-      r'''lør.'''
+      r'''lør.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''søn''',
@@ -1010,7 +1010,7 @@
       r'''ons''',
       r'''tor''',
       r'''fre''',
-      r'''lør'''
+      r'''lør''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1019,7 +1019,7 @@
       r'''O''',
       r'''T''',
       r'''F''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1028,32 +1028,32 @@
       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 @@
       r"""{1} 'kl'. {0}""",
       r"""{1} 'kl'. {0}""",
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'de': <String, dynamic>{
@@ -1082,7 +1082,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -1096,7 +1096,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januar''',
@@ -1110,7 +1110,7 @@
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Dezember'''
+      r'''Dezember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januar''',
@@ -1124,7 +1124,7 @@
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Dezember'''
+      r'''Dezember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan.''',
@@ -1138,7 +1138,7 @@
       r'''Sep.''',
       r'''Okt.''',
       r'''Nov.''',
-      r'''Dez.'''
+      r'''Dez.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -1152,7 +1152,7 @@
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dez'''
+      r'''Dez''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sonntag''',
@@ -1161,7 +1161,7 @@
       r'''Mittwoch''',
       r'''Donnerstag''',
       r'''Freitag''',
-      r'''Samstag'''
+      r'''Samstag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sonntag''',
@@ -1170,7 +1170,7 @@
       r'''Mittwoch''',
       r'''Donnerstag''',
       r'''Freitag''',
-      r'''Samstag'''
+      r'''Samstag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''So.''',
@@ -1179,7 +1179,7 @@
       r'''Mi.''',
       r'''Do.''',
       r'''Fr.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''So''',
@@ -1188,7 +1188,7 @@
       r'''Mi''',
       r'''Do''',
       r'''Fr''',
-      r'''Sa'''
+      r'''Sa''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1197,7 +1197,7 @@
       r'''M''',
       r'''D''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1206,27 +1206,27 @@
       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 @@
       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 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -1269,7 +1269,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januar''',
@@ -1283,7 +1283,7 @@
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Dezember'''
+      r'''Dezember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januar''',
@@ -1297,7 +1297,7 @@
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Dezember'''
+      r'''Dezember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan.''',
@@ -1311,7 +1311,7 @@
       r'''Sep.''',
       r'''Okt.''',
       r'''Nov.''',
-      r'''Dez.'''
+      r'''Dez.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -1325,7 +1325,7 @@
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dez'''
+      r'''Dez''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sonntag''',
@@ -1334,7 +1334,7 @@
       r'''Mittwoch''',
       r'''Donnerstag''',
       r'''Freitag''',
-      r'''Samstag'''
+      r'''Samstag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sonntag''',
@@ -1343,7 +1343,7 @@
       r'''Mittwoch''',
       r'''Donnerstag''',
       r'''Freitag''',
-      r'''Samstag'''
+      r'''Samstag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''So.''',
@@ -1352,7 +1352,7 @@
       r'''Mi.''',
       r'''Do.''',
       r'''Fr.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''So''',
@@ -1361,7 +1361,7 @@
       r'''Mi''',
       r'''Do''',
       r'''Fr''',
-      r'''Sa'''
+      r'''Sa''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1370,7 +1370,7 @@
       r'''M''',
       r'''D''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1379,27 +1379,27 @@
       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 @@
       r"""{1} 'um' {0}""",
       r"""{1} 'um' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'el': <String, dynamic>{
@@ -1428,7 +1428,7 @@
       r'''Σ''',
       r'''Ο''',
       r'''Ν''',
-      r'''Δ'''
+      r'''Δ''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''Ι''',
@@ -1442,7 +1442,7 @@
       r'''Σ''',
       r'''Ο''',
       r'''Ν''',
-      r'''Δ'''
+      r'''Δ''',
     ],
     'MONTHS': <dynamic>[
       r'''Ιανουαρίου''',
@@ -1456,7 +1456,7 @@
       r'''Σεπτεμβρίου''',
       r'''Οκτωβρίου''',
       r'''Νοεμβρίου''',
-      r'''Δεκεμβρίου'''
+      r'''Δεκεμβρίου''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Ιανουάριος''',
@@ -1470,7 +1470,7 @@
       r'''Σεπτέμβριος''',
       r'''Οκτώβριος''',
       r'''Νοέμβριος''',
-      r'''Δεκέμβριος'''
+      r'''Δεκέμβριος''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Ιαν''',
@@ -1484,7 +1484,7 @@
       r'''Σεπ''',
       r'''Οκτ''',
       r'''Νοε''',
-      r'''Δεκ'''
+      r'''Δεκ''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Ιαν''',
@@ -1498,7 +1498,7 @@
       r'''Σεπ''',
       r'''Οκτ''',
       r'''Νοέ''',
-      r'''Δεκ'''
+      r'''Δεκ''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Κυριακή''',
@@ -1507,7 +1507,7 @@
       r'''Τετάρτη''',
       r'''Πέμπτη''',
       r'''Παρασκευή''',
-      r'''Σάββατο'''
+      r'''Σάββατο''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Κυριακή''',
@@ -1516,7 +1516,7 @@
       r'''Τετάρτη''',
       r'''Πέμπτη''',
       r'''Παρασκευή''',
-      r'''Σάββατο'''
+      r'''Σάββατο''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Κυρ''',
@@ -1525,7 +1525,7 @@
       r'''Τετ''',
       r'''Πέμ''',
       r'''Παρ''',
-      r'''Σάβ'''
+      r'''Σάβ''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Κυρ''',
@@ -1534,7 +1534,7 @@
       r'''Τετ''',
       r'''Πέμ''',
       r'''Παρ''',
-      r'''Σάβ'''
+      r'''Σάβ''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Κ''',
@@ -1543,7 +1543,7 @@
       r'''Τ''',
       r'''Π''',
       r'''Π''',
-      r'''Σ'''
+      r'''Σ''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Κ''',
@@ -1552,27 +1552,27 @@
       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 @@
       r'''{1} - {0}''',
       r'''{1} - {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'en': <String, dynamic>{
@@ -1601,7 +1601,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -1615,7 +1615,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -1629,7 +1629,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -1643,7 +1643,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -1657,7 +1657,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -1671,7 +1671,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -1680,7 +1680,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -1689,7 +1689,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -1698,7 +1698,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -1707,7 +1707,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1716,7 +1716,7 @@
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -1725,27 +1725,27 @@
       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 @@
       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 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -1788,7 +1788,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -1802,7 +1802,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -1816,7 +1816,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan.''',
@@ -1830,7 +1830,7 @@
       r'''Sep.''',
       r'''Oct.''',
       r'''Nov.''',
-      r'''Dec.'''
+      r'''Dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan.''',
@@ -1844,7 +1844,7 @@
       r'''Sep.''',
       r'''Oct.''',
       r'''Nov.''',
-      r'''Dec.'''
+      r'''Dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -1853,7 +1853,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -1862,7 +1862,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun.''',
@@ -1871,7 +1871,7 @@
       r'''Wed.''',
       r'''Thu.''',
       r'''Fri.''',
-      r'''Sat.'''
+      r'''Sat.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun.''',
@@ -1880,7 +1880,7 @@
       r'''Wed.''',
       r'''Thu.''',
       r'''Fri.''',
-      r'''Sat.'''
+      r'''Sat.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Su.''',
@@ -1889,7 +1889,7 @@
       r'''W.''',
       r'''Th.''',
       r'''F.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Su.''',
@@ -1898,27 +1898,27 @@
       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 @@
       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 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -1961,7 +1961,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -1975,7 +1975,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -1989,7 +1989,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan.''',
@@ -2003,7 +2003,7 @@
       r'''Sep.''',
       r'''Oct.''',
       r'''Nov.''',
-      r'''Dec.'''
+      r'''Dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2017,7 +2017,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2026,7 +2026,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2035,7 +2035,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun.''',
@@ -2044,7 +2044,7 @@
       r'''Wed.''',
       r'''Thu.''',
       r'''Fri.''',
-      r'''Sat.'''
+      r'''Sat.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun.''',
@@ -2053,7 +2053,7 @@
       r'''Wed.''',
       r'''Thu.''',
       r'''Fri.''',
-      r'''Sat.'''
+      r'''Sat.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2062,7 +2062,7 @@
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2071,27 +2071,27 @@
       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 @@
       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 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -2134,7 +2134,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -2148,7 +2148,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -2162,7 +2162,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2176,7 +2176,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2190,7 +2190,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2199,7 +2199,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2208,7 +2208,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2217,7 +2217,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2226,7 +2226,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2235,7 +2235,7 @@
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2244,27 +2244,27 @@
       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 @@
       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 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -2307,7 +2307,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -2321,7 +2321,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -2335,7 +2335,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2349,7 +2349,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2363,7 +2363,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2372,7 +2372,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2381,7 +2381,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2390,7 +2390,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2399,7 +2399,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2408,7 +2408,7 @@
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2417,27 +2417,27 @@
       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 @@
       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 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -2480,7 +2480,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -2494,7 +2494,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -2508,7 +2508,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2522,7 +2522,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2536,7 +2536,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2545,7 +2545,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2554,7 +2554,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2563,7 +2563,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2572,7 +2572,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2581,7 +2581,7 @@
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2590,27 +2590,27 @@
       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 @@
       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 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -2653,7 +2653,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -2667,7 +2667,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -2681,7 +2681,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2695,7 +2695,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2709,7 +2709,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2718,7 +2718,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2727,7 +2727,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2736,7 +2736,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2745,7 +2745,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2754,7 +2754,7 @@
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2763,27 +2763,27 @@
       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 @@
       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 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -2826,7 +2826,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''January''',
@@ -2840,7 +2840,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''January''',
@@ -2854,7 +2854,7 @@
       r'''September''',
       r'''October''',
       r'''November''',
-      r'''December'''
+      r'''December''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2868,7 +2868,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -2882,7 +2882,7 @@
       r'''Sep''',
       r'''Oct''',
       r'''Nov''',
-      r'''Dec'''
+      r'''Dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2891,7 +2891,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunday''',
@@ -2900,7 +2900,7 @@
       r'''Wednesday''',
       r'''Thursday''',
       r'''Friday''',
-      r'''Saturday'''
+      r'''Saturday''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2909,7 +2909,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Sun''',
@@ -2918,7 +2918,7 @@
       r'''Wed''',
       r'''Thu''',
       r'''Fri''',
-      r'''Sat'''
+      r'''Sat''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2927,7 +2927,7 @@
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -2936,27 +2936,27 @@
       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 @@
       r"""{1} 'at' {0}""",
       r"""{1} 'at' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'es': <String, dynamic>{
@@ -2985,7 +2985,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -2999,7 +2999,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''enero''',
@@ -3013,7 +3013,7 @@
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''enero''',
@@ -3027,7 +3027,7 @@
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3041,7 +3041,7 @@
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3055,7 +3055,7 @@
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3064,7 +3064,7 @@
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3073,7 +3073,7 @@
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3082,7 +3082,7 @@
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3091,7 +3091,7 @@
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3100,7 +3100,7 @@
       r'''X''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3109,27 +3109,27 @@
       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 @@
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'es_419': <String, dynamic>{
@@ -3158,7 +3158,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -3172,7 +3172,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''enero''',
@@ -3186,7 +3186,7 @@
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''enero''',
@@ -3200,7 +3200,7 @@
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3214,7 +3214,7 @@
       r'''sep.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3228,7 +3228,7 @@
       r'''sep.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3237,7 +3237,7 @@
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3246,7 +3246,7 @@
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3255,7 +3255,7 @@
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3264,7 +3264,7 @@
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''d''',
@@ -3273,7 +3273,7 @@
       r'''m''',
       r'''j''',
       r'''v''',
-      r'''s'''
+      r'''s''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3282,27 +3282,27 @@
       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 @@
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'es_MX': <String, dynamic>{
@@ -3331,7 +3331,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -3345,7 +3345,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''enero''',
@@ -3359,7 +3359,7 @@
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''enero''',
@@ -3373,7 +3373,7 @@
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ene''',
@@ -3387,7 +3387,7 @@
       r'''sep''',
       r'''oct''',
       r'''nov''',
-      r'''dic'''
+      r'''dic''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3401,7 +3401,7 @@
       r'''sep.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3410,7 +3410,7 @@
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3419,7 +3419,7 @@
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3428,7 +3428,7 @@
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3437,7 +3437,7 @@
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3446,7 +3446,7 @@
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3455,32 +3455,32 @@
       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 @@
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'es_US': <String, dynamic>{
@@ -3509,7 +3509,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -3523,7 +3523,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''enero''',
@@ -3537,7 +3537,7 @@
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''enero''',
@@ -3551,7 +3551,7 @@
       r'''septiembre''',
       r'''octubre''',
       r'''noviembre''',
-      r'''diciembre'''
+      r'''diciembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3565,7 +3565,7 @@
       r'''sep.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ene.''',
@@ -3579,7 +3579,7 @@
       r'''sep.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dic.'''
+      r'''dic.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3588,7 +3588,7 @@
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -3597,7 +3597,7 @@
       r'''miércoles''',
       r'''jueves''',
       r'''viernes''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3606,7 +3606,7 @@
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -3615,7 +3615,7 @@
       r'''mié.''',
       r'''jue.''',
       r'''vie.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3624,7 +3624,7 @@
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -3633,27 +3633,27 @@
       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 @@
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'et': <String, dynamic>{
@@ -3682,7 +3682,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -3696,7 +3696,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''jaanuar''',
@@ -3710,7 +3710,7 @@
       r'''september''',
       r'''oktoober''',
       r'''november''',
-      r'''detsember'''
+      r'''detsember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''jaanuar''',
@@ -3724,7 +3724,7 @@
       r'''september''',
       r'''oktoober''',
       r'''november''',
-      r'''detsember'''
+      r'''detsember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jaan''',
@@ -3738,7 +3738,7 @@
       r'''sept''',
       r'''okt''',
       r'''nov''',
-      r'''dets'''
+      r'''dets''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jaan''',
@@ -3752,7 +3752,7 @@
       r'''sept''',
       r'''okt''',
       r'''nov''',
-      r'''dets'''
+      r'''dets''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''pühapäev''',
@@ -3761,7 +3761,7 @@
       r'''kolmapäev''',
       r'''neljapäev''',
       r'''reede''',
-      r'''laupäev'''
+      r'''laupäev''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''pühapäev''',
@@ -3770,7 +3770,7 @@
       r'''kolmapäev''',
       r'''neljapäev''',
       r'''reede''',
-      r'''laupäev'''
+      r'''laupäev''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''P''',
@@ -3779,7 +3779,7 @@
       r'''K''',
       r'''N''',
       r'''R''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''P''',
@@ -3788,7 +3788,7 @@
       r'''K''',
       r'''N''',
       r'''R''',
-      r'''L'''
+      r'''L''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''P''',
@@ -3797,7 +3797,7 @@
       r'''K''',
       r'''N''',
       r'''R''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''P''',
@@ -3806,27 +3806,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'fa': <String, dynamic>{
@@ -3855,7 +3855,7 @@
       r'''س''',
       r'''ا''',
       r'''ن''',
-      r'''د'''
+      r'''د''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ژ''',
@@ -3869,7 +3869,7 @@
       r'''س''',
       r'''ا''',
       r'''ن''',
-      r'''د'''
+      r'''د''',
     ],
     'MONTHS': <dynamic>[
       r'''ژانویهٔ''',
@@ -3883,7 +3883,7 @@
       r'''سپتامبر''',
       r'''اکتبر''',
       r'''نوامبر''',
-      r'''دسامبر'''
+      r'''دسامبر''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''ژانویه''',
@@ -3897,7 +3897,7 @@
       r'''سپتامبر''',
       r'''اکتبر''',
       r'''نوامبر''',
-      r'''دسامبر'''
+      r'''دسامبر''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ژانویهٔ''',
@@ -3911,7 +3911,7 @@
       r'''سپتامبر''',
       r'''اکتبر''',
       r'''نوامبر''',
-      r'''دسامبر'''
+      r'''دسامبر''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ژانویه''',
@@ -3925,7 +3925,7 @@
       r'''سپتامبر''',
       r'''اکتبر''',
       r'''نوامبر''',
-      r'''دسامبر'''
+      r'''دسامبر''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''یکشنبه''',
@@ -3934,7 +3934,7 @@
       r'''چهارشنبه''',
       r'''پنجشنبه''',
       r'''جمعه''',
-      r'''شنبه'''
+      r'''شنبه''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''یکشنبه''',
@@ -3943,7 +3943,7 @@
       r'''چهارشنبه''',
       r'''پنجشنبه''',
       r'''جمعه''',
-      r'''شنبه'''
+      r'''شنبه''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''یکشنبه''',
@@ -3952,7 +3952,7 @@
       r'''چهارشنبه''',
       r'''پنجشنبه''',
       r'''جمعه''',
-      r'''شنبه'''
+      r'''شنبه''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''یکشنبه''',
@@ -3961,7 +3961,7 @@
       r'''چهارشنبه''',
       r'''پنجشنبه''',
       r'''جمعه''',
-      r'''شنبه'''
+      r'''شنبه''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''ی''',
@@ -3970,7 +3970,7 @@
       r'''چ''',
       r'''پ''',
       r'''ج''',
-      r'''ش'''
+      r'''ش''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''ی''',
@@ -3979,32 +3979,32 @@
       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 @@
       r'''{1}، ساعت {0}''',
       r'''{1}، ساعت {0}''',
       r'''{1}،‏ {0}''',
-      r'''{1}،‏ {0}'''
+      r'''{1}،‏ {0}''',
     ],
     'ZERODIGIT': r'''۰''',
   },
@@ -4023,7 +4023,7 @@
     '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 @@
       r'''S''',
       r'''L''',
       r'''M''',
-      r'''J'''
+      r'''J''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''T''',
@@ -4051,7 +4051,7 @@
       r'''S''',
       r'''L''',
       r'''M''',
-      r'''J'''
+      r'''J''',
     ],
     'MONTHS': <dynamic>[
       r'''tammikuuta''',
@@ -4065,7 +4065,7 @@
       r'''syyskuuta''',
       r'''lokakuuta''',
       r'''marraskuuta''',
-      r'''joulukuuta'''
+      r'''joulukuuta''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''tammikuu''',
@@ -4079,7 +4079,7 @@
       r'''syyskuu''',
       r'''lokakuu''',
       r'''marraskuu''',
-      r'''joulukuu'''
+      r'''joulukuu''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''tammik.''',
@@ -4093,7 +4093,7 @@
       r'''syysk.''',
       r'''lokak.''',
       r'''marrask.''',
-      r'''jouluk.'''
+      r'''jouluk.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''tammi''',
@@ -4107,7 +4107,7 @@
       r'''syys''',
       r'''loka''',
       r'''marras''',
-      r'''joulu'''
+      r'''joulu''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''sunnuntaina''',
@@ -4116,7 +4116,7 @@
       r'''keskiviikkona''',
       r'''torstaina''',
       r'''perjantaina''',
-      r'''lauantaina'''
+      r'''lauantaina''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''sunnuntai''',
@@ -4125,7 +4125,7 @@
       r'''keskiviikko''',
       r'''torstai''',
       r'''perjantai''',
-      r'''lauantai'''
+      r'''lauantai''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''su''',
@@ -4134,7 +4134,7 @@
       r'''ke''',
       r'''to''',
       r'''pe''',
-      r'''la'''
+      r'''la''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''su''',
@@ -4143,7 +4143,7 @@
       r'''ke''',
       r'''to''',
       r'''pe''',
-      r'''la'''
+      r'''la''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -4152,7 +4152,7 @@
       r'''K''',
       r'''T''',
       r'''P''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -4161,32 +4161,32 @@
       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 @@
       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 @@
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -4229,7 +4229,7 @@
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'MONTHS': <dynamic>[
       r'''Enero''',
@@ -4243,7 +4243,7 @@
       r'''Setyembre''',
       r'''Oktubre''',
       r'''Nobyembre''',
-      r'''Disyembre'''
+      r'''Disyembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Enero''',
@@ -4257,7 +4257,7 @@
       r'''Setyembre''',
       r'''Oktubre''',
       r'''Nobyembre''',
-      r'''Disyembre'''
+      r'''Disyembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Ene''',
@@ -4271,7 +4271,7 @@
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Ene''',
@@ -4285,7 +4285,7 @@
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Linggo''',
@@ -4294,7 +4294,7 @@
       r'''Miyerkules''',
       r'''Huwebes''',
       r'''Biyernes''',
-      r'''Sabado'''
+      r'''Sabado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Linggo''',
@@ -4303,7 +4303,7 @@
       r'''Miyerkules''',
       r'''Huwebes''',
       r'''Biyernes''',
-      r'''Sabado'''
+      r'''Sabado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -4312,7 +4312,7 @@
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -4321,7 +4321,7 @@
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -4330,7 +4330,7 @@
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -4339,27 +4339,27 @@
       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 @@
       r"""{1} 'nang' {0}""",
       r"""{1} 'nang' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'fr': <String, dynamic>{
@@ -4388,7 +4388,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -4402,7 +4402,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''janvier''',
@@ -4416,7 +4416,7 @@
       r'''septembre''',
       r'''octobre''',
       r'''novembre''',
-      r'''décembre'''
+      r'''décembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''janvier''',
@@ -4430,7 +4430,7 @@
       r'''septembre''',
       r'''octobre''',
       r'''novembre''',
-      r'''décembre'''
+      r'''décembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -4444,7 +4444,7 @@
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''déc.'''
+      r'''déc.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -4458,7 +4458,7 @@
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''déc.'''
+      r'''déc.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''dimanche''',
@@ -4467,7 +4467,7 @@
       r'''mercredi''',
       r'''jeudi''',
       r'''vendredi''',
-      r'''samedi'''
+      r'''samedi''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''dimanche''',
@@ -4476,7 +4476,7 @@
       r'''mercredi''',
       r'''jeudi''',
       r'''vendredi''',
-      r'''samedi'''
+      r'''samedi''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dim.''',
@@ -4485,7 +4485,7 @@
       r'''mer.''',
       r'''jeu.''',
       r'''ven.''',
-      r'''sam.'''
+      r'''sam.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dim.''',
@@ -4494,7 +4494,7 @@
       r'''mer.''',
       r'''jeu.''',
       r'''ven.''',
-      r'''sam.'''
+      r'''sam.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -4503,7 +4503,7 @@
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -4512,27 +4512,27 @@
       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 @@
       r"""{1} 'à' {0}""",
       r"""{1} 'à' {0}""",
       r"""{1} 'à' {0}""",
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'fr_CA': <String, dynamic>{
@@ -4561,7 +4561,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -4575,7 +4575,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''janvier''',
@@ -4589,7 +4589,7 @@
       r'''septembre''',
       r'''octobre''',
       r'''novembre''',
-      r'''décembre'''
+      r'''décembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''janvier''',
@@ -4603,7 +4603,7 @@
       r'''septembre''',
       r'''octobre''',
       r'''novembre''',
-      r'''décembre'''
+      r'''décembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -4617,7 +4617,7 @@
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''déc.'''
+      r'''déc.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -4631,7 +4631,7 @@
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''déc.'''
+      r'''déc.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''dimanche''',
@@ -4640,7 +4640,7 @@
       r'''mercredi''',
       r'''jeudi''',
       r'''vendredi''',
-      r'''samedi'''
+      r'''samedi''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''dimanche''',
@@ -4649,7 +4649,7 @@
       r'''mercredi''',
       r'''jeudi''',
       r'''vendredi''',
-      r'''samedi'''
+      r'''samedi''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dim.''',
@@ -4658,7 +4658,7 @@
       r'''mer.''',
       r'''jeu.''',
       r'''ven.''',
-      r'''sam.'''
+      r'''sam.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dim.''',
@@ -4667,7 +4667,7 @@
       r'''mer.''',
       r'''jeu.''',
       r'''ven.''',
-      r'''sam.'''
+      r'''sam.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -4676,7 +4676,7 @@
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -4685,27 +4685,27 @@
       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 @@
       r"""{1} 'à' {0}""",
       r"""{1} 'à' {0}""",
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'gl': <String, dynamic>{
@@ -4734,7 +4734,7 @@
       r'''s.''',
       r'''o.''',
       r'''n.''',
-      r'''d.'''
+      r'''d.''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''X''',
@@ -4748,7 +4748,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''xaneiro''',
@@ -4762,7 +4762,7 @@
       r'''setembro''',
       r'''outubro''',
       r'''novembro''',
-      r'''decembro'''
+      r'''decembro''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Xaneiro''',
@@ -4776,7 +4776,7 @@
       r'''Setembro''',
       r'''Outubro''',
       r'''Novembro''',
-      r'''Decembro'''
+      r'''Decembro''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''xan.''',
@@ -4790,7 +4790,7 @@
       r'''set.''',
       r'''out.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Xan.''',
@@ -4804,7 +4804,7 @@
       r'''Set.''',
       r'''Out.''',
       r'''Nov.''',
-      r'''Dec.'''
+      r'''Dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -4813,7 +4813,7 @@
       r'''mércores''',
       r'''xoves''',
       r'''venres''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Domingo''',
@@ -4822,7 +4822,7 @@
       r'''Mércores''',
       r'''Xoves''',
       r'''Venres''',
-      r'''Sábado'''
+      r'''Sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom.''',
@@ -4831,7 +4831,7 @@
       r'''mér.''',
       r'''xov.''',
       r'''ven.''',
-      r'''sáb.'''
+      r'''sáb.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Dom.''',
@@ -4840,7 +4840,7 @@
       r'''Mér.''',
       r'''Xov.''',
       r'''Ven.''',
-      r'''Sáb.'''
+      r'''Sáb.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''d.''',
@@ -4849,7 +4849,7 @@
       r'''m.''',
       r'''x.''',
       r'''v.''',
-      r'''s.'''
+      r'''s.''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -4858,27 +4858,27 @@
       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 @@
       r"""{0} 'do' {1}""",
       r"""{0} 'do' {1}""",
       r'''{0}, {1}''',
-      r'''{0}, {1}'''
+      r'''{0}, {1}''',
     ],
   },
   'gsw': <String, dynamic>{
@@ -4907,7 +4907,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -4921,7 +4921,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januar''',
@@ -4935,7 +4935,7 @@
       r'''Septämber''',
       r'''Oktoober''',
       r'''Novämber''',
-      r'''Dezämber'''
+      r'''Dezämber''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januar''',
@@ -4949,7 +4949,7 @@
       r'''Septämber''',
       r'''Oktoober''',
       r'''Novämber''',
-      r'''Dezämber'''
+      r'''Dezämber''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -4963,7 +4963,7 @@
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dez'''
+      r'''Dez''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -4977,7 +4977,7 @@
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dez'''
+      r'''Dez''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Sunntig''',
@@ -4986,7 +4986,7 @@
       r'''Mittwuch''',
       r'''Dunschtig''',
       r'''Friitig''',
-      r'''Samschtig'''
+      r'''Samschtig''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Sunntig''',
@@ -4995,7 +4995,7 @@
       r'''Mittwuch''',
       r'''Dunschtig''',
       r'''Friitig''',
-      r'''Samschtig'''
+      r'''Samschtig''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Su.''',
@@ -5004,7 +5004,7 @@
       r'''Mi.''',
       r'''Du.''',
       r'''Fr.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Su.''',
@@ -5013,7 +5013,7 @@
       r'''Mi.''',
       r'''Du.''',
       r'''Fr.''',
-      r'''Sa.'''
+      r'''Sa.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -5022,7 +5022,7 @@
       r'''M''',
       r'''D''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -5031,27 +5031,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'he': <String, dynamic>{
@@ -5080,7 +5080,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -5094,7 +5094,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''ינואר''',
@@ -5108,7 +5108,7 @@
       r'''ספטמבר''',
       r'''אוקטובר''',
       r'''נובמבר''',
-      r'''דצמבר'''
+      r'''דצמבר''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''ינואר''',
@@ -5122,7 +5122,7 @@
       r'''ספטמבר''',
       r'''אוקטובר''',
       r'''נובמבר''',
-      r'''דצמבר'''
+      r'''דצמבר''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ינו׳''',
@@ -5136,7 +5136,7 @@
       r'''ספט׳''',
       r'''אוק׳''',
       r'''נוב׳''',
-      r'''דצמ׳'''
+      r'''דצמ׳''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ינו׳''',
@@ -5150,7 +5150,7 @@
       r'''ספט׳''',
       r'''אוק׳''',
       r'''נוב׳''',
-      r'''דצמ׳'''
+      r'''דצמ׳''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''יום ראשון''',
@@ -5159,7 +5159,7 @@
       r'''יום רביעי''',
       r'''יום חמישי''',
       r'''יום שישי''',
-      r'''יום שבת'''
+      r'''יום שבת''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''יום ראשון''',
@@ -5168,7 +5168,7 @@
       r'''יום רביעי''',
       r'''יום חמישי''',
       r'''יום שישי''',
-      r'''יום שבת'''
+      r'''יום שבת''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''יום א׳''',
@@ -5177,7 +5177,7 @@
       r'''יום ד׳''',
       r'''יום ה׳''',
       r'''יום ו׳''',
-      r'''שבת'''
+      r'''שבת''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''יום א׳''',
@@ -5186,7 +5186,7 @@
       r'''יום ד׳''',
       r'''יום ה׳''',
       r'''יום ו׳''',
-      r'''שבת'''
+      r'''שבת''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''א׳''',
@@ -5195,7 +5195,7 @@
       r'''ד׳''',
       r'''ה׳''',
       r'''ו׳''',
-      r'''ש׳'''
+      r'''ש׳''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''א׳''',
@@ -5204,27 +5204,27 @@
       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 @@
       r'''{1} בשעה {0}''',
       r'''{1} בשעה {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'hi': <String, dynamic>{
@@ -5253,7 +5253,7 @@
       r'''सि''',
       r'''अ''',
       r'''न''',
-      r'''दि'''
+      r'''दि''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ज''',
@@ -5267,7 +5267,7 @@
       r'''सि''',
       r'''अ''',
       r'''न''',
-      r'''दि'''
+      r'''दि''',
     ],
     'MONTHS': <dynamic>[
       r'''जनवरी''',
@@ -5281,7 +5281,7 @@
       r'''सितंबर''',
       r'''अक्तूबर''',
       r'''नवंबर''',
-      r'''दिसंबर'''
+      r'''दिसंबर''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''जनवरी''',
@@ -5295,7 +5295,7 @@
       r'''सितंबर''',
       r'''अक्तूबर''',
       r'''नवंबर''',
-      r'''दिसंबर'''
+      r'''दिसंबर''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''जन॰''',
@@ -5309,7 +5309,7 @@
       r'''सित॰''',
       r'''अक्तू॰''',
       r'''नव॰''',
-      r'''दिस॰'''
+      r'''दिस॰''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''जन॰''',
@@ -5323,7 +5323,7 @@
       r'''सित॰''',
       r'''अक्तू॰''',
       r'''नव॰''',
-      r'''दिस॰'''
+      r'''दिस॰''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''रविवार''',
@@ -5332,7 +5332,7 @@
       r'''बुधवार''',
       r'''गुरुवार''',
       r'''शुक्रवार''',
-      r'''शनिवार'''
+      r'''शनिवार''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''रविवार''',
@@ -5341,7 +5341,7 @@
       r'''बुधवार''',
       r'''गुरुवार''',
       r'''शुक्रवार''',
-      r'''शनिवार'''
+      r'''शनिवार''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''रवि''',
@@ -5350,7 +5350,7 @@
       r'''बुध''',
       r'''गुरु''',
       r'''शुक्र''',
-      r'''शनि'''
+      r'''शनि''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''रवि''',
@@ -5359,7 +5359,7 @@
       r'''बुध''',
       r'''गुरु''',
       r'''शुक्र''',
-      r'''शनि'''
+      r'''शनि''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''र''',
@@ -5368,7 +5368,7 @@
       r'''बु''',
       r'''गु''',
       r'''शु''',
-      r'''श'''
+      r'''श''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''र''',
@@ -5377,27 +5377,27 @@
       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 @@
       r'''{1} को {0}''',
       r'''{1} को {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'hr': <String, dynamic>{
@@ -5426,7 +5426,7 @@
       r'''9.''',
       r'''10.''',
       r'''11.''',
-      r'''12.'''
+      r'''12.''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1.''',
@@ -5440,7 +5440,7 @@
       r'''9.''',
       r'''10.''',
       r'''11.''',
-      r'''12.'''
+      r'''12.''',
     ],
     'MONTHS': <dynamic>[
       r'''siječnja''',
@@ -5454,7 +5454,7 @@
       r'''rujna''',
       r'''listopada''',
       r'''studenoga''',
-      r'''prosinca'''
+      r'''prosinca''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''siječanj''',
@@ -5468,7 +5468,7 @@
       r'''rujan''',
       r'''listopad''',
       r'''studeni''',
-      r'''prosinac'''
+      r'''prosinac''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''sij''',
@@ -5482,7 +5482,7 @@
       r'''ruj''',
       r'''lis''',
       r'''stu''',
-      r'''pro'''
+      r'''pro''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''sij''',
@@ -5496,7 +5496,7 @@
       r'''ruj''',
       r'''lis''',
       r'''stu''',
-      r'''pro'''
+      r'''pro''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''nedjelja''',
@@ -5505,7 +5505,7 @@
       r'''srijeda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''nedjelja''',
@@ -5514,7 +5514,7 @@
       r'''srijeda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -5523,7 +5523,7 @@
       r'''sri''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -5532,7 +5532,7 @@
       r'''sri''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''N''',
@@ -5541,7 +5541,7 @@
       r'''S''',
       r'''Č''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -5550,27 +5550,27 @@
       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 @@
       r"""{1} 'u' {0}""",
       r"""{1} 'u' {0}""",
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'hu': <String, dynamic>{
@@ -5599,7 +5599,7 @@
       r'''Sz''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -5613,7 +5613,7 @@
       r'''Sz''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''január''',
@@ -5627,7 +5627,7 @@
       r'''szeptember''',
       r'''október''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''január''',
@@ -5641,7 +5641,7 @@
       r'''szeptember''',
       r'''október''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -5655,7 +5655,7 @@
       r'''szept.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -5669,7 +5669,7 @@
       r'''szept.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''vasárnap''',
@@ -5678,7 +5678,7 @@
       r'''szerda''',
       r'''csütörtök''',
       r'''péntek''',
-      r'''szombat'''
+      r'''szombat''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''vasárnap''',
@@ -5687,7 +5687,7 @@
       r'''szerda''',
       r'''csütörtök''',
       r'''péntek''',
-      r'''szombat'''
+      r'''szombat''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''V''',
@@ -5696,7 +5696,7 @@
       r'''Sze''',
       r'''Cs''',
       r'''P''',
-      r'''Szo'''
+      r'''Szo''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''V''',
@@ -5705,7 +5705,7 @@
       r'''Sze''',
       r'''Cs''',
       r'''P''',
-      r'''Szo'''
+      r'''Szo''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''V''',
@@ -5714,7 +5714,7 @@
       r'''Sz''',
       r'''Cs''',
       r'''P''',
-      r'''Sz'''
+      r'''Sz''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''V''',
@@ -5723,32 +5723,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'hy': <String, dynamic>{
@@ -5777,7 +5777,7 @@
       r'''Ս''',
       r'''Հ''',
       r'''Ն''',
-      r'''Դ'''
+      r'''Դ''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''Հ''',
@@ -5791,7 +5791,7 @@
       r'''Ս''',
       r'''Հ''',
       r'''Ն''',
-      r'''Դ'''
+      r'''Դ''',
     ],
     'MONTHS': <dynamic>[
       r'''հունվարի''',
@@ -5805,7 +5805,7 @@
       r'''սեպտեմբերի''',
       r'''հոկտեմբերի''',
       r'''նոյեմբերի''',
-      r'''դեկտեմբերի'''
+      r'''դեկտեմբերի''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''հունվար''',
@@ -5819,7 +5819,7 @@
       r'''սեպտեմբեր''',
       r'''հոկտեմբեր''',
       r'''նոյեմբեր''',
-      r'''դեկտեմբեր'''
+      r'''դեկտեմբեր''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''հնվ''',
@@ -5833,7 +5833,7 @@
       r'''սեպ''',
       r'''հոկ''',
       r'''նոյ''',
-      r'''դեկ'''
+      r'''դեկ''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''հնվ''',
@@ -5847,7 +5847,7 @@
       r'''սեպ''',
       r'''հոկ''',
       r'''նոյ''',
-      r'''դեկ'''
+      r'''դեկ''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''կիրակի''',
@@ -5856,7 +5856,7 @@
       r'''չորեքշաբթի''',
       r'''հինգշաբթի''',
       r'''ուրբաթ''',
-      r'''շաբաթ'''
+      r'''շաբաթ''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''կիրակի''',
@@ -5865,7 +5865,7 @@
       r'''չորեքշաբթի''',
       r'''հինգշաբթի''',
       r'''ուրբաթ''',
-      r'''շաբաթ'''
+      r'''շաբաթ''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''կիր''',
@@ -5874,7 +5874,7 @@
       r'''չրք''',
       r'''հնգ''',
       r'''ուր''',
-      r'''շբթ'''
+      r'''շբթ''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''կիր''',
@@ -5883,7 +5883,7 @@
       r'''չրք''',
       r'''հնգ''',
       r'''ուր''',
-      r'''շբթ'''
+      r'''շբթ''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Կ''',
@@ -5892,7 +5892,7 @@
       r'''Չ''',
       r'''Հ''',
       r'''Ո''',
-      r'''Շ'''
+      r'''Շ''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Կ''',
@@ -5901,32 +5901,32 @@
       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 @@
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'id': <String, dynamic>{
@@ -5955,7 +5955,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -5969,7 +5969,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januari''',
@@ -5983,7 +5983,7 @@
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Desember'''
+      r'''Desember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januari''',
@@ -5997,7 +5997,7 @@
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Desember'''
+      r'''Desember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -6011,7 +6011,7 @@
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Des'''
+      r'''Des''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -6025,7 +6025,7 @@
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Des'''
+      r'''Des''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Minggu''',
@@ -6034,7 +6034,7 @@
       r'''Rabu''',
       r'''Kamis''',
       r'''Jumat''',
-      r'''Sabtu'''
+      r'''Sabtu''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Minggu''',
@@ -6043,7 +6043,7 @@
       r'''Rabu''',
       r'''Kamis''',
       r'''Jumat''',
-      r'''Sabtu'''
+      r'''Sabtu''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Min''',
@@ -6052,7 +6052,7 @@
       r'''Rab''',
       r'''Kam''',
       r'''Jum''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Min''',
@@ -6061,7 +6061,7 @@
       r'''Rab''',
       r'''Kam''',
       r'''Jum''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''M''',
@@ -6070,7 +6070,7 @@
       r'''R''',
       r'''K''',
       r'''J''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''M''',
@@ -6079,27 +6079,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'it': <String, dynamic>{
@@ -6128,7 +6128,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''G''',
@@ -6142,7 +6142,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''gennaio''',
@@ -6156,7 +6156,7 @@
       r'''settembre''',
       r'''ottobre''',
       r'''novembre''',
-      r'''dicembre'''
+      r'''dicembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''gennaio''',
@@ -6170,7 +6170,7 @@
       r'''settembre''',
       r'''ottobre''',
       r'''novembre''',
-      r'''dicembre'''
+      r'''dicembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''gen''',
@@ -6184,7 +6184,7 @@
       r'''set''',
       r'''ott''',
       r'''nov''',
-      r'''dic'''
+      r'''dic''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''gen''',
@@ -6198,7 +6198,7 @@
       r'''set''',
       r'''ott''',
       r'''nov''',
-      r'''dic'''
+      r'''dic''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domenica''',
@@ -6207,7 +6207,7 @@
       r'''mercoledì''',
       r'''giovedì''',
       r'''venerdì''',
-      r'''sabato'''
+      r'''sabato''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domenica''',
@@ -6216,7 +6216,7 @@
       r'''mercoledì''',
       r'''giovedì''',
       r'''venerdì''',
-      r'''sabato'''
+      r'''sabato''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom''',
@@ -6225,7 +6225,7 @@
       r'''mer''',
       r'''gio''',
       r'''ven''',
-      r'''sab'''
+      r'''sab''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom''',
@@ -6234,7 +6234,7 @@
       r'''mer''',
       r'''gio''',
       r'''ven''',
-      r'''sab'''
+      r'''sab''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -6243,7 +6243,7 @@
       r'''M''',
       r'''G''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -6252,27 +6252,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ja': <String, dynamic>{
@@ -6301,7 +6301,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -6315,7 +6315,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''1月''',
@@ -6329,7 +6329,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''1月''',
@@ -6343,7 +6343,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -6357,7 +6357,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -6371,7 +6371,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''日曜日''',
@@ -6380,7 +6380,7 @@
       r'''水曜日''',
       r'''木曜日''',
       r'''金曜日''',
-      r'''土曜日'''
+      r'''土曜日''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''日曜日''',
@@ -6389,7 +6389,7 @@
       r'''水曜日''',
       r'''木曜日''',
       r'''金曜日''',
-      r'''土曜日'''
+      r'''土曜日''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''日''',
@@ -6398,7 +6398,7 @@
       r'''水''',
       r'''木''',
       r'''金''',
-      r'''土'''
+      r'''土''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''日''',
@@ -6407,7 +6407,7 @@
       r'''水''',
       r'''木''',
       r'''金''',
-      r'''土'''
+      r'''土''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -6416,7 +6416,7 @@
       r'''水''',
       r'''木''',
       r'''金''',
-      r'''土'''
+      r'''土''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -6425,27 +6425,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'km': <String, dynamic>{
@@ -6474,7 +6474,7 @@
       r'''ក''',
       r'''ត''',
       r'''វ''',
-      r'''ធ'''
+      r'''ធ''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ម''',
@@ -6488,7 +6488,7 @@
       r'''ក''',
       r'''ត''',
       r'''វ''',
-      r'''ធ'''
+      r'''ធ''',
     ],
     'MONTHS': <dynamic>[
       r'''មករា''',
@@ -6502,7 +6502,7 @@
       r'''កញ្ញា''',
       r'''តុលា''',
       r'''វិច្ឆិកា''',
-      r'''ធ្នូ'''
+      r'''ធ្នូ''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''មករា''',
@@ -6516,7 +6516,7 @@
       r'''កញ្ញា''',
       r'''តុលា''',
       r'''វិច្ឆិកា''',
-      r'''ធ្នូ'''
+      r'''ធ្នូ''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''មករា''',
@@ -6530,7 +6530,7 @@
       r'''កញ្ញា''',
       r'''តុលា''',
       r'''វិច្ឆិកា''',
-      r'''ធ្នូ'''
+      r'''ធ្នូ''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''មករា''',
@@ -6544,7 +6544,7 @@
       r'''កញ្ញា''',
       r'''តុលា''',
       r'''វិច្ឆិកា''',
-      r'''ធ្នូ'''
+      r'''ធ្នូ''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''អាទិត្យ''',
@@ -6553,7 +6553,7 @@
       r'''ពុធ''',
       r'''ព្រហស្បតិ៍''',
       r'''សុក្រ''',
-      r'''សៅរ៍'''
+      r'''សៅរ៍''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''អាទិត្យ''',
@@ -6562,7 +6562,7 @@
       r'''ពុធ''',
       r'''ព្រហស្បតិ៍''',
       r'''សុក្រ''',
-      r'''សៅរ៍'''
+      r'''សៅរ៍''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''អាទិត្យ''',
@@ -6571,7 +6571,7 @@
       r'''ពុធ''',
       r'''ព្រហស្បតិ៍''',
       r'''សុក្រ''',
-      r'''សៅរ៍'''
+      r'''សៅរ៍''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''អាទិត្យ''',
@@ -6580,7 +6580,7 @@
       r'''ពុធ''',
       r'''ព្រហស្បតិ៍''',
       r'''សុក្រ''',
-      r'''សៅរ៍'''
+      r'''សៅរ៍''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''អ''',
@@ -6589,7 +6589,7 @@
       r'''ព''',
       r'''ព''',
       r'''ស''',
-      r'''ស'''
+      r'''ស''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''អ''',
@@ -6598,32 +6598,32 @@
       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 @@
       r'''{1} នៅ​ម៉ោង {0}''',
       r'''{1} នៅ​ម៉ោង {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ko': <String, dynamic>{
@@ -6652,7 +6652,7 @@
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1월''',
@@ -6666,7 +6666,7 @@
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'MONTHS': <dynamic>[
       r'''1월''',
@@ -6680,7 +6680,7 @@
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''1월''',
@@ -6694,7 +6694,7 @@
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1월''',
@@ -6708,7 +6708,7 @@
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1월''',
@@ -6722,7 +6722,7 @@
       r'''9월''',
       r'''10월''',
       r'''11월''',
-      r'''12월'''
+      r'''12월''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''일요일''',
@@ -6731,7 +6731,7 @@
       r'''수요일''',
       r'''목요일''',
       r'''금요일''',
-      r'''토요일'''
+      r'''토요일''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''일요일''',
@@ -6740,7 +6740,7 @@
       r'''수요일''',
       r'''목요일''',
       r'''금요일''',
-      r'''토요일'''
+      r'''토요일''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''일''',
@@ -6749,7 +6749,7 @@
       r'''수''',
       r'''목''',
       r'''금''',
-      r'''토'''
+      r'''토''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''일''',
@@ -6758,7 +6758,7 @@
       r'''수''',
       r'''목''',
       r'''금''',
-      r'''토'''
+      r'''토''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''일''',
@@ -6767,7 +6767,7 @@
       r'''수''',
       r'''목''',
       r'''금''',
-      r'''토'''
+      r'''토''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''일''',
@@ -6776,27 +6776,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'lt': <String, dynamic>{
@@ -6825,7 +6825,7 @@
       r'''R''',
       r'''S''',
       r'''L''',
-      r'''G'''
+      r'''G''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''S''',
@@ -6839,7 +6839,7 @@
       r'''R''',
       r'''S''',
       r'''L''',
-      r'''G'''
+      r'''G''',
     ],
     'MONTHS': <dynamic>[
       r'''sausio''',
@@ -6853,7 +6853,7 @@
       r'''rugsėjo''',
       r'''spalio''',
       r'''lapkričio''',
-      r'''gruodžio'''
+      r'''gruodžio''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''sausis''',
@@ -6867,7 +6867,7 @@
       r'''rugsėjis''',
       r'''spalis''',
       r'''lapkritis''',
-      r'''gruodis'''
+      r'''gruodis''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''saus.''',
@@ -6881,7 +6881,7 @@
       r'''rugs.''',
       r'''spal.''',
       r'''lapkr.''',
-      r'''gruod.'''
+      r'''gruod.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''saus.''',
@@ -6895,7 +6895,7 @@
       r'''rugs.''',
       r'''spal.''',
       r'''lapkr.''',
-      r'''gruod.'''
+      r'''gruod.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''sekmadienis''',
@@ -6904,7 +6904,7 @@
       r'''trečiadienis''',
       r'''ketvirtadienis''',
       r'''penktadienis''',
-      r'''šeštadienis'''
+      r'''šeštadienis''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''sekmadienis''',
@@ -6913,7 +6913,7 @@
       r'''trečiadienis''',
       r'''ketvirtadienis''',
       r'''penktadienis''',
-      r'''šeštadienis'''
+      r'''šeštadienis''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''sk''',
@@ -6922,7 +6922,7 @@
       r'''tr''',
       r'''kt''',
       r'''pn''',
-      r'''št'''
+      r'''št''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''sk''',
@@ -6931,7 +6931,7 @@
       r'''tr''',
       r'''kt''',
       r'''pn''',
-      r'''št'''
+      r'''št''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -6940,7 +6940,7 @@
       r'''T''',
       r'''K''',
       r'''P''',
-      r'''Š'''
+      r'''Š''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -6949,32 +6949,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'lv': <String, dynamic>{
@@ -7003,7 +7003,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -7017,7 +7017,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''janvāris''',
@@ -7031,7 +7031,7 @@
       r'''septembris''',
       r'''oktobris''',
       r'''novembris''',
-      r'''decembris'''
+      r'''decembris''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''janvāris''',
@@ -7045,7 +7045,7 @@
       r'''septembris''',
       r'''oktobris''',
       r'''novembris''',
-      r'''decembris'''
+      r'''decembris''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -7059,7 +7059,7 @@
       r'''sept.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''janv.''',
@@ -7073,7 +7073,7 @@
       r'''sept.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''svētdiena''',
@@ -7082,7 +7082,7 @@
       r'''trešdiena''',
       r'''ceturtdiena''',
       r'''piektdiena''',
-      r'''sestdiena'''
+      r'''sestdiena''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Svētdiena''',
@@ -7091,7 +7091,7 @@
       r'''Trešdiena''',
       r'''Ceturtdiena''',
       r'''Piektdiena''',
-      r'''Sestdiena'''
+      r'''Sestdiena''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''svētd.''',
@@ -7100,7 +7100,7 @@
       r'''trešd.''',
       r'''ceturtd.''',
       r'''piektd.''',
-      r'''sestd.'''
+      r'''sestd.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Svētd.''',
@@ -7109,7 +7109,7 @@
       r'''Trešd.''',
       r'''Ceturtd.''',
       r'''Piektd.''',
-      r'''Sestd.'''
+      r'''Sestd.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -7118,7 +7118,7 @@
       r'''T''',
       r'''C''',
       r'''P''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -7127,32 +7127,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'mn': <String, dynamic>{
@@ -7181,7 +7181,7 @@
       r'''IX''',
       r'''X''',
       r'''XI''',
-      r'''XII'''
+      r'''XII''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''I''',
@@ -7195,7 +7195,7 @@
       r'''IX''',
       r'''X''',
       r'''XI''',
-      r'''XII'''
+      r'''XII''',
     ],
     'MONTHS': <dynamic>[
       r'''Нэгдүгээр сар''',
@@ -7209,7 +7209,7 @@
       r'''Есдүгээр сар''',
       r'''Аравдугаар сар''',
       r'''Арван нэгдүгээр сар''',
-      r'''Арван хоёрдугаар сар'''
+      r'''Арван хоёрдугаар сар''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Нэгдүгээр сар''',
@@ -7223,7 +7223,7 @@
       r'''Есдүгээр сар''',
       r'''Аравдугаар сар''',
       r'''Арван нэгдүгээр сар''',
-      r'''Арван хоёрдугаар сар'''
+      r'''Арван хоёрдугаар сар''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1-р сар''',
@@ -7237,7 +7237,7 @@
       r'''9-р сар''',
       r'''10-р сар''',
       r'''11-р сар''',
-      r'''12-р сар'''
+      r'''12-р сар''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1-р сар''',
@@ -7251,7 +7251,7 @@
       r'''9-р сар''',
       r'''10-р сар''',
       r'''11-р сар''',
-      r'''12-р сар'''
+      r'''12-р сар''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''ням''',
@@ -7260,7 +7260,7 @@
       r'''лхагва''',
       r'''пүрэв''',
       r'''баасан''',
-      r'''бямба'''
+      r'''бямба''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''ням''',
@@ -7269,7 +7269,7 @@
       r'''лхагва''',
       r'''пүрэв''',
       r'''баасан''',
-      r'''бямба'''
+      r'''бямба''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Ня''',
@@ -7278,7 +7278,7 @@
       r'''Лх''',
       r'''Пү''',
       r'''Ба''',
-      r'''Бя'''
+      r'''Бя''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Ня''',
@@ -7287,7 +7287,7 @@
       r'''Лх''',
       r'''Пү''',
       r'''Ба''',
-      r'''Бя'''
+      r'''Бя''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Ня''',
@@ -7296,7 +7296,7 @@
       r'''Лх''',
       r'''Пү''',
       r'''Ба''',
-      r'''Бя'''
+      r'''Бя''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Ня''',
@@ -7305,32 +7305,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'mr': <String, dynamic>{
@@ -7359,7 +7359,7 @@
       r'''स''',
       r'''ऑ''',
       r'''नो''',
-      r'''डि'''
+      r'''डि''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''जा''',
@@ -7373,7 +7373,7 @@
       r'''स''',
       r'''ऑ''',
       r'''नो''',
-      r'''डि'''
+      r'''डि''',
     ],
     'MONTHS': <dynamic>[
       r'''जानेवारी''',
@@ -7387,7 +7387,7 @@
       r'''सप्टेंबर''',
       r'''ऑक्टोबर''',
       r'''नोव्हेंबर''',
-      r'''डिसेंबर'''
+      r'''डिसेंबर''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''जानेवारी''',
@@ -7401,7 +7401,7 @@
       r'''सप्टेंबर''',
       r'''ऑक्टोबर''',
       r'''नोव्हेंबर''',
-      r'''डिसेंबर'''
+      r'''डिसेंबर''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''जाने''',
@@ -7415,7 +7415,7 @@
       r'''सप्टें''',
       r'''ऑक्टो''',
       r'''नोव्हें''',
-      r'''डिसें'''
+      r'''डिसें''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''जाने''',
@@ -7429,7 +7429,7 @@
       r'''सप्टें''',
       r'''ऑक्टो''',
       r'''नोव्हें''',
-      r'''डिसें'''
+      r'''डिसें''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''रविवार''',
@@ -7438,7 +7438,7 @@
       r'''बुधवार''',
       r'''गुरुवार''',
       r'''शुक्रवार''',
-      r'''शनिवार'''
+      r'''शनिवार''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''रविवार''',
@@ -7447,7 +7447,7 @@
       r'''बुधवार''',
       r'''गुरुवार''',
       r'''शुक्रवार''',
-      r'''शनिवार'''
+      r'''शनिवार''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''रवि''',
@@ -7456,7 +7456,7 @@
       r'''बुध''',
       r'''गुरु''',
       r'''शुक्र''',
-      r'''शनि'''
+      r'''शनि''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''रवि''',
@@ -7465,7 +7465,7 @@
       r'''बुध''',
       r'''गुरु''',
       r'''शुक्र''',
-      r'''शनि'''
+      r'''शनि''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''र''',
@@ -7474,7 +7474,7 @@
       r'''बु''',
       r'''गु''',
       r'''शु''',
-      r'''श'''
+      r'''श''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''र''',
@@ -7483,27 +7483,27 @@
       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 @@
       r'''{1} रोजी {0}''',
       r'''{1} रोजी {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
     'ZERODIGIT': r'''०''',
   },
@@ -7533,7 +7533,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -7547,7 +7547,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januari''',
@@ -7561,7 +7561,7 @@
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Disember'''
+      r'''Disember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januari''',
@@ -7575,7 +7575,7 @@
       r'''September''',
       r'''Oktober''',
       r'''November''',
-      r'''Disember'''
+      r'''Disember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -7589,7 +7589,7 @@
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -7603,7 +7603,7 @@
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Ahad''',
@@ -7612,7 +7612,7 @@
       r'''Rabu''',
       r'''Khamis''',
       r'''Jumaat''',
-      r'''Sabtu'''
+      r'''Sabtu''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Ahad''',
@@ -7621,7 +7621,7 @@
       r'''Rabu''',
       r'''Khamis''',
       r'''Jumaat''',
-      r'''Sabtu'''
+      r'''Sabtu''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Ahd''',
@@ -7630,7 +7630,7 @@
       r'''Rab''',
       r'''Kha''',
       r'''Jum''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Ahd''',
@@ -7639,7 +7639,7 @@
       r'''Rab''',
       r'''Kha''',
       r'''Jum''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''A''',
@@ -7648,7 +7648,7 @@
       r'''R''',
       r'''K''',
       r'''J''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''A''',
@@ -7657,27 +7657,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'nb': <String, dynamic>{
@@ -7706,7 +7706,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -7720,7 +7720,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''januar''',
@@ -7734,7 +7734,7 @@
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''desember'''
+      r'''desember''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januar''',
@@ -7748,7 +7748,7 @@
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''desember'''
+      r'''desember''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -7762,7 +7762,7 @@
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''des.'''
+      r'''des.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -7776,7 +7776,7 @@
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''des'''
+      r'''des''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''søndag''',
@@ -7785,7 +7785,7 @@
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lørdag'''
+      r'''lørdag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''søndag''',
@@ -7794,7 +7794,7 @@
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lørdag'''
+      r'''lørdag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''søn.''',
@@ -7803,7 +7803,7 @@
       r'''ons.''',
       r'''tor.''',
       r'''fre.''',
-      r'''lør.'''
+      r'''lør.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''søn.''',
@@ -7812,7 +7812,7 @@
       r'''ons.''',
       r'''tor.''',
       r'''fre.''',
-      r'''lør.'''
+      r'''lør.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -7821,7 +7821,7 @@
       r'''O''',
       r'''T''',
       r'''F''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -7830,27 +7830,27 @@
       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 @@
       r'''{1} {0}''',
       r"""{1} 'kl'. {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'nl': <String, dynamic>{
@@ -7879,7 +7879,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -7893,7 +7893,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''januari''',
@@ -7907,7 +7907,7 @@
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januari''',
@@ -7921,7 +7921,7 @@
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -7935,7 +7935,7 @@
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -7949,7 +7949,7 @@
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''zondag''',
@@ -7958,7 +7958,7 @@
       r'''woensdag''',
       r'''donderdag''',
       r'''vrijdag''',
-      r'''zaterdag'''
+      r'''zaterdag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''zondag''',
@@ -7967,7 +7967,7 @@
       r'''woensdag''',
       r'''donderdag''',
       r'''vrijdag''',
-      r'''zaterdag'''
+      r'''zaterdag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''zo''',
@@ -7976,7 +7976,7 @@
       r'''wo''',
       r'''do''',
       r'''vr''',
-      r'''za'''
+      r'''za''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''zo''',
@@ -7985,7 +7985,7 @@
       r'''wo''',
       r'''do''',
       r'''vr''',
-      r'''za'''
+      r'''za''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Z''',
@@ -7994,7 +7994,7 @@
       r'''W''',
       r'''D''',
       r'''V''',
-      r'''Z'''
+      r'''Z''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Z''',
@@ -8003,27 +8003,27 @@
       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 @@
       r"""{1} 'om' {0}""",
       r"""{1} 'om' {0}""",
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'pl': <String, dynamic>{
@@ -8052,7 +8052,7 @@
       r'''w''',
       r'''p''',
       r'''l''',
-      r'''g'''
+      r'''g''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''S''',
@@ -8066,7 +8066,7 @@
       r'''W''',
       r'''P''',
       r'''L''',
-      r'''G'''
+      r'''G''',
     ],
     'MONTHS': <dynamic>[
       r'''stycznia''',
@@ -8080,7 +8080,7 @@
       r'''września''',
       r'''października''',
       r'''listopada''',
-      r'''grudnia'''
+      r'''grudnia''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''styczeń''',
@@ -8094,7 +8094,7 @@
       r'''wrzesień''',
       r'''październik''',
       r'''listopad''',
-      r'''grudzień'''
+      r'''grudzień''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''sty''',
@@ -8108,7 +8108,7 @@
       r'''wrz''',
       r'''paź''',
       r'''lis''',
-      r'''gru'''
+      r'''gru''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''sty''',
@@ -8122,7 +8122,7 @@
       r'''wrz''',
       r'''paź''',
       r'''lis''',
-      r'''gru'''
+      r'''gru''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''niedziela''',
@@ -8131,7 +8131,7 @@
       r'''środa''',
       r'''czwartek''',
       r'''piątek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''niedziela''',
@@ -8140,7 +8140,7 @@
       r'''środa''',
       r'''czwartek''',
       r'''piątek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''niedz.''',
@@ -8149,7 +8149,7 @@
       r'''śr.''',
       r'''czw.''',
       r'''pt.''',
-      r'''sob.'''
+      r'''sob.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''niedz.''',
@@ -8158,7 +8158,7 @@
       r'''śr.''',
       r'''czw.''',
       r'''pt.''',
-      r'''sob.'''
+      r'''sob.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -8167,7 +8167,7 @@
       r'''ś''',
       r'''c''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''N''',
@@ -8176,32 +8176,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ps': <String, dynamic>{
@@ -8219,7 +8219,7 @@
     'ERAS': <dynamic>[r'''له میلاد وړاندې''', r'''م.'''],
     'ERANAMES': <dynamic>[
       r'''له میلاد څخه وړاندې''',
-      r'''له میلاد څخه وروسته'''
+      r'''له میلاد څخه وروسته''',
     ],
     'NARROWMONTHS': <dynamic>[
       r'''ج''',
@@ -8233,7 +8233,7 @@
       r'''س''',
       r'''ا''',
       r'''ن''',
-      r'''د'''
+      r'''د''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -8247,7 +8247,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''جنوري''',
@@ -8261,7 +8261,7 @@
       r'''سېپتمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''جنوري''',
@@ -8275,7 +8275,7 @@
       r'''سپتمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''جنوري''',
@@ -8289,7 +8289,7 @@
       r'''سېپتمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''جنوري''',
@@ -8303,7 +8303,7 @@
       r'''سپتمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''يونۍ''',
@@ -8312,7 +8312,7 @@
       r'''څلرنۍ''',
       r'''پينځنۍ''',
       r'''جمعه''',
-      r'''اونۍ'''
+      r'''اونۍ''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''يونۍ''',
@@ -8321,7 +8321,7 @@
       r'''څلرنۍ''',
       r'''پينځنۍ''',
       r'''جمعه''',
-      r'''اونۍ'''
+      r'''اونۍ''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''يونۍ''',
@@ -8330,7 +8330,7 @@
       r'''څلرنۍ''',
       r'''پينځنۍ''',
       r'''جمعه''',
-      r'''اونۍ'''
+      r'''اونۍ''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''يونۍ''',
@@ -8339,7 +8339,7 @@
       r'''څلرنۍ''',
       r'''پينځنۍ''',
       r'''جمعه''',
-      r'''اونۍ'''
+      r'''اونۍ''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -8348,7 +8348,7 @@
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -8357,32 +8357,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
     'ZERODIGIT': r'''۰''',
   },
@@ -8412,7 +8412,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -8426,7 +8426,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''janeiro''',
@@ -8440,7 +8440,7 @@
       r'''setembro''',
       r'''outubro''',
       r'''novembro''',
-      r'''dezembro'''
+      r'''dezembro''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''janeiro''',
@@ -8454,7 +8454,7 @@
       r'''setembro''',
       r'''outubro''',
       r'''novembro''',
-      r'''dezembro'''
+      r'''dezembro''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -8468,7 +8468,7 @@
       r'''set''',
       r'''out''',
       r'''nov''',
-      r'''dez'''
+      r'''dez''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -8482,7 +8482,7 @@
       r'''set''',
       r'''out''',
       r'''nov''',
-      r'''dez'''
+      r'''dez''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8491,7 +8491,7 @@
       r'''quarta-feira''',
       r'''quinta-feira''',
       r'''sexta-feira''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8500,7 +8500,7 @@
       r'''quarta-feira''',
       r'''quinta-feira''',
       r'''sexta-feira''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dom''',
@@ -8509,7 +8509,7 @@
       r'''qua''',
       r'''qui''',
       r'''sex''',
-      r'''sáb'''
+      r'''sáb''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dom''',
@@ -8518,7 +8518,7 @@
       r'''qua''',
       r'''qui''',
       r'''sex''',
-      r'''sáb'''
+      r'''sáb''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8527,7 +8527,7 @@
       r'''Q''',
       r'''Q''',
       r'''S''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8536,27 +8536,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'pt_PT': <String, dynamic>{
@@ -8585,7 +8585,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -8599,7 +8599,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''janeiro''',
@@ -8613,7 +8613,7 @@
       r'''setembro''',
       r'''outubro''',
       r'''novembro''',
-      r'''dezembro'''
+      r'''dezembro''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''janeiro''',
@@ -8627,7 +8627,7 @@
       r'''setembro''',
       r'''outubro''',
       r'''novembro''',
-      r'''dezembro'''
+      r'''dezembro''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -8641,7 +8641,7 @@
       r'''set''',
       r'''out''',
       r'''nov''',
-      r'''dez'''
+      r'''dez''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -8655,7 +8655,7 @@
       r'''set''',
       r'''out''',
       r'''nov''',
-      r'''dez'''
+      r'''dez''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8664,7 +8664,7 @@
       r'''quarta-feira''',
       r'''quinta-feira''',
       r'''sexta-feira''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8673,7 +8673,7 @@
       r'''quarta-feira''',
       r'''quinta-feira''',
       r'''sexta-feira''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8682,7 +8682,7 @@
       r'''quarta''',
       r'''quinta''',
       r'''sexta''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''domingo''',
@@ -8691,7 +8691,7 @@
       r'''quarta''',
       r'''quinta''',
       r'''sexta''',
-      r'''sábado'''
+      r'''sábado''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8700,7 +8700,7 @@
       r'''Q''',
       r'''Q''',
       r'''S''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8709,27 +8709,27 @@
       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 @@
       r"""{1} 'às' {0}""",
       r"""{1} 'às' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ro': <String, dynamic>{
@@ -8758,7 +8758,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''I''',
@@ -8772,7 +8772,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''ianuarie''',
@@ -8786,7 +8786,7 @@
       r'''septembrie''',
       r'''octombrie''',
       r'''noiembrie''',
-      r'''decembrie'''
+      r'''decembrie''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''ianuarie''',
@@ -8800,7 +8800,7 @@
       r'''septembrie''',
       r'''octombrie''',
       r'''noiembrie''',
-      r'''decembrie'''
+      r'''decembrie''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ian.''',
@@ -8814,7 +8814,7 @@
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ian.''',
@@ -8828,7 +8828,7 @@
       r'''sept.''',
       r'''oct.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''duminică''',
@@ -8837,7 +8837,7 @@
       r'''miercuri''',
       r'''joi''',
       r'''vineri''',
-      r'''sâmbătă'''
+      r'''sâmbătă''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''duminică''',
@@ -8846,7 +8846,7 @@
       r'''miercuri''',
       r'''joi''',
       r'''vineri''',
-      r'''sâmbătă'''
+      r'''sâmbătă''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''dum.''',
@@ -8855,7 +8855,7 @@
       r'''mie.''',
       r'''joi''',
       r'''vin.''',
-      r'''sâm.'''
+      r'''sâm.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''dum.''',
@@ -8864,7 +8864,7 @@
       r'''mie.''',
       r'''joi''',
       r'''vin.''',
-      r'''sâm.'''
+      r'''sâm.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8873,7 +8873,7 @@
       r'''M''',
       r'''J''',
       r'''V''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''D''',
@@ -8882,32 +8882,32 @@
       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 @@
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ru': <String, dynamic>{
@@ -8925,7 +8925,7 @@
     'ERAS': <dynamic>[r'''до н. э.''', r'''н. э.'''],
     'ERANAMES': <dynamic>[
       r'''до Рождества Христова''',
-      r'''от Рождества Христова'''
+      r'''от Рождества Христова''',
     ],
     'NARROWMONTHS': <dynamic>[
       r'''Я''',
@@ -8939,7 +8939,7 @@
       r'''С''',
       r'''О''',
       r'''Н''',
-      r'''Д'''
+      r'''Д''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''Я''',
@@ -8953,7 +8953,7 @@
       r'''С''',
       r'''О''',
       r'''Н''',
-      r'''Д'''
+      r'''Д''',
     ],
     'MONTHS': <dynamic>[
       r'''января''',
@@ -8967,7 +8967,7 @@
       r'''сентября''',
       r'''октября''',
       r'''ноября''',
-      r'''декабря'''
+      r'''декабря''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''январь''',
@@ -8981,7 +8981,7 @@
       r'''сентябрь''',
       r'''октябрь''',
       r'''ноябрь''',
-      r'''декабрь'''
+      r'''декабрь''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''янв.''',
@@ -8995,7 +8995,7 @@
       r'''сент.''',
       r'''окт.''',
       r'''нояб.''',
-      r'''дек.'''
+      r'''дек.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''янв.''',
@@ -9009,7 +9009,7 @@
       r'''сент.''',
       r'''окт.''',
       r'''нояб.''',
-      r'''дек.'''
+      r'''дек.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''воскресенье''',
@@ -9018,7 +9018,7 @@
       r'''среда''',
       r'''четверг''',
       r'''пятница''',
-      r'''суббота'''
+      r'''суббота''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''воскресенье''',
@@ -9027,7 +9027,7 @@
       r'''среда''',
       r'''четверг''',
       r'''пятница''',
-      r'''суббота'''
+      r'''суббота''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''вс''',
@@ -9036,7 +9036,7 @@
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''вс''',
@@ -9045,7 +9045,7 @@
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''вс''',
@@ -9054,7 +9054,7 @@
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''В''',
@@ -9063,32 +9063,32 @@
       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 @@
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'sk': <String, dynamic>{
@@ -9117,7 +9117,7 @@
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''j''',
@@ -9131,7 +9131,7 @@
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'MONTHS': <dynamic>[
       r'''januára''',
@@ -9145,7 +9145,7 @@
       r'''septembra''',
       r'''októbra''',
       r'''novembra''',
-      r'''decembra'''
+      r'''decembra''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''január''',
@@ -9159,7 +9159,7 @@
       r'''september''',
       r'''október''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -9173,7 +9173,7 @@
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -9187,7 +9187,7 @@
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''nedeľa''',
@@ -9196,7 +9196,7 @@
       r'''streda''',
       r'''štvrtok''',
       r'''piatok''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''nedeľa''',
@@ -9205,7 +9205,7 @@
       r'''streda''',
       r'''štvrtok''',
       r'''piatok''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ne''',
@@ -9214,7 +9214,7 @@
       r'''st''',
       r'''št''',
       r'''pi''',
-      r'''so'''
+      r'''so''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ne''',
@@ -9223,7 +9223,7 @@
       r'''st''',
       r'''št''',
       r'''pi''',
-      r'''so'''
+      r'''so''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9232,7 +9232,7 @@
       r'''s''',
       r'''š''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9241,27 +9241,27 @@
       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 @@
       r'''{1}, {0}''',
       r'''{1}, {0}''',
       r'''{1}, {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'sl': <String, dynamic>{
@@ -9290,7 +9290,7 @@
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''j''',
@@ -9304,7 +9304,7 @@
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'MONTHS': <dynamic>[
       r'''januar''',
@@ -9318,7 +9318,7 @@
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januar''',
@@ -9332,7 +9332,7 @@
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -9346,7 +9346,7 @@
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -9360,7 +9360,7 @@
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''nedelja''',
@@ -9369,7 +9369,7 @@
       r'''sreda''',
       r'''četrtek''',
       r'''petek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''nedelja''',
@@ -9378,7 +9378,7 @@
       r'''sreda''',
       r'''četrtek''',
       r'''petek''',
-      r'''sobota'''
+      r'''sobota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ned.''',
@@ -9387,7 +9387,7 @@
       r'''sre.''',
       r'''čet.''',
       r'''pet.''',
-      r'''sob.'''
+      r'''sob.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ned.''',
@@ -9396,7 +9396,7 @@
       r'''sre.''',
       r'''čet.''',
       r'''pet.''',
-      r'''sob.'''
+      r'''sob.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9405,7 +9405,7 @@
       r'''s''',
       r'''č''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9414,32 +9414,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'sr': <String, dynamic>{
@@ -9468,7 +9468,7 @@
       r'''с''',
       r'''о''',
       r'''н''',
-      r'''д'''
+      r'''д''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ј''',
@@ -9482,7 +9482,7 @@
       r'''с''',
       r'''о''',
       r'''н''',
-      r'''д'''
+      r'''д''',
     ],
     'MONTHS': <dynamic>[
       r'''јануар''',
@@ -9496,7 +9496,7 @@
       r'''септембар''',
       r'''октобар''',
       r'''новембар''',
-      r'''децембар'''
+      r'''децембар''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''јануар''',
@@ -9510,7 +9510,7 @@
       r'''септембар''',
       r'''октобар''',
       r'''новембар''',
-      r'''децембар'''
+      r'''децембар''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''јан''',
@@ -9524,7 +9524,7 @@
       r'''сеп''',
       r'''окт''',
       r'''нов''',
-      r'''дец'''
+      r'''дец''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''јан''',
@@ -9538,7 +9538,7 @@
       r'''сеп''',
       r'''окт''',
       r'''нов''',
-      r'''дец'''
+      r'''дец''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''недеља''',
@@ -9547,7 +9547,7 @@
       r'''среда''',
       r'''четвртак''',
       r'''петак''',
-      r'''субота'''
+      r'''субота''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''недеља''',
@@ -9556,7 +9556,7 @@
       r'''среда''',
       r'''четвртак''',
       r'''петак''',
-      r'''субота'''
+      r'''субота''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''нед''',
@@ -9565,7 +9565,7 @@
       r'''сре''',
       r'''чет''',
       r'''пет''',
-      r'''суб'''
+      r'''суб''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''нед''',
@@ -9574,7 +9574,7 @@
       r'''сре''',
       r'''чет''',
       r'''пет''',
-      r'''суб'''
+      r'''суб''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''н''',
@@ -9583,7 +9583,7 @@
       r'''с''',
       r'''ч''',
       r'''п''',
-      r'''с'''
+      r'''с''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''н''',
@@ -9592,27 +9592,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'sr_Latn': <String, dynamic>{
@@ -9641,7 +9641,7 @@
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''j''',
@@ -9655,7 +9655,7 @@
       r'''s''',
       r'''o''',
       r'''n''',
-      r'''d'''
+      r'''d''',
     ],
     'MONTHS': <dynamic>[
       r'''januar''',
@@ -9669,7 +9669,7 @@
       r'''septembar''',
       r'''oktobar''',
       r'''novembar''',
-      r'''decembar'''
+      r'''decembar''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januar''',
@@ -9683,7 +9683,7 @@
       r'''septembar''',
       r'''oktobar''',
       r'''novembar''',
-      r'''decembar'''
+      r'''decembar''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -9697,7 +9697,7 @@
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan''',
@@ -9711,7 +9711,7 @@
       r'''sep''',
       r'''okt''',
       r'''nov''',
-      r'''dec'''
+      r'''dec''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''nedelja''',
@@ -9720,7 +9720,7 @@
       r'''sreda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''nedelja''',
@@ -9729,7 +9729,7 @@
       r'''sreda''',
       r'''četvrtak''',
       r'''petak''',
-      r'''subota'''
+      r'''subota''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -9738,7 +9738,7 @@
       r'''sre''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ned''',
@@ -9747,7 +9747,7 @@
       r'''sre''',
       r'''čet''',
       r'''pet''',
-      r'''sub'''
+      r'''sub''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9756,7 +9756,7 @@
       r'''s''',
       r'''č''',
       r'''p''',
-      r'''s'''
+      r'''s''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''n''',
@@ -9765,27 +9765,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'sv': <String, dynamic>{
@@ -9814,7 +9814,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -9828,7 +9828,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''januari''',
@@ -9842,7 +9842,7 @@
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''januari''',
@@ -9856,7 +9856,7 @@
       r'''september''',
       r'''oktober''',
       r'''november''',
-      r'''december'''
+      r'''december''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -9870,7 +9870,7 @@
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''jan.''',
@@ -9884,7 +9884,7 @@
       r'''sep.''',
       r'''okt.''',
       r'''nov.''',
-      r'''dec.'''
+      r'''dec.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''söndag''',
@@ -9893,7 +9893,7 @@
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lördag'''
+      r'''lördag''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''söndag''',
@@ -9902,7 +9902,7 @@
       r'''onsdag''',
       r'''torsdag''',
       r'''fredag''',
-      r'''lördag'''
+      r'''lördag''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''sön''',
@@ -9911,7 +9911,7 @@
       r'''ons''',
       r'''tors''',
       r'''fre''',
-      r'''lör'''
+      r'''lör''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''sön''',
@@ -9920,7 +9920,7 @@
       r'''ons''',
       r'''tors''',
       r'''fre''',
-      r'''lör'''
+      r'''lör''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -9929,7 +9929,7 @@
       r'''O''',
       r'''T''',
       r'''F''',
-      r'''L'''
+      r'''L''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -9938,27 +9938,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'sw': <String, dynamic>{
@@ -9987,7 +9987,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -10001,7 +10001,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''Januari''',
@@ -10015,7 +10015,7 @@
       r'''Septemba''',
       r'''Oktoba''',
       r'''Novemba''',
-      r'''Desemba'''
+      r'''Desemba''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Januari''',
@@ -10029,7 +10029,7 @@
       r'''Septemba''',
       r'''Oktoba''',
       r'''Novemba''',
-      r'''Desemba'''
+      r'''Desemba''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -10043,7 +10043,7 @@
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Des'''
+      r'''Des''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Jan''',
@@ -10057,7 +10057,7 @@
       r'''Sep''',
       r'''Okt''',
       r'''Nov''',
-      r'''Des'''
+      r'''Des''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Jumapili''',
@@ -10066,7 +10066,7 @@
       r'''Jumatano''',
       r'''Alhamisi''',
       r'''Ijumaa''',
-      r'''Jumamosi'''
+      r'''Jumamosi''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Jumapili''',
@@ -10075,7 +10075,7 @@
       r'''Jumatano''',
       r'''Alhamisi''',
       r'''Ijumaa''',
-      r'''Jumamosi'''
+      r'''Jumamosi''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Jumapili''',
@@ -10084,7 +10084,7 @@
       r'''Jumatano''',
       r'''Alhamisi''',
       r'''Ijumaa''',
-      r'''Jumamosi'''
+      r'''Jumamosi''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Jumapili''',
@@ -10093,7 +10093,7 @@
       r'''Jumatano''',
       r'''Alhamisi''',
       r'''Ijumaa''',
-      r'''Jumamosi'''
+      r'''Jumamosi''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -10102,7 +10102,7 @@
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -10111,32 +10111,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'ta': <String, dynamic>{
@@ -10165,7 +10165,7 @@
       r'''செ''',
       r'''அ''',
       r'''ந''',
-      r'''டி'''
+      r'''டி''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ஜ''',
@@ -10179,7 +10179,7 @@
       r'''செ''',
       r'''அ''',
       r'''ந''',
-      r'''டி'''
+      r'''டி''',
     ],
     'MONTHS': <dynamic>[
       r'''ஜனவரி''',
@@ -10193,7 +10193,7 @@
       r'''செப்டம்பர்''',
       r'''அக்டோபர்''',
       r'''நவம்பர்''',
-      r'''டிசம்பர்'''
+      r'''டிசம்பர்''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''ஜனவரி''',
@@ -10207,7 +10207,7 @@
       r'''செப்டம்பர்''',
       r'''அக்டோபர்''',
       r'''நவம்பர்''',
-      r'''டிசம்பர்'''
+      r'''டிசம்பர்''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ஜன.''',
@@ -10221,7 +10221,7 @@
       r'''செப்.''',
       r'''அக்.''',
       r'''நவ.''',
-      r'''டிச.'''
+      r'''டிச.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ஜன.''',
@@ -10235,7 +10235,7 @@
       r'''செப்.''',
       r'''அக்.''',
       r'''நவ.''',
-      r'''டிச.'''
+      r'''டிச.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''ஞாயிறு''',
@@ -10244,7 +10244,7 @@
       r'''புதன்''',
       r'''வியாழன்''',
       r'''வெள்ளி''',
-      r'''சனி'''
+      r'''சனி''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''ஞாயிறு''',
@@ -10253,7 +10253,7 @@
       r'''புதன்''',
       r'''வியாழன்''',
       r'''வெள்ளி''',
-      r'''சனி'''
+      r'''சனி''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''ஞாயி.''',
@@ -10262,7 +10262,7 @@
       r'''புத.''',
       r'''வியா.''',
       r'''வெள்.''',
-      r'''சனி'''
+      r'''சனி''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''ஞாயி.''',
@@ -10271,7 +10271,7 @@
       r'''புத.''',
       r'''வியா.''',
       r'''வெள்.''',
-      r'''சனி'''
+      r'''சனி''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''ஞா''',
@@ -10280,7 +10280,7 @@
       r'''பு''',
       r'''வி''',
       r'''வெ''',
-      r'''ச'''
+      r'''ச''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''ஞா''',
@@ -10289,32 +10289,32 @@
       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 @@
       r'''{1} ’அன்று’ {0}''',
       r'''{1} ’அன்று’ {0}''',
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'th': <String, dynamic>{
@@ -10343,7 +10343,7 @@
       r'''ก.ย.''',
       r'''ต.ค.''',
       r'''พ.ย.''',
-      r'''ธ.ค.'''
+      r'''ธ.ค.''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''ม.ค.''',
@@ -10357,7 +10357,7 @@
       r'''ก.ย.''',
       r'''ต.ค.''',
       r'''พ.ย.''',
-      r'''ธ.ค.'''
+      r'''ธ.ค.''',
     ],
     'MONTHS': <dynamic>[
       r'''มกราคม''',
@@ -10371,7 +10371,7 @@
       r'''กันยายน''',
       r'''ตุลาคม''',
       r'''พฤศจิกายน''',
-      r'''ธันวาคม'''
+      r'''ธันวาคม''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''มกราคม''',
@@ -10385,7 +10385,7 @@
       r'''กันยายน''',
       r'''ตุลาคม''',
       r'''พฤศจิกายน''',
-      r'''ธันวาคม'''
+      r'''ธันวาคม''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''ม.ค.''',
@@ -10399,7 +10399,7 @@
       r'''ก.ย.''',
       r'''ต.ค.''',
       r'''พ.ย.''',
-      r'''ธ.ค.'''
+      r'''ธ.ค.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''ม.ค.''',
@@ -10413,7 +10413,7 @@
       r'''ก.ย.''',
       r'''ต.ค.''',
       r'''พ.ย.''',
-      r'''ธ.ค.'''
+      r'''ธ.ค.''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''วันอาทิตย์''',
@@ -10422,7 +10422,7 @@
       r'''วันพุธ''',
       r'''วันพฤหัสบดี''',
       r'''วันศุกร์''',
-      r'''วันเสาร์'''
+      r'''วันเสาร์''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''วันอาทิตย์''',
@@ -10431,7 +10431,7 @@
       r'''วันพุธ''',
       r'''วันพฤหัสบดี''',
       r'''วันศุกร์''',
-      r'''วันเสาร์'''
+      r'''วันเสาร์''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''อา.''',
@@ -10440,7 +10440,7 @@
       r'''พ.''',
       r'''พฤ.''',
       r'''ศ.''',
-      r'''ส.'''
+      r'''ส.''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''อา.''',
@@ -10449,7 +10449,7 @@
       r'''พ.''',
       r'''พฤ.''',
       r'''ศ.''',
-      r'''ส.'''
+      r'''ส.''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''อา''',
@@ -10458,7 +10458,7 @@
       r'''พ''',
       r'''พฤ''',
       r'''ศ''',
-      r'''ส'''
+      r'''ส''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''อา''',
@@ -10467,32 +10467,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'tl': <String, dynamic>{
@@ -10521,7 +10521,7 @@
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''E''',
@@ -10535,7 +10535,7 @@
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'MONTHS': <dynamic>[
       r'''Enero''',
@@ -10549,7 +10549,7 @@
       r'''Setyembre''',
       r'''Oktubre''',
       r'''Nobyembre''',
-      r'''Disyembre'''
+      r'''Disyembre''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Enero''',
@@ -10563,7 +10563,7 @@
       r'''Setyembre''',
       r'''Oktubre''',
       r'''Nobyembre''',
-      r'''Disyembre'''
+      r'''Disyembre''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Ene''',
@@ -10577,7 +10577,7 @@
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Ene''',
@@ -10591,7 +10591,7 @@
       r'''Set''',
       r'''Okt''',
       r'''Nob''',
-      r'''Dis'''
+      r'''Dis''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Linggo''',
@@ -10600,7 +10600,7 @@
       r'''Miyerkules''',
       r'''Huwebes''',
       r'''Biyernes''',
-      r'''Sabado'''
+      r'''Sabado''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Linggo''',
@@ -10609,7 +10609,7 @@
       r'''Miyerkules''',
       r'''Huwebes''',
       r'''Biyernes''',
-      r'''Sabado'''
+      r'''Sabado''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -10618,7 +10618,7 @@
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -10627,7 +10627,7 @@
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -10636,7 +10636,7 @@
       r'''Miy''',
       r'''Huw''',
       r'''Biy''',
-      r'''Sab'''
+      r'''Sab''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Lin''',
@@ -10645,27 +10645,27 @@
       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 @@
       r"""{1} 'nang' {0}""",
       r"""{1} 'nang' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'tr': <String, dynamic>{
@@ -10694,7 +10694,7 @@
       r'''E''',
       r'''E''',
       r'''K''',
-      r'''A'''
+      r'''A''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''O''',
@@ -10708,7 +10708,7 @@
       r'''E''',
       r'''E''',
       r'''K''',
-      r'''A'''
+      r'''A''',
     ],
     'MONTHS': <dynamic>[
       r'''Ocak''',
@@ -10722,7 +10722,7 @@
       r'''Eylül''',
       r'''Ekim''',
       r'''Kasım''',
-      r'''Aralık'''
+      r'''Aralık''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''Ocak''',
@@ -10736,7 +10736,7 @@
       r'''Eylül''',
       r'''Ekim''',
       r'''Kasım''',
-      r'''Aralık'''
+      r'''Aralık''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''Oca''',
@@ -10750,7 +10750,7 @@
       r'''Eyl''',
       r'''Eki''',
       r'''Kas''',
-      r'''Ara'''
+      r'''Ara''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Oca''',
@@ -10764,7 +10764,7 @@
       r'''Eyl''',
       r'''Eki''',
       r'''Kas''',
-      r'''Ara'''
+      r'''Ara''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''Pazar''',
@@ -10773,7 +10773,7 @@
       r'''Çarşamba''',
       r'''Perşembe''',
       r'''Cuma''',
-      r'''Cumartesi'''
+      r'''Cumartesi''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''Pazar''',
@@ -10782,7 +10782,7 @@
       r'''Çarşamba''',
       r'''Perşembe''',
       r'''Cuma''',
-      r'''Cumartesi'''
+      r'''Cumartesi''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''Paz''',
@@ -10791,7 +10791,7 @@
       r'''Çar''',
       r'''Per''',
       r'''Cum''',
-      r'''Cmt'''
+      r'''Cmt''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''Paz''',
@@ -10800,7 +10800,7 @@
       r'''Çar''',
       r'''Per''',
       r'''Cum''',
-      r'''Cmt'''
+      r'''Cmt''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''P''',
@@ -10809,7 +10809,7 @@
       r'''Ç''',
       r'''P''',
       r'''C''',
-      r'''C'''
+      r'''C''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''P''',
@@ -10818,27 +10818,27 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'uk': <String, dynamic>{
@@ -10867,7 +10867,7 @@
       r'''в''',
       r'''ж''',
       r'''л''',
-      r'''г'''
+      r'''г''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''С''',
@@ -10881,7 +10881,7 @@
       r'''В''',
       r'''Ж''',
       r'''Л''',
-      r'''Г'''
+      r'''Г''',
     ],
     'MONTHS': <dynamic>[
       r'''січня''',
@@ -10895,7 +10895,7 @@
       r'''вересня''',
       r'''жовтня''',
       r'''листопада''',
-      r'''грудня'''
+      r'''грудня''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''січень''',
@@ -10909,7 +10909,7 @@
       r'''вересень''',
       r'''жовтень''',
       r'''листопад''',
-      r'''грудень'''
+      r'''грудень''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''січ.''',
@@ -10923,7 +10923,7 @@
       r'''вер.''',
       r'''жовт.''',
       r'''лист.''',
-      r'''груд.'''
+      r'''груд.''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''січ''',
@@ -10937,7 +10937,7 @@
       r'''вер''',
       r'''жов''',
       r'''лис''',
-      r'''гру'''
+      r'''гру''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''неділя''',
@@ -10946,7 +10946,7 @@
       r'''середа''',
       r'''четвер''',
       r'''пʼятниця''',
-      r'''субота'''
+      r'''субота''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''неділя''',
@@ -10955,7 +10955,7 @@
       r'''середа''',
       r'''четвер''',
       r'''пʼятниця''',
-      r'''субота'''
+      r'''субота''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''нд''',
@@ -10964,7 +10964,7 @@
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''нд''',
@@ -10973,7 +10973,7 @@
       r'''ср''',
       r'''чт''',
       r'''пт''',
-      r'''сб'''
+      r'''сб''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''Н''',
@@ -10982,7 +10982,7 @@
       r'''С''',
       r'''Ч''',
       r'''П''',
-      r'''С'''
+      r'''С''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''Н''',
@@ -10991,32 +10991,32 @@
       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 @@
       r"""{1} 'о' {0}""",
       r"""{1} 'о' {0}""",
       r'''{1}, {0}''',
-      r'''{1}, {0}'''
+      r'''{1}, {0}''',
     ],
   },
   'ur': <String, dynamic>{
@@ -11045,7 +11045,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''J''',
@@ -11059,7 +11059,7 @@
       r'''S''',
       r'''O''',
       r'''N''',
-      r'''D'''
+      r'''D''',
     ],
     'MONTHS': <dynamic>[
       r'''جنوری''',
@@ -11073,7 +11073,7 @@
       r'''ستمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''جنوری''',
@@ -11087,7 +11087,7 @@
       r'''ستمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''جنوری''',
@@ -11101,7 +11101,7 @@
       r'''ستمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''جنوری''',
@@ -11115,7 +11115,7 @@
       r'''ستمبر''',
       r'''اکتوبر''',
       r'''نومبر''',
-      r'''دسمبر'''
+      r'''دسمبر''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''اتوار''',
@@ -11124,7 +11124,7 @@
       r'''بدھ''',
       r'''جمعرات''',
       r'''جمعہ''',
-      r'''ہفتہ'''
+      r'''ہفتہ''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''اتوار''',
@@ -11133,7 +11133,7 @@
       r'''بدھ''',
       r'''جمعرات''',
       r'''جمعہ''',
-      r'''ہفتہ'''
+      r'''ہفتہ''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''اتوار''',
@@ -11142,7 +11142,7 @@
       r'''بدھ''',
       r'''جمعرات''',
       r'''جمعہ''',
-      r'''ہفتہ'''
+      r'''ہفتہ''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''اتوار''',
@@ -11151,7 +11151,7 @@
       r'''بدھ''',
       r'''جمعرات''',
       r'''جمعہ''',
-      r'''ہفتہ'''
+      r'''ہفتہ''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -11160,7 +11160,7 @@
       r'''W''',
       r'''T''',
       r'''F''',
-      r'''S'''
+      r'''S''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''S''',
@@ -11169,32 +11169,32 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'vi': <String, dynamic>{
@@ -11223,7 +11223,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -11237,7 +11237,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''tháng 1''',
@@ -11251,7 +11251,7 @@
       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 @@
       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 @@
       r'''thg 9''',
       r'''thg 10''',
       r'''thg 11''',
-      r'''thg 12'''
+      r'''thg 12''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''Thg 1''',
@@ -11293,7 +11293,7 @@
       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 @@
       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 @@
       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 @@
       r'''Th 4''',
       r'''Th 5''',
       r'''Th 6''',
-      r'''Th 7'''
+      r'''Th 7''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''CN''',
@@ -11329,7 +11329,7 @@
       r'''Th 4''',
       r'''Th 5''',
       r'''Th 6''',
-      r'''Th 7'''
+      r'''Th 7''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''CN''',
@@ -11338,7 +11338,7 @@
       r'''T4''',
       r'''T5''',
       r'''T6''',
-      r'''T7'''
+      r'''T7''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''CN''',
@@ -11347,27 +11347,27 @@
       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 @@
       r'''{0} {1}''',
       r'''{0} {1}''',
       r'''{0}, {1}''',
-      r'''{0}, {1}'''
+      r'''{0}, {1}''',
     ],
   },
   'zh': <String, dynamic>{
@@ -11396,7 +11396,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -11410,7 +11410,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''一月''',
@@ -11424,7 +11424,7 @@
       r'''九月''',
       r'''十月''',
       r'''十一月''',
-      r'''十二月'''
+      r'''十二月''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''一月''',
@@ -11438,7 +11438,7 @@
       r'''九月''',
       r'''十月''',
       r'''十一月''',
-      r'''十二月'''
+      r'''十二月''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11452,7 +11452,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11466,7 +11466,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11475,7 +11475,7 @@
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11484,7 +11484,7 @@
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''周日''',
@@ -11493,7 +11493,7 @@
       r'''周三''',
       r'''周四''',
       r'''周五''',
-      r'''周六'''
+      r'''周六''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''周日''',
@@ -11502,7 +11502,7 @@
       r'''周三''',
       r'''周四''',
       r'''周五''',
-      r'''周六'''
+      r'''周六''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11511,7 +11511,7 @@
       r'''三''',
       r'''四''',
       r'''五''',
-      r'''六'''
+      r'''六''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11520,7 +11520,7 @@
       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 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'zh_HK': <String, dynamic>{
@@ -11564,7 +11564,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -11578,7 +11578,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''1月''',
@@ -11592,7 +11592,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''1月''',
@@ -11606,7 +11606,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11620,7 +11620,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11634,7 +11634,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11643,7 +11643,7 @@
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11652,7 +11652,7 @@
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''週日''',
@@ -11661,7 +11661,7 @@
       r'''週三''',
       r'''週四''',
       r'''週五''',
-      r'''週六'''
+      r'''週六''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''週日''',
@@ -11670,7 +11670,7 @@
       r'''週三''',
       r'''週四''',
       r'''週五''',
-      r'''週六'''
+      r'''週六''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11679,7 +11679,7 @@
       r'''三''',
       r'''四''',
       r'''五''',
-      r'''六'''
+      r'''六''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11688,7 +11688,7 @@
       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 @@
       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 @@
       r'''{1} {0}''',
       r'''{1} {0}''',
       r'''{1} {0}''',
-      r'''{1} {0}'''
+      r'''{1} {0}''',
     ],
   },
   'zh_TW': <String, dynamic>{
@@ -11732,7 +11732,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'STANDALONENARROWMONTHS': <dynamic>[
       r'''1''',
@@ -11746,7 +11746,7 @@
       r'''9''',
       r'''10''',
       r'''11''',
-      r'''12'''
+      r'''12''',
     ],
     'MONTHS': <dynamic>[
       r'''1月''',
@@ -11760,7 +11760,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONEMONTHS': <dynamic>[
       r'''1月''',
@@ -11774,7 +11774,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'SHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11788,7 +11788,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'STANDALONESHORTMONTHS': <dynamic>[
       r'''1月''',
@@ -11802,7 +11802,7 @@
       r'''9月''',
       r'''10月''',
       r'''11月''',
-      r'''12月'''
+      r'''12月''',
     ],
     'WEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11811,7 +11811,7 @@
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'STANDALONEWEEKDAYS': <dynamic>[
       r'''星期日''',
@@ -11820,7 +11820,7 @@
       r'''星期三''',
       r'''星期四''',
       r'''星期五''',
-      r'''星期六'''
+      r'''星期六''',
     ],
     'SHORTWEEKDAYS': <dynamic>[
       r'''週日''',
@@ -11829,7 +11829,7 @@
       r'''週三''',
       r'''週四''',
       r'''週五''',
-      r'''週六'''
+      r'''週六''',
     ],
     'STANDALONESHORTWEEKDAYS': <dynamic>[
       r'''週日''',
@@ -11838,7 +11838,7 @@
       r'''週三''',
       r'''週四''',
       r'''週五''',
-      r'''週六'''
+      r'''週六''',
     ],
     'NARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11847,7 +11847,7 @@
       r'''三''',
       r'''四''',
       r'''五''',
-      r'''六'''
+      r'''六''',
     ],
     'STANDALONENARROWWEEKDAYS': <dynamic>[
       r'''日''',
@@ -11856,7 +11856,7 @@
       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 @@
       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 @@
       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 dba36d3..ff8f16f 100644
--- a/packages/flutter_localizations/test/date_picker_test.dart
+++ b/packages/flutter_localizations/test/date_picker_test.dart
@@ -229,7 +229,7 @@
   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 98c742f..a36f402 100644
--- a/packages/flutter_localizations/test/override_test.dart
+++ b/packages/flutter_localizations/test/override_test.dart
@@ -29,7 +29,7 @@
 class FooMaterialLocalizationsDelegate extends LocalizationsDelegate<MaterialLocalizations> {
   const FooMaterialLocalizationsDelegate({
     this.supportedLanguage = 'en',
-    this.backButtonTooltip = 'foo'
+    this.backButtonTooltip = 'foo',
   });
 
   final String supportedLanguage;
@@ -121,7 +121,7 @@
               },
             ),
           );
-        }
+        },
       );
     }
 
@@ -153,7 +153,7 @@
               },
             ),
           );
-        }
+        },
       );
     }
 
@@ -186,7 +186,7 @@
             MaterialLocalizations.of(context).backButtonTooltip,
             key: textKey,
           );
-        }
+        },
       )
     );
 
@@ -217,7 +217,7 @@
             MaterialLocalizations.of(context).backButtonTooltip,
             key: textKey,
           );
-        }
+        },
       )
     );
 
@@ -246,7 +246,7 @@
             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 c7c8207..961dabe 100644
--- a/packages/flutter_localizations/test/time_picker_test.dart
+++ b/packages/flutter_localizations/test/time_picker_test.dart
@@ -28,14 +28,14 @@
                 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 0d68d21..bdfcdad 100644
--- a/packages/flutter_localizations/test/widgets_test.dart
+++ b/packages/flutter_localizations/test/widgets_test.dart
@@ -260,7 +260,7 @@
         ],
         buildContent: (BuildContext context) {
           return Text(TestLocalizations.of(context).message);
-        }
+        },
       )
     );
     await tester.pump(const Duration(milliseconds: 50)); // TestLocalizations.loadAsync() takes 100ms
@@ -300,7 +300,7 @@
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -324,7 +324,7 @@
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -365,7 +365,7 @@
               ),
             ],
           );
-        }
+        },
       )
     );
 
@@ -392,7 +392,7 @@
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -417,7 +417,7 @@
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -443,7 +443,7 @@
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -466,7 +466,7 @@
               Text('B: ${MoreLocalizations.of(context).message}'),
             ],
           );
-        }
+        },
       )
     );
 
@@ -491,7 +491,7 @@
         buildContent: (BuildContext context) {
           pageContext = context;
           return const Text('Hello World');
-        }
+        },
       )
     );
 
@@ -512,7 +512,7 @@
         },
         buildContent: (BuildContext context) {
           return Text(Localizations.localeOf(context).toString());
-        }
+        },
       )
     );
 
@@ -535,7 +535,7 @@
         ],
         buildContent: (BuildContext context) {
           return Text(Localizations.localeOf(context).toString());
-        }
+        },
       )
     );
 
@@ -577,7 +577,7 @@
               },
             ),
           );
-        }
+        },
       )
     );
 
@@ -618,7 +618,7 @@
               },
             ),
           );
-        }
+        },
       )
     );
 
@@ -651,7 +651,7 @@
           final Locale locale = Localizations.localeOf(context);
           final TextDirection direction = WidgetsLocalizations.of(context).textDirection;
           return Text('$locale $direction');
-        }
+        },
       )
     );
 
@@ -688,7 +688,7 @@
           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 @@
         locale: const Locale('en', 'US'),
         buildContent: (BuildContext context) {
           return Text(Localizations.localeOf(context).toString());
-        }
+        },
       )
     );
     await tester.pumpAndSettle();
@@ -723,7 +723,7 @@
         locale: const Locale('en', 'US'),
         buildContent: (BuildContext context) {
           return Text(Localizations.localeOf(context).toString());
-        }
+        },
       )
     );
     await tester.pumpAndSettle();
@@ -739,7 +739,7 @@
         locale: const Locale('ab', 'CD'),
         buildContent: (BuildContext context) {
           return Text(Localizations.localeOf(context).toString());
-        }
+        },
       )
     );
     await tester.pumpAndSettle();
@@ -758,7 +758,7 @@
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
     await tester.binding.setLocales(const <Locale>[
@@ -781,7 +781,7 @@
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
     await tester.binding.setLocales(const <Locale>[
@@ -813,7 +813,7 @@
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
 
@@ -954,7 +954,7 @@
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
 
@@ -1094,7 +1094,7 @@
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
     await tester.binding.setLocales(const <Locale>[
@@ -1117,7 +1117,7 @@
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
     await tester.binding.setLocales(const <Locale>[
@@ -1150,7 +1150,7 @@
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
     await tester.binding.setLocales(const <Locale>[
@@ -1217,7 +1217,7 @@
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
 
@@ -1281,7 +1281,7 @@
         buildContent: (BuildContext context) {
           final Locale locale = Localizations.localeOf(context);
           return Text('$locale');
-        }
+        },
       )
     );
 
@@ -1433,7 +1433,7 @@
         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 05fc840..c376781 100644
--- a/packages/flutter_test/lib/src/binding.dart
+++ b/packages/flutter_test/lib/src/binding.dart
@@ -311,7 +311,7 @@
   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 @@
       'Test starting...',
       style: _messageStyle,
       textDirection: TextDirection.ltr,
-    )
+    ),
   );
 
   static const Widget _postTestMessage = Center(
@@ -382,7 +382,7 @@
       'Test finished.',
       style: _messageStyle,
       textDirection: TextDirection.ltr,
-    )
+    ),
   );
 
   /// Whether to include the output of debugDumpApp() when reporting
@@ -465,7 +465,7 @@
         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 @@
           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 @@
           }
           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 @@
   void dispatchEvent(
     PointerEvent event,
     HitTestResult hitTestResult, {
-    TestBindingEventSource source = TestBindingEventSource.device
+    TestBindingEventSource source = TestBindingEventSource.device,
   }) {
     switch (source) {
       case TestBindingEventSource.test:
@@ -1361,7 +1361,7 @@
     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 @@
 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 1b2339b..7480147 100644
--- a/packages/flutter_test/lib/src/finders.dart
+++ b/packages/flutter_test/lib/src/finders.dart
@@ -308,7 +308,7 @@
   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 5e557fc..0c3f78a 100644
--- a/packages/flutter_test/lib/src/matchers.dart
+++ b/packages/flutter_test/lib/src/matchers.dart
@@ -607,7 +607,7 @@
     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 @@
     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 @@
     dynamic item,
     Description mismatchDescription,
     Map<dynamic, dynamic> matchState,
-    bool verbose
+    bool verbose,
   ) {
     if (matchState.containsKey(_toStringDeepErrorDescriptionKey)) {
       return mismatchDescription.add(
@@ -1216,7 +1216,7 @@
     dynamic item,
     Description mismatchDescription,
     Map<dynamic, dynamic> matchState,
-    bool verbose
+    bool verbose,
   ) {
     return mismatchDescription.add(matchState['failure']);
   }
@@ -1505,7 +1505,7 @@
       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 @@
     dynamic item,
     Description mismatchDescription,
     Map<dynamic, dynamic> matchState,
-    bool verbose
+    bool verbose,
   ) {
     return mismatchDescription.add(matchState['failure']);
   }
@@ -1855,7 +1855,7 @@
     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 2a9c806..317ba9b 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 @@
     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 @@
         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 fe9ead2..0ff7bd2 100644
--- a/packages/flutter_test/lib/src/widget_tester.dart
+++ b/packages/flutter_test/lib/src/widget_tester.dart
@@ -70,7 +70,7 @@
   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 @@
       );
     },
     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 6fad639..058d02b 100644
--- a/packages/flutter_test/test/accessibility_test.dart
+++ b/packages/flutter_test/test/accessibility_test.dart
@@ -163,7 +163,7 @@
                   style: TextStyle(fontSize: 14.0, color: Colors.yellowAccent),
                 ),
               ),
-            )
+            ),
           ],
         )
       ));
@@ -349,10 +349,10 @@
                 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 7a30650..ddf7855 100644
--- a/packages/flutter_test/test/controller_test.dart
+++ b/packages/flutter_test/test/controller_test.dart
@@ -214,7 +214,7 @@
 
 class WidgetControllerSpy extends WidgetController {
   WidgetControllerSpy(
-    TestWidgetsFlutterBinding binding
+    TestWidgetsFlutterBinding binding,
   ) : super(binding) {
     _binding = binding;
   }
@@ -250,7 +250,7 @@
       pointer: pointer ?? _getNextPointer(),
       kind: kind,
       dispatcher: sendEventToBinding,
-      hitTester: hitTestOnBinding
+      hitTester: hitTestOnBinding,
     );
   }
 }
@@ -260,7 +260,7 @@
     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 bb0d434..222ba05 100644
--- a/packages/flutter_test/test/finders_test.dart
+++ b/packages/flutter_test/test/finders_test.dart
@@ -21,7 +21,7 @@
           TextSpan(text: 't', children: <TextSpan>[
             TextSpan(text: 'e'),
             TextSpan(text: 'st'),
-          ]
+          ],
         ),
       )));
 
@@ -68,7 +68,7 @@
           ),
           Container(
             child: const Text('2'),
-          )
+          ),
         ],
       )),
     );
diff --git a/packages/flutter_test/test/matchers_test.dart b/packages/flutter_test/test/matchers_test.dart
index 732c835..6be8be5 100644
--- a/packages/flutter_test/test/matchers_test.dart
+++ b/packages/flutter_test/test/matchers_test.dart
@@ -225,7 +225,7 @@
         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 @@
         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 @@
         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 @@
         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 @@
         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 @@
           onLongPressHint: 'fill',
           customActions: <CustomSemanticsAction>[
             const CustomSemanticsAction(label: 'foo'),
-            const CustomSemanticsAction(label: 'bar')
+            const CustomSemanticsAction(label: 'bar'),
           ],
         ),
       );
@@ -447,7 +447,7 @@
           onLongPressHint: 'fill',
           customActions: <CustomSemanticsAction>[
             const CustomSemanticsAction(label: 'foo'),
-            const CustomSemanticsAction(label: 'barz')
+            const CustomSemanticsAction(label: 'barz'),
           ],
         )),
       );
@@ -468,7 +468,7 @@
           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 ecab29a..1c578a5 100644
--- a/packages/flutter_test/test/widget_tester_test.dart
+++ b/packages/flutter_test/test/widget_tester_test.dart
@@ -223,7 +223,7 @@
       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 @@
   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 @@
   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 @@
             body: Container(
               child: OutlineButton(
                   onPressed: () {},
-                  child: const Text('hello')
+                  child: const Text('hello'),
               ),
             ),
           ),
@@ -605,7 +605,7 @@
                   child: Container(),
                 ),
               ),
-            )
+            ),
           ),
         ),
       );
diff --git a/packages/flutter_test/test/window_test.dart b/packages/flutter_test/test/window_test.dart
index 0d603d1..6aad356 100644
--- a/packages/flutter_test/test/window_test.dart
+++ b/packages/flutter_test/test/window_test.dart
@@ -20,7 +20,7 @@
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, double fakeValue) {
         binding.window.devicePixelRatioTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -34,7 +34,7 @@
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, Size fakeValue) {
         binding.window.physicalSizeTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -48,7 +48,7 @@
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, WindowPadding fakeValue) {
         binding.window.viewInsetsTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -62,7 +62,7 @@
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, WindowPadding fakeValue) {
         binding.window.paddingTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -76,7 +76,7 @@
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, Locale fakeValue) {
         binding.window.localeTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -90,7 +90,7 @@
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, List<Locale> fakeValue) {
         binding.window.localesTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -104,7 +104,7 @@
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, double fakeValue) {
         binding.window.textScaleFactorTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -118,7 +118,7 @@
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, bool fakeValue) {
         binding.window.alwaysUse24HourFormatTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -132,7 +132,7 @@
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, String fakeValue) {
         binding.window.defaultRouteNameTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -146,7 +146,7 @@
       },
       propertyFaker: (TestWidgetsFlutterBinding binding, AccessibilityFeatures fakeValue) {
         binding.window.accessibilityFeaturesTestValue = fakeValue;
-      }
+      },
     );
   });
 
@@ -160,7 +160,7 @@
       },
       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 0180b73..eb91c2d 100644
--- a/packages/flutter_tools/bin/fuchsia_attach.dart
+++ b/packages/flutter_tools/bin/fuchsia_attach.dart
@@ -101,7 +101,7 @@
         flutterPatchedSdk: flutterPatchedSdk,
       ),
       HotRunnerConfig: () => HotRunnerConfig()..computeDartDependencies = false,
-    }
+    },
   );
 }
 
diff --git a/packages/flutter_tools/lib/runner.dart b/packages/flutter_tools/lib/runner.dart
index 621cf63..90bf4d7 100644
--- a/packages/flutter_tools/lib/runner.dart
+++ b/packages/flutter_tools/lib/runner.dart
@@ -53,7 +53,7 @@
     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 45e46bc..0a3b8a6 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 @@
     String id, {
     this.productID,
     this.modelID,
-    this.deviceCodeName
+    this.deviceCodeName,
   }) : super(id);
 
   final String productID;
@@ -295,7 +295,7 @@
     }
 
     await runCheckedAsync(adbCommandForDevice(<String>[
-      'shell', 'echo', '-n', _getSourceSha1(app), '>', _getDeviceSha1Path(app)
+      'shell', 'echo', '-n', _getSourceSha1(app), '>', _getDeviceSha1Path(app),
     ]));
     return true;
   }
@@ -505,7 +505,7 @@
   /// 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 @@
 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 @@
           deviceID,
           productID: info['product'],
           modelID: info['model'] ?? deviceID,
-          deviceCodeName: info['device']
+          deviceCodeName: info['device'],
         ));
       }
     } else {
@@ -651,7 +651,7 @@
   _AdbLogReader(this.device) {
     _linesController = StreamController<String>.broadcast(
       onListen: _start,
-      onCancel: _stop
+      onCancel: _stop,
     );
   }
 
@@ -707,7 +707,7 @@
     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 5d6daf8..ea54133 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 @@
     // 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 73432f0..72545e0 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 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 4a0ded0..8b5b8d9 100644
--- a/packages/flutter_tools/lib/src/android/apk.dart
+++ b/packages/flutter_tools/lib/src/android/apk.dart
@@ -16,7 +16,7 @@
 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 @@
     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 c8576c9..c1e94ab 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 @@
 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 @@
     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 60fb758..af9b3e8 100644
--- a/packages/flutter_tools/lib/src/android/gradle.dart
+++ b/packages/flutter_tools/lib/src/android/gradle.dart
@@ -161,7 +161,7 @@
     project = GradleProject(
       <String>['debug', 'profile', 'release'],
       <String>[], flutterProject.android.gradleAppOutV1Directory,
-        flutterProject.android.gradleAppBundleOutV1Directory
+        flutterProject.android.gradleAppBundleOutV1Directory,
     );
   }
   status.stop();
@@ -464,7 +464,7 @@
       }
 
       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 6cd1314..82816b7 100644
--- a/packages/flutter_tools/lib/src/application_package.dart
+++ b/packages/flutter_tools/lib/src/application_package.dart
@@ -85,7 +85,7 @@
     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 @@
       id: data.packageName,
       file: apk,
       versionCode: int.tryParse(data.versionCode),
-      launchActivity: '${data.packageName}/${data.launchableActivityName}'
+      launchActivity: '${data.packageName}/${data.launchableActivityName}',
     );
   }
 
@@ -204,7 +204,7 @@
       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 574e92d..2918097 100644
--- a/packages/flutter_tools/lib/src/asset.dart
+++ b/packages/flutter_tools/lib/src/asset.dart
@@ -44,7 +44,7 @@
     String assetDirPath,
     String packagesPath,
     bool includeDefaultFonts = true,
-    bool reportLicensedPackages = false
+    bool reportLicensedPackages = false,
   });
 }
 
@@ -92,7 +92,7 @@
     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 @@
       packageMap,
       flutterManifest,
       assetBasePath,
-      excludeDirs: <String>[assetDirPath, getBuildDirectory()]
+      excludeDirs: <String>[assetDirPath, getBuildDirectory()],
     );
 
     if (assetVariants == null)
@@ -290,7 +290,7 @@
       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 @@
   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 @@
   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 @@
   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 @@
   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 4cb0e5c..dd75337 100644
--- a/packages/flutter_tools/lib/src/base/os.dart
+++ b/packages/flutter_tools/lib/src/base/os.dart
@@ -62,7 +62,7 @@
     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 fff1252..c6ab59c 100644
--- a/packages/flutter_tools/lib/src/base/process.dart
+++ b/packages/flutter_tools/lib/src/base/process.dart
@@ -111,7 +111,7 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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 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 053de60..137ef53 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 @@
       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 ac3d219..def7e44 100644
--- a/packages/flutter_tools/lib/src/bundle.dart
+++ b/packages/flutter_tools/lib/src/bundle.dart
@@ -165,7 +165,7 @@
   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 @@
     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 e1c1641..7f3aa7a 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart
@@ -622,7 +622,7 @@
   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 105aac1..bc5f63b 100644
--- a/packages/flutter_tools/lib/src/codegen.dart
+++ b/packages/flutter_tools/lib/src/codegen.dart
@@ -194,7 +194,7 @@
         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 2e9acfb..00ddbf0 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 @@
     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 f541aae..d9243be 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 @@
       ..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 fed385d..40a0279 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 @@
       ..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 a9eb527..faaf109 100644
--- a/packages/flutter_tools/lib/src/commands/create.dart
+++ b/packages/flutter_tools/lib/src/commands/create.dart
@@ -56,19 +56,19 @@
   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 @@
     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 @@
   '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 e0b8172..d6364b3 100644
--- a/packages/flutter_tools/lib/src/commands/daemon.dart
+++ b/packages/flutter_tools/lib/src/commands/daemon.dart
@@ -95,7 +95,7 @@
       onDone: () {
         if (!_onExitCompleter.isCompleted)
           _onExitCompleter.complete(0);
-      }
+      },
     );
   }
 
@@ -272,12 +272,12 @@
           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 @@
 
 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 @@
         _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 2179381..8b1c742 100644
--- a/packages/flutter_tools/lib/src/commands/drive.dart
+++ b/packages/flutter_tools/lib/src/commands/drive.dart
@@ -295,7 +295,7 @@
         '--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 e3d3c2b..3e0ec00 100644
--- a/packages/flutter_tools/lib/src/commands/logs.dart
+++ b/packages/flutter_tools/lib/src/commands/logs.dart
@@ -16,7 +16,7 @@
     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 @@
       },
       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 ab4a247..befbe87 100644
--- a/packages/flutter_tools/lib/src/commands/packages.dart
+++ b/packages/flutter_tools/lib/src/commands/packages.dart
@@ -36,7 +36,7 @@
     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 6c59ab07..c79a8a8 100644
--- a/packages/flutter_tools/lib/src/commands/run.dart
+++ b/packages/flutter_tools/lib/src/commands/run.dart
@@ -47,7 +47,7 @@
               '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 @@
         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 f7240e0..6ba8ecd 100644
--- a/packages/flutter_tools/lib/src/commands/upgrade.dart
+++ b/packages/flutter_tools/lib/src/commands/upgrade.dart
@@ -31,7 +31,7 @@
   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 @@
     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 @@
         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 18b1f43..22564de 100644
--- a/packages/flutter_tools/lib/src/commands/version.dart
+++ b/packages/flutter_tools/lib/src/commands/version.dart
@@ -36,7 +36,7 @@
   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 @@
     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 @@
         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 1193a9a..dd255f5 100644
--- a/packages/flutter_tools/lib/src/compile.dart
+++ b/packages/flutter_tools/lib/src/compile.dart
@@ -324,7 +324,7 @@
     this.typeDefinitions,
     this.libraryUri,
     this.klass,
-    this.isStatic
+    this.isStatic,
   ) : super(completer);
 
   String expression;
@@ -440,7 +440,7 @@
       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 863d290..59376bb 100644
--- a/packages/flutter_tools/lib/src/dart/analysis.dart
+++ b/packages/flutter_tools/lib/src/dart/analysis.dart
@@ -54,7 +54,7 @@
     inStream.listen(_handleServerResponse);
 
     _sendCommand('server.setSubscriptions', <String, dynamic>{
-      'subscriptions': <String>['STATUS']
+      'subscriptions': <String>['STATUS'],
     });
 
     _sendCommand('analysis.setAnalysisRoots',
@@ -70,7 +70,7 @@
     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 4de54f8..2f1957b 100644
--- a/packages/flutter_tools/lib/src/dart/pub.dart
+++ b/packages/flutter_tools/lib/src/dart/pub.dart
@@ -75,7 +75,7 @@
   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 66b473a..05e9292 100644
--- a/packages/flutter_tools/lib/src/devfs.dart
+++ b/packages/flutter_tools/lib/src/devfs.dart
@@ -254,7 +254,7 @@
         params: <String, dynamic> {
           'fsName': fsName,
           'uri': deviceUri.toString(),
-          'fileContents': fileContents
+          'fileContents': fileContents,
         },
       );
     } catch (error) {
@@ -384,7 +384,7 @@
     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 b65819d..be1475f 100644
--- a/packages/flutter_tools/lib/src/doctor.dart
+++ b/packages/flutter_tools/lib/src/doctor.dart
@@ -467,7 +467,7 @@
     }
 
     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 3672d44..61f0c34 100644
--- a/packages/flutter_tools/lib/src/emulator.dart
+++ b/packages/flutter_tools/lib/src/emulator.dart
@@ -115,7 +115,7 @@
       'avd',
       '-n', name,
       '-k', sdkId,
-      '-d', device
+      '-d', device,
     ];
     final ProcessResult runResult = processManager.runSync(args,
         environment: androidSdk?.sdkManagerEnv);
@@ -136,7 +136,7 @@
       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 bb27e0c..ffbe9dd 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 @@
     // 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 a29a97e..5bda757 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 @@
 /// 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 c4e092e..bc0e5ae 100644
--- a/packages/flutter_tools/lib/src/ios/devices.dart
+++ b/packages/flutter_tools/lib/src/ios/devices.dart
@@ -166,7 +166,7 @@
 
   static String _checkForCommand(
     String command, [
-    String macInstructions = _kIdeviceinstallerInstructions
+    String macInstructions = _kIdeviceinstallerInstructions,
   ]) {
     try {
       command = runCheckedSync(<String>['which', command]).trim();
@@ -253,7 +253,7 @@
           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 @@
   _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 98b4ef6..4ae1173 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 @@
     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 1468f09..648547e 100644
--- a/packages/flutter_tools/lib/src/ios/mac.dart
+++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -388,7 +388,7 @@
       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 @@
       <String>[
         'CODE_SIGNING_ALLOWED=NO',
         'CODE_SIGNING_REQUIRED=NO',
-        'CODE_SIGNING_IDENTITY=""'
+        'CODE_SIGNING_IDENTITY=""',
       ]
     );
   }
@@ -499,7 +499,7 @@
   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 @@
     '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 31bb934..2b3b75c 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 @@
 
   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 525a1da..f521871 100644
--- a/packages/flutter_tools/lib/src/ios/simulators.dart
+++ b/packages/flutter_tools/lib/src/ios/simulators.dart
@@ -322,7 +322,7 @@
       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 @@
   _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 0a32c7f..1f0e0a4 100644
--- a/packages/flutter_tools/lib/src/ios/xcodeproj.dart
+++ b/packages/flutter_tools/lib/src/ios/xcodeproj.dart
@@ -156,7 +156,7 @@
       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 c9c991a..316b116 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 @@
       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 ac4c7bf..35cad44 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 @@
         }
         final String pid = values[1];
         final ProcessResult killResult = await processManager.run(<String>[
-          'kill', pid
+          'kill', pid,
         ]);
         succeeded &= killResult.exitCode == 0;
       }
@@ -145,7 +145,7 @@
       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 b2a0fde..91a0ef8 100644
--- a/packages/flutter_tools/lib/src/project.dart
+++ b/packages/flutter_tools/lib/src/project.dart
@@ -332,7 +332,7 @@
       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 2addb59..982ca22 100644
--- a/packages/flutter_tools/lib/src/resident_runner.dart
+++ b/packages/flutter_tools/lib/src/resident_runner.dart
@@ -144,21 +144,21 @@
   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 @@
       final Future<Map<String, dynamic>> report = view.uiIsolate.reloadSources(
         pause: pause,
         rootLibUri: deviceEntryUri,
-        packagesUri: devicePackagesUri
+        packagesUri: devicePackagesUri,
       );
       reports.add(report);
     }
@@ -289,7 +289,7 @@
     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 @@
     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 @@
         dillOutputPath: dillOutputPath,
         trackWidgetCreation: trackWidgetCreation,
         projectRootPath: projectRootPath,
-        pathToReload: pathToReload
+        pathToReload: pathToReload,
       );
     } on DevFSException {
       devFSStatus.cancel();
@@ -751,7 +751,7 @@
         // 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 87b6213..a6ef97a 100644
--- a/packages/flutter_tools/lib/src/run_cold.dart
+++ b/packages/flutter_tools/lib/src/run_cold.dart
@@ -44,7 +44,7 @@
     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 cae7e4f..53a4f36 100644
--- a/packages/flutter_tools/lib/src/run_hot.dart
+++ b/packages/flutter_tools/lib/src/run_hot.dart
@@ -217,7 +217,7 @@
           DebugConnectionInfo(
             httpUri: flutterDevices.first.observatoryUris.first,
             wsUri: flutterDevices.first.vmServices.first.wsAddress,
-            baseUri: baseUris.first.toString()
+            baseUri: baseUris.first.toString(),
           )
         );
       }
@@ -286,7 +286,7 @@
     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 @@
       final Uri uri = await device.setupDevFS(
         fsName,
         fs.directory(projectRootPath),
-        packagesFilePath: packagesFilePath
+        packagesFilePath: packagesFilePath,
       );
       devFSUris.add(uri);
     }
@@ -700,7 +700,7 @@
         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 a92cb7e..2d93bfb 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 @@
   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 @@
         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 @@
               '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 @@
         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 @@
         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 @@
         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 @@
       '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 2eb5560..1a71757 100644
--- a/packages/flutter_tools/lib/src/services.dart
+++ b/packages/flutter_tools/lib/src/services.dart
@@ -64,7 +64,7 @@
         'root': serviceRoot,
         'name': service['name'],
         'android-class': service['android-class'],
-        'ios-framework': service['ios-framework']
+        'ios-framework': service['ios-framework'],
       });
     }
 
@@ -102,7 +102,7 @@
   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 451cf1a..a17c008 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 @@
     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 485fb30..a4559f8 100644
--- a/packages/flutter_tools/lib/src/tracing.dart
+++ b/packages/flutter_tools/lib/src/tracing.dart
@@ -35,7 +35,7 @@
 
   /// 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 @@
     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 9fe973e4a..f0d69eb 100644
--- a/packages/flutter_tools/lib/src/vmservice.dart
+++ b/packages/flutter_tools/lib/src/vmservice.dart
@@ -206,7 +206,7 @@
 
       _peer.sendNotification('_registerService', <String, String>{
         'service': 'compileExpression',
-        'alias': 'Flutter Tools'
+        'alias': 'Flutter Tools',
       });
     }
   }
@@ -885,7 +885,7 @@
   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 @@
         'viewId': viewId,
         'mainScript': main.toString(),
         'packagesFile': packages.toString(),
-        'assetDirectory': assetsDirectory.toString()
+        'assetDirectory': assetsDirectory.toString(),
     });
   }
 
@@ -1109,7 +1109,7 @@
     // Inject the 'isolateId' parameter.
     if (params == null) {
       params = <String, dynamic>{
-        'isolateId': id
+        'isolateId': id,
       };
     } else {
       params['isolateId'] = id;
@@ -1154,7 +1154,7 @@
   }) async {
     try {
       final Map<String, dynamic> arguments = <String, dynamic>{
-        'pause': pause
+        'pause': pause,
       };
       if (rootLibUri != null) {
         arguments['rootLibUri'] = rootLibUri.toString();
@@ -1311,7 +1311,7 @@
       'ext.flutter.evict',
       params: <String, dynamic>{
         'value': assetPath,
-      }
+      },
     );
   }
 
@@ -1451,7 +1451,7 @@
         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 94c9a04..f2fac47 100644
--- a/packages/flutter_tools/lib/src/vscode/vscode.dart
+++ b/packages/flutter_tools/lib/src/vscode/vscode.dart
@@ -121,7 +121,7 @@
         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 005e100..5698952 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 @@
       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 a2befdd..79d9c26 100644
--- a/packages/flutter_tools/test/analytics_test.dart
+++ b/packages/flutter_tools/test/analytics_test.dart
@@ -107,7 +107,7 @@
 
       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 @@
 
       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 28046c1..0e2a3a0 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 @@
       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 c988474..7a5e2c8 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 @@
     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 987546f..986bff0 100644
--- a/packages/flutter_tools/test/artifacts_test.dart
+++ b/packages/flutter_tools/test/artifacts_test.dart
@@ -29,33 +29,33 @@
     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 @@
     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 3652e79..80cca02 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 @@
       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 @@
       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 dd867ed..b379352 100644
--- a/packages/flutter_tools/test/base/net_test.dart
+++ b/packages/flutter_tools/test/base/net_test.dart
@@ -26,7 +26,7 @@
         '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 @@
         '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 @@
         '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 21752a4..dcacba9 100644
--- a/packages/flutter_tools/test/base/os_test.dart
+++ b/packages/flutter_tools/test/base/os_test.dart
@@ -32,7 +32,7 @@
       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 @@
       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 @@
       expect(result[1].path, kPath2);
     }, overrides: <Type, Generator>{
       ProcessManager: () => mockProcessManager,
-      Platform: () => FakePlatform(operatingSystem: 'linux')
+      Platform: () => FakePlatform(operatingSystem: 'linux'),
     });
   });
 
@@ -68,7 +68,7 @@
       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 @@
       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 @@
       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 2139a54..c4be308 100644
--- a/packages/flutter_tools/test/base/process_test.dart
+++ b/packages/flutter_tools/test/base/process_test.dart
@@ -87,7 +87,7 @@
       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 4dbd4d5..c5381a2 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 @@
         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 41840a3..079b045 100644
--- a/packages/flutter_tools/test/cache_test.dart
+++ b/packages/flutter_tools/test/cache_test.dart
@@ -63,7 +63,7 @@
       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 @@
       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 d03cf66..7fa979a 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 @@
 
       expect(errorCount, 0);
     }, overrides: <Type, Generator>{
-      OperatingSystemUtils: () => os
+      OperatingSystemUtils: () => os,
     });
   });
 
@@ -67,7 +67,7 @@
 
     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 @@
     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 21fa293..8bf1604 100644
--- a/packages/flutter_tools/test/commands/create_test.dart
+++ b/packages/flutter_tools/test/commands/create_test.dart
@@ -86,7 +86,7 @@
 
   testUsingContext('creates a module project correctly', () async {
     await _createAndAnalyzeProject(projectDir, <String>[
-      '--template=module'
+      '--template=module',
     ], <String>[
       '.android/app/',
       '.gitignore',
@@ -341,7 +341,7 @@
 
   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 @@
     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 @@
     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 @@
     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 @@
     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 4a1c26b..043de1e 100644
--- a/packages/flutter_tools/test/commands/daemon_test.dart
+++ b/packages/flutter_tools/test/commands/daemon_test.dart
@@ -37,7 +37,7 @@
       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 @@
       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 @@
         '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 @@
       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 @@
       daemon = Daemon(
           commands.stream,
           responses.add,
-          notifyingLogger: notifyingLogger
+          notifyingLogger: notifyingLogger,
       );
 
       final MockPollingDeviceDiscovery discoverer = MockPollingDeviceDiscovery();
@@ -255,7 +255,7 @@
         commands.stream,
         responses.add,
         daemonCommand: command,
-        notifyingLogger: notifyingLogger
+        notifyingLogger: notifyingLogger,
       );
 
       commands.add(<String, dynamic>{ 'id': 0, 'method': 'emulator.launch' });
@@ -272,7 +272,7 @@
       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 @@
     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 32a6e5c..dfa032e 100644
--- a/packages/flutter_tools/test/commands/doctor_test.dart
+++ b/packages/flutter_tools/test/commands/doctor_test.dart
@@ -24,7 +24,7 @@
 
 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 @@
       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 @@
       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 @@
       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 @@
       Platform: () => FakePlatform()
         ..environment = <String, String>{
           'HTTP_PROXY': 'fakeproxy.local',
-          'NO_PROXY': 'localhost'
+          'NO_PROXY': 'localhost',
         },
     });
   });
@@ -635,7 +635,7 @@
     return <DoctorValidator>[
       PassingValidator('Passing Validator'),
       PassingValidator('Another Passing Validator'),
-      PassingValidator('Providing validators is fun')
+      PassingValidator('Providing validators is fun'),
     ];
   }
 
@@ -699,11 +699,11 @@
       _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 f3878cf..d20c73d 100644
--- a/packages/flutter_tools/test/commands/format_test.dart
+++ b/packages/flutter_tools/test/commands/format_test.dart
@@ -68,7 +68,7 @@
       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 d7a4718..2d37e95 100644
--- a/packages/flutter_tools/test/commands/packages_test.dart
+++ b/packages/flutter_tools/test/commands/packages_test.dart
@@ -82,7 +82,7 @@
       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 cac269e..3d49ff2 100644
--- a/packages/flutter_tools/test/crash_reporting_test.dart
+++ b/packages/flutter_tools/test/crash_reporting_test.dart
@@ -70,12 +70,12 @@
           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 f3552c2..eb09f26 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 @@
       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 @@
       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 @@
         '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 @@
         '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 16ccf40..db86a6b 100644
--- a/packages/flutter_tools/test/devfs_test.dart
+++ b/packages/flutter_tools/test/devfs_test.dart
@@ -432,7 +432,7 @@
         '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 71469fb..2fdef5b 100644
--- a/packages/flutter_tools/test/emulator_test.dart
+++ b/packages/flutter_tools/test/emulator_test.dart
@@ -53,7 +53,7 @@
       final List<Emulator> emulators = <Emulator>[
         emulator1,
         emulator2,
-        emulator3
+        emulator3,
       ];
       final TestEmulatorManager testEmulatorManager =
           TestEmulatorManager(emulators);
@@ -204,7 +204,7 @@
     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 b4f4508..828bc6f 100644
--- a/packages/flutter_tools/test/flutter_manifest_test.dart
+++ b/packages/flutter_tools/test/flutter_manifest_test.dart
@@ -506,7 +506,7 @@
       },
           overrides: <Type, Generator>{
             FileSystem: () => filesystem,
-          }
+          },
       );
     }
 
@@ -517,13 +517,13 @@
     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 4a6fa02..7b8168b 100644
--- a/packages/flutter_tools/test/forbidden_imports_test.dart
+++ b/packages/flutter_tools/test/forbidden_imports_test.dart
@@ -83,7 +83,7 @@
     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 452fde7..7654d85 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 @@
         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 c14b458..f681f42 100644
--- a/packages/flutter_tools/test/hot_test.dart
+++ b/packages/flutter_tools/test/hot_test.dart
@@ -54,7 +54,7 @@
         'success': false,
         'details': <String, dynamic>{
           'notices': <Map<String, dynamic>>[
-            <String, dynamic>{ 'message': false, }
+            <String, dynamic>{ 'message': false, },
           ],
         },
       }), false);
@@ -141,7 +141,7 @@
       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 @@
       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 @@
       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 @@
         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 @@
         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 be1150c..55d9db3 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 @@
       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 ef85ac8..68de1d4 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 @@
   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 dcb011d..a688cb4 100644
--- a/packages/flutter_tools/test/integration/test_driver.dart
+++ b/packages/flutter_tools/test/integration/test_driver.dart
@@ -502,7 +502,7 @@
     _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 @@
     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 @@
         '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 c312897..4af1c03 100644
--- a/packages/flutter_tools/test/integration/test_utils.dart
+++ b/packages/flutter_tools/test/integration/test_utils.dart
@@ -44,7 +44,7 @@
   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 78454d7..9bb1963 100644
--- a/packages/flutter_tools/test/ios/cocoapods_test.dart
+++ b/packages/flutter_tools/test/ios/cocoapods_test.dart
@@ -62,12 +62,12 @@
     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 8c1fc5d..b205fde 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 @@
         '''
 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 @@
 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 @@
 
       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 @@
 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 @@
 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 @@
 
       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 @@
 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 @@
 
       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 179799d..4692656 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 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 83fd861..7f232e8 100644
--- a/packages/flutter_tools/test/ios/mac_test.dart
+++ b/packages/flutter_tools/test/ios/mac_test.dart
@@ -153,7 +153,7 @@
         // 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 @@
         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 @@
     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 dcadc72..ba2d8be 100644
--- a/packages/flutter_tools/test/ios/simulators_test.dart
+++ b/packages/flutter_tools/test/ios/simulators_test.dart
@@ -195,7 +195,7 @@
         when(mockXcode.minorVersion).thenReturn(1);
         expect(deviceUnderTest.supportsScreenshot, false);
       },
-      overrides: <Type, Generator>{Xcode: () => mockXcode}
+      overrides: <Type, Generator>{Xcode: () => mockXcode},
     );
 
     testUsingContext(
@@ -217,7 +217,7 @@
               fs.path.join('some', 'path', 'to', 'screenshot.png'),
           ],
           environment: null,
-          workingDirectory: null
+          workingDirectory: null,
         ));
       },
       overrides: <Type, Generator>{
@@ -225,7 +225,7 @@
         // 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 26d0c63..4d4e958 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 @@
   '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 2769cdc..ed4fa5e 100644
--- a/packages/flutter_tools/test/ios/xcodeproj_test.dart
+++ b/packages/flutter_tools/test/ios/xcodeproj_test.dart
@@ -110,7 +110,7 @@
       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 8961a5c..2cd86f1 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 @@
       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 3b14447..f98371a 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 @@
         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 @@
         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 @@
             '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 0150d4c..b440e3f 100644
--- a/packages/flutter_tools/test/src/mocks.dart
+++ b/packages/flutter_tools/test/src/mocks.dart
@@ -31,7 +31,7 @@
       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 @@
     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 5b7aa26..a78f70f 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 @@
 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 9acd3b2..00bc4e3 100644
--- a/packages/flutter_tools/tool/daemon_client.dart
+++ b/packages/flutter_tools/tool/daemon_client.dart
@@ -44,13 +44,13 @@
           '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 @@
       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 @@
       _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 66c4813..d668dbd 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 @@
                 'name': 'file://flutterBinary1',
                 'number': '1',
               },
-            }
+            },
           ],
         },
         <String, dynamic>{
@@ -85,7 +85,7 @@
                 '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 7c5a07c..9796988 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 @@
           <String, dynamic>{
             'type': 'FlutterView',
           },
-        ]
+        ],
       };
 
       Future<json_rpc.Peer> mockVmConnectionFunction(