diff --git a/analysis_options.yaml b/analysis_options.yaml index da4cf6e35c..766969bbdb 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -79,7 +79,7 @@ linter: # - avoid_returning_this # there are plenty of valid reasons to return this # - avoid_setters_without_getters # not yet tested # - avoid_shadowing_type_parameters # not yet tested - # - avoid_single_cascade_in_expression_statements # not yet tested + - avoid_single_cascade_in_expression_statements - avoid_slow_async_io - avoid_types_as_parameter_names # - avoid_types_on_closure_parameters # conflicts with always_specify_types diff --git a/dev/automated_tests/flutter_test/ticker_test.dart b/dev/automated_tests/flutter_test/ticker_test.dart index a13963955c..8c28214c83 100644 --- a/dev/automated_tests/flutter_test/ticker_test.dart +++ b/dev/automated_tests/flutter_test/ticker_test.dart @@ -8,7 +8,7 @@ import 'package:flutter_test/flutter_test.dart'; void main() { testWidgets('Does flutter_test catch leaking tickers?', (WidgetTester tester) async { - Ticker((Duration duration) { })..start(); + Ticker((Duration duration) { }).start(); final ByteData message = const StringCodec().encodeMessage('AppLifecycleState.paused'); await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage('flutter/lifecycle', message, (_) {}); diff --git a/dev/manual_tests/lib/material_arc.dart b/dev/manual_tests/lib/material_arc.dart index fd00410069..3d039f46ac 100644 --- a/dev/manual_tests/lib/material_arc.dart +++ b/dev/manual_tests/lib/material_arc.dart @@ -193,8 +193,7 @@ class _PointDemoState extends State<_PointDemo> { ImmediateMultiDragGestureRecognizer: GestureRecognizerFactoryWithHandlers( () => ImmediateMultiDragGestureRecognizer(), (ImmediateMultiDragGestureRecognizer instance) { - instance - ..onStart = _handleOnStart; + instance.onStart = _handleOnStart; }, ), }, @@ -366,8 +365,7 @@ class _RectangleDemoState extends State<_RectangleDemo> { ImmediateMultiDragGestureRecognizer: GestureRecognizerFactoryWithHandlers( () => ImmediateMultiDragGestureRecognizer(), (ImmediateMultiDragGestureRecognizer instance) { - instance - ..onStart = _handleOnStart; + instance.onStart = _handleOnStart; }, ), }, diff --git a/packages/flutter/lib/src/material/expansion_tile.dart b/packages/flutter/lib/src/material/expansion_tile.dart index fc7223566e..5e3c978616 100644 --- a/packages/flutter/lib/src/material/expansion_tile.dart +++ b/packages/flutter/lib/src/material/expansion_tile.dart @@ -188,16 +188,14 @@ class _ExpansionTileState extends State with SingleTickerProvider @override void didChangeDependencies() { final ThemeData theme = Theme.of(context); - _borderColorTween - ..end = theme.dividerColor; + _borderColorTween.end = theme.dividerColor; _headerColorTween ..begin = theme.textTheme.subtitle1.color ..end = theme.accentColor; _iconColorTween ..begin = theme.unselectedWidgetColor ..end = theme.accentColor; - _backgroundColorTween - ..end = widget.backgroundColor; + _backgroundColorTween.end = widget.backgroundColor; super.didChangeDependencies(); } diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart index a7a4ad3ae8..6f8f68107a 100644 --- a/packages/flutter/lib/src/material/floating_action_button.dart +++ b/packages/flutter/lib/src/material/floating_action_button.dart @@ -563,8 +563,7 @@ class _ChildOverflowBox extends SingleChildRenderObjectWidget { @override void updateRenderObject(BuildContext context, _RenderChildOverflowBox renderObject) { - renderObject - ..textDirection = Directionality.of(context); + renderObject.textDirection = Directionality.of(context); } } diff --git a/packages/flutter/lib/src/material/ink_ripple.dart b/packages/flutter/lib/src/material/ink_ripple.dart index 2cff59abf2..b2ed186443 100644 --- a/packages/flutter/lib/src/material/ink_ripple.dart +++ b/packages/flutter/lib/src/material/ink_ripple.dart @@ -198,8 +198,7 @@ class InkRipple extends InteractiveInkFeature { ..forward(); // This confirm may have been preceded by a cancel. _fadeInController.forward(); - _fadeOutController - ..animateTo(1.0, duration: _kFadeOutDuration); + _fadeOutController.animateTo(1.0, duration: _kFadeOutDuration); } @override diff --git a/packages/flutter/lib/src/rendering/object.dart b/packages/flutter/lib/src/rendering/object.dart index 87a81a631e..eaaa3efdaf 100644 --- a/packages/flutter/lib/src/rendering/object.dart +++ b/packages/flutter/lib/src/rendering/object.dart @@ -581,8 +581,7 @@ class PaintingContext extends ClipContext { ..save() ..transform(effectiveTransform.storage); painter(this, offset); - canvas - ..restore(); + canvas.restore(); return null; } } diff --git a/packages/flutter/lib/src/services/binding.dart b/packages/flutter/lib/src/services/binding.dart index 88a320e071..227b9070d3 100644 --- a/packages/flutter/lib/src/services/binding.dart +++ b/packages/flutter/lib/src/services/binding.dart @@ -24,8 +24,7 @@ mixin ServicesBinding on BindingBase { super.initInstances(); _instance = this; _defaultBinaryMessenger = createBinaryMessenger(); - window - ..onPlatformMessage = defaultBinaryMessenger.handlePlatformMessage; + window.onPlatformMessage = defaultBinaryMessenger.handlePlatformMessage; initLicenses(); SystemChannels.system.setMessageHandler(handleSystemMessage); } diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart index 34788fb3be..c9522f88b2 100644 --- a/packages/flutter/lib/src/widgets/basic.dart +++ b/packages/flutter/lib/src/widgets/basic.dart @@ -1306,8 +1306,7 @@ class CompositedTransformTarget extends SingleChildRenderObjectWidget { @override void updateRenderObject(BuildContext context, RenderLeaderLayer renderObject) { - renderObject - ..link = link; + renderObject.link = link; } } @@ -4993,8 +4992,7 @@ class Flow extends MultiChildRenderObjectWidget { @override void updateRenderObject(BuildContext context, RenderFlow renderObject) { - renderObject - ..delegate = delegate; + renderObject.delegate = delegate; } } diff --git a/packages/flutter/lib/src/widgets/color_filter.dart b/packages/flutter/lib/src/widgets/color_filter.dart index 5b6ce657ef..8be10f029d 100644 --- a/packages/flutter/lib/src/widgets/color_filter.dart +++ b/packages/flutter/lib/src/widgets/color_filter.dart @@ -27,7 +27,7 @@ class ColorFiltered extends SingleChildRenderObjectWidget { @override void updateRenderObject(BuildContext context, _ColorFilterRenderObject renderObject) { - renderObject..colorFilter = colorFilter; + renderObject.colorFilter = colorFilter; } @override diff --git a/packages/flutter/lib/src/widgets/gesture_detector.dart b/packages/flutter/lib/src/widgets/gesture_detector.dart index ac7bb6fb92..d1b12a5139 100644 --- a/packages/flutter/lib/src/widgets/gesture_detector.dart +++ b/packages/flutter/lib/src/widgets/gesture_detector.dart @@ -624,8 +624,7 @@ class GestureDetector extends StatelessWidget { gestures[DoubleTapGestureRecognizer] = GestureRecognizerFactoryWithHandlers( () => DoubleTapGestureRecognizer(debugOwner: this), (DoubleTapGestureRecognizer instance) { - instance - ..onDoubleTap = onDoubleTap; + instance.onDoubleTap = onDoubleTap; }, ); } diff --git a/packages/flutter/lib/src/widgets/image_filter.dart b/packages/flutter/lib/src/widgets/image_filter.dart index 3874dbb3cb..e1e6a8a9cf 100644 --- a/packages/flutter/lib/src/widgets/image_filter.dart +++ b/packages/flutter/lib/src/widgets/image_filter.dart @@ -30,7 +30,7 @@ class ImageFiltered extends SingleChildRenderObjectWidget { @override void updateRenderObject(BuildContext context, _ImageFilterRenderObject renderObject) { - renderObject..imageFilter = imageFilter; + renderObject.imageFilter = imageFilter; } @override @@ -63,8 +63,7 @@ class _ImageFilterRenderObject extends RenderProxyBox { layer = ImageFilterLayer(imageFilter: imageFilter); } else { final ImageFilterLayer filterLayer = layer as ImageFilterLayer; - filterLayer - ..imageFilter = imageFilter; + filterLayer.imageFilter = imageFilter; } context.pushLayer(layer, super.paint, offset); assert(layer != null); diff --git a/packages/flutter/lib/src/widgets/navigator.dart b/packages/flutter/lib/src/widgets/navigator.dart index d7abf37ea3..c81cae0505 100644 --- a/packages/flutter/lib/src/widgets/navigator.dart +++ b/packages/flutter/lib/src/widgets/navigator.dart @@ -168,7 +168,7 @@ abstract class Route { // For example, ModalRoute create a focus scope in its overlay entries. The // focused child can only be attached to navigator after initState which // will be guarded by the asynchronous gap. - TickerFuture.complete()..then((void _) { + TickerFuture.complete().then((void _) { navigator.focusScopeNode.requestFocus(); }); } diff --git a/packages/flutter/lib/src/widgets/nested_scroll_view.dart b/packages/flutter/lib/src/widgets/nested_scroll_view.dart index 63dee53f44..83e6c3b711 100644 --- a/packages/flutter/lib/src/widgets/nested_scroll_view.dart +++ b/packages/flutter/lib/src/widgets/nested_scroll_view.dart @@ -1519,8 +1519,7 @@ class SliverOverlapAbsorber extends SingleChildRenderObjectWidget { @override void updateRenderObject(BuildContext context, RenderSliverOverlapAbsorber renderObject) { - renderObject - ..handle = handle; + renderObject.handle = handle; } @override @@ -1694,8 +1693,7 @@ class SliverOverlapInjector extends SingleChildRenderObjectWidget { @override void updateRenderObject(BuildContext context, RenderSliverOverlapInjector renderObject) { - renderObject - ..handle = handle; + renderObject.handle = handle; } @override diff --git a/packages/flutter/test/painting/image_cache_test.dart b/packages/flutter/test/painting/image_cache_test.dart index 7dc9d5a369..ad72ade1ed 100644 --- a/packages/flutter/test/painting/image_cache_test.dart +++ b/packages/flutter/test/painting/image_cache_test.dart @@ -287,12 +287,12 @@ void main() { test('Live image cache avoids leaks of unlistened streams', () async { imageCache.maximumSize = 3; - const TestImageProvider(1, 1)..resolve(ImageConfiguration.empty); - const TestImageProvider(2, 2)..resolve(ImageConfiguration.empty); - const TestImageProvider(3, 3)..resolve(ImageConfiguration.empty); - const TestImageProvider(4, 4)..resolve(ImageConfiguration.empty); - const TestImageProvider(5, 5)..resolve(ImageConfiguration.empty); - const TestImageProvider(6, 6)..resolve(ImageConfiguration.empty); + const TestImageProvider(1, 1).resolve(ImageConfiguration.empty); + const TestImageProvider(2, 2).resolve(ImageConfiguration.empty); + const TestImageProvider(3, 3).resolve(ImageConfiguration.empty); + const TestImageProvider(4, 4).resolve(ImageConfiguration.empty); + const TestImageProvider(5, 5).resolve(ImageConfiguration.empty); + const TestImageProvider(6, 6).resolve(ImageConfiguration.empty); // wait an event loop to let image resolution process. await null; @@ -304,12 +304,12 @@ void main() { test('Disabled image cache does not leak live images', () async { imageCache.maximumSize = 0; - const TestImageProvider(1, 1)..resolve(ImageConfiguration.empty); - const TestImageProvider(2, 2)..resolve(ImageConfiguration.empty); - const TestImageProvider(3, 3)..resolve(ImageConfiguration.empty); - const TestImageProvider(4, 4)..resolve(ImageConfiguration.empty); - const TestImageProvider(5, 5)..resolve(ImageConfiguration.empty); - const TestImageProvider(6, 6)..resolve(ImageConfiguration.empty); + const TestImageProvider(1, 1).resolve(ImageConfiguration.empty); + const TestImageProvider(2, 2).resolve(ImageConfiguration.empty); + const TestImageProvider(3, 3).resolve(ImageConfiguration.empty); + const TestImageProvider(4, 4).resolve(ImageConfiguration.empty); + const TestImageProvider(5, 5).resolve(ImageConfiguration.empty); + const TestImageProvider(6, 6).resolve(ImageConfiguration.empty); // wait an event loop to let image resolution process. await null; diff --git a/packages/flutter/test/widgets/gesture_detector_semantics_test.dart b/packages/flutter/test/widgets/gesture_detector_semantics_test.dart index 46473c8ad5..0700b6e713 100644 --- a/packages/flutter/test/widgets/gesture_detector_semantics_test.dart +++ b/packages/flutter/test/widgets/gesture_detector_semantics_test.dart @@ -122,8 +122,7 @@ void main() { TapGestureRecognizer: GestureRecognizerFactoryWithHandlers( () => TapGestureRecognizer(), (TapGestureRecognizer instance) { - instance - ..onTap = () { logs.add('tap'); }; + instance.onTap = () { logs.add('tap'); }; }, ), }); @@ -146,8 +145,7 @@ void main() { HorizontalDragGestureRecognizer: GestureRecognizerFactoryWithHandlers( () => HorizontalDragGestureRecognizer(), (HorizontalDragGestureRecognizer instance) { - instance - ..onStart = (_) { logs.add('horizontal'); }; + instance.onStart = (_) { logs.add('horizontal'); }; }, ), }, diff --git a/packages/flutter_tools/lib/src/aot.dart b/packages/flutter_tools/lib/src/aot.dart index 03253232ea..e10ea6087d 100644 --- a/packages/flutter_tools/lib/src/aot.dart +++ b/packages/flutter_tools/lib/src/aot.dart @@ -103,7 +103,7 @@ class AotBuilder { if ((await Future.wait(exitCodes.values)).every((int buildExitCode) => buildExitCode == 0)) { final Iterable dylibs = iosBuilds.values.map( (String outputDir) => globals.fs.path.join(outputDir, 'App.framework', 'App')); - globals.fs.directory(globals.fs.path.join(outputPath, 'App.framework'))..createSync(); + globals.fs.directory(globals.fs.path.join(outputPath, 'App.framework')).createSync(); await processUtils.run( [ 'lipo', diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart index fbc443f14a..2e84b0fef5 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -418,7 +418,7 @@ class LicenseCollector { licenseText = rawLicense; } packageLicenses.putIfAbsent(licenseText, () => {}) - ..addAll(packageNames); + .addAll(packageNames); allPackages.addAll(packageNames); } } diff --git a/packages/flutter_tools/lib/src/build_system/targets/web.dart b/packages/flutter_tools/lib/src/build_system/targets/web.dart index 05a7bc73fc..79618de8e0 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/web.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/web.dart @@ -116,7 +116,7 @@ Future main() async { '''; } environment.buildDir.childFile('main.dart') - ..writeAsStringSync(contents); + .writeAsStringSync(contents); } } diff --git a/packages/flutter_tools/test/commands.shard/hermetic/build_web_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/build_web_test.dart index e0efdeaf34..b2531227a3 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/build_web_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/build_web_test.dart @@ -134,12 +134,12 @@ void main() { // Project files. fileSystem.file('.packages') - ..writeAsStringSync(''' + .writeAsStringSync(''' foo:lib/ fizz:bar/lib/ '''); fileSystem.file('pubspec.yaml') - ..writeAsStringSync(''' + .writeAsStringSync(''' name: foo dependencies: @@ -167,7 +167,7 @@ flutter: class UrlLauncherPlugin {} '''); fileSystem.file(fileSystem.path.join('lib', 'main.dart')) - ..writeAsStringSync('void main() { }'); + .writeAsStringSync('void main() { }'); // Process calls. We're not testing that these invocations are correct because // that is covered in targets/web_test.dart. diff --git a/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart index 858e5366a3..d48130f335 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart @@ -42,7 +42,7 @@ void main() { fs.currentDirectory = tempDir; fs.directory('test').createSync(); fs.directory('test_driver').createSync(); - fs.file('pubspec.yaml')..createSync(); + fs.file('pubspec.yaml').createSync(); fs.file('.packages').createSync(); setExitFunctionForTests(); appStarter = (DriveCommand command, Uri webUri) { diff --git a/packages/flutter_tools/test/commands.shard/hermetic/generate_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/generate_test.dart index 334d5af27f..06410b7a63 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/generate_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/generate_test.dart @@ -48,7 +48,7 @@ void main() { final GenerateCommand command = GenerateCommand(); applyMocksToCommand(command); globals.fs.file(globals.fs.path.join('lib', 'main.dart')) - ..createSync(recursive: true); + .createSync(recursive: true); globals.fs.currentDirectory .childDirectory('.dart_tool') diff --git a/packages/flutter_tools/test/commands.shard/hermetic/ide_config_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/ide_config_test.dart index adda297cf6..35bdd75f5f 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/ide_config_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/ide_config_test.dart @@ -58,7 +58,7 @@ void main() { void _populateDir(Map manifest) { for (final String key in manifest.keys) { if (manifest[key] == 'dir') { - tempDir.childDirectory(key)..createSync(recursive: true); + tempDir.childDirectory(key).createSync(recursive: true); } } for (final String key in manifest.keys) { diff --git a/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart index 51f018b13d..2faab29539 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart @@ -156,9 +156,9 @@ void main() { fs.currentDirectory = tempDir; tempDir.childFile('pubspec.yaml') - ..writeAsStringSync('name: flutter_app'); + .writeAsStringSync('name: flutter_app'); tempDir.childFile('.packages') - ..writeAsStringSync('# Generated by pub on 2019-11-25 12:38:01.801784.'); + .writeAsStringSync('# Generated by pub on 2019-11-25 12:38:01.801784.'); final Directory libDir = tempDir.childDirectory('lib'); libDir.createSync(); final File mainFile = libDir.childFile('main.dart'); diff --git a/packages/flutter_tools/test/general.shard/android/gradle_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_test.dart index bd14cb2f33..e13c1b0d4d 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_test.dart @@ -1414,7 +1414,7 @@ plugin1=${plugin1.path} .childDirectory('apk') .childDirectory('release') .childFile('app-release.apk') - ..createSync(recursive: true); + .createSync(recursive: true); await buildGradleApp( project: FlutterProject.current(), @@ -1580,7 +1580,7 @@ plugin1=${plugin1.path} .childDirectory('apk') .childDirectory('release') .childFile('app-release.apk') - ..createSync(recursive: true); + .createSync(recursive: true); await buildGradleApp( project: FlutterProject.current(), @@ -2621,7 +2621,7 @@ FlutterProject generateFakeAppBundle(String directoryName, String fileName) { final Directory bundleDirectory = getBundleDirectory(project); bundleDirectory .childDirectory(directoryName) - ..createSync(recursive: true); + .createSync(recursive: true); bundleDirectory .childDirectory(directoryName) diff --git a/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart index 802f740ef6..5a98f12502 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart @@ -236,8 +236,8 @@ void main() { testUsingContext('returns the gradlew path', () { final Directory androidDirectory = globals.fs.directory('/android')..createSync(); - androidDirectory.childFile('gradlew')..createSync(); - androidDirectory.childFile('gradlew.bat')..createSync(); + androidDirectory.childFile('gradlew').createSync(); + androidDirectory.childFile('gradlew.bat').createSync(); androidDirectory.childFile('gradle.properties').createSync(); when(gradleUtils.injectGradleWrapperIfNeeded(any)).thenReturn(null); diff --git a/packages/flutter_tools/test/general.shard/asset_bundle_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_test.dart index dd616d2e97..6c3a8e8d41 100644 --- a/packages/flutter_tools/test/general.shard/asset_bundle_test.dart +++ b/packages/flutter_tools/test/general.shard/asset_bundle_test.dart @@ -134,7 +134,7 @@ name: example''') // touch .packages to make sure its change time is after pubspec.yaml's globals.fs.file('.packages') - ..setLastModifiedSync(modifiedTime); + .setLastModifiedSync(modifiedTime); // Even though the previous file was removed, it is left in the // asset manifest and not updated. This is due to the devfs not diff --git a/packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart index 5fa9fda49f..3edb0550cc 100644 --- a/packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart +++ b/packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart @@ -57,7 +57,7 @@ flutter: - a/b/c/foo ''' ); - globals.fs.file('.packages')..createSync(); + globals.fs.file('.packages').createSync(); final List assets = [ 'a/b/c/foo', diff --git a/packages/flutter_tools/test/general.shard/base/logger_test.dart b/packages/flutter_tools/test/general.shard/base/logger_test.dart index c8dea3a5a1..622ae2a3ae 100644 --- a/packages/flutter_tools/test/general.shard/base/logger_test.dart +++ b/packages/flutter_tools/test/general.shard/base/logger_test.dart @@ -921,8 +921,8 @@ void main() { outputPreferences: OutputPreferences.test(showColor: false), timeoutConfiguration: const TimeoutConfiguration(), ); - logger.startProgress('AAA', timeout: const TimeoutConfiguration().fastOperation)..stop(); - logger.startProgress('BBB', timeout: const TimeoutConfiguration().fastOperation)..stop(); + logger.startProgress('AAA', timeout: const TimeoutConfiguration().fastOperation).stop(); + logger.startProgress('BBB', timeout: const TimeoutConfiguration().fastOperation).stop(); final List output = outputStdout(); expect(output.length, equals(3)); @@ -947,8 +947,8 @@ void main() { ), stopwatchFactory: FakeStopwatchFactory(), ); - logger.startProgress('AAA', timeout: const TimeoutConfiguration().fastOperation)..stop(); - logger.startProgress('BBB', timeout: const TimeoutConfiguration().fastOperation)..stop(); + logger.startProgress('AAA', timeout: const TimeoutConfiguration().fastOperation).stop(); + logger.startProgress('BBB', timeout: const TimeoutConfiguration().fastOperation).stop(); expect(outputStdout(), [ matches(r'^\[ (?: {0,2}\+[0-9]{1,4} ms| )\] AAA$'), @@ -967,8 +967,8 @@ void main() { ), outputPreferences: OutputPreferences.test(), ); - logger.startProgress('AAA', timeout: const TimeoutConfiguration().fastOperation)..stop(); - logger.startProgress('BBB', timeout: const TimeoutConfiguration().fastOperation)..stop(); + logger.startProgress('AAA', timeout: const TimeoutConfiguration().fastOperation).stop(); + logger.startProgress('BBB', timeout: const TimeoutConfiguration().fastOperation).stop(); expect(logger.statusText, 'AAA\nBBB\n'); }); diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart index f76c93cd60..9d23468fe4 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart @@ -34,7 +34,7 @@ void main() { // create pre-requisites. environment.buildDir.childFile('app.dill') - ..writeAsStringSync('abcd'); + .writeAsStringSync('abcd'); final Directory hostDirectory = globals.fs.currentDirectory .childDirectory(getNameForHostPlatform(getCurrentHostPlatform())) ..createSync(recursive: true); @@ -61,7 +61,7 @@ void main() { // create pre-requisites. environment.buildDir.childFile('app.so') - ..writeAsStringSync('abcd'); + .writeAsStringSync('abcd'); await const ProfileAndroidApplication().build(environment); @@ -80,7 +80,7 @@ void main() { // create pre-requisites. environment.buildDir.childFile('app.so') - ..writeAsStringSync('abcd'); + .writeAsStringSync('abcd'); await const ReleaseAndroidApplication().build(environment); diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/assets_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/assets_test.dart index 0d205b9fad..253a06d1b5 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/assets_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/assets_test.dart @@ -26,13 +26,13 @@ void main() { ); fileSystem.file(environment.buildDir.childFile('app.dill')).createSync(recursive: true); fileSystem.file('packages/flutter_tools/lib/src/build_system/targets/assets.dart') - ..createSync(recursive: true); + .createSync(recursive: true); fileSystem.file('assets/foo/bar.png') - ..createSync(recursive: true); + .createSync(recursive: true); fileSystem.file('assets/wildcard/#bar.png') - ..createSync(recursive: true); + .createSync(recursive: true); fileSystem.file('.packages') - ..createSync(); + .createSync(); fileSystem.file('pubspec.yaml') ..createSync() ..writeAsStringSync(''' diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/ios_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/ios_test.dart index 3a610c237e..0aa6739000 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/ios_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/ios_test.dart @@ -111,7 +111,7 @@ void main() { globals.fs.file('.packages').writeAsStringSync('\n'); // Plist file globals.fs.file(globals.fs.path.join('ios', 'Flutter', 'AppFrameworkInfo.plist')) - ..createSync(recursive: true); + .createSync(recursive: true); // App kernel environment.buildDir.childFile('app.dill').createSync(recursive: true); // Stub framework @@ -140,7 +140,7 @@ void main() { globals.fs.file('.packages').writeAsStringSync('\n'); // Plist file globals.fs.file(globals.fs.path.join('ios', 'Flutter', 'AppFrameworkInfo.plist')) - ..createSync(recursive: true); + .createSync(recursive: true); // Real framework environment.buildDir diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart index f7d7912f65..0cee898d37 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart @@ -137,7 +137,7 @@ void main() { globals.fs.file(globals.fs.path.join('bin', 'cache', 'artifacts', 'engine', 'darwin-x64', 'isolate_snapshot.bin')).createSync(recursive: true); globals.fs.file(globals.fs.path.join(environment.buildDir.path, 'App.framework', 'App')) - ..createSync(recursive: true); + .createSync(recursive: true); final String inputKernel = globals.fs.path.join(environment.buildDir.path, 'app.dill'); final String outputKernel = globals.fs.path.join('App.framework', 'Versions', 'A', 'Resources', @@ -160,7 +160,7 @@ void main() { globals.fs.file(globals.fs.path.join('bin', 'cache', 'artifacts', 'engine', 'darwin-x64', 'isolate_snapshot.bin')).createSync(recursive: true); globals.fs.file(globals.fs.path.join(environment.buildDir.path, 'App.framework', 'App')) - ..createSync(recursive: true); + .createSync(recursive: true); final String outputKernel = globals.fs.path.join('App.framework', 'Resources', 'flutter_assets', 'kernel_blob.bin'); final String precompiledVm = globals.fs.path.join('App.framework', 'Resources', diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart index e7cc0e05c0..3e8002b7d3 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart @@ -90,9 +90,9 @@ void main() { environment.defines[kBuildMode] = 'release'; final Directory webResources = environment.projectDir.childDirectory('web'); webResources.childFile('index.html') - ..createSync(recursive: true); + .createSync(recursive: true); webResources.childFile('foo.txt') - ..writeAsStringSync('A'); + .writeAsStringSync('A'); environment.buildDir.childFile('main.dart.js').createSync(); await const WebReleaseBundle().build(environment); @@ -315,7 +315,7 @@ void main() { environment.defines[kBuildMode] = 'release'; when(globals.processManager.run(any)).thenAnswer((Invocation invocation) async { environment.buildDir.childFile('main.dart.js.deps') - ..writeAsStringSync('file:///a.dart'); + .writeAsStringSync('file:///a.dart'); return FakeProcessResult(exitCode: 0); }); await const Dart2JSTarget().build(environment); diff --git a/packages/flutter_tools/test/general.shard/cache_test.dart b/packages/flutter_tools/test/general.shard/cache_test.dart index 2c29c7ed74..c88fda9225 100644 --- a/packages/flutter_tools/test/general.shard/cache_test.dart +++ b/packages/flutter_tools/test/general.shard/cache_test.dart @@ -423,7 +423,7 @@ void main() { final File ideviceScreenshotFile = iosUsbArtifacts.location.childFile('idevicescreenshot') ..createSync(); iosUsbArtifacts.location.childFile('idevicesyslog') - ..createSync(); + .createSync(); expect(iosUsbArtifacts.isUpToDateInner(), true); diff --git a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart index cd51b1512a..e50c64da72 100644 --- a/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart +++ b/packages/flutter_tools/test/general.shard/dart/pub_get_test.dart @@ -260,7 +260,7 @@ void main() { ], onRun: () { globals.fs.file('.packages') - ..setLastModifiedSync(DateTime(2002)); + .setLastModifiedSync(DateTime(2002)); } ), const FakeCommand( @@ -280,7 +280,7 @@ void main() { ], onRun: () { globals.fs.file('pubspec.yaml') - ..setLastModifiedSync(DateTime(2002)); + .setLastModifiedSync(DateTime(2002)); } ), const FakeCommand( @@ -309,9 +309,9 @@ void main() { testLogger.clear(); // bad scenario 1: pub doesn't update file; doesn't matter, because we do instead globals.fs.file('.packages') - ..setLastModifiedSync(DateTime(2000)); + .setLastModifiedSync(DateTime(2000)); globals.fs.file('pubspec.yaml') - ..setLastModifiedSync(DateTime(2001)); + .setLastModifiedSync(DateTime(2001)); await pub.get(context: PubContext.flutterTests, checkLastModified: true); // pub does nothing expect(testLogger.statusText, 'Running "flutter pub get" in /...\n'); expect(testLogger.errorText, isEmpty); @@ -321,9 +321,9 @@ void main() { testLogger.clear(); // bad scenario 2: pub changes pubspec.yaml instead globals.fs.file('.packages') - ..setLastModifiedSync(DateTime(2000)); + .setLastModifiedSync(DateTime(2000)); globals.fs.file('pubspec.yaml') - ..setLastModifiedSync(DateTime(2001)); + .setLastModifiedSync(DateTime(2001)); try { await pub.get(context: PubContext.flutterTests, checkLastModified: true); expect(true, isFalse, reason: 'pub.get did not throw'); @@ -337,9 +337,9 @@ void main() { expect(globals.fs.file('.packages').lastModifiedSync(), DateTime(2000)); // because nothing touched it // bad scenario 3: pubspec.yaml was created in the future globals.fs.file('.packages') - ..setLastModifiedSync(DateTime(2000)); + .setLastModifiedSync(DateTime(2000)); globals.fs.file('pubspec.yaml') - ..setLastModifiedSync(DateTime(9999)); + .setLastModifiedSync(DateTime(9999)); assert(DateTime(9999).isAfter(DateTime.now())); await pub.get(context: PubContext.flutterTests, checkLastModified: true); // pub does nothing expect(testLogger.statusText, contains('Running "flutter pub get" in /...\n')); diff --git a/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart b/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart index d712f7f1b5..bd30cbad32 100644 --- a/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart +++ b/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart @@ -575,7 +575,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by ..writeAsStringSync('Existing lock file.'); await Future.delayed(const Duration(milliseconds: 10)); projectUnderTest.ios.podfile - ..writeAsStringSync('Updated Podfile'); + .writeAsStringSync('Updated Podfile'); await cocoaPodsUnderTest.processPods( xcodeProject: projectUnderTest.ios, engineDir: 'engine/path', diff --git a/packages/flutter_tools/test/general.shard/plugins_test.dart b/packages/flutter_tools/test/general.shard/plugins_test.dart index 50bb3db00c..f8426716bd 100644 --- a/packages/flutter_tools/test/general.shard/plugins_test.dart +++ b/packages/flutter_tools/test/general.shard/plugins_test.dart @@ -236,7 +236,7 @@ flutter: .childDirectory('java') .childDirectory(pluginName) .childFile('UseOldEmbedding.java') - ..createSync(recursive: true); + .createSync(recursive: true); flutterProject.directory .childFile('.packages') @@ -855,7 +855,7 @@ EndGlobal'''); .childDirectory('lib') .childDirectory('src') .childFile('web_plugin.dart') - ..createSync(recursive: true); + .createSync(recursive: true); flutterProject.directory .childFile('.packages') diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart index 6943e7e7b7..3d504a9993 100644 --- a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart @@ -81,7 +81,7 @@ void main() { urlTunneller: null, ) as ResidentWebRunner; globals.fs.currentDirectory.childFile('.packages') - ..writeAsStringSync('\n'); + .writeAsStringSync('\n'); }, ); }); diff --git a/packages/flutter_tools/test/src/mocks.dart b/packages/flutter_tools/test/src/mocks.dart index dc6bab5776..912c2c4487 100644 --- a/packages/flutter_tools/test/src/mocks.dart +++ b/packages/flutter_tools/test/src/mocks.dart @@ -632,8 +632,7 @@ class MockDeviceLogReader extends DeviceLogReader { } void applyMocksToCommand(FlutterCommand command) { - command - ..applicationPackages = MockApplicationPackageStore(); + command.applicationPackages = MockApplicationPackageStore(); } /// Common functionality for tracking mock interaction