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
f11c3410
Unverified
Commit
f11c3410
authored
Sep 27, 2019
by
Alexandre Ardhuin
Committed by
GitHub
Sep 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bad indentations(mainly around collection literals) (#41355)
parent
62571b4b
Changes
38
Show whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
250 additions
and
229 deletions
+250
-229
nav_bar_test.dart
packages/flutter/test/cupertino/nav_bar_test.dart
+4
-4
route_test.dart
packages/flutter/test/cupertino/route_test.dart
+2
-2
bottom_navigation_bar_test.dart
...ges/flutter/test/material/bottom_navigation_bar_test.dart
+15
-12
raw_material_button_test.dart
packages/flutter/test/material/raw_material_button_test.dart
+19
-17
platform_view_test.dart
packages/flutter/test/rendering/platform_view_test.dart
+7
-6
table_test.dart
packages/flutter/test/rendering/table_test.dart
+20
-10
message_codecs_test.dart
packages/flutter/test/services/message_codecs_test.dart
+4
-2
draggable_test.dart
packages/flutter/test/widgets/draggable_test.dart
+13
-11
navigator_test.dart
packages/flutter/test/widgets/navigator_test.dart
+7
-7
overscroll_indicator_test.dart
packages/flutter/test/widgets/overscroll_indicator_test.dart
+1
-1
sliver_fill_remaining_test.dart
...ages/flutter/test/widgets/sliver_fill_remaining_test.dart
+5
-5
sliver_semantics_test.dart
packages/flutter/test/widgets/sliver_semantics_test.dart
+1
-1
build_runner.dart
...ages/flutter_tools/lib/src/build_runner/build_runner.dart
+2
-2
build_script.dart
...ages/flutter_tools/lib/src/build_runner/build_script.dart
+17
-18
dart.dart
...ages/flutter_tools/lib/src/build_system/targets/dart.dart
+3
-3
bundle.dart
packages/flutter_tools/lib/src/bundle.dart
+1
-1
unpack.dart
packages/flutter_tools/lib/src/commands/unpack.dart
+1
-2
doctor.dart
packages/flutter_tools/lib/src/doctor.dart
+1
-1
flutter_web_platform.dart
...ages/flutter_tools/lib/src/test/flutter_web_platform.dart
+6
-7
version.dart
packages/flutter_tools/lib/src/version.dart
+8
-8
vmservice.dart
packages/flutter_tools/lib/src/vmservice.dart
+2
-2
android_workflow_test.dart
...ols/test/general.shard/android/android_workflow_test.dart
+2
-2
gradle_test.dart
...flutter_tools/test/general.shard/android/gradle_test.dart
+8
-8
build_test.dart
...ges/flutter_tools/test/general.shard/base/build_test.dart
+33
-29
dart_test.dart
...ls/test/general.shard/build_system/targets/dart_test.dart
+6
-6
build_linux_test.dart
...r_tools/test/general.shard/commands/build_linux_test.dart
+1
-1
build_macos_test.dart
...r_tools/test/general.shard/commands/build_macos_test.dart
+1
-1
build_windows_test.dart
...tools/test/general.shard/commands/build_windows_test.dart
+1
-1
precache_test.dart
...tter_tools/test/general.shard/commands/precache_test.dart
+11
-11
flutter_manifest_test.dart
...utter_tools/test/general.shard/flutter_manifest_test.dart
+2
-2
simulators_test.dart
...flutter_tools/test/general.shard/ios/simulators_test.dart
+6
-6
xcode_backend_test.dart
...tter_tools/test/general.shard/ios/xcode_backend_test.dart
+1
-2
cocoapods_test.dart
...lutter_tools/test/general.shard/macos/cocoapods_test.dart
+3
-3
project_test.dart
packages/flutter_tools/test/general.shard/project_test.dart
+3
-3
resident_web_runner_cold_test.dart
...ols/test/general.shard/resident_web_runner_cold_test.dart
+12
-11
resident_web_runner_test.dart
...er_tools/test/general.shard/resident_web_runner_test.dart
+12
-11
flutter_tester_test.dart
..._tools/test/general.shard/tester/flutter_tester_test.dart
+1
-2
visual_studio_test.dart
..._tools/test/general.shard/windows/visual_studio_test.dart
+8
-8
No files found.
packages/flutter/test/cupertino/nav_bar_test.dart
View file @
f11c3410
packages/flutter/test/cupertino/route_test.dart
View file @
f11c3410
packages/flutter/test/material/bottom_navigation_bar_test.dart
View file @
f11c3410
...
@@ -1442,7 +1442,10 @@ void main() {
...
@@ -1442,7 +1442,10 @@ void main() {
BottomNavigationBarItem
(
BottomNavigationBarItem
(
icon:
Icon
(
Icons
.
access_alarm
),
icon:
Icon
(
Icons
.
access_alarm
),
),
),
])));
],
),
),
);
},
throwsA
(
isInstanceOf
<
AssertionError
>()));
},
throwsA
(
isInstanceOf
<
AssertionError
>()));
});
});
...
...
packages/flutter/test/material/raw_material_button_test.dart
View file @
f11c3410
...
@@ -68,7 +68,9 @@ void main() {
...
@@ -68,7 +68,9 @@ void main() {
children:
<
TestSemantics
>[],
children:
<
TestSemantics
>[],
),
),
]
]
),
ignoreTransform:
true
));
),
ignoreTransform:
true
,
));
semantics
.
dispose
();
semantics
.
dispose
();
});
});
...
...
packages/flutter/test/rendering/platform_view_test.dart
View file @
f11c3410
...
@@ -26,7 +26,8 @@ void main() {
...
@@ -26,7 +26,8 @@ void main() {
return
VerticalDragGestureRecognizer
();
return
VerticalDragGestureRecognizer
();
},
},
),
),
},);
},
);
});
});
test
(
'layout should size to max constraint'
,
()
{
test
(
'layout should size to max constraint'
,
()
{
...
...
packages/flutter/test/rendering/table_test.dart
View file @
f11c3410
...
@@ -176,15 +176,21 @@ void main() {
...
@@ -176,15 +176,21 @@ void main() {
final
RenderBox
child2
=
RenderPositionedBox
();
final
RenderBox
child2
=
RenderPositionedBox
();
final
RenderBox
child3
=
RenderPositionedBox
();
final
RenderBox
child3
=
RenderPositionedBox
();
table
=
RenderTable
(
textDirection:
TextDirection
.
ltr
);
table
=
RenderTable
(
textDirection:
TextDirection
.
ltr
);
table
.
setFlatChildren
(
3
,
<
RenderBox
>[
child1
,
RenderPositionedBox
(),
child2
,
table
.
setFlatChildren
(
3
,
<
RenderBox
>[
RenderPositionedBox
(),
child3
,
RenderPositionedBox
()]);
child1
,
RenderPositionedBox
(),
child2
,
RenderPositionedBox
(),
child3
,
RenderPositionedBox
(),
]);
expect
(
table
.
rows
,
equals
(
2
));
expect
(
table
.
rows
,
equals
(
2
));
layout
(
table
);
layout
(
table
);
table
.
setFlatChildren
(
3
,
<
RenderBox
>[
RenderPositionedBox
(),
child1
,
RenderPositionedBox
(),
table
.
setFlatChildren
(
3
,
<
RenderBox
>[
child2
,
RenderPositionedBox
(),
child3
]);
RenderPositionedBox
(),
child1
,
RenderPositionedBox
(),
child2
,
RenderPositionedBox
(),
child3
,
]);
pumpFrame
();
pumpFrame
();
table
.
setFlatChildren
(
3
,
<
RenderBox
>[
RenderPositionedBox
(),
child1
,
RenderPositionedBox
(),
table
.
setFlatChildren
(
3
,
<
RenderBox
>[
child2
,
RenderPositionedBox
(),
child3
]);
RenderPositionedBox
(),
child1
,
RenderPositionedBox
(),
child2
,
RenderPositionedBox
(),
child3
,
]);
pumpFrame
();
pumpFrame
();
expect
(
table
.
columns
,
equals
(
3
));
expect
(
table
.
columns
,
equals
(
3
));
expect
(
table
.
rows
,
equals
(
2
));
expect
(
table
.
rows
,
equals
(
2
));
...
@@ -208,12 +214,16 @@ void main() {
...
@@ -208,12 +214,16 @@ void main() {
table
.
setFlatChildren
(
2
,
<
RenderBox
>[
RenderPositionedBox
(),
RenderPositionedBox
()
]);
table
.
setFlatChildren
(
2
,
<
RenderBox
>[
RenderPositionedBox
(),
RenderPositionedBox
()
]);
pumpFrame
();
pumpFrame
();
expect
(
table
,
paints
..
path
()..
path
()..
path
()..
path
()..
path
());
expect
(
table
,
paints
..
path
()..
path
()..
path
()..
path
()..
path
());
table
.
setFlatChildren
(
2
,
<
RenderBox
>[
RenderPositionedBox
(),
RenderPositionedBox
(),
table
.
setFlatChildren
(
2
,
<
RenderBox
>[
RenderPositionedBox
(),
RenderPositionedBox
()
]);
RenderPositionedBox
(),
RenderPositionedBox
(),
RenderPositionedBox
(),
RenderPositionedBox
(),
]);
pumpFrame
();
pumpFrame
();
expect
(
table
,
paints
..
path
()..
path
()..
path
()..
path
()..
path
()..
path
());
expect
(
table
,
paints
..
path
()..
path
()..
path
()..
path
()..
path
()..
path
());
table
.
setFlatChildren
(
3
,
<
RenderBox
>[
RenderPositionedBox
(),
RenderPositionedBox
(),
RenderPositionedBox
(),
table
.
setFlatChildren
(
3
,
<
RenderBox
>[
RenderPositionedBox
(),
RenderPositionedBox
(),
RenderPositionedBox
()
]);
RenderPositionedBox
(),
RenderPositionedBox
(),
RenderPositionedBox
(),
RenderPositionedBox
(),
RenderPositionedBox
(),
RenderPositionedBox
(),
]);
pumpFrame
();
pumpFrame
();
expect
(
table
,
paints
..
path
()..
path
()..
path
()..
path
()..
path
()..
path
());
expect
(
table
,
paints
..
path
()..
path
()..
path
()..
path
()..
path
()..
path
());
});
});
...
...
packages/flutter/test/services/message_codecs_test.dart
View file @
f11c3410
...
@@ -148,8 +148,10 @@ void main() {
...
@@ -148,8 +148,10 @@ void main() {
checkEncoding
<
dynamic
>(
checkEncoding
<
dynamic
>(
standard
,
standard
,
1.0
,
1.0
,
<
int
>[
6
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
<
int
>[
0
,
0
,
0
,
0
,
0
,
0
,
0xf0
,
0x3f
],
6
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0xf0
,
0x3f
,
],
);
);
});
});
});
});
...
...
packages/flutter/test/widgets/draggable_test.dart
View file @
f11c3410
...
@@ -158,7 +158,8 @@ void main() {
...
@@ -158,7 +158,8 @@ void main() {
onTap:
()
{
onTap:
()
{
events
.
add
(
'tap'
);
events
.
add
(
'tap'
);
},
},
child:
Container
(
child:
const
Text
(
'Button'
),
child:
Container
(
child:
const
Text
(
'Button'
),
),
),
),
),
DragTarget
<
int
>(
DragTarget
<
int
>(
...
@@ -169,7 +170,8 @@ void main() {
...
@@ -169,7 +170,8 @@ void main() {
},
},
onAccept:
(
int
data
)
{
onAccept:
(
int
data
)
{
events
.
add
(
'drop'
);
events
.
add
(
'drop'
);
}),
},
),
],
],
),
),
],
],
...
...
packages/flutter/test/widgets/navigator_test.dart
View file @
f11c3410
...
@@ -294,7 +294,7 @@ void main() {
...
@@ -294,7 +294,7 @@ void main() {
testWidgets
(
'popAndPushNamed'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'popAndPushNamed'
,
(
WidgetTester
tester
)
async
{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
popAndPushNamed
(
context
,
'/B'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
popAndPushNamed
(
context
,
'/B'
);
}),
'/B'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'B'
,
onTap:
()
{
Navigator
.
pop
(
context
);
}),
'/B'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'B'
,
onTap:
()
{
Navigator
.
pop
(
context
);
}),
};
};
...
@@ -321,7 +321,7 @@ void main() {
...
@@ -321,7 +321,7 @@ void main() {
testWidgets
(
'Push and pop should trigger the observers'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'Push and pop should trigger the observers'
,
(
WidgetTester
tester
)
async
{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
pop
(
context
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
pop
(
context
);
}),
};
};
bool
isPushed
=
false
;
bool
isPushed
=
false
;
...
@@ -381,7 +381,7 @@ void main() {
...
@@ -381,7 +381,7 @@ void main() {
testWidgets
(
'Add and remove an observer should work'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'Add and remove an observer should work'
,
(
WidgetTester
tester
)
async
{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
pop
(
context
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
pop
(
context
);
}),
};
};
bool
isPushed
=
false
;
bool
isPushed
=
false
;
...
@@ -428,7 +428,7 @@ void main() {
...
@@ -428,7 +428,7 @@ void main() {
testWidgets
(
'replaceNamed'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'replaceNamed'
,
(
WidgetTester
tester
)
async
{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushReplacementNamed
(
context
,
'/A'
);
}),
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushReplacementNamed
(
context
,
'/A'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
pushReplacementNamed
(
context
,
'/B'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
pushReplacementNamed
(
context
,
'/B'
);
}),
'/B'
:
(
BuildContext
context
)
=>
const
OnTapPage
(
id:
'B'
),
'/B'
:
(
BuildContext
context
)
=>
const
OnTapPage
(
id:
'B'
),
};
};
...
@@ -452,7 +452,7 @@ void main() {
...
@@ -452,7 +452,7 @@ void main() {
Future
<
String
>
value
;
Future
<
String
>
value
;
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
value
=
Navigator
.
pushReplacementNamed
(
context
,
'/B'
,
result:
'B'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
value
=
Navigator
.
pushReplacementNamed
(
context
,
'/B'
,
result:
'B'
);
}),
'/B'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'B'
,
onTap:
()
{
Navigator
.
pop
(
context
,
'B'
);
}),
'/B'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'B'
,
onTap:
()
{
Navigator
.
pop
(
context
,
'B'
);
}),
};
};
...
@@ -499,7 +499,7 @@ void main() {
...
@@ -499,7 +499,7 @@ void main() {
testWidgets
(
'removeRoute'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'removeRoute'
,
(
WidgetTester
tester
)
async
{
final
Map
<
String
,
WidgetBuilder
>
pageBuilders
=
<
String
,
WidgetBuilder
>{
final
Map
<
String
,
WidgetBuilder
>
pageBuilders
=
<
String
,
WidgetBuilder
>{
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/B'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/B'
);
}),
'/B'
:
(
BuildContext
context
)
=>
const
OnTapPage
(
id:
'B'
),
'/B'
:
(
BuildContext
context
)
=>
const
OnTapPage
(
id:
'B'
),
};
};
...
@@ -683,7 +683,7 @@ void main() {
...
@@ -683,7 +683,7 @@ void main() {
testWidgets
(
'didStartUserGesture observable'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'didStartUserGesture observable'
,
(
WidgetTester
tester
)
async
{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
final
Map
<
String
,
WidgetBuilder
>
routes
=
<
String
,
WidgetBuilder
>{
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'/'
,
onTap:
()
{
Navigator
.
pushNamed
(
context
,
'/A'
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
pop
(
context
);
}),
'/A'
:
(
BuildContext
context
)
=>
OnTapPage
(
id:
'A'
,
onTap:
()
{
Navigator
.
pop
(
context
);
}),
};
};
...
...
packages/flutter/test/widgets/overscroll_indicator_test.dart
View file @
f11c3410
packages/flutter/test/widgets/sliver_fill_remaining_test.dart
View file @
f11c3410
packages/flutter/test/widgets/sliver_semantics_test.dart
View file @
f11c3410
packages/flutter_tools/lib/src/build_runner/build_runner.dart
View file @
f11c3410
packages/flutter_tools/lib/src/build_runner/build_script.dart
View file @
f11c3410
...
@@ -58,8 +58,7 @@ const Set<String> skipPlatformCheckPackages = <String>{
...
@@ -58,8 +58,7 @@ const Set<String> skipPlatformCheckPackages = <String>{
'video_player'
,
'video_player'
,
};
};
final
DartPlatform
flutterWebPlatform
=
final
DartPlatform
flutterWebPlatform
=
DartPlatform
.
register
(
'flutter_web'
,
<
String
>[
DartPlatform
.
register
(
'flutter_web'
,
<
String
>[
'async'
,
'async'
,
'collection'
,
'collection'
,
'convert'
,
'convert'
,
...
...
packages/flutter_tools/lib/src/build_system/targets/dart.dart
View file @
f11c3410
...
@@ -73,7 +73,7 @@ class CopyFlutterBundle extends Target {
...
@@ -73,7 +73,7 @@ class CopyFlutterBundle extends Target {
Source
.
artifact
(
Artifact
.
vmSnapshotData
,
mode:
BuildMode
.
debug
),
Source
.
artifact
(
Artifact
.
vmSnapshotData
,
mode:
BuildMode
.
debug
),
Source
.
artifact
(
Artifact
.
isolateSnapshotData
,
mode:
BuildMode
.
debug
),
Source
.
artifact
(
Artifact
.
isolateSnapshotData
,
mode:
BuildMode
.
debug
),
Source
.
pattern
(
'{BUILD_DIR}/app.dill'
),
Source
.
pattern
(
'{BUILD_DIR}/app.dill'
),
Source
.
behavior
(
AssetOutputBehavior
())
Source
.
behavior
(
AssetOutputBehavior
())
,
];
];
@override
@override
...
@@ -84,7 +84,7 @@ class CopyFlutterBundle extends Target {
...
@@ -84,7 +84,7 @@ class CopyFlutterBundle extends Target {
Source
.
pattern
(
'{OUTPUT_DIR}/AssetManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/AssetManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/FontManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/FontManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/LICENSE'
),
Source
.
pattern
(
'{OUTPUT_DIR}/LICENSE'
),
Source
.
behavior
(
AssetOutputBehavior
())
Source
.
behavior
(
AssetOutputBehavior
())
,
];
];
@override
@override
...
@@ -157,7 +157,7 @@ class ReleaseCopyFlutterBundle extends CopyFlutterBundle {
...
@@ -157,7 +157,7 @@ class ReleaseCopyFlutterBundle extends CopyFlutterBundle {
Source
.
pattern
(
'{OUTPUT_DIR}/AssetManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/AssetManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/FontManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/FontManifest.json'
),
Source
.
pattern
(
'{OUTPUT_DIR}/LICENSE'
),
Source
.
pattern
(
'{OUTPUT_DIR}/LICENSE'
),
Source
.
behavior
(
AssetOutputBehavior
())
Source
.
behavior
(
AssetOutputBehavior
())
,
];
];
@override
@override
...
...
packages/flutter_tools/lib/src/bundle.dart
View file @
f11c3410
...
@@ -163,7 +163,7 @@ Future<void> buildWithAssemble({
...
@@ -163,7 +163,7 @@ Future<void> buildWithAssemble({
kTargetFile:
mainPath
,
kTargetFile:
mainPath
,
kBuildMode:
getNameForBuildMode
(
buildMode
),
kBuildMode:
getNameForBuildMode
(
buildMode
),
kTargetPlatform:
getNameForTargetPlatform
(
targetPlatform
),
kTargetPlatform:
getNameForTargetPlatform
(
targetPlatform
),
}
}
,
);
);
final
Target
target
=
buildMode
==
BuildMode
.
debug
final
Target
target
=
buildMode
==
BuildMode
.
debug
?
const
CopyFlutterBundle
()
?
const
CopyFlutterBundle
()
...
...
packages/flutter_tools/lib/src/commands/unpack.dart
View file @
f11c3410
...
@@ -12,8 +12,7 @@ import '../globals.dart';
...
@@ -12,8 +12,7 @@ import '../globals.dart';
import
'../runner/flutter_command.dart'
;
import
'../runner/flutter_command.dart'
;
/// The directory in the Flutter cache for each platform's artifacts.
/// The directory in the Flutter cache for each platform's artifacts.
const
Map
<
TargetPlatform
,
String
>
flutterArtifactPlatformDirectory
=
const
Map
<
TargetPlatform
,
String
>
flutterArtifactPlatformDirectory
=
<
TargetPlatform
,
String
>{
<
TargetPlatform
,
String
>{
TargetPlatform
.
linux_x64
:
'linux-x64'
,
TargetPlatform
.
linux_x64
:
'linux-x64'
,
TargetPlatform
.
darwin_x64
:
'darwin-x64'
,
TargetPlatform
.
darwin_x64
:
'darwin-x64'
,
TargetPlatform
.
windows_x64
:
'windows-x64'
,
TargetPlatform
.
windows_x64
:
'windows-x64'
,
...
...
packages/flutter_tools/lib/src/doctor.dart
View file @
f11c3410
packages/flutter_tools/lib/src/test/flutter_web_platform.dart
View file @
f11c3410
...
@@ -559,8 +559,7 @@ class BrowserManager {
...
@@ -559,8 +559,7 @@ class BrowserManager {
Object
message
,
{
Object
message
,
{
StackTraceMapper
mapper
,
StackTraceMapper
mapper
,
})
async
{
})
async
{
url
=
url
.
replace
(
url
=
url
.
replace
(
fragment:
Uri
.
encodeFull
(
jsonEncode
(<
String
,
Object
>{
fragment:
Uri
.
encodeFull
(
jsonEncode
(<
String
,
Object
>{
'metadata'
:
suiteConfig
.
metadata
.
serialize
(),
'metadata'
:
suiteConfig
.
metadata
.
serialize
(),
'browser'
:
_runtime
.
identifier
,
'browser'
:
_runtime
.
identifier
,
})));
})));
...
...
packages/flutter_tools/lib/src/version.dart
View file @
f11c3410
packages/flutter_tools/lib/src/vmservice.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/android/android_workflow_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/android/gradle_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/base/build_test.dart
View file @
f11c3410
...
@@ -118,14 +118,15 @@ void main() {
...
@@ -118,14 +118,15 @@ void main() {
SnapshotType
(
TargetPlatform
.
android_x64
,
BuildMode
.
release
),
SnapshotType
(
TargetPlatform
.
android_x64
,
BuildMode
.
release
),
darwinArch:
null
,
darwinArch:
null
,
additionalArgs:
<
String
>[
'--additional_arg'
]);
additionalArgs:
<
String
>[
'--additional_arg'
]);
verify
(
mockProcessManager
.
start
(<
String
>[
verify
(
mockProcessManager
.
start
(
<
String
>[
'gen_snapshot'
,
'gen_snapshot'
,
'--causal_async_stacks'
,
'--causal_async_stacks'
,
'--additional_arg'
'--additional_arg'
,
],
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
)))
environment:
anyNamed
(
'environment'
),
.
called
(
1
);
))
.
called
(
1
);
},
overrides:
contextOverrides
);
},
overrides:
contextOverrides
);
testUsingContext
(
'iOS armv7'
,
()
async
{
testUsingContext
(
'iOS armv7'
,
()
async
{
...
@@ -142,14 +143,15 @@ void main() {
...
@@ -142,14 +143,15 @@ void main() {
snapshotType:
SnapshotType
(
TargetPlatform
.
ios
,
BuildMode
.
release
),
snapshotType:
SnapshotType
(
TargetPlatform
.
ios
,
BuildMode
.
release
),
darwinArch:
DarwinArch
.
armv7
,
darwinArch:
DarwinArch
.
armv7
,
additionalArgs:
<
String
>[
'--additional_arg'
]);
additionalArgs:
<
String
>[
'--additional_arg'
]);
verify
(
mockProcessManager
.
start
(<
String
>[
verify
(
mockProcessManager
.
start
(
<
String
>[
'gen_snapshot_armv7'
,
'gen_snapshot_armv7'
,
'--causal_async_stacks'
,
'--causal_async_stacks'
,
'--additional_arg'
'--additional_arg'
,
],
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
)))
environment:
anyNamed
(
'environment'
)),
.
called
(
1
);
)
.
called
(
1
);
},
overrides:
contextOverrides
);
},
overrides:
contextOverrides
);
testUsingContext
(
'iOS arm64'
,
()
async
{
testUsingContext
(
'iOS arm64'
,
()
async
{
...
@@ -166,14 +168,15 @@ void main() {
...
@@ -166,14 +168,15 @@ void main() {
snapshotType:
SnapshotType
(
TargetPlatform
.
ios
,
BuildMode
.
release
),
snapshotType:
SnapshotType
(
TargetPlatform
.
ios
,
BuildMode
.
release
),
darwinArch:
DarwinArch
.
arm64
,
darwinArch:
DarwinArch
.
arm64
,
additionalArgs:
<
String
>[
'--additional_arg'
]);
additionalArgs:
<
String
>[
'--additional_arg'
]);
verify
(
mockProcessManager
.
start
(<
String
>[
verify
(
mockProcessManager
.
start
(
<
String
>[
'gen_snapshot_arm64'
,
'gen_snapshot_arm64'
,
'--causal_async_stacks'
,
'--causal_async_stacks'
,
'--additional_arg'
'--additional_arg'
,
],
],
workingDirectory:
anyNamed
(
'workingDirectory'
),
workingDirectory:
anyNamed
(
'workingDirectory'
),
environment:
anyNamed
(
'environment'
)))
environment:
anyNamed
(
'environment'
),
.
called
(
1
);
))
.
called
(
1
);
},
overrides:
contextOverrides
);
},
overrides:
contextOverrides
);
testUsingContext
(
'--strip filters outputs'
,
()
async
{
testUsingContext
(
'--strip filters outputs'
,
()
async
{
...
@@ -190,8 +193,9 @@ void main() {
...
@@ -190,8 +193,9 @@ void main() {
.
thenAnswer
((
_
)
=>
Stream
<
String
>.
fromIterable
(<
String
>[
.
thenAnswer
((
_
)
=>
Stream
<
String
>.
fromIterable
(<
String
>[
'--ABC
\n
'
,
'--ABC
\n
'
,
'Warning: Generating ELF library without DWARF debugging information.
\n
'
,
'Warning: Generating ELF library without DWARF debugging information.
\n
'
,
'--XYZ
\n
'
'--XYZ
\n
'
,
]).
transform
<
List
<
int
>>(
utf8
.
encoder
));
])
.
transform
<
List
<
int
>>(
utf8
.
encoder
));
await
genSnapshot
.
run
(
await
genSnapshot
.
run
(
snapshotType:
snapshotType:
SnapshotType
(
TargetPlatform
.
android_x64
,
BuildMode
.
release
),
SnapshotType
(
TargetPlatform
.
android_x64
,
BuildMode
.
release
),
...
...
packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/commands/build_linux_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/commands/build_macos_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/commands/build_windows_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/commands/precache_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/flutter_manifest_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/ios/simulators_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/ios/xcode_backend_test.dart
View file @
f11c3410
...
@@ -35,8 +35,7 @@ const Map<String, String> localEngineDebugBuildModeRelease = <String, String>{
...
@@ -35,8 +35,7 @@ const Map<String, String> localEngineDebugBuildModeRelease = <String, String>{
};
};
// Can't use a debug build with a profile engine.
// Can't use a debug build with a profile engine.
const
Map
<
String
,
String
>
localEngineProfileBuildeModeRelease
=
const
Map
<
String
,
String
>
localEngineProfileBuildeModeRelease
=
<
String
,
String
>{
<
String
,
String
>{
'SOURCE_ROOT'
:
'../../../examples/hello_world'
,
'SOURCE_ROOT'
:
'../../../examples/hello_world'
,
'FLUTTER_ROOT'
:
'../../..'
,
'FLUTTER_ROOT'
:
'../../..'
,
'LOCAL_ENGINE'
:
'/engine/src/out/ios_profile'
,
'LOCAL_ENGINE'
:
'/engine/src/out/ios_profile'
,
...
...
packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/project_test.dart
View file @
f11c3410
packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart
View file @
f11c3410
...
@@ -49,7 +49,8 @@ void main() {
...
@@ -49,7 +49,8 @@ void main() {
})
async
{
})
async
{
return
mockWebFs
;
return
mockWebFs
;
},
},
});
},
);
});
});
void
_setupMocks
()
{
void
_setupMocks
()
{
...
...
packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
View file @
f11c3410
...
@@ -61,7 +61,8 @@ void main() {
...
@@ -61,7 +61,8 @@ void main() {
})
async
{
})
async
{
return
mockWebFs
;
return
mockWebFs
;
},
},
});
},
);
});
});
void
_setupMocks
()
{
void
_setupMocks
()
{
...
...
packages/flutter_tools/test/general.shard/tester/flutter_tester_test.dart
View file @
f11c3410
...
@@ -156,8 +156,7 @@ void main() {
...
@@ -156,8 +156,7 @@ void main() {
testUsingContext
(
'start'
,
()
async
{
testUsingContext
(
'start'
,
()
async
{
final
Uri
observatoryUri
=
Uri
.
parse
(
'http://127.0.0.1:6666/'
);
final
Uri
observatoryUri
=
Uri
.
parse
(
'http://127.0.0.1:6666/'
);
mockProcess
=
MockProcess
(
mockProcess
=
MockProcess
(
stdout:
Stream
<
List
<
int
>>.
fromIterable
(<
List
<
int
>>[
stdout:
Stream
<
List
<
int
>>.
fromIterable
(<
List
<
int
>>[
'''
'''
Observatory listening on
$observatoryUri
Observatory listening on
$observatoryUri
Hello!
Hello!
...
...
packages/flutter_tools/test/general.shard/windows/visual_studio_test.dart
View file @
f11c3410
...
@@ -43,7 +43,7 @@ void main() {
...
@@ -43,7 +43,7 @@ void main() {
'isPrerelease'
:
false
,
'isPrerelease'
:
false
,
'catalog'
:
<
String
,
dynamic
>{
'catalog'
:
<
String
,
dynamic
>{
'productDisplayVersion'
:
'16.2.5'
,
'productDisplayVersion'
:
'16.2.5'
,
}
}
,
};
};
// A version of a response that doesn't include certain installation status
// A version of a response that doesn't include certain installation status
...
@@ -415,7 +415,7 @@ void main() {
...
@@ -415,7 +415,7 @@ void main() {
'installationVersion'
:
'15.9.28307.665'
,
'installationVersion'
:
'15.9.28307.665'
,
'catalog'
:
<
String
,
dynamic
>{
'catalog'
:
<
String
,
dynamic
>{
'productDisplayVersion'
:
'15.9.12'
,
'productDisplayVersion'
:
'15.9.12'
,
}
}
,
};
};
setMockCompatibleVisualStudioInstallation
(
olderButCompleteVersionResponse
);
setMockCompatibleVisualStudioInstallation
(
olderButCompleteVersionResponse
);
...
...
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