Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
1cc03651
Unverified
Commit
1cc03651
authored
Jul 20, 2018
by
Greg Spencer
Committed by
GitHub
Jul 20, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes trailing whitespace from source files. (#19329)
parent
2d3a5c74
Changes
47
Hide whitespace changes
Inline
Side-by-side
Showing
47 changed files
with
138 additions
and
138 deletions
+138
-138
NativeViewController.h
examples/flutter_view/ios/Runner/NativeViewController.h
+1
-1
consolidate_response.dart
...ages/flutter/lib/src/foundation/consolidate_response.dart
+2
-2
app.dart
packages/flutter/lib/src/material/app.dart
+1
-1
dialog.dart
packages/flutter/lib/src/material/dialog.dart
+8
-8
material_localizations.dart
...ages/flutter/lib/src/material/material_localizations.dart
+5
-5
popup_menu.dart
packages/flutter/lib/src/material/popup_menu.dart
+5
-5
text_field.dart
packages/flutter/lib/src/material/text_field.dart
+2
-2
typography.dart
packages/flutter/lib/src/material/typography.dart
+4
-4
gradient.dart
packages/flutter/lib/src/painting/gradient.dart
+8
-8
text_style.dart
packages/flutter/lib/src/painting/text_style.dart
+13
-13
custom_layout.dart
packages/flutter/lib/src/rendering/custom_layout.dart
+4
-4
view.dart
packages/flutter/lib/src/rendering/view.dart
+1
-1
semantics.dart
packages/flutter/lib/src/semantics/semantics.dart
+5
-5
semantics_event.dart
packages/flutter/lib/src/semantics/semantics_event.dart
+1
-1
semantics_service.dart
packages/flutter/lib/src/semantics/semantics_service.dart
+1
-1
system_chrome.dart
packages/flutter/lib/src/services/system_chrome.dart
+6
-6
text_input.dart
packages/flutter/lib/src/services/text_input.dart
+2
-2
basic.dart
packages/flutter/lib/src/widgets/basic.dart
+2
-2
drag_target.dart
packages/flutter/lib/src/widgets/drag_target.dart
+2
-2
editable_text.dart
packages/flutter/lib/src/widgets/editable_text.dart
+2
-2
framework.dart
packages/flutter/lib/src/widgets/framework.dart
+3
-3
slider_test.dart
packages/flutter/test/cupertino/slider_test.dart
+9
-9
licenses_test.dart
packages/flutter/test/foundation/licenses_test.dart
+3
-3
scaffold_test.dart
packages/flutter/test/material/scaffold_test.dart
+1
-1
gradient_test.dart
packages/flutter/test/painting/gradient_test.dart
+5
-5
text_style_test.dart
packages/flutter/test/painting/text_style_test.dart
+1
-1
ticker_test.dart
packages/flutter/test/scheduler/ticker_test.dart
+2
-2
fake_platform_views.dart
packages/flutter/test/services/fake_platform_views.dart
+1
-1
draggable_test.dart
packages/flutter/test/widgets/draggable_test.dart
+3
-3
set_state_5_test.dart
packages/flutter/test/widgets/set_state_5_test.dart
+1
-1
spacer_test.dart
packages/flutter/test/widgets/spacer_test.dart
+1
-1
find.dart
packages/flutter_driver/lib/src/common/find.dart
+1
-1
driver.dart
packages/flutter_driver/lib/src/driver/driver.dart
+2
-2
extension.dart
packages/flutter_driver/lib/src/extension/extension.dart
+1
-1
extension_test.dart
packages/flutter_driver/test/src/extension_test.dart
+6
-6
widget_tester.dart
packages/flutter_test/lib/src/widget_tester.dart
+1
-1
finders_test.dart
packages/flutter_test/test/finders_test.dart
+1
-1
widget_tester_test.dart
packages/flutter_test/test/widget_tester_test.dart
+1
-1
android_sdk.dart
packages/flutter_tools/lib/src/android/android_sdk.dart
+1
-1
daemon.dart
packages/flutter_tools/lib/src/commands/daemon.dart
+1
-1
crash_reporting.dart
packages/flutter_tools/lib/src/crash_reporting.dart
+2
-2
code_signing.dart
packages/flutter_tools/lib/src/ios/code_signing.dart
+6
-6
cache_test.dart
packages/flutter_tools/test/cache_test.dart
+1
-1
doctor_test.dart
packages/flutter_tools/test/commands/doctor_test.dart
+1
-1
flutter_attach.dart
packages/flutter_tools/test/integration/flutter_attach.dart
+1
-1
basic_project.dart
...utter_tools/test/integration/test_data/basic_project.dart
+2
-2
test_driver.dart
packages/flutter_tools/test/integration/test_driver.dart
+5
-5
No files found.
examples/flutter_view/ios/Runner/NativeViewController.h
View file @
1cc03651
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
@end
@end
@interface
NativeViewController
:
UIViewController
@interface
NativeViewController
:
UIViewController
@property
(
strong
,
nonatomic
)
id
<
NativeViewControllerDelegate
>
delegate
;
@property
(
strong
,
nonatomic
)
id
<
NativeViewControllerDelegate
>
delegate
;
-
(
void
)
didReceiveIncrement
;
-
(
void
)
didReceiveIncrement
;
@end
@end
packages/flutter/lib/src/foundation/consolidate_response.dart
View file @
1cc03651
...
@@ -7,7 +7,7 @@ import 'dart:io';
...
@@ -7,7 +7,7 @@ import 'dart:io';
import
'dart:typed_data'
;
import
'dart:typed_data'
;
/// Efficiently converts the response body of an [HttpClientResponse] into a [Uint8List].
/// Efficiently converts the response body of an [HttpClientResponse] into a [Uint8List].
///
///
/// The future returned will forward all errors emitted by [response].
/// The future returned will forward all errors emitted by [response].
Future
<
Uint8List
>
consolidateHttpClientResponseBytes
(
HttpClientResponse
response
)
{
Future
<
Uint8List
>
consolidateHttpClientResponseBytes
(
HttpClientResponse
response
)
{
// response.contentLength is not trustworthy when GZIP is involved
// response.contentLength is not trustworthy when GZIP is involved
...
@@ -28,6 +28,6 @@ Future<Uint8List> consolidateHttpClientResponseBytes(HttpClientResponse response
...
@@ -28,6 +28,6 @@ Future<Uint8List> consolidateHttpClientResponseBytes(HttpClientResponse response
}
}
completer
.
complete
(
bytes
);
completer
.
complete
(
bytes
);
},
onError:
completer
.
completeError
,
cancelOnError:
true
);
},
onError:
completer
.
completeError
,
cancelOnError:
true
);
return
completer
.
future
;
return
completer
.
future
;
}
}
packages/flutter/lib/src/material/app.dart
View file @
1cc03651
...
@@ -587,7 +587,7 @@ class _MaterialAppState extends State<MaterialApp> {
...
@@ -587,7 +587,7 @@ class _MaterialAppState extends State<MaterialApp> {
},
},
)
)
);
);
assert
(()
{
assert
(()
{
if
(
widget
.
debugShowMaterialGrid
)
{
if
(
widget
.
debugShowMaterialGrid
)
{
result
=
new
GridPaper
(
result
=
new
GridPaper
(
...
...
packages/flutter/lib/src/material/dialog.dart
View file @
1cc03651
...
@@ -217,15 +217,15 @@ class AlertDialog extends StatelessWidget {
...
@@ -217,15 +217,15 @@ class AlertDialog extends StatelessWidget {
/// from the [actions].
/// from the [actions].
final
List
<
Widget
>
actions
;
final
List
<
Widget
>
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.
/// announce screen transitions when the dialog is opened and closed.
///
///
/// If this label is not provided, a semantic label will be infered from the
/// 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
/// [title] if it is not null. If there is no title, the label will be taken
/// from [MaterialLocalizations.alertDialogLabel].
/// from [MaterialLocalizations.alertDialogLabel].
///
///
/// See also:
/// See also:
///
///
/// * [SemanticsConfiguration.isRouteName], for a description of how this
/// * [SemanticsConfiguration.isRouteName], for a description of how this
/// value is used.
/// value is used.
final
String
semanticLabel
;
final
String
semanticLabel
;
...
@@ -475,15 +475,15 @@ class SimpleDialog extends StatelessWidget {
...
@@ -475,15 +475,15 @@ class SimpleDialog extends StatelessWidget {
/// the top padding ends up being 24 pixels.
/// the top padding ends up being 24 pixels.
final
EdgeInsetsGeometry
contentPadding
;
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.
/// announce screen transitions when the dialog is opened and closed.
///
///
/// If this label is not provided, a semantic label will be infered from the
/// 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
/// [title] if it is not null. If there is no title, the label will be taken
/// from [MaterialLocalizations.dialogLabel].
/// from [MaterialLocalizations.dialogLabel].
///
///
/// See also:
/// See also:
///
///
/// * [SemanticsConfiguration.isRouteName], for a description of how this
/// * [SemanticsConfiguration.isRouteName], for a description of how this
/// value is used.
/// value is used.
final
String
semanticLabel
;
final
String
semanticLabel
;
...
...
packages/flutter/lib/src/material/material_localizations.dart
View file @
1cc03651
...
@@ -144,19 +144,19 @@ abstract class MaterialLocalizations {
...
@@ -144,19 +144,19 @@ abstract class MaterialLocalizations {
/// user interaction with elements behind it.
/// user interaction with elements behind it.
String
get
modalBarrierDismissLabel
;
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.
/// drawer widget is opened.
String
get
drawerLabel
;
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.
/// popup menu widget is opened.
String
get
popupMenuLabel
;
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.
/// dialog widget is opened.
String
get
dialogLabel
;
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.
/// alert dialog widget is opened.
String
get
alertDialogLabel
;
String
get
alertDialogLabel
;
...
...
packages/flutter/lib/src/material/popup_menu.dart
View file @
1cc03651
...
@@ -688,12 +688,12 @@ class _PopupMenuRoute<T> extends PopupRoute<T> {
...
@@ -688,12 +688,12 @@ class _PopupMenuRoute<T> extends PopupRoute<T> {
/// The `context` argument is used to look up the [Navigator] and [Theme] for
/// 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
/// 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.
/// widget can be safely removed from the tree before the popup menu is closed.
///
///
/// The `semanticLabel` argument is used by accessibility frameworks to
/// The `semanticLabel` argument is used by accessibility frameworks to
/// announce screen transitions when the menu is opened and closed. If this
/// announce screen transitions when the menu is opened and closed. If this
/// label is not provided, it will default to
/// label is not provided, it will default to
/// [MaterialLocalizations.popupMenuLabel].
/// [MaterialLocalizations.popupMenuLabel].
///
///
/// See also:
/// See also:
///
///
/// * [PopupMenuItem], a popup menu entry for a single value.
/// * [PopupMenuItem], a popup menu entry for a single value.
...
...
packages/flutter/lib/src/material/text_field.dart
View file @
1cc03651
...
@@ -313,9 +313,9 @@ class TextField extends StatefulWidget {
...
@@ -313,9 +313,9 @@ class TextField extends StatefulWidget {
final
bool
enabled
;
final
bool
enabled
;
/// The appearance of the keyboard.
/// The appearance of the keyboard.
///
///
/// This setting is only honored on iOS devices.
/// This setting is only honored on iOS devices.
///
///
/// If unset, defaults to the brightness of [ThemeData.primaryColorBrightness].
/// If unset, defaults to the brightness of [ThemeData.primaryColorBrightness].
final
Brightness
keyboardAppearance
;
final
Brightness
keyboardAppearance
;
...
...
packages/flutter/lib/src/material/typography.dart
View file @
1cc03651
...
@@ -113,10 +113,10 @@ class TextTheme extends Diagnosticable {
...
@@ -113,10 +113,10 @@ class TextTheme extends Diagnosticable {
/// /// descendants, while leaving other ambient theme attributes alone.
/// /// descendants, while leaving other ambient theme attributes alone.
/// class TitleColorThemeCopy extends StatelessWidget {
/// class TitleColorThemeCopy extends StatelessWidget {
/// TitleColorThemeCopy({Key key, this.child, this.titleColor}) : super(key: key);
/// TitleColorThemeCopy({Key key, this.child, this.titleColor}) : super(key: key);
///
///
/// final Color titleColor;
/// final Color titleColor;
/// final Widget child;
/// final Widget child;
///
///
/// @override
/// @override
/// Widget build(BuildContext context) {
/// Widget build(BuildContext context) {
/// final ThemeData theme = Theme.of(context);
/// final ThemeData theme = Theme.of(context);
...
@@ -192,10 +192,10 @@ class TextTheme extends Diagnosticable {
...
@@ -192,10 +192,10 @@ class TextTheme extends Diagnosticable {
/// /// descendants, while leaving other ambient theme attributes alone.
/// /// descendants, while leaving other ambient theme attributes alone.
/// class TitleColorTheme extends StatelessWidget {
/// class TitleColorTheme extends StatelessWidget {
/// TitleColorTheme({Key key, this.child, this.titleColor}) : super(key: key);
/// TitleColorTheme({Key key, this.child, this.titleColor}) : super(key: key);
///
///
/// final Color titleColor;
/// final Color titleColor;
/// final Widget child;
/// final Widget child;
///
///
/// @override
/// @override
/// Widget build(BuildContext context) {
/// Widget build(BuildContext context) {
/// ThemeData theme = Theme.of(context);
/// ThemeData theme = Theme.of(context);
...
...
packages/flutter/lib/src/painting/gradient.dart
View file @
1cc03651
...
@@ -443,10 +443,10 @@ class LinearGradient extends Gradient {
...
@@ -443,10 +443,10 @@ class LinearGradient extends Gradient {
/// A normal radial gradient has a [center] and a [radius]. The [center] point
/// 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
/// 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
/// 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
/// (This contrasts with [new ui.Gradient.radial], whose arguments are expressed
/// in logical pixels.)
/// in logical pixels.)
///
///
/// It is also possible to create a two-point (or focal pointed) radial gradient
/// 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
/// (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]
/// same as a CSS conic gradient which corresponds to a [SweepGradient]). A [focal]
...
@@ -454,7 +454,7 @@ class LinearGradient extends Gradient {
...
@@ -454,7 +454,7 @@ class LinearGradient extends Gradient {
/// which will make the rendered gradient appear to be pointed or directed in the
/// 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]
/// 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
/// 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,
/// [center] both resolve to [Offset.zero] when [focalRadius] > 0.0. In such a case,
/// a valid shader cannot be created by the framework.
/// a valid shader cannot be created by the framework.
///
///
...
@@ -553,17 +553,17 @@ class RadialGradient extends Gradient {
...
@@ -553,17 +553,17 @@ class RadialGradient extends Gradient {
/// 
/// 
/// 
/// 
/// 
/// 
///
///
/// 
/// 
/// 
/// 
/// 
/// 
final
TileMode
tileMode
;
final
TileMode
tileMode
;
/// The focal point of the gradient. If specified, the gradient will appear
/// 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.
/// See [center] for a description of how the coordinates are mapped.
///
///
/// If this value is specified and [focalRadius] > 0.0, care should be taken
/// 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
/// to ensure that either this value or [center] will not both resolve to
/// [Offset.zero], which would fail to create a valid gradient.
/// [Offset.zero], which would fail to create a valid gradient.
...
@@ -575,7 +575,7 @@ class RadialGradient extends Gradient {
...
@@ -575,7 +575,7 @@ class RadialGradient extends Gradient {
/// For example, if a radial gradient is painted on a box that is
/// 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
/// 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].
/// 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
/// 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
/// [center] must not resolve to [Offset.zero], which would fail to create
/// a valid gradient.
/// a valid gradient.
...
...
packages/flutter/lib/src/painting/text_style.dart
View file @
1cc03651
...
@@ -50,7 +50,7 @@ const String _kColorForegroundWarning = 'Cannot provide both a color and a foreg
...
@@ -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] widget is explicitly given the ambient [DefaultTextStyle], since
/// [RichText] does not do that automatically. The inner [TextStyle] objects are
/// [RichText] does not do that automatically. The inner [TextStyle] objects are
/// implicitly mixed with the parent [TextSpan]'s [TextSpan.style].
/// implicitly mixed with the parent [TextSpan]'s [TextSpan.style].
///
///
/// If [color] is specified, [foreground] must be null and vice versa. [color] is
/// If [color] is specified, [foreground] must be null and vice versa. [color] is
/// treated as a shorthand for `new Paint()..color = color`.
/// treated as a shorthand for `new Paint()..color = color`.
///
///
...
@@ -260,10 +260,10 @@ class TextStyle extends Diagnosticable {
...
@@ -260,10 +260,10 @@ class TextStyle extends Diagnosticable {
final
bool
inherit
;
final
bool
inherit
;
/// The color to use when painting the text.
/// The color to use when painting the text.
///
///
/// If [foreground] is specified, this value must be null. The [color] property
/// If [foreground] is specified, this value must be null. The [color] property
/// is shorthand for `new Paint()..color = color`.
/// is shorthand for `new Paint()..color = color`.
///
///
/// In [merge], [apply], and [lerp], conflicts between [color] and [foreground]
/// In [merge], [apply], and [lerp], conflicts between [color] and [foreground]
/// specification are resolved in [foreground]'s favor - i.e. if [foreground] is
/// specification are resolved in [foreground]'s favor - i.e. if [foreground] is
/// specified in one place, it will dominate [color] in another.
/// specified in one place, it will dominate [color] in another.
...
@@ -331,15 +331,15 @@ class TextStyle extends Diagnosticable {
...
@@ -331,15 +331,15 @@ class TextStyle extends Diagnosticable {
/// styles are created with the same paint settings. Otherwise, each time it
/// styles are created with the same paint settings. Otherwise, each time it
/// will appear like the style changed, which will result in unnecessary
/// will appear like the style changed, which will result in unnecessary
/// updates all the way through the framework.
/// updates all the way through the framework.
///
///
/// If [color] is specified, this value must be null. The [color] property
/// If [color] is specified, this value must be null. The [color] property
/// is shorthand for `new Paint()..color = color`.
/// is shorthand for `new Paint()..color = color`.
///
///
/// In [merge], [apply], and [lerp], conflicts between [color] and [foreground]
/// In [merge], [apply], and [lerp], conflicts between [color] and [foreground]
/// specification are resolved in [foreground]'s favor - i.e. if [foreground] is
/// specification are resolved in [foreground]'s favor - i.e. if [foreground] is
/// specified in one place, it will dominate [color] in another.
/// 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 paint drawn as a background for the text.
///
///
/// The value should ideally be cached and reused each time if multiple text
/// The value should ideally be cached and reused each time if multiple text
...
@@ -372,7 +372,7 @@ class TextStyle extends Diagnosticable {
...
@@ -372,7 +372,7 @@ class TextStyle extends Diagnosticable {
/// Creates a copy of this text style but with the given fields replaced with
/// Creates a copy of this text style but with the given fields replaced with
/// the new values.
/// the new values.
///
///
/// One of [color] or [foreground] must be null, and if this has [foreground]
/// One of [color] or [foreground] must be null, and if this has [foreground]
/// specified it will be given preference over any color parameter.
/// specified it will be given preference over any color parameter.
TextStyle
copyWith
({
TextStyle
copyWith
({
...
@@ -426,7 +426,7 @@ class TextStyle extends Diagnosticable {
...
@@ -426,7 +426,7 @@ class TextStyle extends Diagnosticable {
///
///
/// The non-numeric properties [color], [fontFamily], [decoration],
/// The non-numeric properties [color], [fontFamily], [decoration],
/// [decorationColor] and [decorationStyle] are replaced with the new values.
/// [decorationColor] and [decorationStyle] are replaced with the new values.
///
///
/// [foreground] will be given preference over [color] if it is not null.
/// [foreground] will be given preference over [color] if it is not null.
///
///
/// The numeric properties are multiplied by the given factors and then
/// The numeric properties are multiplied by the given factors and then
...
@@ -444,7 +444,7 @@ class TextStyle extends Diagnosticable {
...
@@ -444,7 +444,7 @@ class TextStyle extends Diagnosticable {
///
///
/// If the underlying values are null, then the corresponding factors and/or
/// If the underlying values are null, then the corresponding factors and/or
/// deltas must not be specified.
/// deltas must not be specified.
///
///
/// If [foreground] is specified on this object, then applying [color] here
/// If [foreground] is specified on this object, then applying [color] here
/// will have no effect.
/// will have no effect.
TextStyle
apply
({
TextStyle
apply
({
...
@@ -520,7 +520,7 @@ class TextStyle extends Diagnosticable {
...
@@ -520,7 +520,7 @@ class TextStyle extends Diagnosticable {
/// inherit properties of this style.
/// inherit properties of this style.
///
///
/// If the given text style is null, returns this text 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
/// 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.
/// [foreground] specified it will be given preference over any color parameter.
TextStyle
merge
(
TextStyle
other
)
{
TextStyle
merge
(
TextStyle
other
)
{
...
@@ -571,7 +571,7 @@ class TextStyle extends Diagnosticable {
...
@@ -571,7 +571,7 @@ class TextStyle extends Diagnosticable {
///
///
/// Values for `t` are usually obtained from an [Animation<double>], such as
/// Values for `t` are usually obtained from an [Animation<double>], such as
/// an [AnimationController].
/// an [AnimationController].
///
///
/// If [foreground] is specified on either of `a` or `b`, both will be treated
/// 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
/// as if they have a [foreground] paint (creating a new [Paint] if necessary
/// based on the [color] property).
/// based on the [color] property).
...
@@ -645,7 +645,7 @@ class TextStyle extends Diagnosticable {
...
@@ -645,7 +645,7 @@ class TextStyle extends Diagnosticable {
height:
ui
.
lerpDouble
(
a
.
height
??
b
.
height
,
b
.
height
??
a
.
height
,
t
),
height:
ui
.
lerpDouble
(
a
.
height
??
b
.
height
,
b
.
height
??
a
.
height
,
t
),
locale:
t
<
0.5
?
a
.
locale
:
b
.
locale
,
locale:
t
<
0.5
?
a
.
locale
:
b
.
locale
,
foreground:
(
a
.
foreground
!=
null
||
b
.
foreground
!=
null
)
foreground:
(
a
.
foreground
!=
null
||
b
.
foreground
!=
null
)
?
t
<
0.5
?
t
<
0.5
?
a
.
foreground
??
(
new
Paint
()..
color
=
a
.
color
)
?
a
.
foreground
??
(
new
Paint
()..
color
=
a
.
color
)
:
b
.
foreground
??
(
new
Paint
()..
color
=
b
.
color
)
:
b
.
foreground
??
(
new
Paint
()..
color
=
b
.
color
)
:
null
,
:
null
,
...
...
packages/flutter/lib/src/rendering/custom_layout.dart
View file @
1cc03651
...
@@ -58,24 +58,24 @@ class MultiChildLayoutParentData extends ContainerBoxParentData<RenderBox> {
...
@@ -58,24 +58,24 @@ class MultiChildLayoutParentData extends ContainerBoxParentData<RenderBox> {
/// leader,
/// leader,
/// follower,
/// follower,
/// }
/// }
///
///
/// class FollowTheLeader extends MultiChildLayoutDelegate {
/// class FollowTheLeader extends MultiChildLayoutDelegate {
/// @override
/// @override
/// void performLayout(Size size) {
/// void performLayout(Size size) {
/// Size leaderSize = Size.zero;
/// Size leaderSize = Size.zero;
///
///
/// if (hasChild(_Slot.leader)) {
/// if (hasChild(_Slot.leader)) {
/// leaderSize = layoutChild(_Slot.leader, new BoxConstraints.loose(size));
/// leaderSize = layoutChild(_Slot.leader, new BoxConstraints.loose(size));
/// positionChild(_Slot.leader, Offset.zero);
/// positionChild(_Slot.leader, Offset.zero);
/// }
/// }
///
///
/// if (hasChild(_Slot.follower)) {
/// if (hasChild(_Slot.follower)) {
/// layoutChild(_Slot.follower, new BoxConstraints.tight(leaderSize));
/// layoutChild(_Slot.follower, new BoxConstraints.tight(leaderSize));
/// positionChild(_Slot.follower, new Offset(size.width - leaderSize.width,
/// positionChild(_Slot.follower, new Offset(size.width - leaderSize.width,
/// size.height - leaderSize.height));
/// size.height - leaderSize.height));
/// }
/// }
/// }
/// }
///
///
/// @override
/// @override
/// bool shouldRelayout(MultiChildLayoutDelegate oldDelegate) => false;
/// bool shouldRelayout(MultiChildLayoutDelegate oldDelegate) => false;
/// }
/// }
...
...
packages/flutter/lib/src/rendering/view.dart
View file @
1cc03651
...
@@ -214,7 +214,7 @@ class RenderView extends RenderObject with RenderObjectWithChildMixin<RenderBox>
...
@@ -214,7 +214,7 @@ class RenderView extends RenderObject with RenderObjectWithChildMixin<RenderBox>
final
Offset
bottom
=
new
Offset
(
bounds
.
center
.
dx
,
bounds
.
center
.
dy
-
ui
.
window
.
padding
.
bottom
/
ui
.
window
.
devicePixelRatio
);
final
Offset
bottom
=
new
Offset
(
bounds
.
center
.
dx
,
bounds
.
center
.
dy
-
ui
.
window
.
padding
.
bottom
/
ui
.
window
.
devicePixelRatio
);
final
SystemUiOverlayStyle
upperOverlayStyle
=
layer
.
find
<
SystemUiOverlayStyle
>(
top
);
final
SystemUiOverlayStyle
upperOverlayStyle
=
layer
.
find
<
SystemUiOverlayStyle
>(
top
);
// Only android has a customizable system navigation bar.
// Only android has a customizable system navigation bar.
SystemUiOverlayStyle
lowerOverlayStyle
;
SystemUiOverlayStyle
lowerOverlayStyle
;
switch
(
defaultTargetPlatform
)
{
switch
(
defaultTargetPlatform
)
{
case
TargetPlatform
.
android
:
case
TargetPlatform
.
android
:
lowerOverlayStyle
=
layer
.
find
<
SystemUiOverlayStyle
>(
bottom
);
lowerOverlayStyle
=
layer
.
find
<
SystemUiOverlayStyle
>(
bottom
);
...
...
packages/flutter/lib/src/semantics/semantics.dart
View file @
1cc03651
...
@@ -536,8 +536,8 @@ class SemanticsProperties extends DiagnosticableTree {
...
@@ -536,8 +536,8 @@ class SemanticsProperties extends DiagnosticableTree {
/// If non-null, whether the node corresponds to the root of a subtree for
/// If non-null, whether the node corresponds to the root of a subtree for
/// which a route name should be announced.
/// 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.
/// nodes with this flag are not considered focusable by Android or iOS.
///
///
/// See also:
/// See also:
...
@@ -549,7 +549,7 @@ class SemanticsProperties extends DiagnosticableTree {
...
@@ -549,7 +549,7 @@ class SemanticsProperties extends DiagnosticableTree {
/// If non-null, whether the node contains the semantic label for a route.
/// If non-null, whether the node contains the semantic label for a route.
///
///
/// See also:
/// See also:
///
///
/// * [SemanticsFlag.namesRoute] for a description of how the name is used.
/// * [SemanticsFlag.namesRoute] for a description of how the name is used.
final
bool
namesRoute
;
final
bool
namesRoute
;
...
@@ -2754,7 +2754,7 @@ class SemanticsConfiguration {
...
@@ -2754,7 +2754,7 @@ class SemanticsConfiguration {
/// Whether the semantics node is the root of a subtree for which values
/// Whether the semantics node is the root of a subtree for which values
/// should be announced.
/// should be announced.
///
///
/// See also:
/// See also:
/// * [SemanticsFlag.scopesRoute], for a full description of route scoping.
/// * [SemanticsFlag.scopesRoute], for a full description of route scoping.
bool
get
scopesRoute
=>
_hasFlag
(
SemanticsFlag
.
scopesRoute
);
bool
get
scopesRoute
=>
_hasFlag
(
SemanticsFlag
.
scopesRoute
);
...
@@ -2763,7 +2763,7 @@ class SemanticsConfiguration {
...
@@ -2763,7 +2763,7 @@ class SemanticsConfiguration {
}
}
/// Whether the semantics node contains the label of a route.
/// Whether the semantics node contains the label of a route.
///
///
/// See also:
/// See also:
/// * [SemanticsFlag.namesRoute], for a full description of route naming.
/// * [SemanticsFlag.namesRoute], for a full description of route naming.
bool
get
namesRoute
=>
_hasFlag
(
SemanticsFlag
.
namesRoute
);
bool
get
namesRoute
=>
_hasFlag
(
SemanticsFlag
.
namesRoute
);
...
...
packages/flutter/lib/src/semantics/semantics_event.dart
View file @
1cc03651
...
@@ -90,7 +90,7 @@ class AnnounceSemanticsEvent extends SemanticsEvent {
...
@@ -90,7 +90,7 @@ class AnnounceSemanticsEvent extends SemanticsEvent {
}
}
/// An event for a semantic announcement of a tooltip.
/// An event for a semantic announcement of a tooltip.
///
///
/// This is only used by Android to announce tooltip values.
/// This is only used by Android to announce tooltip values.
class
TooltipSemanticsEvent
extends
SemanticsEvent
{
class
TooltipSemanticsEvent
extends
SemanticsEvent
{
...
...
packages/flutter/lib/src/semantics/semantics_service.dart
View file @
1cc03651
...
@@ -33,7 +33,7 @@ class SemanticsService {
...
@@ -33,7 +33,7 @@ class SemanticsService {
}
}
/// Sends a semantic announcement of a tooltip.
/// Sends a semantic announcement of a tooltip.
///
///
/// Currently only honored on Android. The contents of [message] will be
/// Currently only honored on Android. The contents of [message] will be
/// read by TalkBack.
/// read by TalkBack.
static
Future
<
Null
>
tooltip
(
String
message
)
async
{
static
Future
<
Null
>
tooltip
(
String
message
)
async
{
...
...
packages/flutter/lib/src/services/system_chrome.dart
View file @
1cc03651
...
@@ -130,32 +130,32 @@ class SystemUiOverlayStyle {
...
@@ -130,32 +130,32 @@ class SystemUiOverlayStyle {
});
});
/// The color of the system bottom navigation bar.
/// The color of the system bottom navigation bar.
///
///
/// Only honored in Android versions O and greater.
/// Only honored in Android versions O and greater.
final
Color
systemNavigationBarColor
;
final
Color
systemNavigationBarColor
;
/// The color of the divider between the system's bottom navigation bar and the app's content.
/// 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.
/// Only honored in Android versions P and greater.
final
Color
systemNavigationBarDividerColor
;
final
Color
systemNavigationBarDividerColor
;
/// The brightness of the system navigation bar icons.
/// The brightness of the system navigation bar icons.
///
///
/// Only honored in Android versions O and greater.
/// Only honored in Android versions O and greater.
final
Brightness
systemNavigationBarIconBrightness
;
final
Brightness
systemNavigationBarIconBrightness
;
/// The color of top status bar.
/// The color of top status bar.
///
///
/// Only honored in Android version M and greater.
/// Only honored in Android version M and greater.
final
Color
statusBarColor
;
final
Color
statusBarColor
;
/// The brightness of top status bar.
/// The brightness of top status bar.
///
///
/// Only honored in iOS.
/// Only honored in iOS.
final
Brightness
statusBarBrightness
;
final
Brightness
statusBarBrightness
;
/// The brightness of the top status bar icons.
/// The brightness of the top status bar icons.
///
///
/// Only honored in Android version M and greater.
/// Only honored in Android version M and greater.
final
Brightness
statusBarIconBrightness
;
final
Brightness
statusBarIconBrightness
;
...
...
packages/flutter/lib/src/services/text_input.dart
View file @
1cc03651
...
@@ -409,9 +409,9 @@ class TextInputConfiguration {
...
@@ -409,9 +409,9 @@ class TextInputConfiguration {
final
TextCapitalization
textCapitalization
;
final
TextCapitalization
textCapitalization
;
/// The appearance of the keyboard.
/// The appearance of the keyboard.
///
///
/// This setting is only honored on iOS devices.
/// This setting is only honored on iOS devices.
///
///
/// Defaults to [Brightness.light].
/// Defaults to [Brightness.light].
final
Brightness
keyboardAppearance
;
final
Brightness
keyboardAppearance
;
...
...
packages/flutter/lib/src/widgets/basic.dart
View file @
1cc03651
...
@@ -4259,8 +4259,8 @@ class Flow extends MultiChildRenderObjectWidget {
...
@@ -4259,8 +4259,8 @@ class Flow extends MultiChildRenderObjectWidget {
///
///
/// Consider using the [Text] widget to integrate with the [DefaultTextStyle]
/// Consider using the [Text] widget to integrate with the [DefaultTextStyle]
/// automatically. When all the text uses the same style, the default constructor
/// automatically. When all the text uses the same style, the default constructor
/// is less verbose. The [Text.rich] constructor allows you to style multiple
/// is less verbose. The [Text.rich] constructor allows you to style multiple
/// spans with the default text style while still allowing specified styles per
/// spans with the default text style while still allowing specified styles per
/// span.
/// span.
///
///
/// ## Sample code
/// ## Sample code
...
...
packages/flutter/lib/src/widgets/drag_target.dart
View file @
1cc03651
...
@@ -168,7 +168,7 @@ class Draggable<T> extends StatefulWidget {
...
@@ -168,7 +168,7 @@ class Draggable<T> extends StatefulWidget {
/// Whether the semantics of the [feedback] widget is ignored when building
/// Whether the semantics of the [feedback] widget is ignored when building
/// the semantics tree.
/// the semantics tree.
///
///
/// This value should be set to false when the [feedback] widget is intended
/// 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
/// 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
/// widget will ensure semantic focus is kept on the element as it moves in
...
@@ -660,7 +660,7 @@ class _DragAvatar<T> extends Drag {
...
@@ -660,7 +660,7 @@ class _DragAvatar<T> extends Drag {
Offset
_restrictAxis
(
Offset
offset
)
{
Offset
_restrictAxis
(
Offset
offset
)
{
if
(
axis
==
null
)
{
if
(
axis
==
null
)
{
return
offset
;
return
offset
;
}
}
if
(
axis
==
Axis
.
horizontal
)
{
if
(
axis
==
Axis
.
horizontal
)
{
return
new
Offset
(
offset
.
dx
,
0.0
);
return
new
Offset
(
offset
.
dx
,
0.0
);
}
}
...
...
packages/flutter/lib/src/widgets/editable_text.dart
View file @
1cc03651
...
@@ -381,9 +381,9 @@ class EditableText extends StatefulWidget {
...
@@ -381,9 +381,9 @@ class EditableText extends StatefulWidget {
final
Radius
cursorRadius
;
final
Radius
cursorRadius
;
/// The appearance of the keyboard.
/// The appearance of the keyboard.
///
///
/// This setting is only honored on iOS devices.
/// This setting is only honored on iOS devices.
///
///
/// Defaults to [Brightness.light].
/// Defaults to [Brightness.light].
final
Brightness
keyboardAppearance
;
final
Brightness
keyboardAppearance
;
...
...
packages/flutter/lib/src/widgets/framework.dart
View file @
1cc03651
...
@@ -2076,15 +2076,15 @@ class BuildOwner {
...
@@ -2076,15 +2076,15 @@ class BuildOwner {
/// Whether [_dirtyElements] need to be sorted again as a result of more
/// Whether [_dirtyElements] need to be sorted again as a result of more
/// elements becoming dirty during the build.
/// elements becoming dirty during the build.
///
///
/// This is necessary to preserve the sort order defined by [Element._sort].
/// This is necessary to preserve the sort order defined by [Element._sort].
///
///
/// This field is set to null when [buildScope] is not actively rebuilding
/// This field is set to null when [buildScope] is not actively rebuilding
/// the widget tree.
/// the widget tree.
bool
_dirtyElementsNeedsResorting
;
bool
_dirtyElementsNeedsResorting
;
/// Whether [buildScope] is actively rebuilding the widget tree.
/// Whether [buildScope] is actively rebuilding the widget tree.
///
///
/// [scheduleBuildFor] should only be called when this value is true.
/// [scheduleBuildFor] should only be called when this value is true.
bool
get
_debugIsInBuildScope
=>
_dirtyElementsNeedsResorting
!=
null
;
bool
get
_debugIsInBuildScope
=>
_dirtyElementsNeedsResorting
!=
null
;
...
...
packages/flutter/test/cupertino/slider_test.dart
View file @
1cc03651
...
@@ -117,7 +117,7 @@ void main() {
...
@@ -117,7 +117,7 @@ void main() {
));
));
await
_dragSlider
(
tester
,
sliderKey
);
await
_dragSlider
(
tester
,
sliderKey
);
expect
(
numberOfTimesOnChangeStartIsCalled
,
equals
(
1
));
expect
(
numberOfTimesOnChangeStartIsCalled
,
equals
(
1
));
await
tester
.
pump
();
// No animation should start.
await
tester
.
pump
();
// No animation should start.
...
@@ -154,9 +154,9 @@ void main() {
...
@@ -154,9 +154,9 @@ void main() {
},
},
),
),
));
));
await
_dragSlider
(
tester
,
sliderKey
);
await
_dragSlider
(
tester
,
sliderKey
);
expect
(
numberOfTimesOnChangeEndIsCalled
,
equals
(
1
));
expect
(
numberOfTimesOnChangeEndIsCalled
,
equals
(
1
));
await
tester
.
pump
();
// No animation should start.
await
tester
.
pump
();
// No animation should start.
...
@@ -199,7 +199,7 @@ void main() {
...
@@ -199,7 +199,7 @@ void main() {
));
));
expect
(
value
,
equals
(
0.0
));
expect
(
value
,
equals
(
0.0
));
final
Offset
topLeft
=
tester
.
getTopLeft
(
find
.
byKey
(
sliderKey
));
final
Offset
topLeft
=
tester
.
getTopLeft
(
find
.
byKey
(
sliderKey
));
const
double
unit
=
CupertinoThumbPainter
.
radius
;
const
double
unit
=
CupertinoThumbPainter
.
radius
;
const
double
delta
=
3.0
*
unit
;
const
double
delta
=
3.0
*
unit
;
...
@@ -210,7 +210,7 @@ void main() {
...
@@ -210,7 +210,7 @@ void main() {
expect
(
startValue
,
equals
(
0.0
));
expect
(
startValue
,
equals
(
0.0
));
expect
(
value
,
equals
(
finalValue
));
expect
(
value
,
equals
(
finalValue
));
expect
(
endValue
,
equals
(
finalValue
));
expect
(
endValue
,
equals
(
finalValue
));
await
tester
.
pump
();
// No animation should start.
await
tester
.
pump
();
// No animation should start.
// Check the transientCallbackCount before tearing down the widget to ensure
// Check the transientCallbackCount before tearing down the widget to ensure
// that no animation is running.
// that no animation is running.
...
@@ -222,7 +222,7 @@ void main() {
...
@@ -222,7 +222,7 @@ void main() {
double
value
=
0.0
;
double
value
=
0.0
;
double
startValue
;
double
startValue
;
double
endValue
;
double
endValue
;
await
tester
.
pumpWidget
(
new
Directionality
(
await
tester
.
pumpWidget
(
new
Directionality
(
textDirection:
TextDirection
.
rtl
,
textDirection:
TextDirection
.
rtl
,
child:
new
StatefulBuilder
(
child:
new
StatefulBuilder
(
...
@@ -255,18 +255,18 @@ void main() {
...
@@ -255,18 +255,18 @@ void main() {
));
));
expect
(
value
,
equals
(
0.0
));
expect
(
value
,
equals
(
0.0
));
final
Offset
bottomRight
=
tester
.
getBottomRight
(
find
.
byKey
(
sliderKey
));
final
Offset
bottomRight
=
tester
.
getBottomRight
(
find
.
byKey
(
sliderKey
));
const
double
unit
=
CupertinoThumbPainter
.
radius
;
const
double
unit
=
CupertinoThumbPainter
.
radius
;
const
double
delta
=
3.0
*
unit
;
const
double
delta
=
3.0
*
unit
;
await
tester
.
dragFrom
(
bottomRight
-
const
Offset
(
unit
,
unit
),
const
Offset
(-
delta
,
0.0
));
await
tester
.
dragFrom
(
bottomRight
-
const
Offset
(
unit
,
unit
),
const
Offset
(-
delta
,
0.0
));
final
Size
size
=
tester
.
getSize
(
find
.
byKey
(
sliderKey
));
final
Size
size
=
tester
.
getSize
(
find
.
byKey
(
sliderKey
));
final
double
finalValue
=
delta
/
(
size
.
width
-
2.0
*
(
8.0
+
CupertinoThumbPainter
.
radius
));
final
double
finalValue
=
delta
/
(
size
.
width
-
2.0
*
(
8.0
+
CupertinoThumbPainter
.
radius
));
expect
(
startValue
,
equals
(
0.0
));
expect
(
startValue
,
equals
(
0.0
));
expect
(
value
,
equals
(
finalValue
));
expect
(
value
,
equals
(
finalValue
));
expect
(
endValue
,
equals
(
finalValue
));
expect
(
endValue
,
equals
(
finalValue
));
await
tester
.
pump
();
// No animation should start.
await
tester
.
pump
();
// No animation should start.
// Check the transientCallbackCount before tearing down the widget to ensure
// Check the transientCallbackCount before tearing down the widget to ensure
// that no animation is running.
// that no animation is running.
...
...
packages/flutter/test/foundation/licenses_test.dart
View file @
1cc03651
...
@@ -34,10 +34,10 @@ G
...
@@ -34,10 +34,10 @@ G
H
H
H]
H]
\
u0020
\
u0020
\
u0020
\
u0020
I
J
I
\
u000c
J
K
\
u000c
K
K
K
\
u000c
L
L
L L
L L
L L
L L
...
...
packages/flutter/test/material/scaffold_test.dart
View file @
1cc03651
...
@@ -133,7 +133,7 @@ void main() {
...
@@ -133,7 +133,7 @@ void main() {
expect
(
tester
.
binding
.
transientCallbackCount
,
0
);
expect
(
tester
.
binding
.
transientCallbackCount
,
0
);
await
tester
.
pumpWidget
(
new
MaterialApp
(
home:
const
Scaffold
()));
await
tester
.
pumpWidget
(
new
MaterialApp
(
home:
const
Scaffold
()));
expect
(
tester
.
binding
.
transientCallbackCount
,
0
);
expect
(
tester
.
binding
.
transientCallbackCount
,
0
);
await
tester
.
pumpWidget
(
new
MaterialApp
(
home:
const
Scaffold
(
await
tester
.
pumpWidget
(
new
MaterialApp
(
home:
const
Scaffold
(
...
...
packages/flutter/test/painting/gradient_test.dart
View file @
1cc03651
...
@@ -251,9 +251,9 @@ void main() {
...
@@ -251,9 +251,9 @@ void main() {
);
);
final
RadialGradient
actual
=
RadialGradient
.
lerp
(
testGradient1
,
testGradient2
,
0.5
);
final
RadialGradient
actual
=
RadialGradient
.
lerp
(
testGradient1
,
testGradient2
,
0.5
);
expect
(
actual
.
focal
,
isNull
);
expect
(
actual
.
focal
,
isNull
);
expect
(
actual
,
const
RadialGradient
(
expect
(
actual
,
const
RadialGradient
(
center:
const
Alignment
(
0.0
,
-
1.0
),
center:
const
Alignment
(
0.0
,
-
1.0
),
radius:
15.0
,
radius:
15.0
,
...
@@ -322,7 +322,7 @@ void main() {
...
@@ -322,7 +322,7 @@ void main() {
],
],
));
));
});
});
test
(
'SweepGradient lerp test'
,
()
{
test
(
'SweepGradient lerp test'
,
()
{
const
SweepGradient
testGradient1
=
const
SweepGradient
(
const
SweepGradient
testGradient1
=
const
SweepGradient
(
center:
Alignment
.
topLeft
,
center:
Alignment
.
topLeft
,
...
@@ -409,9 +409,9 @@ void main() {
...
@@ -409,9 +409,9 @@ void main() {
const
Color
(
0xff666666
),
const
Color
(
0xff666666
),
],
],
);
);
final
SweepGradient
actual
=
testGradient
.
scale
(
0.5
);
final
SweepGradient
actual
=
testGradient
.
scale
(
0.5
);
expect
(
actual
,
const
SweepGradient
(
expect
(
actual
,
const
SweepGradient
(
center:
Alignment
.
topLeft
,
center:
Alignment
.
topLeft
,
startAngle:
0.0
,
startAngle:
0.0
,
...
...
packages/flutter/test/painting/text_style_test.dart
View file @
1cc03651
...
@@ -252,7 +252,7 @@ void main() {
...
@@ -252,7 +252,7 @@ void main() {
expect
(
TextStyle
.
lerp
(
redTextStyle
,
bluePaintTextStyle
,
.
25
).
color
,
isNull
);
expect
(
TextStyle
.
lerp
(
redTextStyle
,
bluePaintTextStyle
,
.
25
).
color
,
isNull
);
expect
(
TextStyle
.
lerp
(
redTextStyle
,
bluePaintTextStyle
,
.
25
).
foreground
.
color
,
red
);
expect
(
TextStyle
.
lerp
(
redTextStyle
,
bluePaintTextStyle
,
.
25
).
foreground
.
color
,
red
);
expect
(
TextStyle
.
lerp
(
redTextStyle
,
bluePaintTextStyle
,
.
75
).
foreground
.
color
,
blue
);
expect
(
TextStyle
.
lerp
(
redTextStyle
,
bluePaintTextStyle
,
.
75
).
foreground
.
color
,
blue
);
expect
(
TextStyle
.
lerp
(
redPaintTextStyle
,
bluePaintTextStyle
,
.
25
).
color
,
isNull
);
expect
(
TextStyle
.
lerp
(
redPaintTextStyle
,
bluePaintTextStyle
,
.
25
).
color
,
isNull
);
expect
(
TextStyle
.
lerp
(
redPaintTextStyle
,
bluePaintTextStyle
,
.
25
).
foreground
.
color
,
red
);
expect
(
TextStyle
.
lerp
(
redPaintTextStyle
,
bluePaintTextStyle
,
.
25
).
foreground
.
color
,
red
);
expect
(
TextStyle
.
lerp
(
redPaintTextStyle
,
bluePaintTextStyle
,
.
75
).
foreground
.
color
,
blue
);
expect
(
TextStyle
.
lerp
(
redPaintTextStyle
,
bluePaintTextStyle
,
.
75
).
foreground
.
color
,
blue
);
...
...
packages/flutter/test/scheduler/ticker_test.dart
View file @
1cc03651
...
@@ -107,7 +107,7 @@ void main() {
...
@@ -107,7 +107,7 @@ void main() {
testWidgets
(
'Ticker can be created before application unpauses'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'Ticker can be created before application unpauses'
,
(
WidgetTester
tester
)
async
{
final
ByteData
pausedMessage
=
const
StringCodec
().
encodeMessage
(
'AppLifecycleState.paused'
);
final
ByteData
pausedMessage
=
const
StringCodec
().
encodeMessage
(
'AppLifecycleState.paused'
);
await
BinaryMessages
.
handlePlatformMessage
(
'flutter/lifecycle'
,
pausedMessage
,
(
_
)
{});
await
BinaryMessages
.
handlePlatformMessage
(
'flutter/lifecycle'
,
pausedMessage
,
(
_
)
{});
int
tickCount
=
0
;
int
tickCount
=
0
;
void
handleTick
(
Duration
duration
)
{
void
handleTick
(
Duration
duration
)
{
tickCount
+=
1
;
tickCount
+=
1
;
...
@@ -126,7 +126,7 @@ void main() {
...
@@ -126,7 +126,7 @@ void main() {
final
ByteData
resumedMessage
=
const
StringCodec
().
encodeMessage
(
'AppLifecycleState.resumed'
);
final
ByteData
resumedMessage
=
const
StringCodec
().
encodeMessage
(
'AppLifecycleState.resumed'
);
await
BinaryMessages
.
handlePlatformMessage
(
'flutter/lifecycle'
,
resumedMessage
,
(
_
)
{});
await
BinaryMessages
.
handlePlatformMessage
(
'flutter/lifecycle'
,
resumedMessage
,
(
_
)
{});
await
tester
.
pump
(
const
Duration
(
milliseconds:
10
));
await
tester
.
pump
(
const
Duration
(
milliseconds:
10
));
expect
(
tickCount
,
equals
(
1
));
expect
(
tickCount
,
equals
(
1
));
...
...
packages/flutter/test/services/fake_platform_views.dart
View file @
1cc03651
...
@@ -73,7 +73,7 @@ class FakePlatformViewsController {
...
@@ -73,7 +73,7 @@ class FakePlatformViewsController {
code:
'error'
,
code:
'error'
,
message:
'Trying to dispose a platform view with unknown id:
$id
'
,
message:
'Trying to dispose a platform view with unknown id:
$id
'
,
);
);
_views
.
remove
(
id
);
_views
.
remove
(
id
);
return
new
Future
<
Null
>.
sync
(()
=>
null
);
return
new
Future
<
Null
>.
sync
(()
=>
null
);
}
}
...
...
packages/flutter/test/widgets/draggable_test.dart
View file @
1cc03651
...
@@ -716,7 +716,7 @@ void main() {
...
@@ -716,7 +716,7 @@ void main() {
expect
(
tester
.
getTopLeft
(
find
.
text
(
'V'
)),
thirdWidgetLocation
);
expect
(
tester
.
getTopLeft
(
find
.
text
(
'V'
)),
thirdWidgetLocation
);
});
});
});
});
testWidgets
(
'Drag and drop - onDraggableCanceled not called if dropped on accepting target'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'Drag and drop - onDraggableCanceled not called if dropped on accepting target'
,
(
WidgetTester
tester
)
async
{
final
List
<
int
>
accepted
=
<
int
>[];
final
List
<
int
>
accepted
=
<
int
>[];
...
@@ -1690,7 +1690,7 @@ void main() {
...
@@ -1690,7 +1690,7 @@ void main() {
],
],
),
),
));
));
expect
(
semantics
,
hasSemantics
(
expect
(
semantics
,
hasSemantics
(
new
TestSemantics
.
root
(
new
TestSemantics
.
root
(
children:
<
TestSemantics
>[
children:
<
TestSemantics
>[
...
@@ -1750,7 +1750,7 @@ void main() {
...
@@ -1750,7 +1750,7 @@ void main() {
await
tester
.
pump
();
await
tester
.
pump
();
await
gesture
.
moveTo
(
secondLocation
);
await
gesture
.
moveTo
(
secondLocation
);
await
tester
.
pump
();
await
tester
.
pump
();
expect
(
semantics
,
hasSemantics
(
expect
(
semantics
,
hasSemantics
(
new
TestSemantics
.
root
(
new
TestSemantics
.
root
(
children:
<
TestSemantics
>[
children:
<
TestSemantics
>[
...
...
packages/flutter/test/widgets/set_state_5_test.dart
View file @
1cc03651
...
@@ -17,7 +17,7 @@ class BadWidgetState extends State<BadWidget> {
...
@@ -17,7 +17,7 @@ class BadWidgetState extends State<BadWidget> {
_count
=
1
;
_count
=
1
;
});
});
}
}
int
_count
=
0
;
int
_count
=
0
;
@override
@override
...
...
packages/flutter/test/widgets/spacer_test.dart
View file @
1cc03651
...
@@ -52,7 +52,7 @@ void main() {
...
@@ -52,7 +52,7 @@ void main() {
expect
(
spacer4Rect
.
size
.
width
,
spacer3Rect
.
size
.
width
*
2.0
);
expect
(
spacer4Rect
.
size
.
width
,
spacer3Rect
.
size
.
width
*
2.0
);
expect
(
spacer4Rect
.
left
,
closeTo
(
10.0
,
0.1
));
expect
(
spacer4Rect
.
left
,
closeTo
(
10.0
,
0.1
));
});
});
testWidgets
(
'Spacer takes up space.'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'Spacer takes up space.'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
new
UnconstrainedBox
(
await
tester
.
pumpWidget
(
new
UnconstrainedBox
(
constrainedAxis:
Axis
.
vertical
,
constrainedAxis:
Axis
.
vertical
,
...
...
packages/flutter_driver/lib/src/common/find.dart
View file @
1cc03651
...
@@ -259,7 +259,7 @@ class ByType extends SerializableFinder {
...
@@ -259,7 +259,7 @@ class ByType extends SerializableFinder {
///
///
/// If the object returned by the finder does not have its own semantics node,
/// 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.
/// 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
/// Throws an error if a finder returns multiple objects or if there are no
/// semantics nodes.
/// semantics nodes.
///
///
...
...
packages/flutter_driver/lib/src/driver/driver.dart
View file @
1cc03651
...
@@ -573,10 +573,10 @@ class FlutterDriver {
...
@@ -573,10 +573,10 @@ class FlutterDriver {
/// Retrieves the semantics node id for the object returned by `finder`, or
/// Retrieves the semantics node id for the object returned by `finder`, or
/// the nearest ancestor with a semantics node.
/// the nearest ancestor with a semantics node.
///
///
/// Throws an error if `finder` returns multiple elements or a semantics
/// Throws an error if `finder` returns multiple elements or a semantics
/// node is not found.
/// node is not found.
///
///
/// Semantics must be enabled to use this method, either using a platform
/// Semantics must be enabled to use this method, either using a platform
/// specific shell command or [setSemantics].
/// specific shell command or [setSemantics].
Future
<
int
>
getSemanticsId
(
SerializableFinder
finder
,
{
Duration
timeout
=
_kShortTimeout
})
async
{
Future
<
int
>
getSemanticsId
(
SerializableFinder
finder
,
{
Duration
timeout
=
_kShortTimeout
})
async
{
...
...
packages/flutter_driver/lib/src/extension/extension.dart
View file @
1cc03651
...
@@ -63,7 +63,7 @@ class _DriverBinding extends BindingBase with ServicesBinding, SchedulerBinding,
...
@@ -63,7 +63,7 @@ class _DriverBinding extends BindingBase with ServicesBinding, SchedulerBinding,
///
///
/// Optionally you can pass a [DataHandler] callback. It will be called if the
/// Optionally you can pass a [DataHandler] callback. It will be called if the
/// test calls [FlutterDriver.requestData].
/// test calls [FlutterDriver.requestData].
///
///
/// `slienceErrors` will prevent exceptions from being logged. This is useful
/// `slienceErrors` will prevent exceptions from being logged. This is useful
/// for tests where exceptions are expected. Defaults to false. Any errors
/// for tests where exceptions are expected. Defaults to false. Any errors
/// will still be returned in the `response` field of the result json along
/// will still be returned in the `response` field of the result json along
...
...
packages/flutter_driver/test/src/extension_test.dart
View file @
1cc03651
...
@@ -81,10 +81,10 @@ void main() {
...
@@ -81,10 +81,10 @@ void main() {
final
SemanticsHandle
semantics
=
RendererBinding
.
instance
.
pipelineOwner
.
ensureSemantics
();
final
SemanticsHandle
semantics
=
RendererBinding
.
instance
.
pipelineOwner
.
ensureSemantics
();
await
tester
.
pumpWidget
(
await
tester
.
pumpWidget
(
const
Text
(
'hello'
,
textDirection:
TextDirection
.
ltr
));
const
Text
(
'hello'
,
textDirection:
TextDirection
.
ltr
));
final
Map
<
String
,
Object
>
arguments
=
new
GetSemanticsId
(
new
ByText
(
'hello'
)).
serialize
();
final
Map
<
String
,
Object
>
arguments
=
new
GetSemanticsId
(
new
ByText
(
'hello'
)).
serialize
();
final
GetSemanticsIdResult
result
=
GetSemanticsIdResult
.
fromJson
((
await
extension
.
call
(
arguments
))[
'response'
]);
final
GetSemanticsIdResult
result
=
GetSemanticsIdResult
.
fromJson
((
await
extension
.
call
(
arguments
))[
'response'
]);
expect
(
result
.
id
,
1
);
expect
(
result
.
id
,
1
);
semantics
.
dispose
();
semantics
.
dispose
();
});
});
...
@@ -92,10 +92,10 @@ void main() {
...
@@ -92,10 +92,10 @@ void main() {
testWidgets
(
'throws state error if no data is found'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'throws state error if no data is found'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
await
tester
.
pumpWidget
(
const
Text
(
'hello'
,
textDirection:
TextDirection
.
ltr
));
const
Text
(
'hello'
,
textDirection:
TextDirection
.
ltr
));
final
Map
<
String
,
Object
>
arguments
=
new
GetSemanticsId
(
new
ByText
(
'hello'
)).
serialize
();
final
Map
<
String
,
Object
>
arguments
=
new
GetSemanticsId
(
new
ByText
(
'hello'
)).
serialize
();
final
Map
<
String
,
Object
>
response
=
await
extension
.
call
(
arguments
);
final
Map
<
String
,
Object
>
response
=
await
extension
.
call
(
arguments
);
expect
(
response
[
'isError'
],
true
);
expect
(
response
[
'isError'
],
true
);
expect
(
response
[
'response'
],
contains
(
'Bad state: No semantics data found'
));
expect
(
response
[
'response'
],
contains
(
'Bad state: No semantics data found'
));
});
});
...
@@ -111,10 +111,10 @@ void main() {
...
@@ -111,10 +111,10 @@ void main() {
]),
]),
),
),
);
);
final
Map
<
String
,
Object
>
arguments
=
new
GetSemanticsId
(
new
ByText
(
'hello'
)).
serialize
();
final
Map
<
String
,
Object
>
arguments
=
new
GetSemanticsId
(
new
ByText
(
'hello'
)).
serialize
();
final
Map
<
String
,
Object
>
response
=
await
extension
.
call
(
arguments
);
final
Map
<
String
,
Object
>
response
=
await
extension
.
call
(
arguments
);
expect
(
response
[
'isError'
],
true
);
expect
(
response
[
'isError'
],
true
);
expect
(
response
[
'response'
],
contains
(
'Bad state: Too many elements'
));
expect
(
response
[
'response'
],
contains
(
'Bad state: Too many elements'
));
semantics
.
dispose
();
semantics
.
dispose
();
...
...
packages/flutter_test/lib/src/widget_tester.dart
View file @
1cc03651
...
@@ -616,7 +616,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker
...
@@ -616,7 +616,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker
}
}
/// Attempts to find the [SemanticsData] of first result from `finder`.
/// Attempts to find the [SemanticsData] of first result from `finder`.
///
///
/// If the object identified by the finder doesn't own it's semantic node,
/// 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
/// 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
/// data. The ancestor's semantic data will include the child's as well as
...
...
packages/flutter_test/test/finders_test.dart
View file @
1cc03651
...
@@ -14,7 +14,7 @@ void main() {
...
@@ -14,7 +14,7 @@ void main() {
));
));
expect
(
find
.
text
(
'test'
),
findsOneWidget
);
expect
(
find
.
text
(
'test'
),
findsOneWidget
);
});
});
testWidgets
(
'finds Text.rich widgets'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'finds Text.rich widgets'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
_boilerplate
(
await
tester
.
pumpWidget
(
_boilerplate
(
const
Text
.
rich
(
const
Text
.
rich
(
...
...
packages/flutter_test/test/widget_tester_test.dart
View file @
1cc03651
...
@@ -564,7 +564,7 @@ void main() {
...
@@ -564,7 +564,7 @@ void main() {
throwsA
(
isInstanceOf
<
StateError
>()));
throwsA
(
isInstanceOf
<
StateError
>()));
semanticsHandle
.
dispose
();
semanticsHandle
.
dispose
();
});
});
testWidgets
(
'Returns the correct SemanticsData'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'Returns the correct SemanticsData'
,
(
WidgetTester
tester
)
async
{
final
SemanticsHandle
semanticsHandle
=
tester
.
ensureSemantics
();
final
SemanticsHandle
semanticsHandle
=
tester
.
ensureSemantics
();
...
...
packages/flutter_tools/lib/src/android/android_sdk.dart
View file @
1cc03651
...
@@ -70,7 +70,7 @@ String getEmulatorPath([AndroidSdk existingSdk]) {
...
@@ -70,7 +70,7 @@ String getEmulatorPath([AndroidSdk existingSdk]) {
/// Locate the path for storing AVD emulator images. Returns null if none found.
/// Locate the path for storing AVD emulator images. Returns null if none found.
String
getAvdPath
(
)
{
String
getAvdPath
(
)
{
final
List
<
String
>
searchPaths
=
<
String
>[
final
List
<
String
>
searchPaths
=
<
String
>[
platform
.
environment
[
'ANDROID_AVD_HOME'
]
platform
.
environment
[
'ANDROID_AVD_HOME'
]
];
];
...
...
packages/flutter_tools/lib/src/commands/daemon.dart
View file @
1cc03651
...
@@ -374,7 +374,7 @@ class AppDomain extends Domain {
...
@@ -374,7 +374,7 @@ class AppDomain extends Domain {
ipv6:
ipv6
,
ipv6:
ipv6
,
);
);
}
}
return
launch
(
return
launch
(
runner
,
runner
,
({
Completer
<
DebugConnectionInfo
>
connectionInfoCompleter
,
({
Completer
<
DebugConnectionInfo
>
connectionInfoCompleter
,
...
...
packages/flutter_tools/lib/src/crash_reporting.dart
View file @
1cc03651
...
@@ -37,9 +37,9 @@ const String _kStackTraceFileField = 'DartError';
...
@@ -37,9 +37,9 @@ const String _kStackTraceFileField = 'DartError';
const
String
_kStackTraceFilename
=
'stacktrace_file'
;
const
String
_kStackTraceFilename
=
'stacktrace_file'
;
/// Sends crash reports to Google.
/// Sends crash reports to Google.
///
///
/// There are two ways to override the behavior of this class:
/// There are two ways to override the behavior of this class:
///
///
/// * Define a `FLUTTER_CRASH_SERVER_BASE_URL` environment variable that points
/// * Define a `FLUTTER_CRASH_SERVER_BASE_URL` environment variable that points
/// to a custom crash reporting server. This is useful if your development
/// to a custom crash reporting server. This is useful if your development
/// environment is behind a firewall and unable to send crash reports to
/// environment is behind a firewall and unable to send crash reports to
...
...
packages/flutter_tools/lib/src/ios/code_signing.dart
View file @
1cc03651
...
@@ -20,7 +20,7 @@ const String noCertificatesInstruction = '''
...
@@ -20,7 +20,7 @@ const String noCertificatesInstruction = '''
════════════════════════════════════════════════════════════════════════════════
════════════════════════════════════════════════════════════════════════════════
No valid code signing certificates were found
No valid code signing certificates were found
You can connect to your Apple Developer account by signing in with your Apple ID
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:
Profile for your project by:
$fixWithDevelopmentTeamInstruction
$fixWithDevelopmentTeamInstruction
5- Trust your newly created Development Certificate on your iOS device
5- Trust your newly created Development Certificate on your iOS device
...
@@ -37,12 +37,12 @@ Or run on an iOS simulator without code signing
...
@@ -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.
/// The user did iOS development but never on this project and/or device.
const
String
noProvisioningProfileInstruction
=
'''
const
String
noProvisioningProfileInstruction
=
'''
════════════════════════════════════════════════════════════════════════════════
════════════════════════════════════════════════════════════════════════════════
No Provisioning Profile was found for your project'
s
Bundle
Identifier
or
your
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
device
.
You
can
create
a
new
Provisioning
Profile
for
your
project
in
Xcode
for
\
u0020
your
team
by:
your
team
by:
$fixWithDevelopmentTeamInstruction
$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.
Identifier was signed with a different certificate.
For more information, please visit:
For more information, please visit:
...
@@ -55,7 +55,7 @@ Or run on an iOS simulator without code signing
...
@@ -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.
/// Couldn't auto sign the app but can likely solved by retracing the signing flow in Xcode.
const
String
noDevelopmentTeamInstruction
=
'''
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:
Provisioning Profile. Please ensure that a Development Team is selected by:
$fixWithDevelopmentTeamInstruction
$fixWithDevelopmentTeamInstruction
...
@@ -69,7 +69,7 @@ const String fixWithDevelopmentTeamInstruction = '''
...
@@ -69,7 +69,7 @@ const String fixWithDevelopmentTeamInstruction = '''
open
ios
/
Runner
.
xcworkspace
open
ios
/
Runner
.
xcworkspace
2
-
Select
the
'Runner'
project
in
the
navigator
then
the
'Runner'
target
2
-
Select
the
'Runner'
project
in
the
navigator
then
the
'Runner'
target
in
the
project
settings
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:
You
may
need
to:
-
Log
in
with
your
Apple
ID
in
Xcode
first
-
Log
in
with
your
Apple
ID
in
Xcode
first
-
Ensure
you
have
a
valid
unique
Bundle
ID
-
Ensure
you
have
a
valid
unique
Bundle
ID
...
...
packages/flutter_tools/test/cache_test.dart
View file @
1cc03651
...
@@ -115,7 +115,7 @@ void main() {
...
@@ -115,7 +115,7 @@ void main() {
class
MockFileSystem
extends
ForwardingFileSystem
{
class
MockFileSystem
extends
ForwardingFileSystem
{
MockFileSystem
()
:
super
(
new
MemoryFileSystem
());
MockFileSystem
()
:
super
(
new
MemoryFileSystem
());
@override
@override
File
file
(
dynamic
path
)
{
File
file
(
dynamic
path
)
{
return
new
MockFile
();
return
new
MockFile
();
...
...
packages/flutter_tools/test/commands/doctor_test.dart
View file @
1cc03651
...
@@ -325,7 +325,7 @@ class VsCodeValidatorTestTargets extends VsCodeValidator {
...
@@ -325,7 +325,7 @@ class VsCodeValidatorTestTargets extends VsCodeValidator {
static
final
String
validInstall
=
fs
.
path
.
join
(
'test'
,
'data'
,
'vscode'
,
'application'
);
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
validExtensions
=
fs
.
path
.
join
(
'test'
,
'data'
,
'vscode'
,
'extensions'
);
static
final
String
missingExtensions
=
fs
.
path
.
join
(
'test'
,
'data'
,
'vscode'
,
'notExtensions'
);
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
));
:
super
(
new
VsCode
.
fromDirectory
(
installDirectory
,
extensionDirectory
,
edition:
edition
));
static
VsCodeValidatorTestTargets
get
installedWithExtension
=>
static
VsCodeValidatorTestTargets
get
installedWithExtension
=>
...
...
packages/flutter_tools/test/integration/flutter_attach.dart
View file @
1cc03651
...
@@ -36,7 +36,7 @@ void main() {
...
@@ -36,7 +36,7 @@ void main() {
testUsingContext
(
'can hot reload'
,
()
async
{
testUsingContext
(
'can hot reload'
,
()
async
{
await
_flutterRun
.
run
(
withDebugger:
true
);
await
_flutterRun
.
run
(
withDebugger:
true
);
await
_flutterAttach
.
attach
(
_flutterRun
.
vmServicePort
);
await
_flutterAttach
.
attach
(
_flutterRun
.
vmServicePort
);
await
_flutterAttach
.
hotReload
();
await
_flutterAttach
.
hotReload
();
});
});
},
timeout:
const
Timeout
.
factor
(
3
));
},
timeout:
const
Timeout
.
factor
(
3
));
...
...
packages/flutter_tools/test/integration/test_data/basic_project.dart
View file @
1cc03651
...
@@ -19,9 +19,9 @@ class BasicProject extends TestProject {
...
@@ -19,9 +19,9 @@ class BasicProject extends TestProject {
@override
@override
final
String
main
=
r''
'
final
String
main
=
r''
'
import '
package:
flutter
/
material
.
dart
';
import '
package:
flutter
/
material
.
dart
';
void main() => runApp(new MyApp());
void main() => runApp(new MyApp());
class MyApp extends StatelessWidget {
class MyApp extends StatelessWidget {
@override
@override
Widget build(BuildContext context) {
Widget build(BuildContext context) {
...
...
packages/flutter_tools/test/integration/test_driver.dart
View file @
1cc03651
...
@@ -78,7 +78,7 @@ class FlutterTestDriver {
...
@@ -78,7 +78,7 @@ class FlutterTestDriver {
Future
<
void
>
_setupProcess
(
List
<
String
>
args
,
{
bool
withDebugger
=
false
})
async
{
Future
<
void
>
_setupProcess
(
List
<
String
>
args
,
{
bool
withDebugger
=
false
})
async
{
final
String
flutterBin
=
fs
.
path
.
join
(
getFlutterRoot
(),
'bin'
,
'flutter'
);
final
String
flutterBin
=
fs
.
path
.
join
(
getFlutterRoot
(),
'bin'
,
'flutter'
);
_debugPrint
(
'Spawning flutter
$args
in
${_projectFolder.path}
'
);
_debugPrint
(
'Spawning flutter
$args
in
${_projectFolder.path}
'
);
const
ProcessManager
_processManager
=
const
LocalProcessManager
();
const
ProcessManager
_processManager
=
const
LocalProcessManager
();
_proc
=
await
_processManager
.
start
(
_proc
=
await
_processManager
.
start
(
<
String
>[
flutterBin
]
<
String
>[
flutterBin
]
...
@@ -103,7 +103,7 @@ class FlutterTestDriver {
...
@@ -103,7 +103,7 @@ class FlutterTestDriver {
// script).
// script).
final
Map
<
String
,
dynamic
>
connected
=
await
_waitFor
(
event:
'daemon.connected'
);
final
Map
<
String
,
dynamic
>
connected
=
await
_waitFor
(
event:
'daemon.connected'
);
_procPid
=
connected
[
'params'
][
'pid'
];
_procPid
=
connected
[
'params'
][
'pid'
];
// Set this up now, but we don't wait it yet. We want to make sure we don't
// 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.
// miss it while waiting for debugPort below.
final
Future
<
Map
<
String
,
dynamic
>>
started
=
_waitFor
(
event:
'app.started'
,
final
Future
<
Map
<
String
,
dynamic
>>
started
=
_waitFor
(
event:
'app.started'
,
...
@@ -126,7 +126,7 @@ class FlutterTestDriver {
...
@@ -126,7 +126,7 @@ class FlutterTestDriver {
// Because we start paused, resume so the app is in a "running" state as
// 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
// expected by tests. Tests will reload/restart as required if they need
// to hit breakpoints, etc.
// to hit breakpoints, etc.
await
waitForPause
();
await
waitForPause
();
await
resume
(
wait:
false
);
await
resume
(
wait:
false
);
}
}
...
@@ -266,7 +266,7 @@ class FlutterTestDriver {
...
@@ -266,7 +266,7 @@ class FlutterTestDriver {
response
.
complete
(
json
);
response
.
complete
(
json
);
}
}
});
});
return
_timeoutWithMessages
(()
=>
response
.
future
,
return
_timeoutWithMessages
(()
=>
response
.
future
,
timeout:
timeout
,
timeout:
timeout
,
message:
event
!=
null
message:
event
!=
null
...
@@ -285,7 +285,7 @@ class FlutterTestDriver {
...
@@ -285,7 +285,7 @@ class FlutterTestDriver {
messages
.
writeln
(
'[+
${ms.toString().padLeft(5)}
]
$m
'
);
messages
.
writeln
(
'[+
${ms.toString().padLeft(5)}
]
$m
'
);
}
}
final
StreamSubscription
<
String
>
sub
=
_allMessages
.
stream
.
listen
(
logMessage
);
final
StreamSubscription
<
String
>
sub
=
_allMessages
.
stream
.
listen
(
logMessage
);
return
f
().
timeout
(
timeout
??
defaultTimeout
,
onTimeout:
()
{
return
f
().
timeout
(
timeout
??
defaultTimeout
,
onTimeout:
()
{
logMessage
(
'<timed out>'
);
logMessage
(
'<timed out>'
);
throw
'
$message
\n
Received:
\n
${messages.toString()}
'
;
throw
'
$message
\n
Received:
\n
${messages.toString()}
'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment