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
66f424f0
Unverified
Commit
66f424f0
authored
Jan 23, 2019
by
Alexandre Ardhuin
Committed by
GitHub
Jan 23, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some bad indentations (#26921)
* fix some bad indentations * remove suspicious line
parent
f329b462
Changes
30
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
50 additions
and
49 deletions
+50
-49
localizations.dart
packages/flutter/lib/src/cupertino/localizations.dart
+1
-1
picker.dart
packages/flutter/lib/src/cupertino/picker.dart
+1
-1
key.dart
packages/flutter/lib/src/foundation/key.dart
+3
-1
licenses.dart
packages/flutter/lib/src/foundation/licenses.dart
+2
-1
scale.dart
packages/flutter/lib/src/gestures/scale.dart
+1
-1
input_decorator.dart
packages/flutter/lib/src/material/input_decorator.dart
+2
-2
raised_button.dart
packages/flutter/lib/src/material/raised_button.dart
+1
-1
tabs.dart
packages/flutter/lib/src/material/tabs.dart
+2
-2
box.dart
packages/flutter/lib/src/rendering/box.dart
+2
-2
flex.dart
packages/flutter/lib/src/rendering/flex.dart
+2
-2
list_body.dart
packages/flutter/lib/src/rendering/list_body.dart
+1
-1
proxy_box.dart
packages/flutter/lib/src/rendering/proxy_box.dart
+1
-1
binding.dart
packages/flutter/lib/src/semantics/binding.dart
+1
-1
app.dart
packages/flutter/lib/src/widgets/app.dart
+1
-1
scroll_controller.dart
packages/flutter/lib/src/widgets/scroll_controller.dart
+1
-1
bit_field_test.dart
packages/flutter/test/foundation/bit_field_test.dart
+1
-3
mock_canvas.dart
packages/flutter/test/rendering/mock_canvas.dart
+2
-2
animated_size_test.dart
packages/flutter/test/widgets/animated_size_test.dart
+3
-3
stack_test.dart
packages/flutter/test/widgets/stack_test.dart
+3
-3
android_device.dart
packages/flutter_tools/lib/src/android/android_device.dart
+2
-2
gradle.dart
packages/flutter_tools/lib/src/android/gradle.dart
+3
-2
process.dart
packages/flutter_tools/lib/src/base/process.dart
+2
-2
daemon.dart
packages/flutter_tools/lib/src/commands/daemon.dart
+1
-1
update_packages.dart
packages/flutter_tools/lib/src/commands/update_packages.dart
+0
-1
compile.dart
packages/flutter_tools/lib/src/compile.dart
+1
-1
doctor.dart
packages/flutter_tools/lib/src/doctor.dart
+1
-1
vmservice.dart
packages/flutter_tools/lib/src/vmservice.dart
+1
-1
flutter_run_test.dart
...ages/flutter_tools/test/integration/flutter_run_test.dart
+3
-3
hot_reload_test.dart
packages/flutter_tools/test/integration/hot_reload_test.dart
+2
-2
test_driver.dart
packages/flutter_tools/test/integration/test_driver.dart
+3
-3
No files found.
packages/flutter/lib/src/cupertino/localizations.dart
View file @
66f424f0
...
@@ -292,7 +292,7 @@ class DefaultCupertinoLocalizations implements CupertinoLocalizations {
...
@@ -292,7 +292,7 @@ class DefaultCupertinoLocalizations implements CupertinoLocalizations {
@override
@override
String
datePickerMinuteSemanticsLabel
(
int
minute
)
{
String
datePickerMinuteSemanticsLabel
(
int
minute
)
{
if
(
minute
==
1
)
if
(
minute
==
1
)
return
'1 minute'
;
return
'1 minute'
;
return
minute
.
toString
()
+
' minutes'
;
return
minute
.
toString
()
+
' minutes'
;
}
}
...
...
packages/flutter/lib/src/cupertino/picker.dart
View file @
66f424f0
...
@@ -419,7 +419,7 @@ class _RenderCupertinoPickerSemantics extends RenderProxyBox {
...
@@ -419,7 +419,7 @@ class _RenderCupertinoPickerSemantics extends RenderProxyBox {
_currentIndex
=
controller
.
selectedItem
;
_currentIndex
=
controller
.
selectedItem
;
markNeedsSemanticsUpdate
();
markNeedsSemanticsUpdate
();
}
}
@override
@override
void
describeSemanticsConfiguration
(
SemanticsConfiguration
config
)
{
void
describeSemanticsConfiguration
(
SemanticsConfiguration
config
)
{
super
.
describeSemanticsConfiguration
(
config
);
super
.
describeSemanticsConfiguration
(
config
);
config
.
isSemanticBoundary
=
true
;
config
.
isSemanticBoundary
=
true
;
...
...
packages/flutter/lib/src/foundation/key.dart
View file @
66f424f0
...
@@ -83,4 +83,6 @@ class ValueKey<T> extends LocalKey {
...
@@ -83,4 +83,6 @@ class ValueKey<T> extends LocalKey {
}
}
}
}
class
_TypeLiteral
<
T
>
{
Type
get
type
=>
T
;
}
class
_TypeLiteral
<
T
>
{
Type
get
type
=>
T
;
}
packages/flutter/lib/src/foundation/licenses.dart
View file @
66f424f0
...
@@ -54,7 +54,8 @@ abstract class LicenseEntry {
...
@@ -54,7 +54,8 @@ abstract class LicenseEntry {
}
}
enum
_LicenseEntryWithLineBreaksParserState
{
enum
_LicenseEntryWithLineBreaksParserState
{
beforeParagraph
,
inParagraph
,
beforeParagraph
,
inParagraph
,
}
}
/// Variant of [LicenseEntry] for licenses that separate paragraphs with blank
/// Variant of [LicenseEntry] for licenses that separate paragraphs with blank
...
...
packages/flutter/lib/src/gestures/scale.dart
View file @
66f424f0
...
@@ -168,7 +168,7 @@ class ScaleGestureRecognizer extends OneSequenceGestureRecognizer {
...
@@ -168,7 +168,7 @@ class ScaleGestureRecognizer extends OneSequenceGestureRecognizer {
_LineBetweenPointers
_initialLine
;
_LineBetweenPointers
_initialLine
;
_LineBetweenPointers
_currentLine
;
_LineBetweenPointers
_currentLine
;
Map
<
int
,
Offset
>
_pointerLocations
;
Map
<
int
,
Offset
>
_pointerLocations
;
List
<
int
>
_pointerQueue
;
//
/
A queue to sort pointers in order of entrance
List
<
int
>
_pointerQueue
;
// A queue to sort pointers in order of entrance
final
Map
<
int
,
VelocityTracker
>
_velocityTrackers
=
<
int
,
VelocityTracker
>{};
final
Map
<
int
,
VelocityTracker
>
_velocityTrackers
=
<
int
,
VelocityTracker
>{};
double
get
_scaleFactor
=>
_initialSpan
>
0.0
?
_currentSpan
/
_initialSpan
:
1.0
;
double
get
_scaleFactor
=>
_initialSpan
>
0.0
?
_currentSpan
/
_initialSpan
:
1.0
;
...
...
packages/flutter/lib/src/material/input_decorator.dart
View file @
66f424f0
...
@@ -3043,7 +3043,7 @@ class InputDecorationTheme extends Diagnosticable {
...
@@ -3043,7 +3043,7 @@ class InputDecorationTheme extends Diagnosticable {
/// * [InputDecorator.isFocused], which is true if the [InputDecorator]'s child
/// * [InputDecorator.isFocused], which is true if the [InputDecorator]'s child
/// has the focus.
/// has the focus.
/// * [InputDecoration.errorText], the error shown by the [InputDecorator], if non-null.
/// * [InputDecoration.errorText], the error shown by the [InputDecorator], if non-null.
/// * [border], for a description of where the [InputDecorator] border appears.
/// * [border], for a description of where the [InputDecorator] border appears.
/// * [UnderlineInputBorder], an [InputDecorator] border which draws a horizontal
/// * [UnderlineInputBorder], an [InputDecorator] border which draws a horizontal
/// line at the bottom of the input decorator's container.
/// line at the bottom of the input decorator's container.
/// * [OutlineInputBorder], an [InputDecorator] border which draws a
/// * [OutlineInputBorder], an [InputDecorator] border which draws a
...
@@ -3059,7 +3059,7 @@ class InputDecorationTheme extends Diagnosticable {
...
@@ -3059,7 +3059,7 @@ class InputDecorationTheme extends Diagnosticable {
/// and [InputDecoration.errorText] is null.
/// and [InputDecoration.errorText] is null.
final
InputBorder
focusedErrorBorder
;
final
InputBorder
focusedErrorBorder
;
/// The border to display when the [InputDecorator] is disabled and is not
/// The border to display when the [InputDecorator] is disabled and is not
/// showing an error.
/// showing an error.
///
///
/// See also:
/// See also:
...
...
packages/flutter/lib/src/material/raised_button.dart
View file @
66f424f0
...
@@ -124,7 +124,7 @@ class RaisedButton extends MaterialButton {
...
@@ -124,7 +124,7 @@ class RaisedButton extends MaterialButton {
@required
Widget
label
,
@required
Widget
label
,
})
=
_RaisedButtonWithIcon
;
})
=
_RaisedButtonWithIcon
;
@override
@override
Widget
build
(
BuildContext
context
)
{
Widget
build
(
BuildContext
context
)
{
final
ThemeData
theme
=
Theme
.
of
(
context
);
final
ThemeData
theme
=
Theme
.
of
(
context
);
final
ButtonThemeData
buttonTheme
=
ButtonTheme
.
of
(
context
);
final
ButtonThemeData
buttonTheme
=
ButtonTheme
.
of
(
context
);
...
...
packages/flutter/lib/src/material/tabs.dart
View file @
66f424f0
...
@@ -393,7 +393,7 @@ class _IndicatorPainter extends CustomPainter {
...
@@ -393,7 +393,7 @@ class _IndicatorPainter extends CustomPainter {
else
if
(
value
==
index
+
1.0
)
else
if
(
value
==
index
+
1.0
)
_currentRect
=
next
??
middle
;
_currentRect
=
next
??
middle
;
else
if
(
value
==
index
)
else
if
(
value
==
index
)
_currentRect
=
middle
;
_currentRect
=
middle
;
else
if
(
value
<
index
)
else
if
(
value
<
index
)
_currentRect
=
previous
==
null
?
middle
:
Rect
.
lerp
(
middle
,
previous
,
index
-
value
);
_currentRect
=
previous
==
null
?
middle
:
Rect
.
lerp
(
middle
,
previous
,
index
-
value
);
else
else
...
@@ -864,7 +864,7 @@ class _TabBarState extends State<TabBar> {
...
@@ -864,7 +864,7 @@ class _TabBarState extends State<TabBar> {
else
if
(
value
==
index
+
1.0
)
else
if
(
value
==
index
+
1.0
)
offset
=
trailingPosition
??
middlePosition
;
offset
=
trailingPosition
??
middlePosition
;
else
if
(
value
==
index
)
else
if
(
value
==
index
)
offset
=
middlePosition
;
offset
=
middlePosition
;
else
if
(
value
<
index
)
else
if
(
value
<
index
)
offset
=
leadingPosition
==
null
?
middlePosition
:
lerpDouble
(
middlePosition
,
leadingPosition
,
index
-
value
);
offset
=
leadingPosition
==
null
?
middlePosition
:
lerpDouble
(
middlePosition
,
leadingPosition
,
index
-
value
);
else
else
...
...
packages/flutter/lib/src/rendering/box.dart
View file @
66f424f0
...
@@ -1736,7 +1736,7 @@ abstract class RenderBox extends RenderObject {
...
@@ -1736,7 +1736,7 @@ abstract class RenderBox extends RenderObject {
information
.
writeln
(
'The nearest ancestor providing an unbounded width constraint is:'
);
information
.
writeln
(
'The nearest ancestor providing an unbounded width constraint is:'
);
information
.
write
(
' '
);
information
.
write
(
' '
);
information
.
writeln
(
node
.
toStringShallow
(
joiner:
'
\n
'
));
information
.
writeln
(
node
.
toStringShallow
(
joiner:
'
\n
'
));
}
}
if
(!
constraints
.
hasBoundedHeight
)
{
if
(!
constraints
.
hasBoundedHeight
)
{
RenderBox
node
=
this
;
RenderBox
node
=
this
;
while
(!
node
.
constraints
.
hasBoundedHeight
&&
node
.
parent
is
RenderBox
)
while
(!
node
.
constraints
.
hasBoundedHeight
&&
node
.
parent
is
RenderBox
)
...
@@ -1834,7 +1834,7 @@ abstract class RenderBox extends RenderObject {
...
@@ -1834,7 +1834,7 @@ abstract class RenderBox extends RenderObject {
// notify them again.
// notify them again.
_cachedBaselines
?.
clear
();
_cachedBaselines
?.
clear
();
_cachedIntrinsicDimensions
?.
clear
();
_cachedIntrinsicDimensions
?.
clear
();
if
(
parent
is
RenderObject
)
{
if
(
parent
is
RenderObject
)
{
markParentNeedsLayout
();
markParentNeedsLayout
();
return
;
return
;
}
}
...
...
packages/flutter/lib/src/rendering/flex.dart
View file @
66f424f0
...
@@ -453,8 +453,8 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
...
@@ -453,8 +453,8 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
assert
(
verticalDirection
!=
null
,
'Vertical
$runtimeType
with
$mainAxisAlignment
has a null verticalDirection, so the alignment cannot be resolved.'
);
assert
(
verticalDirection
!=
null
,
'Vertical
$runtimeType
with
$mainAxisAlignment
has a null verticalDirection, so the alignment cannot be resolved.'
);
break
;
break
;
}
}
}
}
if
(
crossAxisAlignment
==
CrossAxisAlignment
.
start
||
if
(
crossAxisAlignment
==
CrossAxisAlignment
.
start
||
crossAxisAlignment
==
CrossAxisAlignment
.
end
)
{
crossAxisAlignment
==
CrossAxisAlignment
.
end
)
{
switch
(
direction
)
{
switch
(
direction
)
{
case
Axis
.
horizontal
:
case
Axis
.
horizontal
:
...
...
packages/flutter/lib/src/rendering/list_body.dart
View file @
66f424f0
...
@@ -148,7 +148,7 @@ class RenderListBody extends RenderBox
...
@@ -148,7 +148,7 @@ class RenderListBody extends RenderBox
child
.
layout
(
innerConstraints
,
parentUsesSize:
true
);
child
.
layout
(
innerConstraints
,
parentUsesSize:
true
);
final
ListBodyParentData
childParentData
=
child
.
parentData
;
final
ListBodyParentData
childParentData
=
child
.
parentData
;
childParentData
.
offset
=
Offset
(
0.0
,
mainAxisExtent
);
childParentData
.
offset
=
Offset
(
0.0
,
mainAxisExtent
);
mainAxisExtent
+=
child
.
size
.
height
;
mainAxisExtent
+=
child
.
size
.
height
;
assert
(
child
.
parentData
==
childParentData
);
assert
(
child
.
parentData
==
childParentData
);
child
=
childParentData
.
nextSibling
;
child
=
childParentData
.
nextSibling
;
}
}
...
...
packages/flutter/lib/src/rendering/proxy_box.dart
View file @
66f424f0
...
@@ -3098,7 +3098,7 @@ class RenderSemanticsGestureHandler extends RenderProxyBox {
...
@@ -3098,7 +3098,7 @@ class RenderSemanticsGestureHandler extends RenderProxyBox {
markNeedsSemanticsUpdate
();
markNeedsSemanticsUpdate
();
}
}
/// Called when the user taps on the render object.
/// Called when the user taps on the render object.
GestureTapCallback
get
onTap
=>
_onTap
;
GestureTapCallback
get
onTap
=>
_onTap
;
GestureTapCallback
_onTap
;
GestureTapCallback
_onTap
;
set
onTap
(
GestureTapCallback
value
)
{
set
onTap
(
GestureTapCallback
value
)
{
...
...
packages/flutter/lib/src/semantics/binding.dart
View file @
66f424f0
...
@@ -50,7 +50,7 @@ mixin SemanticsBinding on BindingBase {
...
@@ -50,7 +50,7 @@ mixin SemanticsBinding on BindingBase {
bool
value
=
_accessibilityFeatures
.
disableAnimations
;
bool
value
=
_accessibilityFeatures
.
disableAnimations
;
assert
(()
{
assert
(()
{
if
(
debugSemanticsDisableAnimations
!=
null
)
if
(
debugSemanticsDisableAnimations
!=
null
)
value
=
debugSemanticsDisableAnimations
;
value
=
debugSemanticsDisableAnimations
;
return
true
;
return
true
;
}());
}());
return
value
;
return
value
;
...
...
packages/flutter/lib/src/widgets/app.dart
View file @
66f424f0
...
@@ -929,7 +929,7 @@ class _WidgetsAppState extends State<WidgetsApp> implements WidgetsBindingObserv
...
@@ -929,7 +929,7 @@ class _WidgetsAppState extends State<WidgetsApp> implements WidgetsBindingObserv
}
}
// Look for language+country match.
// Look for language+country match.
if
(
userLocale
.
countryCode
!=
null
)
{
if
(
userLocale
.
countryCode
!=
null
)
{
final
Locale
match
=
languageAndCountryLocales
[
'
${userLocale.languageCode}
_
${userLocale.countryCode}
'
];
final
Locale
match
=
languageAndCountryLocales
[
'
${userLocale.languageCode}
_
${userLocale.countryCode}
'
];
if
(
match
!=
null
)
{
if
(
match
!=
null
)
{
return
match
;
return
match
;
}
}
...
...
packages/flutter/lib/src/widgets/scroll_controller.dart
View file @
66f424f0
...
@@ -224,7 +224,7 @@ class ScrollController extends ChangeNotifier {
...
@@ -224,7 +224,7 @@ class ScrollController extends ChangeNotifier {
/// This is used when the environment has changed and the [Scrollable]
/// This is used when the environment has changed and the [Scrollable]
/// needs to recreate the [ScrollPosition] object. It is null the first
/// needs to recreate the [ScrollPosition] object. It is null the first
/// time the [ScrollPosition] is created.
/// time the [ScrollPosition] is created.
ScrollPosition
createScrollPosition
(
ScrollPosition
createScrollPosition
(
ScrollPhysics
physics
,
ScrollPhysics
physics
,
ScrollContext
context
,
ScrollContext
context
,
ScrollPosition
oldPosition
,
ScrollPosition
oldPosition
,
...
...
packages/flutter/test/foundation/bit_field_test.dart
View file @
66f424f0
...
@@ -5,9 +5,7 @@
...
@@ -5,9 +5,7 @@
import
'package:flutter/foundation.dart'
;
import
'package:flutter/foundation.dart'
;
import
'../flutter_test_alternative.dart'
;
import
'../flutter_test_alternative.dart'
;
enum
_TestEnum
{
enum
_TestEnum
{
a
,
b
,
c
,
d
,
e
,
f
,
g
,
h
,
}
a
,
b
,
c
,
d
,
e
,
f
,
g
,
h
,
}
void
main
(
)
{
void
main
(
)
{
test
(
'BitField control test'
,
()
{
test
(
'BitField control test'
,
()
{
...
...
packages/flutter/test/rendering/mock_canvas.dart
View file @
66f424f0
...
@@ -1182,10 +1182,10 @@ class _LinePaintPredicate extends _DrawCommandPaintPredicate {
...
@@ -1182,10 +1182,10 @@ class _LinePaintPredicate extends _DrawCommandPaintPredicate {
final
Offset
p1Argument
=
arguments
[
0
];
final
Offset
p1Argument
=
arguments
[
0
];
final
Offset
p2Argument
=
arguments
[
1
];
final
Offset
p2Argument
=
arguments
[
1
];
if
(
p1
!=
null
&&
p1Argument
!=
p1
)
{
if
(
p1
!=
null
&&
p1Argument
!=
p1
)
{
throw
'It called
$methodName
with p1 endpoint,
$p1Argument
, which was not exactly the expected endpoint (
$p1
).'
;
throw
'It called
$methodName
with p1 endpoint,
$p1Argument
, which was not exactly the expected endpoint (
$p1
).'
;
}
}
if
(
p2
!=
null
&&
p2Argument
!=
p2
)
{
if
(
p2
!=
null
&&
p2Argument
!=
p2
)
{
throw
'It called
$methodName
with p2 endpoint,
$p2Argument
, which was not exactly the expected endpoint (
$p2
).'
;
throw
'It called
$methodName
with p2 endpoint,
$p2Argument
, which was not exactly the expected endpoint (
$p2
).'
;
}
}
}
}
...
...
packages/flutter/test/widgets/animated_size_test.dart
View file @
66f424f0
...
@@ -10,9 +10,9 @@ class TestPaintingContext implements PaintingContext {
...
@@ -10,9 +10,9 @@ class TestPaintingContext implements PaintingContext {
final
List
<
Invocation
>
invocations
=
<
Invocation
>[];
final
List
<
Invocation
>
invocations
=
<
Invocation
>[];
@override
@override
void
noSuchMethod
(
Invocation
invocation
)
{
void
noSuchMethod
(
Invocation
invocation
)
{
invocations
.
add
(
invocation
);
invocations
.
add
(
invocation
);
}
}
}
}
void
main
(
)
{
void
main
(
)
{
...
...
packages/flutter/test/widgets/stack_test.dart
View file @
66f424f0
...
@@ -12,9 +12,9 @@ class TestPaintingContext implements PaintingContext {
...
@@ -12,9 +12,9 @@ class TestPaintingContext implements PaintingContext {
final
List
<
Invocation
>
invocations
=
<
Invocation
>[];
final
List
<
Invocation
>
invocations
=
<
Invocation
>[];
@override
@override
void
noSuchMethod
(
Invocation
invocation
)
{
void
noSuchMethod
(
Invocation
invocation
)
{
invocations
.
add
(
invocation
);
invocations
.
add
(
invocation
);
}
}
}
}
void
main
(
)
{
void
main
(
)
{
...
...
packages/flutter_tools/lib/src/android/android_device.dart
View file @
66f424f0
...
@@ -676,9 +676,9 @@ class _AdbLogReader extends DeviceLogReader {
...
@@ -676,9 +676,9 @@ class _AdbLogReader extends DeviceLogReader {
final
List
<
String
>
args
=
<
String
>[
'shell'
,
'-x'
,
'logcat'
,
'-v'
,
'time'
];
final
List
<
String
>
args
=
<
String
>[
'shell'
,
'-x'
,
'logcat'
,
'-v'
,
'time'
];
final
String
lastTimestamp
=
device
.
lastLogcatTimestamp
;
final
String
lastTimestamp
=
device
.
lastLogcatTimestamp
;
if
(
lastTimestamp
!=
null
)
if
(
lastTimestamp
!=
null
)
_timeOrigin
=
_adbTimestampToDateTime
(
lastTimestamp
);
_timeOrigin
=
_adbTimestampToDateTime
(
lastTimestamp
);
else
else
_timeOrigin
=
null
;
_timeOrigin
=
null
;
runCommand
(
device
.
adbCommandForDevice
(
args
)).
then
<
void
>((
Process
process
)
{
runCommand
(
device
.
adbCommandForDevice
(
args
)).
then
<
void
>((
Process
process
)
{
_process
=
process
;
_process
=
process
;
const
Utf8Decoder
decoder
=
Utf8Decoder
(
allowMalformed:
true
);
const
Utf8Decoder
decoder
=
Utf8Decoder
(
allowMalformed:
true
);
...
...
packages/flutter_tools/lib/src/android/gradle.dart
View file @
66f424f0
...
@@ -448,8 +448,9 @@ Future<void> _buildGradleProjectV2(
...
@@ -448,8 +448,9 @@ Future<void> _buildGradleProjectV2(
if
(
buildInfo
.
createPatch
)
{
if
(
buildInfo
.
createPatch
)
{
final
AndroidApk
package
=
AndroidApk
.
fromApk
(
apkFile
);
final
AndroidApk
package
=
AndroidApk
.
fromApk
(
apkFile
);
final
Directory
baselineDir
=
fs
.
directory
(
buildInfo
.
baselineDir
);
final
Directory
baselineDir
=
fs
.
directory
(
buildInfo
.
baselineDir
);
final
File
baselineApkFile
=
baselineDir
.
childFile
(
'
${package.versionCode}
.apk'
);
if
(!
baselineApkFile
.
existsSync
())
final
File
baselineApkFile
=
baselineDir
.
childFile
(
'
${package.versionCode}
.apk'
);
if
(!
baselineApkFile
.
existsSync
())
throwToolExit
(
'Error: Could not find baseline package
${baselineApkFile.path}
.'
);
throwToolExit
(
'Error: Could not find baseline package
${baselineApkFile.path}
.'
);
printStatus
(
'Found baseline package
${baselineApkFile.path}
.'
);
printStatus
(
'Found baseline package
${baselineApkFile.path}
.'
);
...
...
packages/flutter_tools/lib/src/base/process.dart
View file @
66f424f0
...
@@ -381,8 +381,8 @@ class RunResult {
...
@@ -381,8 +381,8 @@ class RunResult {
return
out
.
toString
().
trimRight
();
return
out
.
toString
().
trimRight
();
}
}
/// Throws a [ProcessException] with the given `message`.
/// Throws a [ProcessException] with the given `message`.
void
throwException
(
String
message
)
{
void
throwException
(
String
message
)
{
throw
ProcessException
(
throw
ProcessException
(
_command
.
first
,
_command
.
first
,
_command
.
skip
(
1
).
toList
(),
_command
.
skip
(
1
).
toList
(),
...
...
packages/flutter_tools/lib/src/commands/daemon.dart
View file @
66f424f0
...
@@ -99,7 +99,7 @@ class Daemon {
...
@@ -99,7 +99,7 @@ class Daemon {
_handleRequest
,
_handleRequest
,
onDone:
()
{
onDone:
()
{
if
(!
_onExitCompleter
.
isCompleted
)
if
(!
_onExitCompleter
.
isCompleted
)
_onExitCompleter
.
complete
(
0
);
_onExitCompleter
.
complete
(
0
);
}
}
);
);
}
}
...
...
packages/flutter_tools/lib/src/commands/update_packages.dart
View file @
66f424f0
...
@@ -640,7 +640,6 @@ class PubspecYaml {
...
@@ -640,7 +640,6 @@ class PubspecYaml {
// place to insert our transitive dependencies.
// place to insert our transitive dependencies.
if
(
section
==
Section
.
dependencies
)
if
(
section
==
Section
.
dependencies
)
endOfDirectDependencies
=
output
.
length
;
endOfDirectDependencies
=
output
.
length
;
endOfDevDependencies
=
output
.
length
;
if
(
section
==
Section
.
devDependencies
)
if
(
section
==
Section
.
devDependencies
)
endOfDevDependencies
=
output
.
length
;
endOfDevDependencies
=
output
.
length
;
section
=
data
.
section
;
// track which section we're now in.
section
=
data
.
section
;
// track which section we're now in.
...
...
packages/flutter_tools/lib/src/compile.dart
View file @
66f424f0
...
@@ -224,7 +224,7 @@ class KernelCompiler {
...
@@ -224,7 +224,7 @@ class KernelCompiler {
Uri
mainUri
;
Uri
mainUri
;
if
(
packagesPath
!=
null
)
{
if
(
packagesPath
!=
null
)
{
command
.
addAll
(<
String
>[
'--packages'
,
packagesPath
]);
command
.
addAll
(<
String
>[
'--packages'
,
packagesPath
]);
mainUri
=
_PackageUriMapper
.
findUri
(
mainPath
,
packagesPath
);
mainUri
=
_PackageUriMapper
.
findUri
(
mainPath
,
packagesPath
);
}
}
if
(
outputFilePath
!=
null
)
{
if
(
outputFilePath
!=
null
)
{
command
.
addAll
(<
String
>[
'--output-dill'
,
outputFilePath
]);
command
.
addAll
(<
String
>[
'--output-dill'
,
outputFilePath
]);
...
...
packages/flutter_tools/lib/src/doctor.dart
View file @
66f424f0
...
@@ -68,7 +68,7 @@ class _DefaultDoctorValidatorsProvider implements DoctorValidatorsProvider {
...
@@ -68,7 +68,7 @@ class _DefaultDoctorValidatorsProvider implements DoctorValidatorsProvider {
_validators
.
add
(
NoIdeValidator
());
_validators
.
add
(
NoIdeValidator
());
if
(
ProxyValidator
.
shouldShow
)
if
(
ProxyValidator
.
shouldShow
)
_validators
.
add
(
ProxyValidator
());
_validators
.
add
(
ProxyValidator
());
if
(
deviceManager
.
canListAnything
)
if
(
deviceManager
.
canListAnything
)
_validators
.
add
(
DeviceValidator
());
_validators
.
add
(
DeviceValidator
());
...
...
packages/flutter_tools/lib/src/vmservice.dart
View file @
66f424f0
...
@@ -1305,7 +1305,7 @@ class Isolate extends ServiceObjectOwner {
...
@@ -1305,7 +1305,7 @@ class Isolate extends ServiceObjectOwner {
final
Map
<
String
,
dynamic
>
result
=
final
Map
<
String
,
dynamic
>
result
=
await
invokeFlutterExtensionRpcRaw
(
'ext.flutter.saveCompilationTrace'
);
await
invokeFlutterExtensionRpcRaw
(
'ext.flutter.saveCompilationTrace'
);
if
(
result
!=
null
&&
result
[
'value'
]
is
List
<
dynamic
>)
if
(
result
!=
null
&&
result
[
'value'
]
is
List
<
dynamic
>)
return
result
[
'value'
].
cast
<
int
>();
return
result
[
'value'
].
cast
<
int
>();
return
null
;
return
null
;
}
}
...
...
packages/flutter_tools/test/integration/flutter_run_test.dart
View file @
66f424f0
...
@@ -45,9 +45,9 @@ void main() {
...
@@ -45,9 +45,9 @@ void main() {
expect
(
_proc
.
stdout
,
isNot
(
contains
(
'flutter has exited unexpectedly'
)));
expect
(
_proc
.
stdout
,
isNot
(
contains
(
'flutter has exited unexpectedly'
)));
expect
(
_proc
.
stderr
,
isNot
(
contains
(
'flutter has exited unexpectedly'
)));
expect
(
_proc
.
stderr
,
isNot
(
contains
(
'flutter has exited unexpectedly'
)));
if
(!
_proc
.
stderr
.
toString
().
contains
(
'Unable to locate a development'
)
if
(!
_proc
.
stderr
.
toString
().
contains
(
'Unable to locate a development'
)
&&
!
_proc
.
stdout
.
toString
().
contains
(
'No devices found with name or id matching'
))
{
&&
!
_proc
.
stdout
.
toString
().
contains
(
'No devices found with name or id matching'
))
{
fail
(
"'flutter run -d invalid-device-id' did not produce the expected error"
);
fail
(
"'flutter run -d invalid-device-id' did not produce the expected error"
);
}
}
});
});
test
(
'writes pid-file'
,
()
async
{
test
(
'writes pid-file'
,
()
async
{
...
...
packages/flutter_tools/test/integration/hot_reload_test.dart
View file @
66f424f0
...
@@ -41,8 +41,8 @@ void main() {
...
@@ -41,8 +41,8 @@ void main() {
final
StringBuffer
stdout
=
StringBuffer
();
final
StringBuffer
stdout
=
StringBuffer
();
final
StreamSubscription
<
String
>
subscription
=
_flutter
.
stdout
.
listen
(
stdout
.
writeln
);
final
StreamSubscription
<
String
>
subscription
=
_flutter
.
stdout
.
listen
(
stdout
.
writeln
);
try
{
try
{
await
_flutter
.
hotReload
();
await
_flutter
.
hotReload
();
expect
(
stdout
.
toString
(),
contains
(
'(((((RELOAD WORKED)))))'
));
expect
(
stdout
.
toString
(),
contains
(
'(((((RELOAD WORKED)))))'
));
}
finally
{
}
finally
{
await
subscription
.
cancel
();
await
subscription
.
cancel
();
}
}
...
...
packages/flutter_tools/test/integration/test_driver.dart
View file @
66f424f0
...
@@ -82,11 +82,11 @@ abstract class FlutterTestDriver {
...
@@ -82,11 +82,11 @@ abstract class FlutterTestDriver {
})
async
{
})
async
{
final
String
flutterBin
=
fs
.
path
.
join
(
getFlutterRoot
(),
'bin'
,
'flutter'
);
final
String
flutterBin
=
fs
.
path
.
join
(
getFlutterRoot
(),
'bin'
,
'flutter'
);
if
(
withDebugger
)
if
(
withDebugger
)
arguments
.
add
(
'--start-paused'
);
arguments
.
add
(
'--start-paused'
);
if
(
_printDebugOutputToStdOut
)
if
(
_printDebugOutputToStdOut
)
arguments
.
add
(
'--verbose'
);
arguments
.
add
(
'--verbose'
);
if
(
pidFile
!=
null
)
{
if
(
pidFile
!=
null
)
{
arguments
.
addAll
(<
String
>[
'--pid-file'
,
pidFile
.
path
]);
arguments
.
addAll
(<
String
>[
'--pid-file'
,
pidFile
.
path
]);
}
}
if
(
script
!=
null
)
{
if
(
script
!=
null
)
{
arguments
.
add
(
script
);
arguments
.
add
(
script
);
...
...
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