firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some formatting of map, parameters and spaces (#29760)

Browse Source
This commit is contained in:
Alexandre Ardhuin 2019-03-23 00:02:21 +01:00 committed by GitHub
parent ecfdd7e1ea
commit bfa1d25bf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
95 changed files with 351 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
examples/catalog/lib/custom_a11y_traversal.dart
View File

@ -61,14 +61,15 @@ class RowColumnTraversal extends StatelessWidget {
/// A Button class that wraps an [IconButton] with a [RowColumnTraversal] to
/// set its traversal order.
class SpinnerButton extends StatelessWidget {
const SpinnerButton(
{Key key,
this.onPressed,
this.icon,
this.rowOrder,
this.columnOrder,
this.field,
this.increment}) : super(key: key);
const SpinnerButton({
Key key,
this.onPressed,
this.icon,
this.rowOrder,
this.columnOrder,
this.field,
this.increment,
}) : super(key: key);
final VoidCallback onPressed;
final IconData icon;

3
examples/catalog/test/custom_semantics_test.dart
View File

@ -91,7 +91,8 @@ void main() {
});
}
void expectAdjustable(SemanticsNode node, {
void expectAdjustable(
SemanticsNode node, {
bool hasIncreaseAction = true,
bool hasDecreaseAction = true,
String label = '',

3
examples/flutter_gallery/lib/demo/material/date_and_time_picker_demo.dart
View File

@ -16,7 +16,8 @@ class _InputDropdown extends StatelessWidget {
this.labelText,
this.valueText,
this.valueStyle,
this.onPressed }) : super(key: key);
this.onPressed,
}) : super(key: key);
final String labelText;
final String valueText;

3
examples/flutter_gallery/lib/demo/shrine/expanding_bottom_sheet.dart
View File

@ -71,7 +71,8 @@ Animation<T> _getEmphasizedEasingAnimation<T>({
@required T peak,
@required T end,
@required bool isForward,
@required Animation<double> parent}) {
@required Animation<double> parent,
}) {
Curve firstCurve;
Curve secondCurve;
double firstWeight;

7
examples/flutter_gallery/lib/demo/video_demo.dart
View File

@ -50,8 +50,11 @@ class VideoCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
Widget fullScreenRoutePageBuilder(BuildContext context,
Animation<double> animation, Animation<double> secondaryAnimation) {
Widget fullScreenRoutePageBuilder(
BuildContext context,
Animation<double> animation,
Animation<double> secondaryAnimation,
) {
return _buildFullScreenVideo();
}

3
examples/flutter_gallery/lib/gallery/backdrop.dart
View File

@ -24,7 +24,8 @@ final Animatable<BorderRadius> _kFrontHeadingBevelRadius = BorderRadiusTween(
);
class _TappableWhileStatusIs extends StatefulWidget {
const _TappableWhileStatusIs(this.status, {
const _TappableWhileStatusIs(
this.status, {
Key key,
this.controller,
this.child,

10
examples/layers/rendering/src/sector_layout.dart
View File

@ -57,9 +57,10 @@ class SectorDimensions {
const SectorDimensions({ this.deltaRadius = 0.0, this.deltaTheta = 0.0 });
factory SectorDimensions.withConstraints(
SectorConstraints constraints,
{ double deltaRadius = 0.0, double deltaTheta = 0.0, }
) {
SectorConstraints constraints, {
double deltaRadius = 0.0,
double deltaTheta = 0.0,
}) {
return SectorDimensions(
deltaRadius: constraints.constrainDeltaRadius(deltaRadius),
deltaTheta: constraints.constrainDeltaTheta(deltaTheta),
@ -554,7 +555,8 @@ class RenderBoxToRenderSectorAdapter extends RenderBox with RenderObjectWithChil
}
class RenderSolidColor extends RenderDecoratedSector {
RenderSolidColor(this.backgroundColor, {
RenderSolidColor(
this.backgroundColor, {
this.desiredDeltaRadius = double.infinity,
this.desiredDeltaTheta = kTwoPi,
}) : super(BoxDecoration(color: backgroundColor));

2
packages/flutter/lib/src/foundation/binding.dart
View File

@ -140,7 +140,7 @@ abstract class BindingBase {
registerServiceExtension(
name: 'saveCompilationTrace',
callback: (Map<String, String> parameters) async {
return <String, dynamic> {
return <String, dynamic>{
'value': ui.saveCompilationTrace(),
};
},

41
packages/flutter/lib/src/foundation/diagnostics.dart
View File

@ -1045,7 +1045,9 @@ class MessageProperty extends DiagnosticsProperty<void> {
/// message is stored as the description.
///
/// The [name], `message`, and [level] arguments must not be null.
MessageProperty(String name, String message, {
MessageProperty(
String name,
String message, {
DiagnosticLevel level = DiagnosticLevel.info,
}) : assert(name != null),
assert(message != null),
@ -1063,7 +1065,9 @@ class StringProperty extends DiagnosticsProperty<String> {
/// Create a diagnostics property for strings.
///
/// The [showName], [quoted], and [level] arguments must not be null.
StringProperty(String name, String value, {
StringProperty(
String name,
String value, {
String description,
String tooltip,
bool showName = true,
@ -1119,7 +1123,8 @@ class StringProperty extends DiagnosticsProperty<String> {
}
abstract class _NumProperty<T extends num> extends DiagnosticsProperty<T> {
_NumProperty(String name,
_NumProperty(
String name,
T value, {
String ifNull,
this.unit,
@ -1137,7 +1142,8 @@ abstract class _NumProperty<T extends num> extends DiagnosticsProperty<T> {
level: level,
);
_NumProperty.lazy(String name,
_NumProperty.lazy(
String name,
ComputePropertyValueCallback<T> computeValue, {
String ifNull,
this.unit,
@ -1190,7 +1196,9 @@ class DoubleProperty extends _NumProperty<double> {
/// If specified, [unit] describes the unit for the [value] (e.g. px).
///
/// The [showName] and [level] arguments must not be null.
DoubleProperty(String name, double value, {
DoubleProperty(
String name,
double value, {
String ifNull,
String unit,
String tooltip,
@ -1249,7 +1257,9 @@ class IntProperty extends _NumProperty<int> {
/// Create a diagnostics property for integers.
///
/// The [showName] and [level] arguments must not be null.
IntProperty(String name, int value, {
IntProperty(
String name,
int value, {
String ifNull,
bool showName = true,
String unit,
@ -1282,7 +1292,9 @@ class PercentProperty extends DoubleProperty {
/// be sufficient to disambiguate its meaning.
///
/// The [showName] and [level] arguments must not be null.
PercentProperty(String name, double fraction, {
PercentProperty(
String name,
double fraction, {
String ifNull,
bool showName = true,
String tooltip,
@ -1361,7 +1373,8 @@ class FlagProperty extends DiagnosticsProperty<bool> {
/// be descriptions that make the property name redundant.
///
/// The [showName] and [level] arguments must not be null.
FlagProperty(String name, {
FlagProperty(
String name, {
@required bool value,
this.ifTrue,
this.ifFalse,
@ -1456,7 +1469,9 @@ class IterableProperty<T> extends DiagnosticsProperty<Iterable<T>> {
/// interesting to display.
///
/// The [style], [showName], and [level] arguments must not be null.
IterableProperty(String name, Iterable<T> value, {
IterableProperty(
String name,
Iterable<T> value, {
Object defaultValue = kNoDefaultValue,
String ifNull,
String ifEmpty = '[]',
@ -1531,7 +1546,9 @@ class EnumProperty<T> extends DiagnosticsProperty<T> {
/// Create a diagnostics property that displays an enum.
///
/// The [level] argument must also not be null.
EnumProperty(String name, T value, {
EnumProperty(
String name,
T value, {
Object defaultValue = kNoDefaultValue,
DiagnosticLevel level = DiagnosticLevel.info,
}) : assert(level != null),
@ -1575,7 +1592,9 @@ class ObjectFlagProperty<T> extends DiagnosticsProperty<T> {
///
/// The [showName] and [level] arguments must not be null. Additionally, at
/// least one of [ifPresent] and [ifNull] must not be null.
ObjectFlagProperty(String name, T value, {
ObjectFlagProperty(
String name,
T value, {
this.ifPresent,
String ifNull,
bool showName = false,

2
packages/flutter/lib/src/gestures/pointer_signal_resolver.dart
View File

@ -59,7 +59,7 @@ class PointerSignalResolver {
informationCollector: (StringBuffer information) {
information.writeln('Event:');
information.write(' $event');
}
},
));
}
_firstRegisteredCallback = null;

3
packages/flutter/lib/src/material/data_table.dart
View File

@ -162,7 +162,8 @@ class DataCell {
/// If the cell has no data, then a [Text] widget with placeholder
/// text should be provided instead, and then the [placeholder]
/// argument should be set to true.
const DataCell(this.child, {
const DataCell(
this.child, {
this.placeholder = false,
this.showEditIcon = false,
this.onTap,

6
packages/flutter/lib/src/material/ink_well.dart
View File

@ -47,15 +47,13 @@ abstract class InteractiveInkFeature extends InkFeature {
///
/// Typically causes the ink to propagate faster across the material. By default this
/// method does nothing.
void confirm() {
}
void confirm() { }
/// Called when the user input that triggered this feature's appearance was canceled.
///
/// Typically causes the ink to gradually disappear. By default this method does
/// nothing.
void cancel() {
}
void cancel() { }
/// The ink's color.
Color get color => _color;

2
packages/flutter/lib/src/material/material.dart
View File

@ -53,7 +53,7 @@ enum MaterialType {
///
/// * [MaterialType]
/// * [Material]
final Map<MaterialType, BorderRadius> kMaterialEdges = <MaterialType, BorderRadius> {
final Map<MaterialType, BorderRadius> kMaterialEdges = <MaterialType, BorderRadius>{
MaterialType.canvas: null,
MaterialType.card: BorderRadius.circular(2.0),
MaterialType.circle: null,

5
packages/flutter/lib/src/painting/image_provider.dart
View File

@ -466,7 +466,7 @@ class NetworkImage extends ImageProvider<NetworkImage> {
/// Creates an object that fetches the image at the given URL.
///
/// The arguments must not be null.
const NetworkImage(this.url, { this.scale = 1.0 , this.headers })
const NetworkImage(this.url, { this.scale = 1.0, this.headers })
: assert(url != null),
assert(scale != null);
@ -736,7 +736,8 @@ class ExactAssetImage extends AssetBundleImageProvider {
/// The [package] argument must be non-null when fetching an asset that is
/// included in a package. See the documentation for the [ExactAssetImage] class
/// itself for details.
const ExactAssetImage(this.assetName, {
const ExactAssetImage(
this.assetName, {
this.scale = 1.0,
this.bundle,
this.package,

3
packages/flutter/lib/src/painting/image_resolution.dart
View File

@ -128,7 +128,8 @@ class AssetImage extends AssetBundleImageProvider {
/// from the set of images to choose from. The [package] argument must be
/// non-null when fetching an asset that is included in package. See the
/// documentation for the [AssetImage] class itself for details.
const AssetImage(this.assetName, {
const AssetImage(
this.assetName, {
this.bundle,
this.package,
}) : assert(assetName != null);

4
packages/flutter/lib/src/painting/matrix_utils.dart
View File

@ -265,7 +265,9 @@ class TransformProperty extends DiagnosticsProperty<Matrix4> {
/// Create a diagnostics property for [Matrix4] objects.
///
/// The [showName] and [level] arguments must not be null.
TransformProperty(String name, Matrix4 value, {
TransformProperty(
String name,
Matrix4 value, {
bool showName = true,
Object defaultValue = kNoDefaultValue,
DiagnosticLevel level = DiagnosticLevel.info,

3
packages/flutter/lib/src/painting/strut_style.dart
View File

@ -302,7 +302,8 @@ class StrutStyle extends Diagnosticable {
/// is inherited by being prepended onto the font family names. If
/// [fontFamilyFallback] is meant to be empty, pass an empty list instead of null.
/// This prevents the previous package name from being prepended twice.
StrutStyle.fromTextStyle(TextStyle textStyle, {
StrutStyle.fromTextStyle(
TextStyle textStyle, {
String fontFamily,
List<String> fontFamilyFallback,
double fontSize,

3
packages/flutter/lib/src/physics/clamped_simulation.dart
View File

@ -21,7 +21,8 @@ class ClampedSimulation extends Simulation {
///
/// The named arguments specify the ranges for the clamping behavior, as
/// applied to [x] and [dx].
ClampedSimulation(this.simulation, {
ClampedSimulation(
this.simulation, {
this.xMin = double.negativeInfinity,
this.xMax = double.infinity,
this.dxMin = double.negativeInfinity,

5
packages/flutter/lib/src/physics/friction_simulation.dart
View File

@ -18,7 +18,10 @@ class FrictionSimulation extends Simulation {
/// drag coefficient, a unitless value; the initial position, in the same
/// length units as used for [x]; and the initial velocity, in the same
/// velocity units as used for [dx].
FrictionSimulation(double drag, double position, double velocity, {
FrictionSimulation(
double drag,
double position,
double velocity, {
Tolerance tolerance = Tolerance.defaultTolerance,
}) : _drag = drag,
_dragLog = math.log(drag),

4
packages/flutter/lib/src/rendering/editable.dart
View File

@ -300,14 +300,14 @@ class RenderEditable extends RenderBox {
final Offset startOffset = _textPainter.getOffsetForCaret(
TextPosition(offset: _selection.start, affinity: _selection.affinity),
Rect.zero
Rect.zero,
);
_selectionStartInViewport.value = visibleRegion.contains(startOffset + effectiveOffset);
final Offset endOffset = _textPainter.getOffsetForCaret(
TextPosition(offset: _selection.end, affinity: _selection.affinity),
Rect.zero
Rect.zero,
);
_selectionEndInViewport.value = visibleRegion.contains(endOffset + effectiveOffset);

3
packages/flutter/lib/src/rendering/paragraph.dart
View File

@ -41,7 +41,8 @@ class RenderParagraph extends RenderBox {
///
/// The [maxLines] property may be null (and indeed defaults to null), but if
/// it is not null, it must be greater than zero.
RenderParagraph(TextSpan text, {
RenderParagraph(
TextSpan text, {
TextAlign textAlign = TextAlign.start,
@required TextDirection textDirection,
bool softWrap = true,

2
packages/flutter/lib/src/rendering/platform_view.dart
View File

@ -503,7 +503,7 @@ class _AndroidViewGestureRecognizer extends OneSequenceGestureRecognizer {
// Before the arena for a pointer is resolved all events are cached here, if we win the arena
// the cached events are dispatched to the view, if we lose the arena we clear the cache for
// the pointer.
final Map<int, List<PointerEvent>> cachedEvents = <int, List<PointerEvent>> {};
final Map<int, List<PointerEvent>> cachedEvents = <int, List<PointerEvent>>{};
// Pointer for which we have already won the arena, events for pointers in this set are
// immediately dispatched to the Android view.

2
packages/flutter/lib/src/rendering/shifted_box.dart
View File

@ -244,7 +244,7 @@ abstract class RenderAligningShiftedBox extends RenderShiftedBox {
/// A constructor to be used only when the extending class also has a mixin.
// TODO(gspencer): Remove this constructor once https://github.com/dart-lang/sdk/issues/31543 is fixed.
@protected
RenderAligningShiftedBox.mixin(AlignmentGeometry alignment,TextDirection textDirection, RenderBox child)
RenderAligningShiftedBox.mixin(AlignmentGeometry alignment, TextDirection textDirection, RenderBox child)
: this(alignment: alignment, textDirection: textDirection, child: child);
Alignment _resolvedAlignment;

3
packages/flutter/lib/src/rendering/sliver.dart
View File

@ -773,7 +773,8 @@ class SliverHitTestEntry extends HitTestEntry {
/// Creates a sliver hit test entry.
///
/// The [mainAxisPosition] and [crossAxisPosition] arguments must not be null.
const SliverHitTestEntry(RenderSliver target, {
const SliverHitTestEntry(
RenderSliver target, {
@required this.mainAxisPosition,
@required this.crossAxisPosition,
}) : assert(mainAxisPosition != null),

12
packages/flutter/lib/src/services/platform_views.dart
View File

@ -117,7 +117,7 @@ class PlatformViewsService {
assert(creationParams == null || creationParamsCodec != null);
// TODO(amirh): pass layoutDirection once the system channel supports it.
final Map<String, dynamic> args = <String, dynamic> {
final Map<String, dynamic> args = <String, dynamic>{
'id': id,
'viewType': viewType,
};
@ -520,7 +520,7 @@ class AndroidViewController {
if (_state == _AndroidViewState.waitingForSize)
return _create(size);
await SystemChannels.platform_views.invokeMethod<void>('resize', <String, dynamic> {
await SystemChannels.platform_views.invokeMethod<void>('resize', <String, dynamic>{
'id': id,
'width': size.width,
'height': size.height,
@ -542,7 +542,7 @@ class AndroidViewController {
if (_state == _AndroidViewState.waitingForSize)
return;
await SystemChannels.platform_views.invokeMethod<void>('setDirection', <String, dynamic> {
await SystemChannels.platform_views.invokeMethod<void>('setDirection', <String, dynamic>{
'id': id,
'direction': _getAndroidDirection(layoutDirection),
});
@ -578,7 +578,7 @@ class AndroidViewController {
}
Future<void> _create(Size size) async {
final Map<String, dynamic> args = <String, dynamic> {
final Map<String, dynamic> args = <String, dynamic>{
'id': id,
'viewType': _viewType,
'width': size.width,
@ -642,7 +642,7 @@ class UiKitViewController {
/// Calling this method releases the delayed events to the embedded UIView and makes it consume
/// any following touch events for the pointers involved in the active gesture.
Future<void> acceptGesture() {
final Map<String, dynamic> args = <String, dynamic> {
final Map<String, dynamic> args = <String, dynamic>{
'id': id,
};
return SystemChannels.platform_views.invokeMethod('acceptGesture', args);
@ -654,7 +654,7 @@ class UiKitViewController {
/// Calling this method drops the buffered touch events and prevents any future touch events for
/// the pointers that are part of the active touch sequence from arriving to the embedded view.
Future<void> rejectGesture() {
final Map<String, dynamic> args = <String, dynamic> {
final Map<String, dynamic> args = <String, dynamic>{
'id': id,
};
return SystemChannels.platform_views.invokeMethod('rejectGesture', args);

3
packages/flutter/lib/src/widgets/icon.dart
View File

@ -48,7 +48,8 @@ class Icon extends StatelessWidget {
/// Creates an icon.
///
/// The [size] and [color] default to the value given by the current [IconTheme].
const Icon(this.icon, {
const Icon(
this.icon, {
Key key,
this.size,
this.color,

12
packages/flutter/lib/src/widgets/image.dart
View File

@ -195,7 +195,8 @@ class Image extends StatefulWidget {
/// [FilterQuality.none] which corresponds to nearest-neighbor.
///
/// If [excludeFromSemantics] is true, then [semanticLabel] will be ignored.
Image.network(String src, {
Image.network(
String src, {
Key key,
double scale = 1.0,
this.semanticLabel,
@ -236,7 +237,8 @@ class Image extends StatefulWidget {
/// [FilterQuality.none] which corresponds to nearest-neighbor.
///
/// If [excludeFromSemantics] is true, then [semanticLabel] will be ignored.
Image.file(File file, {
Image.file(
File file, {
Key key,
double scale = 1.0,
this.semanticLabel,
@ -384,7 +386,8 @@ class Image extends StatefulWidget {
/// scale is present.
/// * <https://flutter.io/assets-and-images/>, an introduction to assets in
/// Flutter.
Image.asset(String name, {
Image.asset(
String name, {
Key key,
AssetBundle bundle,
this.semanticLabel,
@ -425,7 +428,8 @@ class Image extends StatefulWidget {
/// [FilterQuality.none] which corresponds to nearest-neighbor.
///
/// If [excludeFromSemantics] is true, then [semanticLabel] will be ignored.
Image.memory(Uint8List bytes, {
Image.memory(
Uint8List bytes, {
Key key,
double scale = 1.0,
this.semanticLabel,

3
packages/flutter/lib/src/widgets/image_icon.dart
View File

@ -23,7 +23,8 @@ class ImageIcon extends StatelessWidget {
/// Creates an image icon.
///
/// The [size] and [color] default to the value given by the current [IconTheme].
const ImageIcon(this.image, {
const ImageIcon(
this.image, {
Key key,
this.size,
this.color,

3
packages/flutter/lib/src/widgets/nested_scroll_view.dart
View File

@ -844,7 +844,8 @@ class _NestedScrollCoordinator implements ScrollActivityDelegate, ScrollHoldCont
}
class _NestedScrollController extends ScrollController {
_NestedScrollController(this.coordinator, {
_NestedScrollController(
this.coordinator, {
double initialScrollOffset = 0.0,
String debugLabel,
}) : super(initialScrollOffset: initialScrollOffset, debugLabel: debugLabel);

11
packages/flutter/lib/src/widgets/performance_overlay.dart
View File

@ -36,11 +36,12 @@ class PerformanceOverlay extends LeafRenderObjectWidget {
}) : super(key: key);
/// Create a performance overlay that displays all available statistics
PerformanceOverlay.allEnabled({ Key key,
this.rasterizerThreshold = 0,
this.checkerboardRasterCacheImages = false,
this.checkerboardOffscreenLayers = false })
: optionsMask =
PerformanceOverlay.allEnabled({
Key key,
this.rasterizerThreshold = 0,
this.checkerboardRasterCacheImages = false,
this.checkerboardOffscreenLayers = false,
}) : optionsMask =
1 << PerformanceOverlayOption.displayRasterizerStatistics.index |
1 << PerformanceOverlayOption.visualizeRasterizerStatistics.index |
1 << PerformanceOverlayOption.displayEngineStatistics.index |

6
packages/flutter/lib/src/widgets/text.dart
View File

@ -224,7 +224,8 @@ class Text extends StatelessWidget {
/// closest enclosing [DefaultTextStyle].
///
/// The [data] parameter must not be null.
const Text(this.data, {
const Text(
this.data, {
Key key,
this.style,
this.strutStyle,
@ -246,7 +247,8 @@ class Text extends StatelessWidget {
/// Creates a text widget with a [TextSpan].
///
/// The [textSpan] parameter must not be null.
const Text.rich(this.textSpan, {
const Text.rich(
this.textSpan, {
Key key,
this.style,
this.strutStyle,

2
packages/flutter/lib/src/widgets/text_selection.dart
View File

@ -640,7 +640,7 @@ class _TextSelectionHandleOverlayState
],
),
),
)
),
);
}

2
packages/flutter/test/cupertino/route_test.dart
View File

@ -348,7 +348,7 @@ void main() {
onPressed: () {
Navigator.pop<void>(context);
},
)
),
],
);
},

2
packages/flutter/test/material/popup_menu_test.dart
View File

@ -14,7 +14,7 @@ void main() {
final Key targetKey = UniqueKey();
await tester.pumpWidget(
MaterialApp(
routes: <String, WidgetBuilder> {
routes: <String, WidgetBuilder>{
'/next': (BuildContext context) {
return const Text('Next');
},

2
packages/flutter/test/material/radio_test.dart
View File

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

7
packages/flutter/test/material/tab_bar_theme_test.dart
View File

@ -26,7 +26,10 @@ final List<SizedBox> _sizedTabs = <SizedBox>[
];
Widget _withTheme(
TabBarTheme theme, { List<Widget> tabs = _tabs, bool isScrollable = false }) {
TabBarTheme theme, {
List<Widget> tabs = _tabs,
bool isScrollable = false,
}) {
return MaterialApp(
theme: ThemeData(tabBarTheme: theme),
home: Scaffold(
@ -102,7 +105,7 @@ void main() {
const double indicatorWeight = 2.0; // default value
const EdgeInsetsGeometry labelPadding = EdgeInsets.fromLTRB(
leftPadding, topPadding, rightPadding, bottomPadding
leftPadding, topPadding, rightPadding, bottomPadding,
);
const TabBarTheme tabBarTheme = TabBarTheme(labelPadding: labelPadding);

6
packages/flutter/test/material/theme_test.dart
View File

@ -741,7 +741,7 @@ class _TextStyleProxy implements TextStyle {
double wordSpacingFactor = 1.0,
double wordSpacingDelta = 0.0,
double heightFactor = 1.0,
double heightDelta = 0.0
double heightDelta = 0.0,
}) {
throw UnimplementedError();
}
@ -773,7 +773,7 @@ class _TextStyleProxy implements TextStyle {
Color decorationColor,
TextDecorationStyle decorationStyle,
double decorationThickness,
String debugLabel
String debugLabel,
}) {
throw UnimplementedError();
}
@ -796,7 +796,7 @@ class _TextStyleProxy implements TextStyle {
FontWeight fontWeight,
FontStyle fontStyle,
double height,
StrutStyle strutStyle
StrutStyle strutStyle,
}) {
throw UnimplementedError();
}

20
packages/flutter/test/rendering/mock_canvas.dart
View File

@ -866,9 +866,15 @@ abstract class _PaintPredicate {
abstract class _DrawCommandPaintPredicate extends _PaintPredicate {
_DrawCommandPaintPredicate(
this.symbol, this.name, this.argumentCount, this.paintArgumentIndex,
{ this.color, this.strokeWidth, this.hasMaskFilter, this.style, }
);
this.symbol,
this.name,
this.argumentCount,
this.paintArgumentIndex, {
this.color,
this.strokeWidth,
this.hasMaskFilter,
this.style,
});
final Symbol symbol;
final String name;
@ -934,7 +940,9 @@ abstract class _DrawCommandPaintPredicate extends _PaintPredicate {
}
class _OneParameterPaintPredicate<T> extends _DrawCommandPaintPredicate {
_OneParameterPaintPredicate(Symbol symbol, String name, {
_OneParameterPaintPredicate(
Symbol symbol,
String name, {
@required this.expected,
@required Color color,
@required double strokeWidth,
@ -967,7 +975,9 @@ class _OneParameterPaintPredicate<T> extends _DrawCommandPaintPredicate {
}
class _TwoParameterPaintPredicate<T1, T2> extends _DrawCommandPaintPredicate {
_TwoParameterPaintPredicate(Symbol symbol, String name, {
_TwoParameterPaintPredicate(
Symbol symbol,
String name, {
@required this.expected1,
@required this.expected2,
@required Color color,

4
packages/flutter/test/semantics/semantics_service_test.dart
View File

@ -22,8 +22,8 @@ void main() {
await SemanticsService.announce('announcement 2', TextDirection.rtl);
expect(log, equals(<Map<String, dynamic>>[
<String, dynamic> {'type': 'announce', 'data': <String, dynamic> {'message': 'announcement 1', 'textDirection': 1}},
<String, dynamic> {'type': 'announce', 'data': <String, dynamic> {'message': 'announcement 2', 'textDirection': 0}},
<String, dynamic>{'type': 'announce', 'data': <String, dynamic>{'message': 'announcement 1', 'textDirection': 1}},
<String, dynamic>{'type': 'announce', 'data': <String, dynamic>{'message': 'announcement 2', 'textDirection': 0}},
]));
});
}

4
packages/flutter/test/services/message_codecs_test.dart
View File

@ -67,7 +67,7 @@ void main() {
'',
'hello',
<dynamic>['nested', <dynamic>[]],
<dynamic, dynamic>{ 'a': 'nested', 'b': <dynamic, dynamic>{} },
<dynamic, dynamic>{'a': 'nested', 'b': <dynamic, dynamic>{}},
'world',
];
_checkEncodeDecode<dynamic>(json, message);
@ -185,7 +185,7 @@ void main() {
double.nan,
]),
<dynamic>['nested', <dynamic>[]],
<dynamic, dynamic>{ 'a': 'nested', null: <dynamic, dynamic>{} },
<dynamic, dynamic>{'a': 'nested', null: <dynamic, dynamic>{}},
'world',
];
_checkEncodeDecode<dynamic>(standard, message);

8
packages/flutter/test/services/text_input_test.dart
View File

@ -26,7 +26,9 @@ void main() {
);
final Map<String, dynamic> json = configuration.toJson();
expect(json['inputType'], <String, dynamic>{
'name': 'TextInputType.text', 'signed': null, 'decimal': null,
'name': 'TextInputType.text',
'signed': null,
'decimal': null,
});
expect(json['obscureText'], true);
expect(json['autocorrect'], false);
@ -42,7 +44,9 @@ void main() {
);
final Map<String, dynamic> json = configuration.toJson();
expect(json['inputType'], <String, dynamic>{
'name': 'TextInputType.number', 'signed': false, 'decimal': true,
'name': 'TextInputType.number',
'signed': false,
'decimal': true,
});
expect(json['obscureText'], true);
expect(json['autocorrect'], false);

4
packages/flutter/test/widgets/backdrop_filter_test.dart
View File

@ -37,8 +37,8 @@ void main() {
),
),
],
)
)
),
),
)
);
await expectLater(

6
packages/flutter/test/widgets/heroes_test.dart
View File

@ -1649,8 +1649,7 @@ void main() {
expect(tester.takeException(), isAssertionError);
});
testWidgets('Hero within a Hero subtree with Builder, throws', (
WidgetTester tester) async {
testWidgets('Hero within a Hero subtree with Builder, throws', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
home: Material(
@ -1672,8 +1671,7 @@ void main() {
expect(tester.takeException(),isAssertionError);
});
testWidgets('Hero within a Hero subtree with LayoutBuilder, throws', (
WidgetTester tester) async {
testWidgets('Hero within a Hero subtree with LayoutBuilder, throws', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
home: Material(

2
packages/flutter/test/widgets/image_test.dart
View File

@ -902,7 +902,7 @@ class TestImageProvider extends ImageProvider<TestImageProvider> {
}
class TestImageStreamCompleter extends ImageStreamCompleter {
final Map<ImageListener, ImageErrorListener> listeners = <ImageListener, ImageErrorListener> {};
final Map<ImageListener, ImageErrorListener> listeners = <ImageListener, ImageErrorListener>{};
@override
void addListener(ImageListener listener, { ImageErrorListener onError }) {

3
packages/flutter/test/widgets/linked_scroll_view_test.dart
View File

@ -105,7 +105,8 @@ class LinkedScrollController extends ScrollController {
}
class LinkedScrollPosition extends ScrollPositionWithSingleContext {
LinkedScrollPosition(this.owner, {
LinkedScrollPosition(
this.owner, {
ScrollPhysics physics,
ScrollContext context,
double initialPixels,

4
packages/flutter/test/widgets/navigator_replacement_test.dart
View File

@ -9,7 +9,7 @@ void main() {
testWidgets('Back during pushReplacement', (WidgetTester tester) async {
await tester.pumpWidget(MaterialApp(
home: const Material(child: Text('home')),
routes: <String, WidgetBuilder> {
routes: <String, WidgetBuilder>{
'/a': (BuildContext context) => const Material(child: Text('a')),
'/b': (BuildContext context) => const Material(child: Text('b')),
},
@ -42,7 +42,7 @@ void main() {
testWidgets('pushAndRemoveUntil', (WidgetTester tester) async {
await tester.pumpWidget(MaterialApp(
home: const Material(child: Text('home')),
routes: <String, WidgetBuilder> {
routes: <String, WidgetBuilder>{
'/a': (BuildContext context) => const Material(child: Text('a')),
'/b': (BuildContext context) => const Material(child: Text('b')),
},

2
packages/flutter/test/widgets/obscured_animated_image_test.dart
View File

@ -22,7 +22,7 @@ Future<void> main() async {
await tester.pumpWidget(
MaterialApp(
home: Image(image: fakeImageProvider, excludeFromSemantics: true, key: imageKey),
routes: <String, WidgetBuilder> {
routes: <String, WidgetBuilder>{
'/page': (BuildContext context) => Container(),
},
)

8
packages/flutter/test/widgets/semantics_event_test.dart
View File

@ -27,9 +27,9 @@ void main() {
test('SemanticsEvent.toMap', () {
expect(
TestSemanticsEvent(text: 'hi', number: 11).toMap(),
<String, dynamic> {
<String, dynamic>{
'type': 'TestEvent',
'data': <String, dynamic> {
'data': <String, dynamic>{
'text': 'hi',
'number': 11,
},
@ -37,10 +37,10 @@ void main() {
);
expect(
TestSemanticsEvent(text: 'hi', number: 11).toMap(nodeId: 123),
<String, dynamic> {
<String, dynamic>{
'type': 'TestEvent',
'nodeId': 123,
'data': <String, dynamic> {
'data': <String, dynamic>{
'text': 'hi',
'number': 11,
},

21
packages/flutter/test/widgets/semantics_tester.dart
View File

@ -621,17 +621,16 @@ class SemanticsTester {
class _HasSemantics extends Matcher {
const _HasSemantics(
this._semantics,
{
@required this.ignoreRect,
@required this.ignoreTransform,
@required this.ignoreId,
@required this.childOrder,
}) : assert(_semantics != null),
assert(ignoreRect != null),
assert(ignoreId != null),
assert(ignoreTransform != null),
assert(childOrder != null);
this._semantics, {
@required this.ignoreRect,
@required this.ignoreTransform,
@required this.ignoreId,
@required this.childOrder,
}) : assert(_semantics != null),
assert(ignoreRect != null),
assert(ignoreId != null),
assert(ignoreTransform != null),
assert(childOrder != null);
final TestSemantics _semantics;
final bool ignoreRect;

2
packages/flutter/test/widgets/sliver_appbar_opacity.dart
View File

@ -166,7 +166,7 @@ void main() {
class _TestWidget extends StatelessWidget {
const _TestWidget({this.pinned, this.floating, this.bottom, this.controller,});
const _TestWidget({this.pinned, this.floating, this.bottom, this.controller});
final bool pinned;
final bool floating;

4
packages/flutter/test/widgets/table_test.dart
View File

@ -73,7 +73,7 @@ void main() {
textDirection: TextDirection.ltr,
child: Center(
child: Table(
columnWidths: const <int, TableColumnWidth> {
columnWidths: const <int, TableColumnWidth>{
0: FixedColumnWidth(100.0),
1: FixedColumnWidth(110.0),
2: FixedColumnWidth(125.0),
@ -143,7 +143,7 @@ void main() {
textDirection: TextDirection.rtl,
child: Center(
child: Table(
columnWidths: const <int, TableColumnWidth> {
columnWidths: const <int, TableColumnWidth>{
0: FixedColumnWidth(100.0),
1: FixedColumnWidth(110.0),
2: FixedColumnWidth(125.0),

2
packages/flutter/test/widgets/widget_inspector_test.dart
View File

@ -964,7 +964,7 @@ class TestWidgetInspectorService extends Object with WidgetInspectorService {
expect(selectionChangedCount, equals(2));
expect(service.selection.current, equals(elementB.renderObject));
await service.testExtension('setSelectionById', <String, String>{'arg' : service.toId(elementA, 'my-group'), 'objectGroup': 'my-group'});
await service.testExtension('setSelectionById', <String, String>{'arg': service.toId(elementA, 'my-group'), 'objectGroup': 'my-group'});
expect(selectionChangedCount, equals(3));
expect(service.selection.currentElement, equals(elementA));
expect(service.selection.current, equals(elementA.renderObject));

2
packages/flutter_driver/lib/src/driver/timeline_summary.dart
View File

@ -85,7 +85,7 @@ class TimelineSummary {
/// Encodes this summary as JSON.
Map<String, dynamic> get summaryJson {
return <String, dynamic> {
return <String, dynamic>{
'average_frame_build_time_millis': computeAverageFrameBuildTimeMillis(),
'90th_percentile_frame_build_time_millis': computePercentileFrameBuildTimeMillis(90.0),
'99th_percentile_frame_build_time_millis': computePercentileFrameBuildTimeMillis(99.0),

4
packages/flutter_driver/test/flutter_driver_test.dart
View File

@ -300,7 +300,7 @@ void main() {
when(mockPeer.sendRequest('_getVMTimeline')).thenAnswer((Invocation invocation) async {
log.add('download');
return <String, dynamic> {
return <String, dynamic>{
'traceEvents': <dynamic>[
<String, String>{
'name': 'test event',
@ -359,7 +359,7 @@ void main() {
});
when(mockPeer.sendRequest('_getVMTimeline')).thenAnswer((Invocation invocation) async {
return <String, dynamic> {
return <String, dynamic>{
'traceEvents': <dynamic>[
<String, String>{
'name': 'test event',

13
packages/flutter_driver/test/src/timeline_summary_test.dart
View File

@ -21,15 +21,22 @@ void main() {
}
Map<String, dynamic> build(int timeStamp, int duration) => <String, dynamic>{
'name': 'Frame', 'ph': 'X', 'ts': timeStamp, 'dur': duration,
'name': 'Frame',
'ph': 'X',
'ts': timeStamp,
'dur': duration,
};
Map<String, dynamic> begin(int timeStamp) => <String, dynamic>{
'name': 'GPURasterizer::Draw', 'ph': 'B', 'ts': timeStamp,
'name': 'GPURasterizer::Draw',
'ph': 'B',
'ts': timeStamp,
};
Map<String, dynamic> end(int timeStamp) => <String, dynamic>{
'name': 'GPURasterizer::Draw', 'ph': 'E', 'ts': timeStamp,
'name': 'GPURasterizer::Draw',
'ph': 'E',
'ts': timeStamp,
};
List<Map<String, dynamic>> rasterizeTimeSequenceInMillis(List<int> sequence) {

9
packages/flutter_test/lib/src/binding.dart
View File

@ -231,7 +231,8 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
/// [AutomatedTestWidgetsFlutterBinding] implementation to increase the
/// current timeout. See [AutomatedTestWidgetsFlutterBinding.addTime] for
/// details. The value is ignored by the [LiveTestWidgetsFlutterBinding].
Future<T> runAsync<T>(Future<T> callback(), {
Future<T> runAsync<T>(
Future<T> callback(), {
Duration additionalTime = const Duration(milliseconds: 1000),
});
@ -740,7 +741,8 @@ class AutomatedTestWidgetsFlutterBinding extends TestWidgetsFlutterBinding {
}
@override
Future<T> runAsync<T>(Future<T> callback(), {
Future<T> runAsync<T>(
Future<T> callback(), {
Duration additionalTime = const Duration(milliseconds: 1000),
}) {
assert(additionalTime != null);
@ -1249,7 +1251,8 @@ class LiveTestWidgetsFlutterBinding extends TestWidgetsFlutterBinding {
}
@override
Future<T> runAsync<T>(Future<T> callback(), {
Future<T> runAsync<T>(
Future<T> callback(), {
Duration additionalTime = const Duration(milliseconds: 1000),
}) async {
assert(() {

4
packages/flutter_test/lib/src/finders.dart
View File

@ -654,7 +654,9 @@ class _ElementPredicateFinder extends MatchFinder {
}
class _DescendantFinder extends Finder {
_DescendantFinder(this.ancestor, this.descendant, {
_DescendantFinder(
this.ancestor,
this.descendant, {
this.matchRoot = false,
bool skipOffstage = true,
}) : super(skipOffstage: skipOffstage);

3
packages/flutter_test/lib/src/widget_tester.dart
View File

@ -409,7 +409,8 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker
/// are required to wait for the returned future to complete before calling
/// this method again. Attempts to do otherwise will result in a
/// [TestFailure] error being thrown.
Future<T> runAsync<T>(Future<T> callback(), {
Future<T> runAsync<T>(
Future<T> callback(), {
Duration additionalTime = const Duration(milliseconds: 1000),
}) => binding.runAsync<T>(callback, additionalTime: additionalTime);

8
packages/flutter_test/lib/src/window.dart
View File

@ -315,9 +315,11 @@ class TestWindow implements Window {
}
@override
void sendPlatformMessage(String name,
ByteData data,
PlatformMessageResponseCallback callback) {
void sendPlatformMessage(
String name,
ByteData data,
PlatformMessageResponseCallback callback,
) {
_window.sendPlatformMessage(name, data, callback);
}

3
packages/flutter_test/test/finders_test.dart
View File

@ -162,6 +162,5 @@ class SimpleCustomSemanticsRenderObject extends RenderBox {
void describeSemanticsConfiguration(SemanticsConfiguration config) {
super.describeSemanticsConfiguration(config);
config..label = label..textDirection = TextDirection.ltr;
}
}
}

2
packages/flutter_tools/bin/fuchsia_attach.dart
View File

@ -113,7 +113,7 @@ Future<void> main(List<String> args) async {
platformKernelDill: platformKernelDill,
flutterPatchedSdk: flutterPatchedSdk,
),
}
},
);
}

3
packages/flutter_tools/lib/src/android/android_sdk.dart
View File

@ -588,7 +588,8 @@ class AndroidSdk {
}
class AndroidSdkVersion implements Comparable<AndroidSdkVersion> {
AndroidSdkVersion._(this.sdk, {
AndroidSdkVersion._(
this.sdk, {
@required this.sdkLevel,
@required this.platformName,
@required this.buildToolsVersion,

10
packages/flutter_tools/lib/src/android/android_studio.dart
View File

@ -30,9 +30,13 @@ final RegExp _dotHomeStudioVersionMatcher =
String get javaPath => androidStudio?.javaPath;
class AndroidStudio implements Comparable<AndroidStudio> {
AndroidStudio(this.directory,
{Version version, this.configured, this.studioAppName = 'AndroidStudio', this.presetPluginsPath})
: version = version ?? Version.unknown {
AndroidStudio(
this.directory, {
Version version,
this.configured,
this.studioAppName = 'AndroidStudio',
this.presetPluginsPath,
}) : version = version ?? Version.unknown {
_init();
}

4
packages/flutter_tools/lib/src/build_info.dart
View File

@ -10,7 +10,9 @@ import 'globals.dart';
/// Information about a build to be performed or used.
class BuildInfo {
const BuildInfo(this.mode, this.flavor, {
const BuildInfo(
this.mode,
this.flavor, {
this.trackWidgetCreation = false,
this.compilationTraceFilePath,
this.createBaseline = false,

3
packages/flutter_tools/lib/src/build_runner/build_runner.dart
View File

@ -119,7 +119,8 @@ class BuildRunner extends CodeGenerator {
}
@override
Future<CodegenDaemon> daemon(FlutterProject flutterProject, {
Future<CodegenDaemon> daemon(
FlutterProject flutterProject, {
String mainPath,
bool linkPlatformKernelIn = false,
bool targetProductVm = false,

8
packages/flutter_tools/lib/src/commands/daemon.dart
View File

@ -528,7 +528,7 @@ class AppDomain extends Domain {
return app.stop().then<bool>(
(void value) => true,
onError: (dynamic error, StackTrace stack) {
_sendAppEvent(app, 'log', <String, dynamic>{ 'log': '$error', 'error': true });
_sendAppEvent(app, 'log', <String, dynamic>{'log': '$error', 'error': true});
app.closeLogger();
_apps.remove(app);
return false;
@ -546,7 +546,7 @@ class AppDomain extends Domain {
return app.detach().then<bool>(
(void value) => true,
onError: (dynamic error, StackTrace stack) {
_sendAppEvent(app, 'log', <String, dynamic>{ 'log': '$error', 'error': true });
_sendAppEvent(app, 'log', <String, dynamic>{'log': '$error', 'error': true});
app.closeLogger();
_apps.remove(app);
return false;
@ -559,7 +559,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);
@ -951,7 +951,7 @@ class _AppRunLogger extends Logger {
if (parent != null) {
parent.printTrace(message);
} else {
_sendLogEvent(<String, dynamic>{ 'log': message, 'trace': true });
_sendLogEvent(<String, dynamic>{'log': message, 'trace': true});
}
}

4
packages/flutter_tools/lib/src/commands/run.dart
View File

@ -34,7 +34,7 @@ abstract class RunCommandBase extends FlutterCommand {
)
..addFlag('verbose-system-logs',
negatable: false,
help: 'Include verbose logging from the flutter engine.'
help: 'Include verbose logging from the flutter engine.',
)
..addOption('route',
help: 'Which route to load when running the app.',
@ -203,7 +203,7 @@ class RunCommand extends RunCommandBase {
? getNameForTargetPlatform(await devices[0].targetPlatform)
: 'multiple';
return <String, String>{ 'cd3': '$isEmulator', 'cd4': deviceType };
return <String, String>{'cd3': '$isEmulator', 'cd4': deviceType};
}
@override

5
packages/flutter_tools/lib/src/commands/update_packages.dart
View File

@ -909,7 +909,10 @@ class PubspecHeader extends PubspecLine {
/// A dependency, as represented by a line (or two) from a pubspec.yaml file.
class PubspecDependency extends PubspecLine {
PubspecDependency(String line, this.name, this.suffix, {
PubspecDependency(
String line,
this.name,
this.suffix, {
@required this.isTransitive,
DependencyKind kind,
this.version,

3
packages/flutter_tools/lib/src/compile.dart
View File

@ -412,7 +412,8 @@ class _RejectRequest extends _CompilationRequest {
/// The wrapper is intended to stay resident in memory as user changes, reloads,
/// restarts the Flutter app.
class ResidentCompiler {
ResidentCompiler(this._sdkRoot, {
ResidentCompiler(
this._sdkRoot, {
bool trackWidgetCreation = false,
String packagesPath,
List<String> fileSystemRoots,

2
packages/flutter_tools/lib/src/dart/pub.dart
View File

@ -76,7 +76,7 @@ Future<void> pubGet({
bool upgrade = false,
bool offline = false,
bool checkLastModified = true,
bool skipPubspecYamlCheck = false
bool skipPubspecYamlCheck = false,
}) async {
directory ??= fs.currentDirectory.path;

9
packages/flutter_tools/lib/src/devfs.dart
View File

@ -241,7 +241,7 @@ class ServiceProtocolDevFSOperations implements DevFSOperations {
try {
return await vmService.vm.invokeRpcRaw(
'_writeDevFSFile',
params: <String, dynamic> {
params: <String, dynamic>{
'fsName': fsName,
'uri': deviceUri.toString(),
'fileContents': fileContents,
@ -337,8 +337,11 @@ class _DevFSHttpWriter {
// Basic statistics for DevFS update operation.
class UpdateFSReport {
UpdateFSReport({bool success = false,
int invalidatedSourcesCount = 0, int syncedBytes = 0}) {
UpdateFSReport({
bool success = false,
int invalidatedSourcesCount = 0,
int syncedBytes = 0,
}) {
_success = success;
_invalidatedSourcesCount = invalidatedSourcesCount;
_syncedBytes = syncedBytes;

3
packages/flutter_tools/lib/src/device.dart
View File

@ -364,7 +364,8 @@ abstract class Device {
}
class DebuggingOptions {
DebuggingOptions.enabled(this.buildInfo, {
DebuggingOptions.enabled(
this.buildInfo, {
this.startPaused = false,
this.enableSoftwareRendering = false,
this.skiaDeterministicRendering = false,

7
packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart
View File

@ -213,8 +213,7 @@ class FuchsiaDevice extends Device {
_FuchsiaPortForwarder _portForwarder;
@override
void clearLogs() {
}
void clearLogs() { }
@override
bool get supportsScreenshot => false;
@ -306,7 +305,9 @@ class FuchsiaDevice extends Device {
}
class FuchsiaIsolateDiscoveryProtocol {
FuchsiaIsolateDiscoveryProtocol(this._device, this._isolateName, [
FuchsiaIsolateDiscoveryProtocol(
this._device,
this._isolateName, [
this._vmServiceConnector = _kDefaultFuchsiaIsolateDiscoveryConnector,
this._pollOnce = false,
]);

2
packages/flutter_tools/lib/src/ios/code_signing.dart
View File

@ -163,7 +163,7 @@ Future<Map<String, String>> getCodeSigningIdentityDevelopmentTeam({
if (await opensslProcess.exitCode != 0)
return null;
return <String, String> {
return <String, String>{
'DEVELOPMENT_TEAM': _certificateOrganizationalUnitExtractionPattern
.firstMatch(opensslOutput)
?.group(1),

3
packages/flutter_tools/lib/src/ios/devices.dart
View File

@ -389,8 +389,7 @@ class IOSDevice extends Device {
DevicePortForwarder get portForwarder => _portForwarder ??= _IOSDevicePortForwarder(this);
@override
void clearLogs() {
}
void clearLogs() { }
@override
bool get supportsScreenshot => iMobileDevice.isInstalled;

30
packages/flutter_tools/lib/src/ios/mac.dart
View File

@ -625,15 +625,13 @@ Future<void> diagnoseXcodeBuildFailure(XcodeBuildResult result) async {
}
class XcodeBuildResult {
XcodeBuildResult(
{
@required this.success,
this.output,
this.stdout,
this.stderr,
this.xcodeBuildExecution,
}
);
XcodeBuildResult({
@required this.success,
this.output,
this.stdout,
this.stderr,
this.xcodeBuildExecution,
});
final bool success;
final String output;
@ -645,14 +643,12 @@ class XcodeBuildResult {
/// Describes an invocation of a Xcode build command.
class XcodeBuildExecution {
XcodeBuildExecution(
{
@required this.buildCommands,
@required this.appDirectory,
@required this.buildForPhysicalDevice,
@required this.buildSettings,
}
);
XcodeBuildExecution({
@required this.buildCommands,
@required this.appDirectory,
@required this.buildForPhysicalDevice,
@required this.buildSettings,
});
/// The original list of Xcode build commands used to produce this build result.
final List<String> buildCommands;

2
packages/flutter_tools/lib/src/macos/application_package.dart
View File

@ -9,7 +9,7 @@ import '../base/file_system.dart';
import '../globals.dart';
import '../ios/plist_utils.dart' as plist;
/// Tests whether a [FileSystemEntity] is an macOS bundle directory
/// Tests whether a [FileSystemEntity] is an macOS bundle directory
bool _isBundleDirectory(FileSystemEntity entity) =>
entity is Directory && entity.path.endsWith('.app');

9
packages/flutter_tools/lib/src/resident_runner.dart
View File

@ -28,7 +28,8 @@ import 'run_hot.dart';
import 'vmservice.dart';
class FlutterDevice {
FlutterDevice(this.device, {
FlutterDevice(
this.device, {
@required this.trackWidgetCreation,
this.dillOutputPath,
this.fileSystemRoots,
@ -48,7 +49,8 @@ class FlutterDevice {
);
/// Create a [FlutterDevice] with optional code generation enabled.
static Future<FlutterDevice> create(Device device, {
static Future<FlutterDevice> create(
Device device, {
@required bool trackWidgetCreation,
String dillOutputPath,
List<String> fileSystemRoots,
@ -482,7 +484,8 @@ class FlutterDevice {
// Shared code between different resident application runners.
abstract class ResidentRunner {
ResidentRunner(this.flutterDevices, {
ResidentRunner(
this.flutterDevices, {
this.target,
this.debuggingOptions,
this.usesTerminalUI = true,

9
packages/flutter_tools/lib/src/run_hot.dart
View File

@ -93,8 +93,11 @@ class HotRunner extends ResidentRunner {
benchmarkData[name].add(value);
}
Future<void> _reloadSourcesService(String isolateId,
{ bool force = false, bool pause = false }) async {
Future<void> _reloadSourcesService(
String isolateId, {
bool force = false,
bool pause = false,
}) async {
// TODO(cbernaschina): check that isolateId is the id of the UI isolate.
final OperationResult result = await restart(pauseAfterRestart: pause);
if (!result.isOk) {
@ -589,7 +592,7 @@ class HotRunner extends ResidentRunner {
}
}
Future<OperationResult> _reloadSources({ bool pause = false, String reason, void Function(String message) onSlow, }) async {
Future<OperationResult> _reloadSources({ bool pause = false, String reason, void Function(String message) onSlow }) async {
final Map<String, String> analyticsParameters = <String, String>{};
if (reason != null) {
analyticsParameters[kEventReloadReasonParameterName] = reason;

10
packages/flutter_tools/lib/src/vmservice.dart
View File

@ -424,8 +424,10 @@ abstract class ServiceObject {
/// Factory constructor given a [ServiceObjectOwner] and a service map,
/// upgrade the map into a proper [ServiceObject]. This function always
/// returns a new instance and does not interact with caches.
factory ServiceObject._fromMap(ServiceObjectOwner owner,
Map<String, dynamic> map) {
factory ServiceObject._fromMap(
ServiceObjectOwner owner,
Map<String, dynamic> map,
) {
if (map == null)
return null;
@ -873,7 +875,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.
@ -928,7 +930,7 @@ class VM extends ServiceObjectOwner {
Uri assetsDirectory,
) {
return invokeRpc<ServiceMap>('_flutter.runInView',
params: <String, dynamic> {
params: <String, dynamic>{
'viewId': viewId,
'mainScript': main.toString(),
'packagesFile': packages.toString(),

7
packages/flutter_tools/lib/src/vscode/vscode.dart
View File

@ -57,8 +57,11 @@ class VsCode {
}
}
factory VsCode.fromDirectory(String installPath, String extensionDirectory,
{ String edition }) {
factory VsCode.fromDirectory(
String installPath,
String extensionDirectory, {
String edition,
}) {
final String packageJsonPath =
fs.path.join(installPath, 'resources', 'app', 'package.json');
final String versionString = _getVersionFromPackageJson(packageJsonPath);

8
packages/flutter_tools/test/artifacts_test.dart
View File

@ -35,7 +35,7 @@ void main() {
artifacts.getArtifactPath(Artifact.flutterTester),
fs.path.join(tempDir.path, 'bin', 'cache', 'artifacts', 'engine', 'linux-x64', 'flutter_tester'),
);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
Cache: () => Cache(rootOverride: tempDir),
Platform: () => FakePlatform(operatingSystem: 'linux'),
});
@ -53,7 +53,7 @@ void main() {
artifacts.getEngineType(TargetPlatform.darwin_x64),
'darwin-x64',
);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
Cache: () => Cache(rootOverride: tempDir),
Platform: () => FakePlatform(operatingSystem: 'linux'),
});
@ -89,7 +89,7 @@ void main() {
artifacts.getArtifactPath(Artifact.engineDartSdkPath),
fs.path.join(tempDir.path, 'out', 'host_debug_unopt', 'dart-sdk'),
);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
Platform: () => FakePlatform(operatingSystem: 'linux'),
});
@ -106,7 +106,7 @@ void main() {
artifacts.getEngineType(TargetPlatform.darwin_x64),
'android_debug_unopt',
);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
Platform: () => FakePlatform(operatingSystem: 'linux'),
});
});

4
packages/flutter_tools/test/base/logger_test.dart
View File

@ -36,7 +36,7 @@ void main() {
r'\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Oooh, I do I do I do\n$'));
expect(mockLogger.traceText, '');
expect(mockLogger.errorText, matches( r'^\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Helpless!\n$'));
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
OutputPreferences: () => OutputPreferences(showColor: false),
Platform: _kNoAnsiPlatform,
});
@ -57,7 +57,7 @@ void main() {
expect(
mockLogger.errorText,
matches('^$red' r'\[ (?: {0,2}\+[0-9]{1,3} ms| )\] ' '${bold}Helpless!$resetBold$resetColor' r'\n$'));
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
OutputPreferences: () => OutputPreferences(showColor: true),
Platform: () => FakePlatform()..stdoutSupportsAnsi = true,
});

2
packages/flutter_tools/test/base/os_utils_test.dart
View File

@ -32,7 +32,7 @@ void main() {
// rwxr--r--
expect(mode.substring(0, 3), endsWith('x'));
}
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
OperatingSystemUtils: () => OperatingSystemUtils(),
});
});

12
packages/flutter_tools/test/base/terminal_test.dart
View File

@ -44,7 +44,7 @@ void main() {
equals('${AnsiTerminal.colorCode(color)}output${AnsiTerminal.resetColor}'),
);
}
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
OutputPreferences: () => OutputPreferences(showColor: true),
Platform: () => FakePlatform()..stdoutSupportsAnsi = true,
});
@ -54,7 +54,7 @@ void main() {
terminal.bolden('output'),
equals('${AnsiTerminal.bold}output${AnsiTerminal.resetBold}'),
);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
OutputPreferences: () => OutputPreferences(showColor: true),
Platform: () => FakePlatform()..stdoutSupportsAnsi = true,
});
@ -68,7 +68,7 @@ void main() {
terminal.color('non-bold ${terminal.bolden('output')} also non-bold', TerminalColor.blue),
equals('${AnsiTerminal.blue}non-bold ${AnsiTerminal.bold}output${AnsiTerminal.resetBold} also non-bold${AnsiTerminal.resetColor}'),
);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
OutputPreferences: () => OutputPreferences(showColor: true),
Platform: () => FakePlatform()..stdoutSupportsAnsi = true,
});
@ -82,7 +82,7 @@ void main() {
terminal.bolden('non-color ${terminal.color('output', TerminalColor.blue)} also non-color'),
equals('${AnsiTerminal.bold}non-color ${AnsiTerminal.blue}output${AnsiTerminal.resetColor} also non-color${AnsiTerminal.resetBold}'),
);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
OutputPreferences: () => OutputPreferences(showColor: true),
Platform: () => FakePlatform()..stdoutSupportsAnsi = true,
});
@ -96,7 +96,7 @@ void main() {
terminal.color('magenta ${terminal.color('output', TerminalColor.blue)} also magenta', TerminalColor.magenta),
equals('${AnsiTerminal.magenta}magenta ${AnsiTerminal.blue}output${AnsiTerminal.resetColor}${AnsiTerminal.magenta} also magenta${AnsiTerminal.resetColor}'),
);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
OutputPreferences: () => OutputPreferences(showColor: true),
Platform: () => FakePlatform()..stdoutSupportsAnsi = true,
});
@ -110,7 +110,7 @@ void main() {
terminal.bolden('bold ${terminal.bolden('output')} still bold'),
equals('${AnsiTerminal.bold}bold output still bold${AnsiTerminal.resetBold}'),
);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
OutputPreferences: () => OutputPreferences(showColor: true),
Platform: () => FakePlatform()..stdoutSupportsAnsi = true,
});

9
packages/flutter_tools/test/build_info_test.dart
View File

@ -9,12 +9,10 @@ import 'src/common.dart';
import 'src/context.dart';
void main() {
setUpAll(() {
});
setUpAll(() { });
group('Validate build number', () {
setUp(() async {
});
setUp(() async { });
testUsingContext('CFBundleVersion for iOS', () async {
String buildName = validatedBuildNumberForPlatform(TargetPlatform.ios, 'xyz');
@ -34,8 +32,7 @@ void main() {
});
group('Validate build name', () {
setUp(() async {
});
setUp(() async { });
testUsingContext('CFBundleShortVersionString for iOS', () async {
String buildName = validatedBuildNameForPlatform(TargetPlatform.ios, 'xyz');

6
packages/flutter_tools/test/commands/create_test.dart
View File

@ -24,7 +24,7 @@ import '../src/context.dart';
const String frameworkRevision = '12345678';
const String frameworkChannel = 'omega';
final Generator _kNoColorTerminalPlatform = () => FakePlatform.fromPlatform(const LocalPlatform())..stdoutSupportsAnsi = false;
final Map<Type, Generator> noColorTerminalOverride = <Type, Generator> {
final Map<Type, Generator> noColorTerminalOverride = <Type, Generator>{
Platform: _kNoColorTerminalPlatform,
};
const String samplesIndexJson = '''[
@ -900,7 +900,7 @@ void main() {
final List<String> args = <String>[
'create',
'--list-samples',
outputFile
outputFile,
];
await runner.run(args);
@ -918,7 +918,7 @@ void main() {
final List<String> args = <String>[
'create',
'--list-samples',
outputFile
outputFile,
];
await expectLater(runner.run(args), throwsToolExit(exitCode: 2, message: 'Failed to write samples'));

8
packages/flutter_tools/test/commands/daemon_test.dart
View File

@ -123,7 +123,7 @@ void main() {
notifyingLogger: notifyingLogger,
);
commands.add(<String, dynamic>{ 'id': 0, 'method': 'app.restart' });
commands.add(<String, dynamic>{'id': 0, 'method': 'app.restart'});
final Map<String, dynamic> response = await responses.stream.firstWhere(_notEvent);
expect(response['id'], 0);
expect(response['error'], contains('appId is required'));
@ -147,7 +147,7 @@ void main() {
commands.add(<String, dynamic>{
'id': 0,
'method': 'app.callServiceExtension',
'params': <String, String> {
'params': <String, String>{
'methodName': 'ext.flutter.debugPaint',
},
});
@ -171,7 +171,7 @@ void main() {
notifyingLogger: notifyingLogger,
);
commands.add(<String, dynamic>{ 'id': 0, 'method': 'app.stop' });
commands.add(<String, dynamic>{'id': 0, 'method': 'app.stop'});
final Map<String, dynamic> response = await responses.stream.firstWhere(_notEvent);
expect(response['id'], 0);
expect(response['error'], contains('appId is required'));
@ -258,7 +258,7 @@ void main() {
notifyingLogger: notifyingLogger,
);
commands.add(<String, dynamic>{ 'id': 0, 'method': 'emulator.launch' });
commands.add(<String, dynamic>{'id': 0, 'method': 'emulator.launch'});
final Map<String, dynamic> response = await responses.stream.firstWhere(_notEvent);
expect(response['id'], 0);
expect(response['error'], contains('emulatorId is required'));

14
packages/flutter_tools/test/commands/version_test.dart
View File

@ -108,12 +108,14 @@ class MockProcessManager extends Mock implements ProcessManager {
}
@override
Future<Process> start(List<dynamic> command,
{String workingDirectory,
Map<String, String> environment,
bool includeParentEnvironment = true,
bool runInShell = false,
ProcessStartMode mode = ProcessStartMode.normal}) {
Future<Process> start(
List<dynamic> command, {
String workingDirectory,
Map<String, String> environment,
bool includeParentEnvironment = true,
bool runInShell = false,
ProcessStartMode mode = ProcessStartMode.normal,
}) {
final Completer<Process> completer = Completer<Process>();
completer.complete(MockProcess());
return completer.future;

19
packages/flutter_tools/test/compile_test.dart
View File

@ -532,9 +532,12 @@ Future<void> _recompile(
mockFrontendServerStdIn._stdInWrites.clear();
}
Future<void> _accept(StreamController<List<int>> streamController,
ResidentCompiler generator, MockStdIn mockFrontendServerStdIn,
String expected) async {
Future<void> _accept(
StreamController<List<int>> streamController,
ResidentCompiler generator,
MockStdIn mockFrontendServerStdIn,
String expected,
) async {
// Put content into the output stream after generator.recompile gets
// going few lines below, resets completer.
generator.accept();
@ -544,9 +547,13 @@ Future<void> _accept(StreamController<List<int>> streamController,
mockFrontendServerStdIn._stdInWrites.clear();
}
Future<void> _reject(StreamController<List<int>> streamController,
ResidentCompiler generator, MockStdIn mockFrontendServerStdIn,
String mockCompilerOutput, String expected) async {
Future<void> _reject(
StreamController<List<int>> streamController,
ResidentCompiler generator,
MockStdIn mockFrontendServerStdIn,
String mockCompilerOutput,
String expected,
) async {
// Put content into the output stream after generator.recompile gets
// going few lines below, resets completer.
scheduleMicrotask(() {

2
packages/flutter_tools/test/crash_reporting_test.dart
View File

@ -151,7 +151,7 @@ void main() {
'version': 'test-version',
},
));
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
Platform: () => FakePlatform(
operatingSystem: 'linux',
environment: <String, String>{

4
packages/flutter_tools/test/hot_test.dart
View File

@ -237,7 +237,7 @@ void main() {
];
await HotRunner(devices).cleanupAfterSignal();
expect(shutdownTestingConfig.shutdownHookCalled, true);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
Artifacts: () => mockArtifacts,
HotRunnerConfig: () => shutdownTestingConfig,
});
@ -252,7 +252,7 @@ void main() {
];
await HotRunner(devices).preStop();
expect(shutdownTestingConfig.shutdownHookCalled, true);
}, overrides: <Type, Generator> {
}, overrides: <Type, Generator>{
Artifacts: () => mockArtifacts,
HotRunnerConfig: () => shutdownTestingConfig,
});

10
packages/flutter_tools/test/ios/code_signing_test.dart
View File

@ -146,7 +146,7 @@ void main() {
expect(testLogger.statusText, contains('iPhone Developer: Profile 1 (1111AAAA11)'));
expect(testLogger.errorText, isEmpty);
verify(mockStdIn.write('This is a mock certificate'));
expect(signingConfigs, <String, String> {'DEVELOPMENT_TEAM': '3333CCCC33'});
expect(signingConfigs, <String, String>{'DEVELOPMENT_TEAM': '3333CCCC33'});
},
overrides: <Type, Generator>{
ProcessManager: () => mockProcessManager,
@ -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>{

5
packages/flutter_tools/test/version_test.dart
View File

@ -403,11 +403,12 @@ void main() {
expect(GitTagVersion.parse('v1.2.3-4-gx$hash').frameworkVersionFor(hash), '0.0.0-unknown');
expect(testLogger.statusText, '');
expect(testLogger.errorText, '');
expect(testLogger.traceText,
expect(
testLogger.traceText,
'Could not interpret results of "git describe": x1.2.3-4-gabcdef\n'
'Could not interpret results of "git describe": v1.0.0-unknown-0-gabcdef\n'
'Could not interpret results of "git describe": beta-1-gabcdef\n'
'Could not interpret results of "git describe": v1.2.3-4-gxabcdef\n'
'Could not interpret results of "git describe": v1.2.3-4-gxabcdef\n',
);
});
}

6
packages/flutter_tools/tool/daemon_client.dart
View File

@ -40,7 +40,7 @@ Future<void> main() async {
} else if (words.first == 'start') {
_send(<String, dynamic>{
'method': 'app.start',
'params': <String, dynamic> {
'params': <String, dynamic>{
'deviceId': words[1],
'projectDirectory': words[2],
'launchMode': words[3],
@ -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'});