some spaces formatting (#29452)

* some space formattings

* always use blocks in if-else if a block is used

* format spaces in for and while

* allow multiline if conditions

* fix missing space

examples/layers/rendering/src/sector_layout.dart

@@ -440,8 +440,8 @@ class RenderSectorSlice extends RenderSectorWithChildren {
 
 class RenderBoxToRenderSectorAdapter extends RenderBox with RenderObjectWithChildMixin<RenderSector> {
 
-  RenderBoxToRenderSectorAdapter({ double innerRadius = 0.0, RenderSector child }) :
+  RenderBoxToRenderSectorAdapter({ double innerRadius = 0.0, RenderSector child })
-    _innerRadius = innerRadius {
+    : _innerRadius = innerRadius {
     this.child = child;
   }
 

packages/flutter/lib/src/cupertino/date_picker.dart

@@ -279,14 +279,14 @@ class CupertinoDatePicker extends StatefulWidget {
         }
         break;
       case _PickerColumnType.hour:
-        for (int i = 0 ; i < 24; i++) {
+        for (int i = 0; i < 24; i++) {
           final String hour = localizations.datePickerHour(i);
           if (longestText.length < hour.length)
             longestText = hour;
         }
         break;
       case _PickerColumnType.minute:
-        for (int i = 0 ; i < 60; i++) {
+        for (int i = 0; i < 60; i++) {
           final String minute = localizations.datePickerMinute(i);
           if (longestText.length < minute.length)
             longestText = minute;
@@ -299,14 +299,14 @@ class CupertinoDatePicker extends StatefulWidget {
             : localizations.postMeridiemAbbreviation;
         break;
       case _PickerColumnType.dayOfMonth:
-        for (int i = 1 ; i <=31; i++) {
+        for (int i = 1; i <=31; i++) {
           final String dayOfMonth = localizations.datePickerDayOfMonth(i);
           if (longestText.length < dayOfMonth.length)
             longestText = dayOfMonth;
         }
         break;
       case _PickerColumnType.month:
-        for (int i = 1 ; i <=12; i++) {
+        for (int i = 1; i <=12; i++) {
           final String month = localizations.datePickerMonth(i);
           if (longestText.length < month.length)
             longestText = month;
@@ -514,8 +514,7 @@ class _CupertinoDatePickerDateTimeState extends State<CupertinoDatePicker> {
               duration: const Duration(milliseconds: 300),
               curve: Curves.easeOut,
             );
-          }
+          } else {
-          else {
             widget.onDateTimeChanged(_getDateTime());
           }
         }
@@ -608,8 +607,7 @@ class _CupertinoDatePickerDateTimeState extends State<CupertinoDatePicker> {
         || localizations.datePickerDateTimeOrder == DatePickerDateTimeOrder.time_dayPeriod_date) {
         pickerBuilders.add(_buildAmPmPicker);
         columnWidths.add(_getEstimatedColumnWidth(_PickerColumnType.dayPeriod));
-      }
+      } else {
-      else {
         pickerBuilders.insert(0, _buildAmPmPicker);
         columnWidths.insert(0, _getEstimatedColumnWidth(_PickerColumnType.dayPeriod));
       }
@@ -621,8 +619,7 @@ class _CupertinoDatePickerDateTimeState extends State<CupertinoDatePicker> {
           || localizations.datePickerDateTimeOrder == DatePickerDateTimeOrder.dayPeriod_time_date) {
         pickerBuilders.add(_buildMediumDatePicker);
         columnWidths.add(_getEstimatedColumnWidth(_PickerColumnType.date));
-      }
+      } else {
-      else {
         pickerBuilders.insert(0, _buildMediumDatePicker);
         columnWidths.insert(0, _getEstimatedColumnWidth(_PickerColumnType.date));
       }
@@ -1181,8 +1178,7 @@ class _CupertinoTimerPickerState extends State<CupertinoTimerPicker> {
               ),
             ),
           );
-        }
+        } else {
-        else
           return Semantics(
             label: semanticsLabel,
             excludeSemantics: true,
@@ -1199,6 +1195,7 @@ class _CupertinoTimerPickerState extends State<CupertinoTimerPicker> {
               ),
             ),
           );
+        }
       }),
     );
   }

packages/flutter/lib/src/cupertino/nav_bar.dart

@@ -2001,8 +2001,7 @@ class _NavigationBarComponentsTransition {
     // text.
     if (bottomLargeTitle != null &&
         topBackLabel != null &&
-        bottomLargeExpanded
+        bottomLargeExpanded) {
-    ) {
       return PositionedTransition(
         rect: animation.drive(slideFromLeadingEdge(
           fromKey: bottomComponents.largeTitleKey,

packages/flutter/lib/src/cupertino/tab_view.dart

@@ -165,9 +165,9 @@ class _CupertinoTabViewState extends State<CupertinoTabView> {
     if (name == Navigator.defaultRouteName && widget.builder != null) {
       routeBuilder = widget.builder;
       title = widget.defaultTitle;
-    }
+    } else if (widget.routes != null) {
-    else if (widget.routes != null)
       routeBuilder = widget.routes[name];
+    }
     if (routeBuilder != null) {
       return CupertinoPageRoute<dynamic>(
         builder: routeBuilder,

packages/flutter/lib/src/foundation/binding.dart

@@ -323,7 +323,7 @@ abstract class BindingBase {
           await setter(parameters['enabled'] == 'true');
           _postExtensionStateChangedEvent(name, await getter() ? 'true' : 'false');
         }
-        return <String, dynamic>{ 'enabled': await getter() ? 'true' : 'false' };
+        return <String, dynamic>{'enabled': await getter() ? 'true' : 'false'};
       },
     );
   }
@@ -357,7 +357,7 @@ abstract class BindingBase {
           await setter(double.parse(parameters[name]));
           _postExtensionStateChangedEvent(name, (await getter()).toString());
         }
-        return <String, dynamic>{ name: (await getter()).toString() };
+        return <String, dynamic>{name: (await getter()).toString()};
       },
     );
   }
@@ -419,7 +419,7 @@ abstract class BindingBase {
           await setter(parameters['value']);
           _postExtensionStateChangedEvent(name, await getter());
         }
-        return <String, dynamic>{ 'value': await getter() };
+        return <String, dynamic>{'value': await getter()};
       },
     );
   }

packages/flutter/lib/src/gestures/eager.dart

@@ -15,7 +15,7 @@ class EagerGestureRecognizer extends OneSequenceGestureRecognizer {
   /// Create an eager gesture recognizer.
   ///
   /// {@macro flutter.gestures.gestureRecognizer.kind}
-  EagerGestureRecognizer({ PointerDeviceKind kind }): super(kind: kind);
+  EagerGestureRecognizer({ PointerDeviceKind kind }) : super(kind: kind);
 
   @override
   void addAllowedPointer(PointerDownEvent event) {

packages/flutter/lib/src/material/expansion_panel.dart

@@ -203,7 +203,7 @@ class _ExpansionPanelListState extends State<ExpansionPanelList> {
             newChild.value == widget.initialOpenPanelValue)
           _currentOpenPanel = newChild;
       }
-    } else if(oldWidget._allowOnlyOnePanelOpen) {
+    } else if (oldWidget._allowOnlyOnePanelOpen) {
       _currentOpenPanel = null;
     }
   }

packages/flutter/lib/src/material/input_decorator.dart

@@ -760,8 +760,9 @@ class _RenderDecoration extends RenderBox {
       // label from changing when text is entered.
       final RenderProxyBox typedHint = hint;
       visitor(typedHint.child);
-    } else if (!isFocused && label != null)
+    } else if (!isFocused && label != null) {
       visitor(label);
+    }
     if (input != null)
       visitor(input);
     if (suffixIcon != null)
@@ -1699,9 +1700,8 @@ class _InputDecoratorState extends State<InputDecorator> with TickerProviderStat
       _effectiveDecoration = null;
 
     if (widget._labelShouldWithdraw != old._labelShouldWithdraw && widget.decoration.hasFloatingPlaceholder) {
-      if (widget._labelShouldWithdraw) {
+      if (widget._labelShouldWithdraw)
         _floatingLabelController.forward();
-      }
       else
         _floatingLabelController.reverse();
     }

packages/flutter/lib/src/material/scaffold.dart

@@ -581,8 +581,7 @@ class _FloatingActionButtonTransitionState extends State<_FloatingActionButtonTr
       // If we start out with a child, have the child appear fully visible instead
       // of animating in.
       _currentController.value = 1.0;
-    }
+    } else {
-    else {
       // If we start without a child we update the geometry object with a
       // floating action button scale of 0, as it is not showing on the screen.
       _updateGeometryScale(0.0);

packages/flutter/lib/src/material/switch.dart

@@ -445,7 +445,7 @@ class _RenderSwitch extends RenderToggleable {
   DragStartBehavior get dragStartBehavior => _drag.dragStartBehavior;
   set dragStartBehavior(DragStartBehavior value) {
     assert(value != null);
-    if(_drag.dragStartBehavior == value)
+    if (_drag.dragStartBehavior == value)
       return;
     _drag.dragStartBehavior = value;
   }

packages/flutter/lib/src/painting/image_resolution.dart

@@ -260,8 +260,7 @@ class AssetImage extends AssetBundleImageProvider {
   static final RegExp _extractRatioRegExp = RegExp(r'/?(\d+(\.\d*)?)x$');
 
   double _parseScale(String key) {
-
+    if (key == assetName) {
-    if ( key == assetName){
       return _naturalResolution;
     }
 

packages/flutter/lib/src/rendering/editable.dart

@@ -718,8 +718,7 @@ class RenderEditable extends RenderBox {
       assert(!_listenerAttached);
       RawKeyboard.instance.addListener(_handleKeyEvent);
       _listenerAttached = true;
-    }
+    } else {
-    else {
       assert(_listenerAttached);
       RawKeyboard.instance.removeListener(_handleKeyEvent);
       _listenerAttached = false;
@@ -1565,7 +1564,7 @@ class RenderEditable extends RenderBox {
     }
     _floatingCursorOn = state != FloatingCursorDragState.End;
     _resetFloatingCursorAnimationValue = resetLerpValue;
-    if(_floatingCursorOn) {
+    if (_floatingCursorOn) {
       _floatingCursorOffset = boundedOffset;
       _floatingCursorTextPosition = lastTextPosition;
     }
@@ -1582,7 +1581,7 @@ class RenderEditable extends RenderBox {
     double sizeAdjustmentX = _kFloatingCaretSizeIncrease.dx;
     double sizeAdjustmentY = _kFloatingCaretSizeIncrease.dy;
 
-    if(_resetFloatingCursorAnimationValue != null) {
+    if (_resetFloatingCursorAnimationValue != null) {
       sizeAdjustmentX = ui.lerpDouble(sizeAdjustmentX, 0, _resetFloatingCursorAnimationValue);
       sizeAdjustmentY = ui.lerpDouble(sizeAdjustmentY, 0, _resetFloatingCursorAnimationValue);
     }
@@ -1645,9 +1644,9 @@ class RenderEditable extends RenderBox {
     final double adjustedY = math.min(math.max(currentY, topBound), bottomBound);
     final Offset adjustedOffset = Offset(adjustedX, adjustedY);
 
-    if (currentX < leftBound && deltaPosition.dx < 0) {
+    if (currentX < leftBound && deltaPosition.dx < 0)
       _resetOriginOnLeft = true;
-    } else if(currentX > rightBound && deltaPosition.dx > 0)
+    else if (currentX > rightBound && deltaPosition.dx > 0)
       _resetOriginOnRight = true;
     if (currentY < topBound && deltaPosition.dy < 0)
       _resetOriginOnTop = true;

packages/flutter/lib/src/rendering/image.dart

@@ -156,7 +156,7 @@ class RenderImage extends RenderBox {
   FilterQuality _filterQuality;
   set filterQuality(FilterQuality value) {
     assert(value != null);
-    if(value == _filterQuality)
+    if (value == _filterQuality)
       return;
     _filterQuality = value;
     markNeedsPaint();

packages/flutter/lib/src/rendering/platform_view.dart

@@ -386,7 +386,7 @@ class RenderUiKitView extends RenderBox {
       return;
     }
     final Offset localOffset = globalToLocal(event.position);
-    if(!(Offset.zero & size).contains(localOffset)) {
+    if (!(Offset.zero & size).contains(localOffset)) {
       return;
     }
     if (event != _lastPointerDownEvent) {
@@ -419,9 +419,11 @@ class RenderUiKitView extends RenderBox {
 // When the team wins a gesture the recognizer notifies the engine that it should release
 // the touch sequence to the embedded UIView.
 class _UiKitViewGestureRecognizer extends OneSequenceGestureRecognizer {
-  _UiKitViewGestureRecognizer(this.controller, this.gestureRecognizerFactories, {
+  _UiKitViewGestureRecognizer(
+    this.controller,
+    this.gestureRecognizerFactories, {
     PointerDeviceKind kind,
-  }): super(kind: kind) {
+  }) : super(kind: kind) {
     team = GestureArenaTeam();
     team.captain = this;
     _gestureRecognizers = gestureRecognizerFactories.map(
@@ -481,9 +483,11 @@ class _UiKitViewGestureRecognizer extends OneSequenceGestureRecognizer {
 // When the team wins the recognizer sends all the cached point events to the embedded Android view, and
 // sets itself to a "forwarding mode" where it will forward any new pointer event to the Android view.
 class _AndroidViewGestureRecognizer extends OneSequenceGestureRecognizer {
-  _AndroidViewGestureRecognizer(this.dispatcher, this.gestureRecognizerFactories, {
+  _AndroidViewGestureRecognizer(
+    this.dispatcher,
+    this.gestureRecognizerFactories, {
     PointerDeviceKind kind,
-  }): super(kind: kind) {
+  }) : super(kind: kind) {
     team = GestureArenaTeam();
     team.captain = this;
     _gestureRecognizers = gestureRecognizerFactories.map(

packages/flutter/lib/src/rendering/table.dart

@@ -881,11 +881,11 @@ class RenderTable extends RenderBox {
         }
         assert(tableWidth >= targetWidth);
       }
-    } else // step 2 and 3 are mutually exclusive
+    } // step 2 and 3 are mutually exclusive
 
     // 3. if there were no flex columns, then grow the table to the
     //    minWidth.
-    if (tableWidth < minWidthConstraint) {
+    else if (tableWidth < minWidthConstraint) {
       final double delta = (minWidthConstraint - tableWidth) / columns;
       for (int x = 0; x < columns; x += 1)
         widths[x] += delta;

packages/flutter/lib/src/widgets/editable_text.dart

@@ -1153,7 +1153,7 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
     _showCaretOnScreenScheduled = true;
     SchedulerBinding.instance.addPostFrameCallback((Duration _) {
       _showCaretOnScreenScheduled = false;
-      if (_currentCaretRect == null || !_scrollController.hasClients){
+      if (_currentCaretRect == null || !_scrollController.hasClients) {
         return;
       }
       final double scrollOffsetForCaret =  _getScrollOffsetForCaret(_currentCaretRect);

packages/flutter/lib/src/widgets/focus_manager.dart

@@ -153,7 +153,7 @@ class FocusScopeNode extends Object with DiagnosticableTreeMixin {
   List<FocusScopeNode> _getFocusPath() {
     final List<FocusScopeNode> nodes = <FocusScopeNode>[this];
     FocusScopeNode node = _parent;
-    while(node != null && node != _manager?.rootScope) {
+    while (node != null && node != _manager?.rootScope) {
       nodes.add(node);
       node = node._parent;
     }

packages/flutter/lib/src/widgets/localizations.dart

@@ -223,7 +223,7 @@ class DefaultWidgetsLocalizations implements WidgetsLocalizations {
 }
 
 class _LocalizationsScope extends InheritedWidget {
-  const _LocalizationsScope ({
+  const _LocalizationsScope({
     Key key,
     @required this.locale,
     @required this.localizationsState,

packages/flutter/lib/src/widgets/scrollable.dart

@@ -733,9 +733,9 @@ class _RenderScrollSemantics extends RenderProxyBox {
     final List<SemanticsNode> included = <SemanticsNode>[];
     for (SemanticsNode child in children) {
       assert(child.isTagged(RenderViewport.useTwoPaneSemantics));
-      if (child.isTagged(RenderViewport.excludeFromScrolling))
+      if (child.isTagged(RenderViewport.excludeFromScrolling)) {
         excluded.add(child);
-      else {
+      } else {
         if (!child.hasFlag(SemanticsFlag.isHidden))
           firstVisibleIndex ??= child.indexInParent;
         included.add(child);

packages/flutter/lib/src/widgets/widget_inspector.dart

@@ -876,7 +876,7 @@ mixin WidgetInspectorService {
           await setter(value);
           _postExtensionStateChangedEvent(name, value);
         }
-        return <String, dynamic>{ 'enabled': await getter() ? 'true' : 'false' };
+        return <String, dynamic>{'enabled': await getter() ? 'true' : 'false'};
       },
     );
   }

packages/flutter/test/foundation/service_extensions_test.dart

@@ -126,13 +126,13 @@ void main() {
     Map<String, dynamic> firstFrameResult;
     expect(binding.debugDidSendFirstFrameEvent, isFalse);
     firstFrameResult = await binding.testExtension('didSendFirstFrameEvent', <String, String>{});
-    expect(firstFrameResult, <String, String>{ 'enabled': 'false' });
+    expect(firstFrameResult, <String, String>{'enabled': 'false'});
 
     await binding.doFrame(); // initial frame scheduled by creating the binding
 
     expect(binding.debugDidSendFirstFrameEvent, isTrue);
     firstFrameResult = await binding.testExtension('didSendFirstFrameEvent', <String, String>{});
-    expect(firstFrameResult, <String, String>{ 'enabled': 'true' });
+    expect(firstFrameResult, <String, String>{'enabled': 'true'});
 
     expect(binding.frameScheduled, isFalse);
 
@@ -153,19 +153,19 @@ void main() {
     expect(binding.frameScheduled, isFalse);
     expect(WidgetsApp.debugAllowBannerOverride, true);
     result = await binding.testExtension('debugAllowBanner', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(WidgetsApp.debugAllowBannerOverride, true);
-    result = await binding.testExtension('debugAllowBanner', <String, String>{ 'enabled': 'false' });
+    result = await binding.testExtension('debugAllowBanner', <String, String>{'enabled': 'false'});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(WidgetsApp.debugAllowBannerOverride, false);
     result = await binding.testExtension('debugAllowBanner', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(WidgetsApp.debugAllowBannerOverride, false);
-    result = await binding.testExtension('debugAllowBanner', <String, String>{ 'enabled': 'true' });
+    result = await binding.testExtension('debugAllowBanner', <String, String>{'enabled': 'true'});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(WidgetsApp.debugAllowBannerOverride, true);
     result = await binding.testExtension('debugAllowBanner', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(WidgetsApp.debugAllowBannerOverride, true);
     expect(binding.frameScheduled, isFalse);
   });
@@ -253,11 +253,11 @@ void main() {
     expect(binding.frameScheduled, isFalse);
     expect(debugPaintSizeEnabled, false);
     result = await binding.testExtension('debugPaint', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugPaintSizeEnabled, false);
     expect(extensionChangedEvents, isEmpty);
     expect(binding.frameScheduled, isFalse);
-    pendingResult = binding.testExtension('debugPaint', <String, String>{ 'enabled': 'true' });
+    pendingResult = binding.testExtension('debugPaint', <String, String>{'enabled': 'true'});
     completed = false;
     pendingResult.whenComplete(() { completed = true; });
     await binding.flushMicrotasks();
@@ -268,31 +268,31 @@ void main() {
     expect(completed, isTrue);
     expect(binding.frameScheduled, isFalse);
     result = await pendingResult;
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(debugPaintSizeEnabled, true);
     expect(extensionChangedEvents.length, 1);
     extensionChangedEvent = extensionChangedEvents.last;
     expect(extensionChangedEvent['extension'], 'ext.flutter.debugPaint');
     expect(extensionChangedEvent['value'], 'true');
     result = await binding.testExtension('debugPaint', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(debugPaintSizeEnabled, true);
     expect(extensionChangedEvents.length, 1);
     expect(binding.frameScheduled, isFalse);
-    pendingResult = binding.testExtension('debugPaint', <String, String>{ 'enabled': 'false' });
+    pendingResult = binding.testExtension('debugPaint', <String, String>{'enabled': 'false'});
     await binding.flushMicrotasks();
     expect(binding.frameScheduled, isTrue);
     await binding.doFrame();
     expect(binding.frameScheduled, isFalse);
     result = await pendingResult;
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugPaintSizeEnabled, false);
     expect(extensionChangedEvents.length, 2);
     extensionChangedEvent = extensionChangedEvents.last;
     expect(extensionChangedEvent['extension'], 'ext.flutter.debugPaint');
     expect(extensionChangedEvent['value'], 'false');
     result = await binding.testExtension('debugPaint', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugPaintSizeEnabled, false);
     expect(extensionChangedEvents.length, 2);
     expect(binding.frameScheduled, isFalse);
@@ -306,10 +306,10 @@ void main() {
     expect(binding.frameScheduled, isFalse);
     expect(debugPaintBaselinesEnabled, false);
     result = await binding.testExtension('debugPaintBaselinesEnabled', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugPaintBaselinesEnabled, false);
     expect(binding.frameScheduled, isFalse);
-    pendingResult = binding.testExtension('debugPaintBaselinesEnabled', <String, String>{ 'enabled': 'true' });
+    pendingResult = binding.testExtension('debugPaintBaselinesEnabled', <String, String>{'enabled': 'true'});
     completed = false;
     pendingResult.whenComplete(() { completed = true; });
     await binding.flushMicrotasks();
@@ -320,22 +320,22 @@ void main() {
     expect(completed, isTrue);
     expect(binding.frameScheduled, isFalse);
     result = await pendingResult;
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(debugPaintBaselinesEnabled, true);
     result = await binding.testExtension('debugPaintBaselinesEnabled', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(debugPaintBaselinesEnabled, true);
     expect(binding.frameScheduled, isFalse);
-    pendingResult = binding.testExtension('debugPaintBaselinesEnabled', <String, String>{ 'enabled': 'false' });
+    pendingResult = binding.testExtension('debugPaintBaselinesEnabled', <String, String>{'enabled': 'false'});
     await binding.flushMicrotasks();
     expect(binding.frameScheduled, isTrue);
     await binding.doFrame();
     expect(binding.frameScheduled, isFalse);
     result = await pendingResult;
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugPaintBaselinesEnabled, false);
     result = await binding.testExtension('debugPaintBaselinesEnabled', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugPaintBaselinesEnabled, false);
     expect(binding.frameScheduled, isFalse);
   });
@@ -347,23 +347,23 @@ void main() {
     expect(debugProfileBuildsEnabled, false);
 
     result = await binding.testExtension('profileWidgetBuilds', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugProfileBuildsEnabled, false);
 
-    result = await binding.testExtension('profileWidgetBuilds', <String, String>{ 'enabled': 'true' });
+    result = await binding.testExtension('profileWidgetBuilds', <String, String>{'enabled': 'true'});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(debugProfileBuildsEnabled, true);
 
     result = await binding.testExtension('profileWidgetBuilds', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(debugProfileBuildsEnabled, true);
 
-    result = await binding.testExtension('profileWidgetBuilds', <String, String>{ 'enabled': 'false' });
+    result = await binding.testExtension('profileWidgetBuilds', <String, String>{'enabled': 'false'});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugProfileBuildsEnabled, false);
 
     result = await binding.testExtension('profileWidgetBuilds', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugProfileBuildsEnabled, false);
 
     expect(binding.frameScheduled, isFalse);
@@ -387,8 +387,8 @@ void main() {
     data = await rootBundle.loadStructuredData('test', (String value) async { expect(true, isFalse); return null; });
     expect(data, isTrue);
     expect(completed, isFalse);
-    result = await binding.testExtension('evict', <String, String>{ 'value': 'test' });
+    result = await binding.testExtension('evict', <String, String>{'value': 'test'});
-    expect(result, <String, String>{ 'value': '' });
+    expect(result, <String, String>{'value': ''});
     expect(completed, isFalse);
     data = await rootBundle.loadStructuredData<bool>('test', (String value) async { expect(value, '\x00\x00\x00\x00\x00'); return false; });
     expect(data, isFalse);
@@ -471,23 +471,23 @@ void main() {
     expect(binding.frameScheduled, isFalse);
     expect(debugRepaintRainbowEnabled, false);
     result = await binding.testExtension('repaintRainbow', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugRepaintRainbowEnabled, false);
     expect(binding.frameScheduled, isFalse);
-    pendingResult = binding.testExtension('repaintRainbow', <String, String>{ 'enabled': 'true' });
+    pendingResult = binding.testExtension('repaintRainbow', <String, String>{'enabled': 'true'});
     completed = false;
     pendingResult.whenComplete(() { completed = true; });
     await binding.flushMicrotasks();
     expect(completed, true);
     expect(binding.frameScheduled, isFalse);
     result = await pendingResult;
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(debugRepaintRainbowEnabled, true);
     result = await binding.testExtension('repaintRainbow', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(debugRepaintRainbowEnabled, true);
     expect(binding.frameScheduled, isFalse);
-    pendingResult = binding.testExtension('repaintRainbow', <String, String>{ 'enabled': 'false' });
+    pendingResult = binding.testExtension('repaintRainbow', <String, String>{'enabled': 'false'});
     completed = false;
     pendingResult.whenComplete(() { completed = true; });
     await binding.flushMicrotasks();
@@ -498,10 +498,10 @@ void main() {
     expect(completed, true);
     expect(binding.frameScheduled, isFalse);
     result = await pendingResult;
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugRepaintRainbowEnabled, false);
     result = await binding.testExtension('repaintRainbow', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(debugRepaintRainbowEnabled, false);
     expect(binding.frameScheduled, isFalse);
   });
@@ -534,19 +534,19 @@ void main() {
     expect(binding.frameScheduled, isFalse);
     expect(WidgetsApp.showPerformanceOverlayOverride, false);
     result = await binding.testExtension('showPerformanceOverlay', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(WidgetsApp.showPerformanceOverlayOverride, false);
-    result = await binding.testExtension('showPerformanceOverlay', <String, String>{ 'enabled': 'true' });
+    result = await binding.testExtension('showPerformanceOverlay', <String, String>{'enabled': 'true'});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(WidgetsApp.showPerformanceOverlayOverride, true);
     result = await binding.testExtension('showPerformanceOverlay', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(WidgetsApp.showPerformanceOverlayOverride, true);
-    result = await binding.testExtension('showPerformanceOverlay', <String, String>{ 'enabled': 'false' });
+    result = await binding.testExtension('showPerformanceOverlay', <String, String>{'enabled': 'false'});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(WidgetsApp.showPerformanceOverlayOverride, false);
     result = await binding.testExtension('showPerformanceOverlay', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(WidgetsApp.showPerformanceOverlayOverride, false);
     expect(binding.frameScheduled, isFalse);
   });
@@ -556,19 +556,19 @@ void main() {
     expect(binding.frameScheduled, isFalse);
     expect(WidgetsApp.debugShowWidgetInspectorOverride, false);
     result = await binding.testExtension('debugWidgetInspector', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(WidgetsApp.debugShowWidgetInspectorOverride, false);
-    result = await binding.testExtension('debugWidgetInspector', <String, String>{ 'enabled': 'true' });
+    result = await binding.testExtension('debugWidgetInspector', <String, String>{'enabled': 'true'});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(WidgetsApp.debugShowWidgetInspectorOverride, true);
     result = await binding.testExtension('debugWidgetInspector', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'true' });
+    expect(result, <String, String>{'enabled': 'true'});
     expect(WidgetsApp.debugShowWidgetInspectorOverride, true);
-    result = await binding.testExtension('debugWidgetInspector', <String, String>{ 'enabled': 'false' });
+    result = await binding.testExtension('debugWidgetInspector', <String, String>{'enabled': 'false'});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(WidgetsApp.debugShowWidgetInspectorOverride, false);
     result = await binding.testExtension('debugWidgetInspector', <String, String>{});
-    expect(result, <String, String>{ 'enabled': 'false' });
+    expect(result, <String, String>{'enabled': 'false'});
     expect(WidgetsApp.debugShowWidgetInspectorOverride, false);
     expect(binding.frameScheduled, isFalse);
   });
@@ -581,29 +581,29 @@ void main() {
     expect(binding.frameScheduled, isFalse);
     expect(timeDilation, 1.0);
     result = await binding.testExtension('timeDilation', <String, String>{});
-    expect(result, <String, String>{ 'timeDilation': '1.0' });
+    expect(result, <String, String>{'timeDilation': '1.0'});
     expect(timeDilation, 1.0);
     expect(extensionChangedEvents, isEmpty);
-    result = await binding.testExtension('timeDilation', <String, String>{ 'timeDilation': '100.0' });
+    result = await binding.testExtension('timeDilation', <String, String>{'timeDilation': '100.0'});
-    expect(result, <String, String>{ 'timeDilation': '100.0' });
+    expect(result, <String, String>{'timeDilation': '100.0'});
     expect(timeDilation, 100.0);
     expect(extensionChangedEvents.length, 1);
     extensionChangedEvent = extensionChangedEvents.last;
     expect(extensionChangedEvent['extension'], 'ext.flutter.timeDilation');
     expect(extensionChangedEvent['value'], '100.0');
     result = await binding.testExtension('timeDilation', <String, String>{});
-    expect(result, <String, String>{ 'timeDilation': '100.0' });
+    expect(result, <String, String>{'timeDilation': '100.0'});
     expect(timeDilation, 100.0);
     expect(extensionChangedEvents.length, 1);
-    result = await binding.testExtension('timeDilation', <String, String>{ 'timeDilation': '1.0' });
+    result = await binding.testExtension('timeDilation', <String, String>{'timeDilation': '1.0'});
-    expect(result, <String, String>{ 'timeDilation': '1.0' });
+    expect(result, <String, String>{'timeDilation': '1.0'});
     expect(timeDilation, 1.0);
     expect(extensionChangedEvents.length, 2);
     extensionChangedEvent = extensionChangedEvents.last;
     expect(extensionChangedEvent['extension'], 'ext.flutter.timeDilation');
     expect(extensionChangedEvent['value'], '1.0');
     result = await binding.testExtension('timeDilation', <String, String>{});
-    expect(result, <String, String>{ 'timeDilation': '1.0' });
+    expect(result, <String, String>{'timeDilation': '1.0'});
     expect(timeDilation, 1.0);
     expect(extensionChangedEvents.length, 2);
     expect(binding.frameScheduled, isFalse);

packages/flutter/test/material/date_picker_test.dart

@@ -701,7 +701,7 @@ void _tests() {
 
     // Initial chevron animation state should be dismissed
     // An AlwaysStoppedAnimation is also found and is ignored
-    for(RenderAnimatedOpacity renderer in chevronRenderers) {
+    for (RenderAnimatedOpacity renderer in chevronRenderers) {
       expect(renderer.opacity.value, equals(1.0));
       expect(renderer.opacity.status, equals(AnimationStatus.dismissed));
     }
@@ -710,7 +710,7 @@ void _tests() {
     final TestGesture gesture = await tester.startGesture(const Offset(100.0, 100.0));
     await gesture.moveBy(const Offset(50.0, 100.0));
     await tester.pumpAndSettle();
-    for(RenderAnimatedOpacity renderer in chevronRenderers) {
+    for (RenderAnimatedOpacity renderer in chevronRenderers) {
       expect(renderer.opacity.value, equals(0.0));
       expect(renderer.opacity.status, equals(AnimationStatus.completed));
     }
@@ -718,7 +718,7 @@ void _tests() {
     // Release the drag and test for the opacity to return to original value
     await gesture.up();
     await tester.pumpAndSettle();
-    for(RenderAnimatedOpacity renderer in chevronRenderers) {
+    for (RenderAnimatedOpacity renderer in chevronRenderers) {
       expect(renderer.opacity.value, equals(1.0));
       expect(renderer.opacity.status, equals(AnimationStatus.dismissed));
     }

packages/flutter/test/material/radio_test.dart

@@ -265,7 +265,7 @@ void main() {
                 key: radioKey,
                 value: 1,
                 groupValue: 1,
-                onChanged: (int value) {},
+                onChanged: (int value) { },
               ),
             )
           ),

packages/flutter/test/material/snack_bar_test.dart

@@ -336,8 +336,9 @@ void main() {
       TextStyle effectiveStyle = textWidget.style;
       effectiveStyle = defaultTextStyle.style.merge(textWidget.style);
       expect(effectiveStyle.color, Colors.lightBlue);
-    } else
+    } else {
       expect(false, true);
+    }
   });
 
   testWidgets('SnackBar button text alignment', (WidgetTester tester) async {

packages/flutter/test/material/text_field_test.dart

@@ -2551,7 +2551,7 @@ void main() {
     sendFakeKeyEvent(<String, dynamic>{
       'type': down ? 'keydown' : 'keyup',
       'keymap': 'android',
-      'keyCode' : code,
+      'keyCode': code,
       'hidUsage': 0x04,
       'codePoint': 0x64,
       'metaState': metaState,

packages/flutter/test/painting/decoration_test.dart

@@ -483,7 +483,7 @@ void main() {
       BoxFit.scaleDown,
     ];
 
-    for(BoxFit boxFit in boxFits) {
+    for (BoxFit boxFit in boxFits) {
       final TestCanvas canvas = TestCanvas(<Invocation>[]);
 
       final Rect outputRect = Rect.fromLTWH(30.0, 30.0, 250.0, 250.0);

packages/flutter/test/rendering/mock_canvas.dart

@@ -573,7 +573,7 @@ class _TestRecordingCanvasPaintsCountMatcher extends _TestRecordingCanvasMatcher
   @override
   bool _evaluatePredicates(Iterable<RecordedInvocation> calls, StringBuffer description) {
     int count = 0;
-    for(RecordedInvocation call in calls) {
+    for (RecordedInvocation call in calls) {
       if (call.invocation.isMethod && call.invocation.memberName == _methodName) {
         count++;
       }

packages/flutter/test/widgets/automatic_keep_alive_test.dart

@@ -481,7 +481,7 @@ void main() {
         addSemanticIndexes: false,
         itemCount: 50,
         itemBuilder: (BuildContext context, int index) {
-          if (index == 0){
+          if (index == 0) {
             return const _AlwaysKeepAlive(
               key: GlobalObjectKey<_AlwaysKeepAliveState>(0),
             );
@@ -515,7 +515,7 @@ void main() {
         addSemanticIndexes: false,
         itemCount: 250,
         itemBuilder: (BuildContext context, int index) {
-          if (index % 2 == 0){
+          if (index % 2 == 0) {
             return _AlwaysKeepAlive(
               key: GlobalObjectKey<_AlwaysKeepAliveState>(index),
             );

packages/flutter/test/widgets/list_view_builder_test.dart

@@ -299,7 +299,7 @@ void main() {
 
     // ListView's height is 600, so items i0-i5 and s0-s4 fit.
     await tester.pumpWidget(buildFrame(itemCount: 25));
-    for(String s in <String>['i0', 's0', 'i1', 's1', 'i2', 's2', 'i3', 's3', 'i4', 's4', 'i5'])
+    for (String s in <String>['i0', 's0', 'i1', 's1', 'i2', 's2', 'i3', 's3', 'i4', 's4', 'i5'])
       expect(find.text(s), findsOneWidget);
     expect(find.text('s5'), findsNothing);
     expect(find.text('i6'), findsNothing);

packages/flutter_driver/test/src/timeline_summary_test.dart

@@ -221,7 +221,7 @@ void main() {
       ];
 
       test('computes 90th frame rasterizer time in milliseconds', () {
-        for(int i = 0; i < sequences.length; ++i) {
+        for (int i = 0; i < sequences.length; ++i) {
           expect(
             summarize(rasterizeTimeSequenceInMillis(sequences[i])).computePercentileFrameRasterizerTimeMillis(90.0),
             p90s[i],
@@ -231,7 +231,7 @@ void main() {
 
       test('compute 99th frame rasterizer time in milliseconds', () {
         final List<int> sequence = <int>[];
-        for(int i = 1; i <= 100; ++i) {
+        for (int i = 1; i <= 100; ++i) {
           sequence.add(i);
         }
         expect(

packages/flutter_driver/test/src/timeline_test.dart

@@ -42,7 +42,7 @@ void main() {
       expect(e1.threadDuration, const Duration(microseconds: 245));
       expect(e1.timestampMicros, 456);
       expect(e1.threadTimestampMicros, 567);
-      expect(e1.arguments, <String, dynamic>{ 'arg1': true });
+      expect(e1.arguments, <String, dynamic>{'arg1': true});
 
       final TimelineEvent e2 = timeline.events[1];
       expect(e2.name, isNull);

packages/flutter_test/lib/src/matchers.dart

@@ -1309,18 +1309,20 @@ class _RendersOnPhysicalModel extends _MatchRenderObject<RenderPhysicalShape, Re
       return false;
 
     if (
-      borderRadius == null
+      borderRadius == null &&
-      && shape == BoxShape.rectangle
+      shape == BoxShape.rectangle &&
-      && !assertRoundedRectangle(shapeClipper, BorderRadius.zero, matchState)
+      !assertRoundedRectangle(shapeClipper, BorderRadius.zero, matchState)
-    )
+    ) {
       return false;
+    }
 
     if (
-      borderRadius == null
+      borderRadius == null &&
-      && shape == BoxShape.circle
+      shape == BoxShape.circle &&
-      && !assertCircle(shapeClipper, matchState)
+      !assertCircle(shapeClipper, matchState)
-    )
+    ) {
       return false;
+    }
 
     if (elevation != null && renderObject.elevation != elevation)
       return failWithDescription(matchState, 'had elevation: ${renderObject.elevation}');

packages/flutter_test/lib/src/stack_manipulation.dart

@@ -21,8 +21,7 @@ int reportExpectCall(StackTrace stack, StringBuffer information) {
   if (line0.firstMatch(stackLines[0]) != null &&
       line1.firstMatch(stackLines[1]) != null &&
       line2.firstMatch(stackLines[2]) != null &&
-      line3.firstMatch(stackLines[3]) != null
+      line3.firstMatch(stackLines[3]) != null) {
-      ) {
     final Match expectMatch = line4.firstMatch(stackLines[4]);
     assert(expectMatch != null);
     assert(expectMatch.groupCount == 2);

packages/flutter_tools/lib/src/android/android_device.dart

@@ -792,7 +792,7 @@ class _AdbLogReader extends DeviceLogReader {
       }
       _acceptedLastLine = false;
     } else if (line == '--------- beginning of system' ||
-               line == '--------- beginning of main' ) {
+               line == '--------- beginning of main') {
       // hide the ugly adb logcat log boundaries at the start
       _acceptedLastLine = false;
     } else {

packages/flutter_tools/lib/src/android/gradle.dart

@@ -478,7 +478,7 @@ Future<void> _buildGradleProjectV2(
     throwToolExit('Gradle task $assembleTask failed with exit code $exitCode', exitCode: exitCode);
   }
 
-  if(!isBuildingBundle) {
+  if (!isBuildingBundle) {
     final File apkFile = _findApkFile(project, buildInfo);
     if (apkFile == null)
       throwToolExit('Gradle build failed to produce an Android package.');

packages/flutter_tools/lib/src/application_package.dart

@@ -458,7 +458,7 @@ class ApkManifestData {
       final int level = line.length - trimLine.length;
 
       // Handle level out
-      while(level <= currentElement.level) {
+      while (level <= currentElement.level) {
         currentElement = currentElement.parent;
       }
 

packages/flutter_tools/lib/src/base/process.dart

@@ -97,7 +97,7 @@ Future<void> runShutdownHooks() async {
 Map<String, String> _environment(bool allowReentrantFlutter, [ Map<String, String> environment ]) {
   if (allowReentrantFlutter) {
     if (environment == null)
-      environment = <String, String>{ 'FLUTTER_ALREADY_LOCKED': 'true' };
+      environment = <String, String>{'FLUTTER_ALREADY_LOCKED': 'true'};
     else
       environment['FLUTTER_ALREADY_LOCKED'] = 'true';
   }

packages/flutter_tools/lib/src/commands/daemon.dart

@@ -203,7 +203,7 @@ abstract class Domain {
   }
 
   void sendEvent(String name, [ dynamic args ]) {
-    final Map<String, dynamic> map = <String, dynamic>{ 'event': name };
+    final Map<String, dynamic> map = <String, dynamic>{'event': name};
     if (args != null)
       map['params'] = _toJsonable(args);
     _send(map);
@@ -563,7 +563,7 @@ class AppDomain extends Domain {
   }
 
   void _sendAppEvent(AppInstance app, String name, [ Map<String, dynamic> args ]) {
-    final Map<String, dynamic> eventArgs = <String, dynamic> { 'appId': app.id };
+    final Map<String, dynamic> eventArgs = <String, dynamic> {'appId': app.id};
     if (args != null)
       eventArgs.addAll(args);
     sendEvent('app.$name', eventArgs);
@@ -652,7 +652,7 @@ class DeviceDomain extends Domain {
 
     hostPort = await device.portForwarder.forward(devicePort, hostPort: hostPort);
 
-    return <String, dynamic>{ 'hostPort': hostPort };
+    return <String, dynamic>{'hostPort': hostPort};
   }
 
   /// Removes a forwarded port.

packages/flutter_tools/lib/src/commands/drive.dart

@@ -295,7 +295,7 @@ Future<void> _runTests(List<String> testArgs, String observatoryUri) async {
         '--packages=${PackageMap.globalPackagesPath}',
         '-rexpanded',
       ]),
-    environment: <String, String>{ 'VM_SERVICE_URL': observatoryUri },
+    environment: <String, String>{'VM_SERVICE_URL': observatoryUri},
   );
   if (result != 0)
     throwToolExit('Driver tests failed: $result', exitCode: result);

packages/flutter_tools/lib/src/commands/version.dart

@@ -16,7 +16,7 @@ import '../runner/flutter_command.dart';
 import '../version.dart';
 
 class VersionCommand extends FlutterCommand {
-  VersionCommand(): super() {
+  VersionCommand() : super() {
     argParser.addFlag('force',
       abbr: 'f',
       help: 'Force switch to older Flutter versions that do not include a version command',

packages/flutter_tools/lib/src/compile.dart

@@ -378,7 +378,7 @@ class _CompileExpressionRequest extends _CompilationRequest {
 }
 
 class _RejectRequest extends _CompilationRequest {
-  _RejectRequest(Completer<CompilerOutput> completer): super(completer);
+  _RejectRequest(Completer<CompilerOutput> completer) : super(completer);
 
   @override
   Future<CompilerOutput> _run(ResidentCompiler compiler) async =>

packages/flutter_tools/lib/src/doctor.dart

@@ -501,8 +501,8 @@ abstract class IntelliJValidator extends DoctorValidator {
   String get pluginsPath;
 
   static final Map<String, String> _idToTitle = <String, String>{
-    'IntelliJIdea' : 'IntelliJ IDEA Ultimate Edition',
+    'IntelliJIdea': 'IntelliJ IDEA Ultimate Edition',
-    'IdeaIC' : 'IntelliJ IDEA Community Edition',
+    'IdeaIC': 'IntelliJ IDEA Community Edition',
   };
 
   static final Version kMinIdeaVersion = Version(2017, 1, 0);
@@ -615,9 +615,9 @@ class IntelliJValidatorOnMac extends IntelliJValidator {
   final String id;
 
   static final Map<String, String> _dirNameToId = <String, String>{
-    'IntelliJ IDEA.app' : 'IntelliJIdea',
+    'IntelliJ IDEA.app': 'IntelliJIdea',
-    'IntelliJ IDEA Ultimate.app' : 'IntelliJIdea',
+    'IntelliJ IDEA Ultimate.app': 'IntelliJIdea',
-    'IntelliJ IDEA CE.app' : 'IdeaIC',
+    'IntelliJ IDEA CE.app': 'IdeaIC',
   };
 
   static Iterable<DoctorValidator> get installed {

packages/flutter_tools/lib/src/flutter_manifest.dart

@@ -102,10 +102,9 @@ class FlutterManifest {
   String get buildName {
     if (appVersion != null && appVersion.contains('+'))
       return appVersion.split('+')?.elementAt(0);
-    else {
+    else
       return appVersion;
   }
-  }
 
   /// The build version number from the `pubspec.yaml` file.
   /// Can be null if version isn't set or has a wrong format.

packages/flutter_tools/lib/src/ios/code_signing.dart

@@ -187,8 +187,7 @@ Future<String> _chooseSigningIdentity(List<String> validCodeSigningIdentities, b
       if (validCodeSigningIdentities.contains(savedCertChoice)) {
         printStatus('Found saved certificate choice "$savedCertChoice". To clear, use "flutter config".');
         return savedCertChoice;
-      }
+      } else {
-      else {
         printError('Saved signing certificate "$savedCertChoice" is not a valid development certificate');
       }
     }

packages/flutter_tools/lib/src/ios/devices.dart

@@ -433,7 +433,7 @@ String decodeSyslog(String line) {
   try {
     final List<int> bytes = utf8.encode(line);
     final List<int> out = <int>[];
-    for (int i = 0; i < bytes.length; ) {
+    for (int i = 0; i < bytes.length;) {
       if (bytes[i] != kBackslash || i > bytes.length - 4) {
         // Unmapped byte: copy as-is.
         out.add(bytes[i++]);

packages/flutter_tools/lib/src/ios/ios_workflow.dart

@@ -192,8 +192,7 @@ class CocoaPodsValidator extends DoctorValidator {
           status = ValidationType.missing;
           messages.add(ValidationMessage.error(
               userMessages.cocoaPodsMissing(noCocoaPodsConsequence, cocoaPodsInstallInstructions)));
-        }
+        } else if (cocoaPodsStatus == CocoaPodsStatus.unknownVersion) {
-        else if (cocoaPodsStatus == CocoaPodsStatus.unknownVersion) {
           status = ValidationType.partial;
           messages.add(ValidationMessage.hint(
               userMessages.cocoaPodsUnknownVersion(unknownCocoaPodsConsequence, cocoaPodsUpgradeInstructions)));

packages/flutter_tools/lib/src/ios/mac.dart

@@ -599,8 +599,7 @@ Future<void> diagnoseXcodeBuildFailure(XcodeBuildResult result) async {
   if (result.xcodeBuildExecution != null &&
       result.xcodeBuildExecution.buildForPhysicalDevice &&
       !<String>['DEVELOPMENT_TEAM', 'PROVISIONING_PROFILE'].any(
-        result.xcodeBuildExecution.buildSettings.containsKey)
+        result.xcodeBuildExecution.buildSettings.containsKey)) {
-      ) {
     printError(noDevelopmentTeamInstruction, emphasis: true);
     return;
   }
@@ -722,7 +721,7 @@ void _copyServiceDefinitionsManifest(List<Map<String, String>> services, File ma
     // the directory and basenames.
     'framework': fs.path.basenameWithoutExtension(service['ios-framework']),
   }).toList();
-  final Map<String, dynamic> jsonObject = <String, dynamic>{ 'services' : jsonServices };
+  final Map<String, dynamic> jsonObject = <String, dynamic>{'services': jsonServices};
   manifest.writeAsStringSync(json.encode(jsonObject), mode: FileMode.write, flush: true);
 }
 

packages/flutter_tools/lib/src/ios/plist_utils.dart

@@ -29,7 +29,7 @@ String getValueFromFile(String plistFilePath, String key) {
     final List<String> args = <String>[
       executable, 'read', normalizedPlistPath,
     ];
-    if (key != null && key.isNotEmpty){
+    if (key != null && key.isNotEmpty) {
       args.add(key);
     }
     final String value = runCheckedSync(args);

packages/flutter_tools/lib/src/run_hot.dart

@@ -406,7 +406,7 @@ class HotRunner extends ResidentRunner {
     final Map<String, String> analyticsParameters =
       reason == null
         ? null
-        : <String, String>{ kEventReloadReasonParameterName: reason };
+        : <String, String>{kEventReloadReasonParameterName: reason};
 
     if (!_isPaused()) {
       printTrace('Refreshing active FlutterViews before restarting.');

packages/flutter_tools/lib/src/services.dart

@@ -105,7 +105,7 @@ File generateServiceDefinitions(
         'class': service['android-class'],
       }).toList();
 
-  final Map<String, dynamic> jsonObject = <String, dynamic>{ 'services': services };
+  final Map<String, dynamic> jsonObject = <String, dynamic>{'services': services};
   final File servicesFile = fs.file(fs.path.join(dir, 'services.json'));
   servicesFile.writeAsStringSync(json.encode(jsonObject), mode: FileMode.write, flush: true);
   return servicesFile;

packages/flutter_tools/lib/src/test/event_printer.dart

@@ -19,7 +19,7 @@ class EventPrinter extends TestWatcher {
   }
 
   void _sendEvent(String name, [ dynamic params ]) {
-    final Map<String, dynamic> map = <String, dynamic>{ 'event': name};
+    final Map<String, dynamic> map = <String, dynamic>{'event': name};
     if (params != null) {
       map['params'] = params;
     }

packages/flutter_tools/lib/src/vmservice.dart

@@ -352,7 +352,7 @@ class VMService {
   Future<void> _streamListen(String streamId) async {
     if (!_listeningFor.contains(streamId)) {
       _listeningFor.add(streamId);
-      await _sendRequest('streamListen', <String, dynamic>{ 'streamId': streamId });
+      await _sendRequest('streamListen', <String, dynamic>{'streamId': streamId});
     }
   }
 
@@ -873,7 +873,7 @@ class VM extends ServiceObjectOwner {
 
   /// Create a new development file system on the device.
   Future<Map<String, dynamic>> createDevFS(String fsName) {
-    return invokeRpcRaw('_createDevFS', params: <String, dynamic> { 'fsName': fsName });
+    return invokeRpcRaw('_createDevFS', params: <String, dynamic> {'fsName': fsName});
   }
 
   /// List the development file system son the device.
@@ -913,12 +913,12 @@ class VM extends ServiceObjectOwner {
 
   /// The complete list of a file system.
   Future<List<String>> listDevFSFiles(String fsName) async {
-    return (await invokeRpcRaw('_listDevFSFiles', params: <String, dynamic>{ 'fsName': fsName }))['files'];
+    return (await invokeRpcRaw('_listDevFSFiles', params: <String, dynamic>{'fsName': fsName}))['files'];
   }
 
   /// Delete an existing file system.
   Future<Map<String, dynamic>> deleteDevFS(String fsName) {
-    return invokeRpcRaw('_deleteDevFS', params: <String, dynamic>{ 'fsName': fsName });
+    return invokeRpcRaw('_deleteDevFS', params: <String, dynamic>{'fsName': fsName});
   }
 
   Future<ServiceMap> runInView(
@@ -1273,7 +1273,7 @@ class Isolate extends ServiceObjectOwner {
     if (state != null && state.containsKey('enabled') && state['enabled'] is String) {
       state = await invokeFlutterExtensionRpcRaw(
         'ext.flutter.$name',
-        params: <String, dynamic>{ 'enabled': state['enabled'] == 'true' ? 'false' : 'true' },
+        params: <String, dynamic>{'enabled': state['enabled'] == 'true' ? 'false' : 'true'},
       );
     }
     return state;
@@ -1288,7 +1288,7 @@ class Isolate extends ServiceObjectOwner {
   Future<Map<String, dynamic>> flutterDebugAllowBanner(bool show) {
     return invokeFlutterExtensionRpcRaw(
       'ext.flutter.debugAllowBanner',
-      params: <String, dynamic>{ 'enabled': show ? 'true' : 'false' },
+      params: <String, dynamic>{'enabled': show ? 'true' : 'false'},
     );
   }
 
@@ -1331,7 +1331,7 @@ class Isolate extends ServiceObjectOwner {
   Future<String> flutterPlatformOverride([ String platform ]) async {
     final Map<String, dynamic> result = await invokeFlutterExtensionRpcRaw(
       'ext.flutter.platformOverride',
-      params: platform != null ? <String, dynamic>{ 'value': platform } : <String, String>{},
+      params: platform != null ? <String, dynamic>{'value': platform} : <String, String>{},
     );
     if (result != null && result['value'] is String)
       return result['value'];

packages/flutter_tools/test/base/file_system_test.dart

@@ -20,12 +20,12 @@ void main() {
     testUsingContext('recursively creates a directory if it does not exist', () async {
       ensureDirectoryExists('foo/bar/baz.flx');
       expect(fs.isDirectorySync('foo/bar'), true);
-    }, overrides: <Type, Generator>{ FileSystem: () => fs });
+    }, overrides: <Type, Generator>{FileSystem: () => fs});
 
     testUsingContext('throws tool exit on failure to create', () async {
       fs.file('foo').createSync();
       expect(() => ensureDirectoryExists('foo/bar.flx'), throwsToolExit());
-    }, overrides: <Type, Generator>{ FileSystem: () => fs });
+    }, overrides: <Type, Generator>{FileSystem: () => fs});
   });
 
   group('copyDirectorySync', () {

packages/flutter_tools/test/base/fingerprint_test.dart

@@ -247,7 +247,7 @@ void main() {
           () => Fingerprint.fromBuildInputs(<String, String>{}, <String>['a.dart', 'b.dart']),
           throwsArgumentError,
         );
-      }, overrides: <Type, Generator>{ FileSystem: () => fs });
+      }, overrides: <Type, Generator>{FileSystem: () => fs});
 
       testUsingContext('populates checksums for valid files', () async {
         await fs.file('a.dart').writeAsString('This is a');
@@ -258,14 +258,14 @@ void main() {
         expect(jsonObject['files'], hasLength(2));
         expect(jsonObject['files']['a.dart'], '8a21a15fad560b799f6731d436c1b698');
         expect(jsonObject['files']['b.dart'], '6f144e08b58cd0925328610fad7ac07c');
-      }, overrides: <Type, Generator>{ FileSystem: () => fs });
+      }, overrides: <Type, Generator>{FileSystem: () => fs});
 
       testUsingContext('includes framework version', () {
         final Fingerprint fingerprint = Fingerprint.fromBuildInputs(<String, String>{}, <String>[]);
 
         final Map<String, dynamic> jsonObject = json.decode(fingerprint.toJson());
         expect(jsonObject['version'], mockVersion.frameworkRevision);
-      }, overrides: <Type, Generator>{ FlutterVersion: () => mockVersion });
+      }, overrides: <Type, Generator>{FlutterVersion: () => mockVersion});
 
       testUsingContext('includes provided properties', () {
         final Fingerprint fingerprint = Fingerprint.fromBuildInputs(<String, String>{'a': 'A', 'b': 'B'}, <String>[]);
@@ -274,7 +274,7 @@ void main() {
         expect(jsonObject['properties'], hasLength(2));
         expect(jsonObject['properties']['a'], 'A');
         expect(jsonObject['properties']['b'], 'B');
-      }, overrides: <Type, Generator>{ FlutterVersion: () => mockVersion });
+      }, overrides: <Type, Generator>{FlutterVersion: () => mockVersion});
     });
 
     group('fromJson', () {
@@ -315,8 +315,8 @@ void main() {
       testUsingContext('throws ArgumentError for unknown versions', () async {
         final String jsonString = json.encode(<String, dynamic>{
           'version': 'bad',
-          'properties':<String, String>{},
+          'properties': <String, String>{},
-          'files':<String, String>{},
+          'files': <String, String>{},
         });
         expect(() => Fingerprint.fromJson(jsonString), throwsArgumentError);
       }, overrides: <Type, Generator>{
@@ -325,8 +325,8 @@ void main() {
 
       testUsingContext('throws ArgumentError if version is not present', () async {
         final String jsonString = json.encode(<String, dynamic>{
-          'properties':<String, String>{},
+          'properties': <String, String>{},
-          'files':<String, String>{},
+          'files': <String, String>{},
         });
         expect(() => Fingerprint.fromJson(jsonString), throwsArgumentError);
       }, overrides: <Type, Generator>{
@@ -437,7 +437,7 @@ void main() {
       fs = MemoryFileSystem();
     });
 
-    final Map<Type, Generator> contextOverrides = <Type, Generator>{ FileSystem: () => fs };
+    final Map<Type, Generator> contextOverrides = <Type, Generator>{FileSystem: () => fs};
 
     testUsingContext('returns one file if only one is listed', () async {
       await fs.file('a.d').writeAsString('snapshot.d: /foo/a.dart');

packages/flutter_tools/test/crash_reporting_test.dart

@@ -97,7 +97,7 @@ void main() {
         path: '/cr/report',
         queryParameters: <String, String>{
           'product': 'Flutter_Tools',
-          'version' : 'test-version',
+          'version': 'test-version',
         },
       ));
       expect(fields['uuid'], '00000000-0000-4000-0000-000000000000');
@@ -148,7 +148,7 @@ void main() {
         path: '/fake_server',
         queryParameters: <String, String>{
           'product': 'Flutter_Tools',
-          'version' : 'test-version',
+          'version': 'test-version',
         },
       ));
     }, overrides: <Type, Generator> {

packages/flutter_tools/test/hot_test.dart

@@ -54,7 +54,7 @@ void main() {
         'success': false,
         'details': <String, dynamic>{
           'notices': <Map<String, dynamic>>[
-            <String, dynamic>{ 'message': false, },
+            <String, dynamic>{'message': false},
           ],
         },
       }), false);
@@ -63,7 +63,7 @@ void main() {
         'success': false,
         'details': <String, dynamic>{
           'notices': <Map<String, dynamic>>[
-            <String, dynamic>{ 'message': <String>['error'], },
+            <String, dynamic>{'message': <String>['error']},
           ],
         },
       }), false);
@@ -72,8 +72,8 @@ void main() {
         'success': false,
         'details': <String, dynamic>{
           'notices': <Map<String, dynamic>>[
-            <String, dynamic>{ 'message': 'error', },
+            <String, dynamic>{'message': 'error'},
-            <String, dynamic>{ 'message': <String>['error'], },
+            <String, dynamic>{'message': <String>['error']},
           ],
         },
       }), false);
@@ -82,7 +82,7 @@ void main() {
         'success': false,
         'details': <String, dynamic>{
           'notices': <Map<String, dynamic>>[
-            <String, dynamic>{ 'message': 'error', },
+            <String, dynamic>{'message': 'error'},
           ],
         },
       }), false);

packages/flutter_tools/test/ios/code_signing_test.dart

@@ -217,7 +217,7 @@ void main() {
       );
       expect(testLogger.errorText, isEmpty);
       verify(mockOpenSslStdIn.write('This is a mock certificate'));
-      expect(signingConfigs, <String, String> {'DEVELOPMENT_TEAM':'4444DDDD44'});
+      expect(signingConfigs, <String, String> {'DEVELOPMENT_TEAM': '4444DDDD44'});
 
       verify(config.setValue('ios-signing-cert', 'iPhone Developer: Profile 3 (3333CCCC33)'));
     },
@@ -288,7 +288,7 @@ void main() {
       );
       expect(testLogger.errorText, isEmpty);
       verify(mockOpenSslStdIn.write('This is a mock certificate'));
-      expect(signingConfigs, <String, String> {'DEVELOPMENT_TEAM':'5555EEEE55'});
+      expect(signingConfigs, <String, String> {'DEVELOPMENT_TEAM': '5555EEEE55'});
     },
     overrides: <Type, Generator>{
       ProcessManager: () => mockProcessManager,
@@ -360,7 +360,7 @@ void main() {
       );
       expect(testLogger.errorText, isEmpty);
       verify(mockOpenSslStdIn.write('This is a mock certificate'));
-      expect(signingConfigs, <String, String> {'DEVELOPMENT_TEAM':'4444DDDD44'});
+      expect(signingConfigs, <String, String> {'DEVELOPMENT_TEAM': '4444DDDD44'});
     },
     overrides: <Type, Generator>{
       ProcessManager: () => mockProcessManager,
@@ -432,7 +432,7 @@ void main() {
         testLogger.statusText,
         contains('Certificate choice "iPhone Developer: Profile 3 (3333CCCC33)"'),
       );
-      expect(signingConfigs, <String, String> {'DEVELOPMENT_TEAM':'4444DDDD44'});
+      expect(signingConfigs, <String, String> {'DEVELOPMENT_TEAM': '4444DDDD44'});
       verify(config.setValue('ios-signing-cert', 'iPhone Developer: Profile 3 (3333CCCC33)'));
     },
     overrides: <Type, Generator>{

packages/flutter_tools/test/project_file_invalidator_test.dart

@@ -102,7 +102,7 @@ void main() {}
       });
       expect(invalidator.updateTime, <String, int>{
         '/foo/lib/foo.dart': fooFile.statSync().modified.millisecondsSinceEpoch,
-        '/lib/main.dart':mainFile.statSync().modified.millisecondsSinceEpoch,
+        '/lib/main.dart': mainFile.statSync().modified.millisecondsSinceEpoch,
       });
       expect(invalidator.findInvalidated(), isEmpty);
 

packages/flutter_tools/tool/daemon_client.dart

@@ -50,7 +50,7 @@ Future<void> main() async {
       if (words.length > 1) {
         _send(<String, dynamic>{
           'method': 'app.stop',
-          'params': <String, dynamic> { 'appId': words[1] },
+          'params': <String, dynamic> {'appId': words[1]},
         });
       } else {
         _send(<String, dynamic>{'method': 'app.stop'});
@@ -59,7 +59,7 @@ Future<void> main() async {
       if (words.length > 1) {
         _send(<String, dynamic>{
           'method': 'app.restart',
-          'params': <String, dynamic> { 'appId': words[1] },
+          'params': <String, dynamic> {'appId': words[1]},
         });
       } else {
         _send(<String, dynamic>{'method': 'app.restart'});