From 1cc036519cb6af2bc1af8c9bc39468bc2fc8e05f Mon Sep 17 00:00:00 2001 From: Greg Spencer Date: Thu, 19 Jul 2018 23:03:58 -0700 Subject: [PATCH] Removes trailing whitespace from source files. (#19329) --- .../ios/Runner/NativeViewController.h | 2 +- .../src/foundation/consolidate_response.dart | 4 +-- packages/flutter/lib/src/material/app.dart | 2 +- packages/flutter/lib/src/material/dialog.dart | 16 ++++++------ .../src/material/material_localizations.dart | 10 +++---- .../flutter/lib/src/material/popup_menu.dart | 10 +++---- .../flutter/lib/src/material/text_field.dart | 4 +-- .../flutter/lib/src/material/typography.dart | 8 +++--- .../flutter/lib/src/painting/gradient.dart | 16 ++++++------ .../flutter/lib/src/painting/text_style.dart | 26 +++++++++---------- .../lib/src/rendering/custom_layout.dart | 8 +++--- packages/flutter/lib/src/rendering/view.dart | 2 +- .../flutter/lib/src/semantics/semantics.dart | 10 +++---- .../lib/src/semantics/semantics_event.dart | 2 +- .../lib/src/semantics/semantics_service.dart | 2 +- .../lib/src/services/system_chrome.dart | 12 ++++----- .../flutter/lib/src/services/text_input.dart | 4 +-- packages/flutter/lib/src/widgets/basic.dart | 4 +-- .../flutter/lib/src/widgets/drag_target.dart | 4 +-- .../lib/src/widgets/editable_text.dart | 4 +-- .../flutter/lib/src/widgets/framework.dart | 6 ++--- .../flutter/test/cupertino/slider_test.dart | 18 ++++++------- .../test/foundation/licenses_test.dart | 6 ++--- .../flutter/test/material/scaffold_test.dart | 2 +- .../flutter/test/painting/gradient_test.dart | 10 +++---- .../test/painting/text_style_test.dart | 2 +- .../flutter/test/scheduler/ticker_test.dart | 4 +-- .../test/services/fake_platform_views.dart | 2 +- .../flutter/test/widgets/draggable_test.dart | 6 ++--- .../test/widgets/set_state_5_test.dart | 2 +- .../flutter/test/widgets/spacer_test.dart | 2 +- .../flutter_driver/lib/src/common/find.dart | 2 +- .../flutter_driver/lib/src/driver/driver.dart | 4 +-- .../lib/src/extension/extension.dart | 2 +- .../test/src/extension_test.dart | 12 ++++----- .../flutter_test/lib/src/widget_tester.dart | 2 +- packages/flutter_test/test/finders_test.dart | 2 +- .../flutter_test/test/widget_tester_test.dart | 2 +- .../lib/src/android/android_sdk.dart | 2 +- .../lib/src/commands/daemon.dart | 2 +- .../lib/src/crash_reporting.dart | 4 +-- .../lib/src/ios/code_signing.dart | 12 ++++----- packages/flutter_tools/test/cache_test.dart | 2 +- .../test/commands/doctor_test.dart | 2 +- .../test/integration/flutter_attach.dart | 2 +- .../integration/test_data/basic_project.dart | 4 +-- .../test/integration/test_driver.dart | 10 +++---- 47 files changed, 138 insertions(+), 138 deletions(-) diff --git a/examples/flutter_view/ios/Runner/NativeViewController.h b/examples/flutter_view/ios/Runner/NativeViewController.h index e3c1329f201..c1718356c45 100644 --- a/examples/flutter_view/ios/Runner/NativeViewController.h +++ b/examples/flutter_view/ios/Runner/NativeViewController.h @@ -11,7 +11,7 @@ @end -@interface NativeViewController: UIViewController +@interface NativeViewController: UIViewController @property (strong, nonatomic) id delegate; - (void) didReceiveIncrement; @end diff --git a/packages/flutter/lib/src/foundation/consolidate_response.dart b/packages/flutter/lib/src/foundation/consolidate_response.dart index cd6f1589fd0..f28e39cda0e 100644 --- a/packages/flutter/lib/src/foundation/consolidate_response.dart +++ b/packages/flutter/lib/src/foundation/consolidate_response.dart @@ -7,7 +7,7 @@ import 'dart:io'; import 'dart:typed_data'; /// Efficiently converts the response body of an [HttpClientResponse] into a [Uint8List]. -/// +/// /// The future returned will forward all errors emitted by [response]. Future consolidateHttpClientResponseBytes(HttpClientResponse response) { // response.contentLength is not trustworthy when GZIP is involved @@ -28,6 +28,6 @@ Future consolidateHttpClientResponseBytes(HttpClientResponse response } completer.complete(bytes); }, onError: completer.completeError, cancelOnError: true); - + return completer.future; } diff --git a/packages/flutter/lib/src/material/app.dart b/packages/flutter/lib/src/material/app.dart index 089d8c4a4d6..a0bbe3f34ef 100644 --- a/packages/flutter/lib/src/material/app.dart +++ b/packages/flutter/lib/src/material/app.dart @@ -587,7 +587,7 @@ class _MaterialAppState extends State { }, ) ); - + assert(() { if (widget.debugShowMaterialGrid) { result = new GridPaper( diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart index 776fa2b8d88..0a60297d1b9 100644 --- a/packages/flutter/lib/src/material/dialog.dart +++ b/packages/flutter/lib/src/material/dialog.dart @@ -217,15 +217,15 @@ class AlertDialog extends StatelessWidget { /// from the [actions]. final List actions; - /// The semantic label of the dialog used by accessibility frameworks to + /// The semantic label of the dialog used by accessibility frameworks to /// announce screen transitions when the dialog is opened and closed. - /// + /// /// If this label is not provided, a semantic label will be infered from the /// [title] if it is not null. If there is no title, the label will be taken /// from [MaterialLocalizations.alertDialogLabel]. - /// + /// /// See also: - /// + /// /// * [SemanticsConfiguration.isRouteName], for a description of how this /// value is used. final String semanticLabel; @@ -475,15 +475,15 @@ class SimpleDialog extends StatelessWidget { /// the top padding ends up being 24 pixels. final EdgeInsetsGeometry contentPadding; - /// The semantic label of the dialog used by accessibility frameworks to + /// The semantic label of the dialog used by accessibility frameworks to /// announce screen transitions when the dialog is opened and closed. - /// + /// /// If this label is not provided, a semantic label will be infered from the /// [title] if it is not null. If there is no title, the label will be taken /// from [MaterialLocalizations.dialogLabel]. - /// + /// /// See also: - /// + /// /// * [SemanticsConfiguration.isRouteName], for a description of how this /// value is used. final String semanticLabel; diff --git a/packages/flutter/lib/src/material/material_localizations.dart b/packages/flutter/lib/src/material/material_localizations.dart index d86ad9a0227..5003027fef0 100644 --- a/packages/flutter/lib/src/material/material_localizations.dart +++ b/packages/flutter/lib/src/material/material_localizations.dart @@ -144,19 +144,19 @@ abstract class MaterialLocalizations { /// user interaction with elements behind it. String get modalBarrierDismissLabel; - /// Label read out by accessibility tools (TalkBack or VoiceOver) when a + /// Label read out by accessibility tools (TalkBack or VoiceOver) when a /// drawer widget is opened. String get drawerLabel; - - /// Label read out by accessibility tools (TalkBack or VoiceOver) when a + + /// Label read out by accessibility tools (TalkBack or VoiceOver) when a /// popup menu widget is opened. String get popupMenuLabel; - /// Label read out by accessibility tools (TalkBack or VoiceOver) when a + /// Label read out by accessibility tools (TalkBack or VoiceOver) when a /// dialog widget is opened. String get dialogLabel; - /// Label read out by accessibility tools (TalkBack or VoiceOver) when an + /// Label read out by accessibility tools (TalkBack or VoiceOver) when an /// alert dialog widget is opened. String get alertDialogLabel; diff --git a/packages/flutter/lib/src/material/popup_menu.dart b/packages/flutter/lib/src/material/popup_menu.dart index ebb4588c3bc..77a3d86167b 100644 --- a/packages/flutter/lib/src/material/popup_menu.dart +++ b/packages/flutter/lib/src/material/popup_menu.dart @@ -688,12 +688,12 @@ class _PopupMenuRoute extends PopupRoute { /// The `context` argument is used to look up the [Navigator] and [Theme] for /// the menu. It is only used when the method is called. Its corresponding /// widget can be safely removed from the tree before the popup menu is closed. -/// -/// The `semanticLabel` argument is used by accessibility frameworks to -/// announce screen transitions when the menu is opened and closed. If this -/// label is not provided, it will default to +/// +/// The `semanticLabel` argument is used by accessibility frameworks to +/// announce screen transitions when the menu is opened and closed. If this +/// label is not provided, it will default to /// [MaterialLocalizations.popupMenuLabel]. -/// +/// /// See also: /// /// * [PopupMenuItem], a popup menu entry for a single value. diff --git a/packages/flutter/lib/src/material/text_field.dart b/packages/flutter/lib/src/material/text_field.dart index bfd33735472..7133c20dc56 100644 --- a/packages/flutter/lib/src/material/text_field.dart +++ b/packages/flutter/lib/src/material/text_field.dart @@ -313,9 +313,9 @@ class TextField extends StatefulWidget { final bool enabled; /// The appearance of the keyboard. - /// + /// /// This setting is only honored on iOS devices. - /// + /// /// If unset, defaults to the brightness of [ThemeData.primaryColorBrightness]. final Brightness keyboardAppearance; diff --git a/packages/flutter/lib/src/material/typography.dart b/packages/flutter/lib/src/material/typography.dart index 742856df832..47d56458c76 100644 --- a/packages/flutter/lib/src/material/typography.dart +++ b/packages/flutter/lib/src/material/typography.dart @@ -113,10 +113,10 @@ class TextTheme extends Diagnosticable { /// /// descendants, while leaving other ambient theme attributes alone. /// class TitleColorThemeCopy extends StatelessWidget { /// TitleColorThemeCopy({Key key, this.child, this.titleColor}) : super(key: key); - /// + /// /// final Color titleColor; /// final Widget child; - /// + /// /// @override /// Widget build(BuildContext context) { /// final ThemeData theme = Theme.of(context); @@ -192,10 +192,10 @@ class TextTheme extends Diagnosticable { /// /// descendants, while leaving other ambient theme attributes alone. /// class TitleColorTheme extends StatelessWidget { /// TitleColorTheme({Key key, this.child, this.titleColor}) : super(key: key); - /// + /// /// final Color titleColor; /// final Widget child; - /// + /// /// @override /// Widget build(BuildContext context) { /// ThemeData theme = Theme.of(context); diff --git a/packages/flutter/lib/src/painting/gradient.dart b/packages/flutter/lib/src/painting/gradient.dart index d803ede9c61..4a80840cc11 100644 --- a/packages/flutter/lib/src/painting/gradient.dart +++ b/packages/flutter/lib/src/painting/gradient.dart @@ -443,10 +443,10 @@ class LinearGradient extends Gradient { /// A normal radial gradient has a [center] and a [radius]. The [center] point /// corresponds to 0.0, and the ring at [radius] from the center corresponds /// to 1.0. These lengths are expressed in fractions, so that the same gradient -/// can be reused with varying sized boxes without changing the parameters. +/// can be reused with varying sized boxes without changing the parameters. /// (This contrasts with [new ui.Gradient.radial], whose arguments are expressed /// in logical pixels.) -/// +/// /// It is also possible to create a two-point (or focal pointed) radial gradient /// (which is sometimes referred to as a two point conic gradient, but is not the /// same as a CSS conic gradient which corresponds to a [SweepGradient]). A [focal] @@ -454,7 +454,7 @@ class LinearGradient extends Gradient { /// which will make the rendered gradient appear to be pointed or directed in the /// direction of the [focal] point. This is only important if [focal] and [center] /// are not equal or [focalRadius] > 0.0 (as this case is visually identical to a -/// normal radial gradient). One important case to avoid is having [focal] and +/// normal radial gradient). One important case to avoid is having [focal] and /// [center] both resolve to [Offset.zero] when [focalRadius] > 0.0. In such a case, /// a valid shader cannot be created by the framework. /// @@ -553,17 +553,17 @@ class RadialGradient extends Gradient { /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/tile_mode_clamp_radial.png) /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/tile_mode_mirror_radial.png) /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/tile_mode_repeated_radial.png) - /// + /// /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/tile_mode_clamp_radialWithFocal.png) /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/tile_mode_mirror_radialWithFocal.png) /// ![](https://flutter.github.io/assets-for-api-docs/assets/dart-ui/tile_mode_repeated_radialWithFocal.png) final TileMode tileMode; /// The focal point of the gradient. If specified, the gradient will appear - /// to be focused along the vector from [center] to focal. - /// + /// to be focused along the vector from [center] to focal. + /// /// See [center] for a description of how the coordinates are mapped. - /// + /// /// If this value is specified and [focalRadius] > 0.0, care should be taken /// to ensure that either this value or [center] will not both resolve to /// [Offset.zero], which would fail to create a valid gradient. @@ -575,7 +575,7 @@ class RadialGradient extends Gradient { /// For example, if a radial gradient is painted on a box that is /// 100.0 pixels wide and 200.0 pixels tall, then a radius of 1.0 /// will place the 1.0 stop at 100.0 pixels from the [focus]. - /// + /// /// If this value is specified and is greater than 0.0, either [focal] or /// [center] must not resolve to [Offset.zero], which would fail to create /// a valid gradient. diff --git a/packages/flutter/lib/src/painting/text_style.dart b/packages/flutter/lib/src/painting/text_style.dart index 8224d0b8163..6134c1bc207 100644 --- a/packages/flutter/lib/src/painting/text_style.dart +++ b/packages/flutter/lib/src/painting/text_style.dart @@ -50,7 +50,7 @@ const String _kColorForegroundWarning = 'Cannot provide both a color and a foreg /// [RichText] widget is explicitly given the ambient [DefaultTextStyle], since /// [RichText] does not do that automatically. The inner [TextStyle] objects are /// implicitly mixed with the parent [TextSpan]'s [TextSpan.style]. -/// +/// /// If [color] is specified, [foreground] must be null and vice versa. [color] is /// treated as a shorthand for `new Paint()..color = color`. /// @@ -260,10 +260,10 @@ class TextStyle extends Diagnosticable { final bool inherit; /// The color to use when painting the text. - /// + /// /// If [foreground] is specified, this value must be null. The [color] property /// is shorthand for `new Paint()..color = color`. - /// + /// /// In [merge], [apply], and [lerp], conflicts between [color] and [foreground] /// specification are resolved in [foreground]'s favor - i.e. if [foreground] is /// specified in one place, it will dominate [color] in another. @@ -331,15 +331,15 @@ class TextStyle extends Diagnosticable { /// styles are created with the same paint settings. Otherwise, each time it /// will appear like the style changed, which will result in unnecessary /// updates all the way through the framework. - /// + /// /// If [color] is specified, this value must be null. The [color] property /// is shorthand for `new Paint()..color = color`. - /// + /// /// In [merge], [apply], and [lerp], conflicts between [color] and [foreground] /// specification are resolved in [foreground]'s favor - i.e. if [foreground] is /// specified in one place, it will dominate [color] in another. - final Paint foreground; - + final Paint foreground; + /// The paint drawn as a background for the text. /// /// The value should ideally be cached and reused each time if multiple text @@ -372,7 +372,7 @@ class TextStyle extends Diagnosticable { /// Creates a copy of this text style but with the given fields replaced with /// the new values. - /// + /// /// One of [color] or [foreground] must be null, and if this has [foreground] /// specified it will be given preference over any color parameter. TextStyle copyWith({ @@ -426,7 +426,7 @@ class TextStyle extends Diagnosticable { /// /// The non-numeric properties [color], [fontFamily], [decoration], /// [decorationColor] and [decorationStyle] are replaced with the new values. - /// + /// /// [foreground] will be given preference over [color] if it is not null. /// /// The numeric properties are multiplied by the given factors and then @@ -444,7 +444,7 @@ class TextStyle extends Diagnosticable { /// /// If the underlying values are null, then the corresponding factors and/or /// deltas must not be specified. - /// + /// /// If [foreground] is specified on this object, then applying [color] here /// will have no effect. TextStyle apply({ @@ -520,7 +520,7 @@ class TextStyle extends Diagnosticable { /// inherit properties of this style. /// /// If the given text style is null, returns this text style. - /// + /// /// One of [color] or [foreground] must be null, and if this or `other` has /// [foreground] specified it will be given preference over any color parameter. TextStyle merge(TextStyle other) { @@ -571,7 +571,7 @@ class TextStyle extends Diagnosticable { /// /// Values for `t` are usually obtained from an [Animation], such as /// an [AnimationController]. - /// + /// /// If [foreground] is specified on either of `a` or `b`, both will be treated /// as if they have a [foreground] paint (creating a new [Paint] if necessary /// based on the [color] property). @@ -645,7 +645,7 @@ class TextStyle extends Diagnosticable { height: ui.lerpDouble(a.height ?? b.height, b.height ?? a.height, t), locale: t < 0.5 ? a.locale : b.locale, foreground: (a.foreground != null || b.foreground != null) - ? t < 0.5 + ? t < 0.5 ? a.foreground ?? (new Paint()..color = a.color) : b.foreground ?? (new Paint()..color = b.color) : null, diff --git a/packages/flutter/lib/src/rendering/custom_layout.dart b/packages/flutter/lib/src/rendering/custom_layout.dart index 46e99396713..201af4cedbc 100644 --- a/packages/flutter/lib/src/rendering/custom_layout.dart +++ b/packages/flutter/lib/src/rendering/custom_layout.dart @@ -58,24 +58,24 @@ class MultiChildLayoutParentData extends ContainerBoxParentData { /// leader, /// follower, /// } -/// +/// /// class FollowTheLeader extends MultiChildLayoutDelegate { /// @override /// void performLayout(Size size) { /// Size leaderSize = Size.zero; -/// +/// /// if (hasChild(_Slot.leader)) { /// leaderSize = layoutChild(_Slot.leader, new BoxConstraints.loose(size)); /// positionChild(_Slot.leader, Offset.zero); /// } -/// +/// /// if (hasChild(_Slot.follower)) { /// layoutChild(_Slot.follower, new BoxConstraints.tight(leaderSize)); /// positionChild(_Slot.follower, new Offset(size.width - leaderSize.width, /// size.height - leaderSize.height)); /// } /// } -/// +/// /// @override /// bool shouldRelayout(MultiChildLayoutDelegate oldDelegate) => false; /// } diff --git a/packages/flutter/lib/src/rendering/view.dart b/packages/flutter/lib/src/rendering/view.dart index fbce210f026..4d7a7e288f4 100644 --- a/packages/flutter/lib/src/rendering/view.dart +++ b/packages/flutter/lib/src/rendering/view.dart @@ -214,7 +214,7 @@ class RenderView extends RenderObject with RenderObjectWithChildMixin final Offset bottom = new Offset(bounds.center.dx, bounds.center.dy - ui.window.padding.bottom / ui.window.devicePixelRatio); final SystemUiOverlayStyle upperOverlayStyle = layer.find(top); // Only android has a customizable system navigation bar. - SystemUiOverlayStyle lowerOverlayStyle; + SystemUiOverlayStyle lowerOverlayStyle; switch (defaultTargetPlatform) { case TargetPlatform.android: lowerOverlayStyle = layer.find(bottom); diff --git a/packages/flutter/lib/src/semantics/semantics.dart b/packages/flutter/lib/src/semantics/semantics.dart index 5567adb9af5..923c9ad8069 100644 --- a/packages/flutter/lib/src/semantics/semantics.dart +++ b/packages/flutter/lib/src/semantics/semantics.dart @@ -536,8 +536,8 @@ class SemanticsProperties extends DiagnosticableTree { /// If non-null, whether the node corresponds to the root of a subtree for /// which a route name should be announced. - /// - /// Generally, this is set in combination with [explicitChildNodes], since + /// + /// Generally, this is set in combination with [explicitChildNodes], since /// nodes with this flag are not considered focusable by Android or iOS. /// /// See also: @@ -549,7 +549,7 @@ class SemanticsProperties extends DiagnosticableTree { /// If non-null, whether the node contains the semantic label for a route. /// /// See also: - /// + /// /// * [SemanticsFlag.namesRoute] for a description of how the name is used. final bool namesRoute; @@ -2754,7 +2754,7 @@ class SemanticsConfiguration { /// Whether the semantics node is the root of a subtree for which values /// should be announced. - /// + /// /// See also: /// * [SemanticsFlag.scopesRoute], for a full description of route scoping. bool get scopesRoute => _hasFlag(SemanticsFlag.scopesRoute); @@ -2763,7 +2763,7 @@ class SemanticsConfiguration { } /// Whether the semantics node contains the label of a route. - /// + /// /// See also: /// * [SemanticsFlag.namesRoute], for a full description of route naming. bool get namesRoute => _hasFlag(SemanticsFlag.namesRoute); diff --git a/packages/flutter/lib/src/semantics/semantics_event.dart b/packages/flutter/lib/src/semantics/semantics_event.dart index 45b1b3d359c..3b7a3def7e0 100644 --- a/packages/flutter/lib/src/semantics/semantics_event.dart +++ b/packages/flutter/lib/src/semantics/semantics_event.dart @@ -90,7 +90,7 @@ class AnnounceSemanticsEvent extends SemanticsEvent { } /// An event for a semantic announcement of a tooltip. -/// +/// /// This is only used by Android to announce tooltip values. class TooltipSemanticsEvent extends SemanticsEvent { diff --git a/packages/flutter/lib/src/semantics/semantics_service.dart b/packages/flutter/lib/src/semantics/semantics_service.dart index 815ae78db6b..2429493b8d5 100644 --- a/packages/flutter/lib/src/semantics/semantics_service.dart +++ b/packages/flutter/lib/src/semantics/semantics_service.dart @@ -33,7 +33,7 @@ class SemanticsService { } /// Sends a semantic announcement of a tooltip. - /// + /// /// Currently only honored on Android. The contents of [message] will be /// read by TalkBack. static Future tooltip(String message) async { diff --git a/packages/flutter/lib/src/services/system_chrome.dart b/packages/flutter/lib/src/services/system_chrome.dart index 0ceb002ff8a..6d466512302 100644 --- a/packages/flutter/lib/src/services/system_chrome.dart +++ b/packages/flutter/lib/src/services/system_chrome.dart @@ -130,32 +130,32 @@ class SystemUiOverlayStyle { }); /// The color of the system bottom navigation bar. - /// + /// /// Only honored in Android versions O and greater. final Color systemNavigationBarColor; /// The color of the divider between the system's bottom navigation bar and the app's content. - /// + /// /// Only honored in Android versions P and greater. final Color systemNavigationBarDividerColor; /// The brightness of the system navigation bar icons. - /// + /// /// Only honored in Android versions O and greater. final Brightness systemNavigationBarIconBrightness; /// The color of top status bar. - /// + /// /// Only honored in Android version M and greater. final Color statusBarColor; /// The brightness of top status bar. - /// + /// /// Only honored in iOS. final Brightness statusBarBrightness; /// The brightness of the top status bar icons. - /// + /// /// Only honored in Android version M and greater. final Brightness statusBarIconBrightness; diff --git a/packages/flutter/lib/src/services/text_input.dart b/packages/flutter/lib/src/services/text_input.dart index 3b82326ef61..9e613739752 100644 --- a/packages/flutter/lib/src/services/text_input.dart +++ b/packages/flutter/lib/src/services/text_input.dart @@ -409,9 +409,9 @@ class TextInputConfiguration { final TextCapitalization textCapitalization; /// The appearance of the keyboard. - /// + /// /// This setting is only honored on iOS devices. - /// + /// /// Defaults to [Brightness.light]. final Brightness keyboardAppearance; diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart index 70842012dfc..b46efef71d1 100644 --- a/packages/flutter/lib/src/widgets/basic.dart +++ b/packages/flutter/lib/src/widgets/basic.dart @@ -4259,8 +4259,8 @@ class Flow extends MultiChildRenderObjectWidget { /// /// Consider using the [Text] widget to integrate with the [DefaultTextStyle] /// automatically. When all the text uses the same style, the default constructor -/// is less verbose. The [Text.rich] constructor allows you to style multiple -/// spans with the default text style while still allowing specified styles per +/// is less verbose. The [Text.rich] constructor allows you to style multiple +/// spans with the default text style while still allowing specified styles per /// span. /// /// ## Sample code diff --git a/packages/flutter/lib/src/widgets/drag_target.dart b/packages/flutter/lib/src/widgets/drag_target.dart index 94905ecf7cb..339f56c1b13 100644 --- a/packages/flutter/lib/src/widgets/drag_target.dart +++ b/packages/flutter/lib/src/widgets/drag_target.dart @@ -168,7 +168,7 @@ class Draggable extends StatefulWidget { /// Whether the semantics of the [feedback] widget is ignored when building /// the semantics tree. - /// + /// /// This value should be set to false when the [feedback] widget is intended /// to be the same object as the [child]. Placing a [GlobalKey] on this /// widget will ensure semantic focus is kept on the element as it moves in @@ -660,7 +660,7 @@ class _DragAvatar extends Drag { Offset _restrictAxis(Offset offset) { if (axis == null) { return offset; - } + } if (axis == Axis.horizontal) { return new Offset(offset.dx, 0.0); } diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart index 67301425aa6..0db6606b364 100644 --- a/packages/flutter/lib/src/widgets/editable_text.dart +++ b/packages/flutter/lib/src/widgets/editable_text.dart @@ -381,9 +381,9 @@ class EditableText extends StatefulWidget { final Radius cursorRadius; /// The appearance of the keyboard. - /// + /// /// This setting is only honored on iOS devices. - /// + /// /// Defaults to [Brightness.light]. final Brightness keyboardAppearance; diff --git a/packages/flutter/lib/src/widgets/framework.dart b/packages/flutter/lib/src/widgets/framework.dart index ae3329d1c24..0482b964512 100644 --- a/packages/flutter/lib/src/widgets/framework.dart +++ b/packages/flutter/lib/src/widgets/framework.dart @@ -2076,15 +2076,15 @@ class BuildOwner { /// Whether [_dirtyElements] need to be sorted again as a result of more /// elements becoming dirty during the build. - /// + /// /// This is necessary to preserve the sort order defined by [Element._sort]. - /// + /// /// This field is set to null when [buildScope] is not actively rebuilding /// the widget tree. bool _dirtyElementsNeedsResorting; /// Whether [buildScope] is actively rebuilding the widget tree. - /// + /// /// [scheduleBuildFor] should only be called when this value is true. bool get _debugIsInBuildScope => _dirtyElementsNeedsResorting != null; diff --git a/packages/flutter/test/cupertino/slider_test.dart b/packages/flutter/test/cupertino/slider_test.dart index d2fa1761397..0f917ef7ffe 100644 --- a/packages/flutter/test/cupertino/slider_test.dart +++ b/packages/flutter/test/cupertino/slider_test.dart @@ -117,7 +117,7 @@ void main() { )); await _dragSlider(tester, sliderKey); - + expect(numberOfTimesOnChangeStartIsCalled, equals(1)); await tester.pump(); // No animation should start. @@ -154,9 +154,9 @@ void main() { }, ), )); - + await _dragSlider(tester, sliderKey); - + expect(numberOfTimesOnChangeEndIsCalled, equals(1)); await tester.pump(); // No animation should start. @@ -199,7 +199,7 @@ void main() { )); expect(value, equals(0.0)); - + final Offset topLeft = tester.getTopLeft(find.byKey(sliderKey)); const double unit = CupertinoThumbPainter.radius; const double delta = 3.0 * unit; @@ -210,7 +210,7 @@ void main() { expect(startValue, equals(0.0)); expect(value, equals(finalValue)); expect(endValue, equals(finalValue)); - + await tester.pump(); // No animation should start. // Check the transientCallbackCount before tearing down the widget to ensure // that no animation is running. @@ -222,7 +222,7 @@ void main() { double value = 0.0; double startValue; double endValue; - + await tester.pumpWidget(new Directionality( textDirection: TextDirection.rtl, child: new StatefulBuilder( @@ -255,18 +255,18 @@ void main() { )); expect(value, equals(0.0)); - + final Offset bottomRight = tester.getBottomRight(find.byKey(sliderKey)); const double unit = CupertinoThumbPainter.radius; const double delta = 3.0 * unit; await tester.dragFrom(bottomRight - const Offset(unit, unit), const Offset(-delta, 0.0)); - + final Size size = tester.getSize(find.byKey(sliderKey)); final double finalValue = delta / (size.width - 2.0 * (8.0 + CupertinoThumbPainter.radius)); expect(startValue, equals(0.0)); expect(value, equals(finalValue)); expect(endValue, equals(finalValue)); - + await tester.pump(); // No animation should start. // Check the transientCallbackCount before tearing down the widget to ensure // that no animation is running. diff --git a/packages/flutter/test/foundation/licenses_test.dart b/packages/flutter/test/foundation/licenses_test.dart index 5a0d06d2e51..d19fbd427c6 100644 --- a/packages/flutter/test/foundation/licenses_test.dart +++ b/packages/flutter/test/foundation/licenses_test.dart @@ -34,10 +34,10 @@ G H H] \u0020\u0020 -I J - K +I\u000cJ +\u000cK K - +\u000c L L L L L diff --git a/packages/flutter/test/material/scaffold_test.dart b/packages/flutter/test/material/scaffold_test.dart index 36c250869af..99951537a2b 100644 --- a/packages/flutter/test/material/scaffold_test.dart +++ b/packages/flutter/test/material/scaffold_test.dart @@ -133,7 +133,7 @@ void main() { expect(tester.binding.transientCallbackCount, 0); await tester.pumpWidget(new MaterialApp(home: const Scaffold())); - + expect(tester.binding.transientCallbackCount, 0); await tester.pumpWidget(new MaterialApp(home: const Scaffold( diff --git a/packages/flutter/test/painting/gradient_test.dart b/packages/flutter/test/painting/gradient_test.dart index 96875573879..0ab6f42a253 100644 --- a/packages/flutter/test/painting/gradient_test.dart +++ b/packages/flutter/test/painting/gradient_test.dart @@ -251,9 +251,9 @@ void main() { ); final RadialGradient actual = RadialGradient.lerp(testGradient1, testGradient2, 0.5); - + expect(actual.focal, isNull); - + expect(actual, const RadialGradient( center: const Alignment(0.0, -1.0), radius: 15.0, @@ -322,7 +322,7 @@ void main() { ], )); }); - + test('SweepGradient lerp test', () { const SweepGradient testGradient1 = const SweepGradient( center: Alignment.topLeft, @@ -409,9 +409,9 @@ void main() { const Color(0xff666666), ], ); - + final SweepGradient actual = testGradient.scale(0.5); - + expect(actual, const SweepGradient( center: Alignment.topLeft, startAngle: 0.0, diff --git a/packages/flutter/test/painting/text_style_test.dart b/packages/flutter/test/painting/text_style_test.dart index 71f80e44660..6ef5d29a72d 100644 --- a/packages/flutter/test/painting/text_style_test.dart +++ b/packages/flutter/test/painting/text_style_test.dart @@ -252,7 +252,7 @@ void main() { expect(TextStyle.lerp(redTextStyle, bluePaintTextStyle, .25).color, isNull); expect(TextStyle.lerp(redTextStyle, bluePaintTextStyle, .25).foreground.color, red); expect(TextStyle.lerp(redTextStyle, bluePaintTextStyle, .75).foreground.color, blue); - + expect(TextStyle.lerp(redPaintTextStyle, bluePaintTextStyle, .25).color, isNull); expect(TextStyle.lerp(redPaintTextStyle, bluePaintTextStyle, .25).foreground.color, red); expect(TextStyle.lerp(redPaintTextStyle, bluePaintTextStyle, .75).foreground.color, blue); diff --git a/packages/flutter/test/scheduler/ticker_test.dart b/packages/flutter/test/scheduler/ticker_test.dart index fbaf01f6e5e..9fd788c4375 100644 --- a/packages/flutter/test/scheduler/ticker_test.dart +++ b/packages/flutter/test/scheduler/ticker_test.dart @@ -107,7 +107,7 @@ void main() { testWidgets('Ticker can be created before application unpauses', (WidgetTester tester) async { final ByteData pausedMessage = const StringCodec().encodeMessage('AppLifecycleState.paused'); await BinaryMessages.handlePlatformMessage('flutter/lifecycle', pausedMessage, (_) {}); - + int tickCount = 0; void handleTick(Duration duration) { tickCount += 1; @@ -126,7 +126,7 @@ void main() { final ByteData resumedMessage = const StringCodec().encodeMessage('AppLifecycleState.resumed'); await BinaryMessages.handlePlatformMessage('flutter/lifecycle', resumedMessage, (_) {}); - + await tester.pump(const Duration(milliseconds: 10)); expect(tickCount, equals(1)); diff --git a/packages/flutter/test/services/fake_platform_views.dart b/packages/flutter/test/services/fake_platform_views.dart index 6c1f7e940d4..e6c549621da 100644 --- a/packages/flutter/test/services/fake_platform_views.dart +++ b/packages/flutter/test/services/fake_platform_views.dart @@ -73,7 +73,7 @@ class FakePlatformViewsController { code: 'error', message: 'Trying to dispose a platform view with unknown id: $id', ); - + _views.remove(id); return new Future.sync(() => null); } diff --git a/packages/flutter/test/widgets/draggable_test.dart b/packages/flutter/test/widgets/draggable_test.dart index 4e2345fbd14..c0e47b3f16d 100644 --- a/packages/flutter/test/widgets/draggable_test.dart +++ b/packages/flutter/test/widgets/draggable_test.dart @@ -716,7 +716,7 @@ void main() { expect(tester.getTopLeft(find.text('V')), thirdWidgetLocation); }); }); - + testWidgets('Drag and drop - onDraggableCanceled not called if dropped on accepting target', (WidgetTester tester) async { final List accepted = []; @@ -1690,7 +1690,7 @@ void main() { ], ), )); - + expect(semantics, hasSemantics( new TestSemantics.root( children: [ @@ -1750,7 +1750,7 @@ void main() { await tester.pump(); await gesture.moveTo(secondLocation); await tester.pump(); - + expect(semantics, hasSemantics( new TestSemantics.root( children: [ diff --git a/packages/flutter/test/widgets/set_state_5_test.dart b/packages/flutter/test/widgets/set_state_5_test.dart index 887dd08dde0..d9b3583896e 100644 --- a/packages/flutter/test/widgets/set_state_5_test.dart +++ b/packages/flutter/test/widgets/set_state_5_test.dart @@ -17,7 +17,7 @@ class BadWidgetState extends State { _count = 1; }); } - + int _count = 0; @override diff --git a/packages/flutter/test/widgets/spacer_test.dart b/packages/flutter/test/widgets/spacer_test.dart index 2c0e0104445..332b421ea05 100644 --- a/packages/flutter/test/widgets/spacer_test.dart +++ b/packages/flutter/test/widgets/spacer_test.dart @@ -52,7 +52,7 @@ void main() { expect(spacer4Rect.size.width, spacer3Rect.size.width * 2.0); expect(spacer4Rect.left, closeTo(10.0, 0.1)); }); - + testWidgets('Spacer takes up space.', (WidgetTester tester) async { await tester.pumpWidget(new UnconstrainedBox( constrainedAxis: Axis.vertical, diff --git a/packages/flutter_driver/lib/src/common/find.dart b/packages/flutter_driver/lib/src/common/find.dart index 841d301b696..aadf3fdc375 100644 --- a/packages/flutter_driver/lib/src/common/find.dart +++ b/packages/flutter_driver/lib/src/common/find.dart @@ -259,7 +259,7 @@ class ByType extends SerializableFinder { /// /// If the object returned by the finder does not have its own semantics node, /// then the semantics node of the first ancestor is returned instead. -/// +/// /// Throws an error if a finder returns multiple objects or if there are no /// semantics nodes. /// diff --git a/packages/flutter_driver/lib/src/driver/driver.dart b/packages/flutter_driver/lib/src/driver/driver.dart index daf81539ba4..deb6335b6bc 100644 --- a/packages/flutter_driver/lib/src/driver/driver.dart +++ b/packages/flutter_driver/lib/src/driver/driver.dart @@ -573,10 +573,10 @@ class FlutterDriver { /// Retrieves the semantics node id for the object returned by `finder`, or /// the nearest ancestor with a semantics node. - /// + /// /// Throws an error if `finder` returns multiple elements or a semantics /// node is not found. - /// + /// /// Semantics must be enabled to use this method, either using a platform /// specific shell command or [setSemantics]. Future getSemanticsId(SerializableFinder finder, { Duration timeout = _kShortTimeout}) async { diff --git a/packages/flutter_driver/lib/src/extension/extension.dart b/packages/flutter_driver/lib/src/extension/extension.dart index c87a9a354b4..78584c25933 100644 --- a/packages/flutter_driver/lib/src/extension/extension.dart +++ b/packages/flutter_driver/lib/src/extension/extension.dart @@ -63,7 +63,7 @@ class _DriverBinding extends BindingBase with ServicesBinding, SchedulerBinding, /// /// Optionally you can pass a [DataHandler] callback. It will be called if the /// test calls [FlutterDriver.requestData]. -/// +/// /// `slienceErrors` will prevent exceptions from being logged. This is useful /// for tests where exceptions are expected. Defaults to false. Any errors /// will still be returned in the `response` field of the result json along diff --git a/packages/flutter_driver/test/src/extension_test.dart b/packages/flutter_driver/test/src/extension_test.dart index 3fa18216889..16a77d570ea 100644 --- a/packages/flutter_driver/test/src/extension_test.dart +++ b/packages/flutter_driver/test/src/extension_test.dart @@ -81,10 +81,10 @@ void main() { final SemanticsHandle semantics = RendererBinding.instance.pipelineOwner.ensureSemantics(); await tester.pumpWidget( const Text('hello', textDirection: TextDirection.ltr)); - + final Map arguments = new GetSemanticsId(new ByText('hello')).serialize(); final GetSemanticsIdResult result = GetSemanticsIdResult.fromJson((await extension.call(arguments))['response']); - + expect(result.id, 1); semantics.dispose(); }); @@ -92,10 +92,10 @@ void main() { testWidgets('throws state error if no data is found', (WidgetTester tester) async { await tester.pumpWidget( const Text('hello', textDirection: TextDirection.ltr)); - + final Map arguments = new GetSemanticsId(new ByText('hello')).serialize(); final Map response = await extension.call(arguments); - + expect(response['isError'], true); expect(response['response'], contains('Bad state: No semantics data found')); }); @@ -111,10 +111,10 @@ void main() { ]), ), ); - + final Map arguments = new GetSemanticsId(new ByText('hello')).serialize(); final Map response = await extension.call(arguments); - + expect(response['isError'], true); expect(response['response'], contains('Bad state: Too many elements')); semantics.dispose(); diff --git a/packages/flutter_test/lib/src/widget_tester.dart b/packages/flutter_test/lib/src/widget_tester.dart index 8b75ef31998..73fa28ff8bd 100644 --- a/packages/flutter_test/lib/src/widget_tester.dart +++ b/packages/flutter_test/lib/src/widget_tester.dart @@ -616,7 +616,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker } /// Attempts to find the [SemanticsData] of first result from `finder`. - /// + /// /// If the object identified by the finder doesn't own it's semantic node, /// this will return the semantics data of the first ancestor with semantics /// data. The ancestor's semantic data will include the child's as well as diff --git a/packages/flutter_test/test/finders_test.dart b/packages/flutter_test/test/finders_test.dart index 625c86bae67..50f54fcb691 100644 --- a/packages/flutter_test/test/finders_test.dart +++ b/packages/flutter_test/test/finders_test.dart @@ -14,7 +14,7 @@ void main() { )); expect(find.text('test'), findsOneWidget); }); - + testWidgets('finds Text.rich widgets', (WidgetTester tester) async { await tester.pumpWidget(_boilerplate( const Text.rich( diff --git a/packages/flutter_test/test/widget_tester_test.dart b/packages/flutter_test/test/widget_tester_test.dart index 31a7693b70b..cf35c982145 100644 --- a/packages/flutter_test/test/widget_tester_test.dart +++ b/packages/flutter_test/test/widget_tester_test.dart @@ -564,7 +564,7 @@ void main() { throwsA(isInstanceOf())); semanticsHandle.dispose(); }); - + testWidgets('Returns the correct SemanticsData', (WidgetTester tester) async { final SemanticsHandle semanticsHandle = tester.ensureSemantics(); diff --git a/packages/flutter_tools/lib/src/android/android_sdk.dart b/packages/flutter_tools/lib/src/android/android_sdk.dart index d547cef2919..0726a6f8fac 100644 --- a/packages/flutter_tools/lib/src/android/android_sdk.dart +++ b/packages/flutter_tools/lib/src/android/android_sdk.dart @@ -70,7 +70,7 @@ String getEmulatorPath([AndroidSdk existingSdk]) { /// Locate the path for storing AVD emulator images. Returns null if none found. String getAvdPath() { - + final List searchPaths = [ platform.environment['ANDROID_AVD_HOME'] ]; diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 0d1a3d5a2a7..202fbf2dacd 100644 --- a/packages/flutter_tools/lib/src/commands/daemon.dart +++ b/packages/flutter_tools/lib/src/commands/daemon.dart @@ -374,7 +374,7 @@ class AppDomain extends Domain { ipv6: ipv6, ); } - + return launch( runner, ({ Completer connectionInfoCompleter, diff --git a/packages/flutter_tools/lib/src/crash_reporting.dart b/packages/flutter_tools/lib/src/crash_reporting.dart index b063dd18f29..1bf1cd1f796 100644 --- a/packages/flutter_tools/lib/src/crash_reporting.dart +++ b/packages/flutter_tools/lib/src/crash_reporting.dart @@ -37,9 +37,9 @@ const String _kStackTraceFileField = 'DartError'; const String _kStackTraceFilename = 'stacktrace_file'; /// Sends crash reports to Google. -/// +/// /// There are two ways to override the behavior of this class: -/// +/// /// * Define a `FLUTTER_CRASH_SERVER_BASE_URL` environment variable that points /// to a custom crash reporting server. This is useful if your development /// environment is behind a firewall and unable to send crash reports to diff --git a/packages/flutter_tools/lib/src/ios/code_signing.dart b/packages/flutter_tools/lib/src/ios/code_signing.dart index be172f8c1f5..0da85d224f9 100644 --- a/packages/flutter_tools/lib/src/ios/code_signing.dart +++ b/packages/flutter_tools/lib/src/ios/code_signing.dart @@ -20,7 +20,7 @@ const String noCertificatesInstruction = ''' ════════════════════════════════════════════════════════════════════════════════ No valid code signing certificates were found You can connect to your Apple Developer account by signing in with your Apple ID -in Xcode and create an iOS Development Certificate as well as a Provisioning +in Xcode and create an iOS Development Certificate as well as a Provisioning\u0020 Profile for your project by: $fixWithDevelopmentTeamInstruction 5- Trust your newly created Development Certificate on your iOS device @@ -37,12 +37,12 @@ Or run on an iOS simulator without code signing /// The user did iOS development but never on this project and/or device. const String noProvisioningProfileInstruction = ''' ════════════════════════════════════════════════════════════════════════════════ -No Provisioning Profile was found for your project's Bundle Identifier or your -device. You can create a new Provisioning Profile for your project in Xcode for +No Provisioning Profile was found for your project's Bundle Identifier or your\u0020 +device. You can create a new Provisioning Profile for your project in Xcode for\u0020 your team by: $fixWithDevelopmentTeamInstruction -It's also possible that a previously installed app with the same Bundle +It's also possible that a previously installed app with the same Bundle\u0020 Identifier was signed with a different certificate. For more information, please visit: @@ -55,7 +55,7 @@ Or run on an iOS simulator without code signing /// Couldn't auto sign the app but can likely solved by retracing the signing flow in Xcode. const String noDevelopmentTeamInstruction = ''' ════════════════════════════════════════════════════════════════════════════════ -Building a deployable iOS app requires a selected Development Team with a +Building a deployable iOS app requires a selected Development Team with a\u0020 Provisioning Profile. Please ensure that a Development Team is selected by: $fixWithDevelopmentTeamInstruction @@ -69,7 +69,7 @@ const String fixWithDevelopmentTeamInstruction = ''' open ios/Runner.xcworkspace 2- Select the 'Runner' project in the navigator then the 'Runner' target in the project settings - 3- In the 'General' tab, make sure a 'Development Team' is selected. + 3- In the 'General' tab, make sure a 'Development Team' is selected.\u0020 You may need to: - Log in with your Apple ID in Xcode first - Ensure you have a valid unique Bundle ID diff --git a/packages/flutter_tools/test/cache_test.dart b/packages/flutter_tools/test/cache_test.dart index 0b227e50223..a1f8044c478 100644 --- a/packages/flutter_tools/test/cache_test.dart +++ b/packages/flutter_tools/test/cache_test.dart @@ -115,7 +115,7 @@ void main() { class MockFileSystem extends ForwardingFileSystem { MockFileSystem() : super(new MemoryFileSystem()); - + @override File file(dynamic path) { return new MockFile(); diff --git a/packages/flutter_tools/test/commands/doctor_test.dart b/packages/flutter_tools/test/commands/doctor_test.dart index 0b1933031f9..25c2a4e2465 100644 --- a/packages/flutter_tools/test/commands/doctor_test.dart +++ b/packages/flutter_tools/test/commands/doctor_test.dart @@ -325,7 +325,7 @@ class VsCodeValidatorTestTargets extends VsCodeValidator { static final String validInstall = fs.path.join('test', 'data', 'vscode', 'application'); static final String validExtensions = fs.path.join('test', 'data', 'vscode', 'extensions'); static final String missingExtensions = fs.path.join('test', 'data', 'vscode', 'notExtensions'); - VsCodeValidatorTestTargets._(String installDirectory, String extensionDirectory, {String edition}) + VsCodeValidatorTestTargets._(String installDirectory, String extensionDirectory, {String edition}) : super(new VsCode.fromDirectory(installDirectory, extensionDirectory, edition: edition)); static VsCodeValidatorTestTargets get installedWithExtension => diff --git a/packages/flutter_tools/test/integration/flutter_attach.dart b/packages/flutter_tools/test/integration/flutter_attach.dart index d24314dd203..04e8ea9d2c2 100644 --- a/packages/flutter_tools/test/integration/flutter_attach.dart +++ b/packages/flutter_tools/test/integration/flutter_attach.dart @@ -36,7 +36,7 @@ void main() { testUsingContext('can hot reload', () async { await _flutterRun.run(withDebugger: true); await _flutterAttach.attach(_flutterRun.vmServicePort); - + await _flutterAttach.hotReload(); }); }, timeout: const Timeout.factor(3)); diff --git a/packages/flutter_tools/test/integration/test_data/basic_project.dart b/packages/flutter_tools/test/integration/test_data/basic_project.dart index 3df2d30e045..d8cf9e44c51 100644 --- a/packages/flutter_tools/test/integration/test_data/basic_project.dart +++ b/packages/flutter_tools/test/integration/test_data/basic_project.dart @@ -19,9 +19,9 @@ class BasicProject extends TestProject { @override final String main = r''' import 'package:flutter/material.dart'; - + void main() => runApp(new MyApp()); - + class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { diff --git a/packages/flutter_tools/test/integration/test_driver.dart b/packages/flutter_tools/test/integration/test_driver.dart index c59fc9ec02d..4390fe75c6f 100644 --- a/packages/flutter_tools/test/integration/test_driver.dart +++ b/packages/flutter_tools/test/integration/test_driver.dart @@ -78,7 +78,7 @@ class FlutterTestDriver { Future _setupProcess(List args, {bool withDebugger = false}) async { final String flutterBin = fs.path.join(getFlutterRoot(), 'bin', 'flutter'); _debugPrint('Spawning flutter $args in ${_projectFolder.path}'); - + const ProcessManager _processManager = const LocalProcessManager(); _proc = await _processManager.start( [flutterBin] @@ -103,7 +103,7 @@ class FlutterTestDriver { // script). final Map connected = await _waitFor(event: 'daemon.connected'); _procPid = connected['params']['pid']; - + // Set this up now, but we don't wait it yet. We want to make sure we don't // miss it while waiting for debugPort below. final Future> started = _waitFor(event: 'app.started', @@ -126,7 +126,7 @@ class FlutterTestDriver { // Because we start paused, resume so the app is in a "running" state as // expected by tests. Tests will reload/restart as required if they need - // to hit breakpoints, etc. + // to hit breakpoints, etc. await waitForPause(); await resume(wait: false); } @@ -266,7 +266,7 @@ class FlutterTestDriver { response.complete(json); } }); - + return _timeoutWithMessages(() => response.future, timeout: timeout, message: event != null @@ -285,7 +285,7 @@ class FlutterTestDriver { messages.writeln('[+ ${ms.toString().padLeft(5)}] $m'); } final StreamSubscription sub = _allMessages.stream.listen(logMessage); - + return f().timeout(timeout ?? defaultTimeout, onTimeout: () { logMessage(''); throw '$message\nReceived:\n${messages.toString()}';