Unverified Commit f11c3410 authored by Alexandre Ardhuin's avatar Alexandre Ardhuin Committed by GitHub

fix bad indentations(mainly around collection literals) (#41355)

parent 62571b4b
...@@ -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>()));
}); });
......
...@@ -68,7 +68,9 @@ void main() { ...@@ -68,7 +68,9 @@ void main() {
children: <TestSemantics>[], children: <TestSemantics>[],
), ),
] ]
), ignoreTransform: true)); ),
ignoreTransform: true,
));
semantics.dispose(); semantics.dispose();
}); });
......
...@@ -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', () {
......
...@@ -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());
}); });
......
...@@ -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,
],
); );
}); });
}); });
......
...@@ -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');
}), },
),
], ],
), ),
], ],
......
...@@ -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); }),
}; };
......
...@@ -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',
......
...@@ -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
......
...@@ -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()
......
...@@ -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',
......
...@@ -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,
}))); })));
......
...@@ -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),
......
...@@ -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',
......
...@@ -49,7 +49,8 @@ void main() { ...@@ -49,7 +49,8 @@ void main() {
}) async { }) async {
return mockWebFs; return mockWebFs;
}, },
}); },
);
}); });
void _setupMocks() { void _setupMocks() {
......
...@@ -61,7 +61,8 @@ void main() { ...@@ -61,7 +61,8 @@ void main() {
}) async { }) async {
return mockWebFs; return mockWebFs;
}, },
}); },
);
}); });
void _setupMocks() { void _setupMocks() {
......
...@@ -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!
......
...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment