From cb867bbedc31c3be5796f9ebcdb7c147e97d2f17 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 5 Mar 2021 18:38:15 -0800 Subject: [PATCH] Enable unnecessary_await_in_return lint (#77434) --- analysis_options.yaml | 4 +- dev/bots/analyze.dart | 4 +- dev/bots/prepare_package.dart | 2 +- dev/bots/test/prepare_package_test.dart | 2 +- dev/bots/unpublish_package.dart | 2 +- .../flutter_gallery_v2_web_compile_test.dart | 2 +- .../tasks/platform_view_ios__start_up.dart | 2 +- dev/devicelab/bin/tasks/routing_test.dart | 2 +- .../bin/tasks/web_benchmarks_canvaskit.dart | 2 +- .../bin/tasks/web_benchmarks_html.dart | 2 +- dev/devicelab/lib/framework/apk_utils.dart | 2 +- dev/devicelab/lib/framework/utils.dart | 2 +- dev/devicelab/lib/tasks/microbenchmarks.dart | 4 +- dev/devicelab/lib/tasks/new_gallery.dart | 2 +- dev/devicelab/lib/tasks/perf_tests.dart | 4 +- dev/devicelab/lib/tasks/web_benchmarks.dart | 2 +- .../material/full_screen_dialog_demo.dart | 4 +- .../demo/material/text_form_field_demo.dart | 4 +- dev/tools/gen_keycodes/bin/gen_keycodes.dart | 6 +- dev/tools/test/codesign_test.dart | 8 +- .../flutter/lib/src/material/time_picker.dart | 2 +- .../lib/src/painting/image_provider.dart | 4 +- packages/flutter/lib/src/widgets/app.dart | 2 +- packages/flutter/lib/src/widgets/routes.dart | 2 +- .../test/foundation/error_reporting_test.dart | 2 +- .../flutter/test/material/checkbox_test.dart | 2 +- packages/flutter/test/material/chip_test.dart | 2 +- .../test/material/elevated_button_test.dart | 2 +- .../test/material/flat_button_test.dart | 2 +- .../test/material/icon_button_test.dart | 2 +- .../flutter/test/material/ink_paint_test.dart | 2 +- .../test/material/input_decorator_test.dart | 6 +- .../flutter/test/material/list_tile_test.dart | 2 +- .../test/material/material_button_test.dart | 2 +- .../test/material/outline_button_test.dart | 2 +- .../test/material/outlined_button_test.dart | 2 +- .../flutter/test/material/radio_test.dart | 2 +- .../test/material/raised_button_test.dart | 2 +- .../material/raw_material_button_test.dart | 2 +- .../test/material/text_button_test.dart | 2 +- .../image_provider_resize_image_test.dart | 2 +- .../lib/src/driver/vmservice_driver.dart | 2 +- .../test/src/real_tests/extension_test.dart | 6 +- .../lib/src/event_simulation.dart | 2 +- packages/flutter_test/lib/src/image.dart | 4 +- packages/flutter_tools/lib/runner.dart | 4 +- .../lib/src/application_package.dart | 2 +- .../flutter_tools/lib/src/base/context.dart | 2 +- packages/flutter_tools/lib/src/base/dds.dart | 2 +- .../flutter_tools/lib/src/base/process.dart | 2 +- .../flutter_tools/lib/src/context_runner.dart | 2 +- .../lib/src/fuchsia/fuchsia_device.dart | 4 +- .../lib/src/fuchsia/fuchsia_pm.dart | 2 +- .../flutter_tools/lib/src/ios/devices.dart | 4 +- .../flutter_tools/lib/src/mdns_discovery.dart | 2 +- .../lib/src/reporting/github_template.dart | 2 +- .../lib/src/runner/flutter_command.dart | 2 +- .../commands.shard/hermetic/daemon_test.dart | 2 +- .../commands.shard/hermetic/install_test.dart | 2 +- .../commands.shard/permeable/create_test.dart | 2 +- .../permeable/upgrade_test.dart | 6 +- .../android/android_gradle_builder_test.dart | 2 +- .../general.shard/artifact_updater_test.dart | 10 +-- .../base/error_handling_io_test.dart | 74 +++++++++---------- .../test/general.shard/base/logger_test.dart | 4 +- .../test/general.shard/base/process_test.dart | 4 +- .../build_system/targets/assets_test.dart | 2 +- .../targets/icon_tree_shaker_test.dart | 12 +-- .../build_system/targets/macos_test.dart | 2 +- .../test/general.shard/cache_test.dart | 2 +- .../test/general.shard/devfs_test.dart | 4 +- .../test/general.shard/device_test.dart | 2 +- .../drive/drive_service_test.dart | 2 +- .../test/general.shard/emulator_test.dart | 4 +- .../fuchsia/fuchsia_dev_finder_test.dart | 2 +- .../fuchsia/fuchsia_device_test.dart | 12 +-- .../fuchsia/fuchsia_ffx_test.dart | 2 +- .../general.shard/ios/code_signing_test.dart | 2 +- .../test/general.shard/ios/mac_test.dart | 2 +- .../general.shard/ios/simulators_test.dart | 6 +- .../general.shard/ios/xcodeproj_test.dart | 2 +- .../test/general.shard/macos/xcode_test.dart | 2 +- .../general.shard/mdns_discovery_test.dart | 2 +- .../resident_web_runner_cold_test.dart | 4 +- .../runner/flutter_command_test.dart | 2 +- .../test/general.shard/tracing_test.dart | 6 +- .../test/general.shard/web/chrome_test.dart | 14 ++-- .../general.shard/web/devfs_web_test.dart | 2 +- .../test/integration.shard/test_driver.dart | 6 +- .../lib/src/fuchsia_remote_connection.dart | 4 +- .../lib/integration_test.dart | 6 +- 91 files changed, 183 insertions(+), 183 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 107c3084ff..1c6be48507 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -173,7 +173,7 @@ linter: - prefer_iterable_whereType # - prefer_mixin # https://github.com/dart-lang/language/issues/32 - prefer_null_aware_operators - # - prefer_relative_imports # not yet tested + # - prefer_relative_imports # incompatible with sub-package imports - prefer_single_quotes - prefer_spread_collections - prefer_typing_uninitialized_variables @@ -193,7 +193,7 @@ linter: # - type_annotate_public_apis # subset of always_specify_types - type_init_formals # - unawaited_futures # too many false positives - # - unnecessary_await_in_return # not yet tested + - unnecessary_await_in_return - unnecessary_brace_in_string_interps - unnecessary_const # - unnecessary_final # conflicts with prefer_final_locals diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart index aeee35da9f..b31f040c9c 100644 --- a/dev/bots/analyze.dart +++ b/dev/bots/analyze.dart @@ -1203,7 +1203,7 @@ Future _evalCommand(String executable, List arguments, { Future _runFlutterAnalyze(String workingDirectory, { List options = const [], }) async { - return await runCommand( + return runCommand( flutter, ['analyze', '--dartdocs', ...options], workingDirectory: workingDirectory, @@ -1214,7 +1214,7 @@ final RegExp _importPattern = RegExp(r'''^\s*import (['"])package:flutter/([^.]+ final RegExp _importMetaPattern = RegExp(r'''^\s*import (['"])package:meta/meta\.dart\1'''); Future> _findFlutterDependencies(String srcPath, List errors, { bool checkForMeta = false }) async { - return await _allFiles(srcPath, 'dart', minimumMatches: 1) + return _allFiles(srcPath, 'dart', minimumMatches: 1) .map>((File file) { final Set result = {}; for (final String line in file.readAsLinesSync()) { diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart index 8129efb3b6..adf334428a 100644 --- a/dev/bots/prepare_package.dart +++ b/dev/bots/prepare_package.dart @@ -669,7 +669,7 @@ class ArchivePublisher { if (dest.endsWith('.json')) { mimeType = 'application/json'; } - return await _runGsUtil([ + return _runGsUtil([ // Use our preferred MIME type for the files we care about // and let gsutil figure it out for anything else. if (mimeType != null) ...['-h', 'Content-Type:$mimeType'], diff --git a/dev/bots/test/prepare_package_test.dart b/dev/bots/test/prepare_package_test.dart index f1d55b9821..d80b2f12b8 100644 --- a/dev/bots/test/prepare_package_test.dart +++ b/dev/bots/test/prepare_package_test.dart @@ -377,7 +377,7 @@ void main() { '$gsutilCall -- stat $gsArchivePath': [ProcessResult(0, 0, '', '')], }; processManager.fakeResults = calls; - expect(() async => await publisher.publishArchive(false), throwsException); + expect(() async => publisher.publishArchive(false), throwsException); processManager.verifyCalls(calls.keys.toList()); }); diff --git a/dev/bots/unpublish_package.dart b/dev/bots/unpublish_package.dart index 43ccc6ee9d..799211d8ff 100644 --- a/dev/bots/unpublish_package.dart +++ b/dev/bots/unpublish_package.dart @@ -383,7 +383,7 @@ class ArchiveUnpublisher { if (mimeType != null) ...['-h', 'Content-Type:$mimeType'], ...['cp', src, dest], ]; - return await _runGsUtil(args, confirm: confirmed); + return _runGsUtil(args, confirm: confirmed); } } diff --git a/dev/devicelab/bin/tasks/flutter_gallery_v2_web_compile_test.dart b/dev/devicelab/bin/tasks/flutter_gallery_v2_web_compile_test.dart index 60c04a658f..684f3d4cd9 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery_v2_web_compile_test.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery_v2_web_compile_test.dart @@ -38,7 +38,7 @@ class NewGalleryWebCompileTest { () async { await flutter('doctor'); - return await WebCompileTest.runSingleBuildTest( + return WebCompileTest.runSingleBuildTest( directory: galleryDir.path, metric: metricKeyPrefix, measureBuildTime: true, diff --git a/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart b/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart index 80a304e4cc..16267185b7 100644 --- a/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart +++ b/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @@ -33,6 +33,6 @@ Future main() async { }); final TaskFunction taskFunction = createPlatformViewStartupTest(); - return await taskFunction(); + return taskFunction(); }); } diff --git a/dev/devicelab/bin/tasks/routing_test.dart b/dev/devicelab/bin/tasks/routing_test.dart index ee3627fb6e..aca34d2fde 100644 --- a/dev/devicelab/bin/tasks/routing_test.dart +++ b/dev/devicelab/bin/tasks/routing_test.dart @@ -22,7 +22,7 @@ void main() { final Directory appDir = dir(path.join(flutterDirectory.path, 'dev/integration_tests/ui')); section('TEST WHETHER `flutter drive --route` WORKS'); await inDirectory(appDir, () async { - return await flutter( + return flutter( 'drive', options: ['--verbose', '-d', device.deviceId, '--route', '/smuggle-it', 'lib/route.dart'], canFail: false, diff --git a/dev/devicelab/bin/tasks/web_benchmarks_canvaskit.dart b/dev/devicelab/bin/tasks/web_benchmarks_canvaskit.dart index 7a2dec8e8b..313f7e27af 100644 --- a/dev/devicelab/bin/tasks/web_benchmarks_canvaskit.dart +++ b/dev/devicelab/bin/tasks/web_benchmarks_canvaskit.dart @@ -8,6 +8,6 @@ import 'package:flutter_devicelab/tasks/web_benchmarks.dart'; /// Runs all Web benchmarks using the CanvasKit rendering backend. Future main() async { await task(() async { - return await runWebBenchmark(useCanvasKit: true); + return runWebBenchmark(useCanvasKit: true); }); } diff --git a/dev/devicelab/bin/tasks/web_benchmarks_html.dart b/dev/devicelab/bin/tasks/web_benchmarks_html.dart index f5dad2e469..8cca0d6092 100644 --- a/dev/devicelab/bin/tasks/web_benchmarks_html.dart +++ b/dev/devicelab/bin/tasks/web_benchmarks_html.dart @@ -8,6 +8,6 @@ import 'package:flutter_devicelab/tasks/web_benchmarks.dart'; /// Runs all Web benchmarks using the HTML rendering backend. Future main() async { await task(() async { - return await runWebBenchmark(useCanvasKit: false); + return runWebBenchmark(useCanvasKit: false); }); } diff --git a/dev/devicelab/lib/framework/apk_utils.dart b/dev/devicelab/lib/framework/apk_utils.dart index b9fd7b238b..8e3f21a3c1 100644 --- a/dev/devicelab/lib/framework/apk_utils.dart +++ b/dev/devicelab/lib/framework/apk_utils.dart @@ -210,7 +210,7 @@ class ApkExtractor { /// Gets the content of the `AndroidManifest.xml`. Future getAndroidManifest(String apk) async { - return await _evalApkAnalyzer( + return _evalApkAnalyzer( [ 'manifest', 'print', diff --git a/dev/devicelab/lib/framework/utils.dart b/dev/devicelab/lib/framework/utils.dart index 21a96e97ad..b2eb099022 100644 --- a/dev/devicelab/lib/framework/utils.dart +++ b/dev/devicelab/lib/framework/utils.dart @@ -750,7 +750,7 @@ Future gitClone({String path, String repo}) async { await Directory(path).create(recursive: true); - return await inDirectory( + return inDirectory( path, () => exec('git', ['clone', repo]), ); diff --git a/dev/devicelab/lib/tasks/microbenchmarks.dart b/dev/devicelab/lib/tasks/microbenchmarks.dart index 246455cab6..4036905099 100644 --- a/dev/devicelab/lib/tasks/microbenchmarks.dart +++ b/dev/devicelab/lib/tasks/microbenchmarks.dart @@ -35,13 +35,13 @@ TaskFunction createMicrobenchmarkTask() { device.deviceId, ]; options.add(benchmarkPath); - return await _startFlutter( + return _startFlutter( options: options, canFail: false, ); }); - return await _readJsonResults(flutterProcess); + return _readJsonResults(flutterProcess); } return _run(); } diff --git a/dev/devicelab/lib/tasks/new_gallery.dart b/dev/devicelab/lib/tasks/new_gallery.dart index 69745a3dea..ee53732811 100644 --- a/dev/devicelab/lib/tasks/new_gallery.dart +++ b/dev/devicelab/lib/tasks/new_gallery.dart @@ -29,7 +29,7 @@ class NewGalleryPerfTest extends PerfTest { // turns out to be updated frequently in the future, we can set up an auto // roller to update this version. await getNewGallery(galleryVersion, galleryDir); - return await super.run(); + return super.run(); } final Directory galleryDir; diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart index 4837a72a55..ab72576bb6 100644 --- a/dev/devicelab/lib/tasks/perf_tests.dart +++ b/dev/devicelab/lib/tasks/perf_tests.dart @@ -486,7 +486,7 @@ class StartupTest { final bool reportMetrics; Future run() async { - return await inDirectory(testDirectory, () async { + return inDirectory(testDirectory, () async { final Device device = await devices.workingDevice; const int iterations = 5; final List> results = >[]; @@ -995,7 +995,7 @@ class CompileTest { final bool reportPackageContentSizes; Future run() async { - return await inDirectory(testDirectory, () async { + return inDirectory(testDirectory, () async { final Device device = await devices.workingDevice; await device.unlock(); await flutter('packages', options: ['get']); diff --git a/dev/devicelab/lib/tasks/web_benchmarks.dart b/dev/devicelab/lib/tasks/web_benchmarks.dart index 5295a2a7c5..069f78fa0c 100644 --- a/dev/devicelab/lib/tasks/web_benchmarks.dart +++ b/dev/devicelab/lib/tasks/web_benchmarks.dart @@ -25,7 +25,7 @@ Future runWebBenchmark({ @required bool useCanvasKit }) async { // Reduce logging level. Otherwise, package:webkit_inspection_protocol is way too spammy. Logger.root.level = Level.INFO; final String macrobenchmarksDirectory = path.join(flutterDirectory.path, 'dev', 'benchmarks', 'macrobenchmarks'); - return await inDirectory(macrobenchmarksDirectory, () async { + return inDirectory(macrobenchmarksDirectory, () async { await evalFlutter('build', options: [ 'web', '--dart-define=FLUTTER_WEB_ENABLE_PROFILING=true', diff --git a/dev/integration_tests/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart b/dev/integration_tests/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart index 1562920d58..96642eee38 100644 --- a/dev/integration_tests/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart +++ b/dev/integration_tests/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart @@ -116,7 +116,7 @@ class FullScreenDialogDemoState extends State { final ThemeData theme = Theme.of(context); final TextStyle dialogTextStyle = theme.textTheme.subtitle1!.copyWith(color: theme.textTheme.caption!.color); - return await (showDialog( + return showDialog( context: context, builder: (BuildContext context) { return AlertDialog( @@ -140,7 +140,7 @@ class FullScreenDialogDemoState extends State { ], ); }, - ) as Future); + ) as Future; } @override diff --git a/dev/integration_tests/flutter_gallery/lib/demo/material/text_form_field_demo.dart b/dev/integration_tests/flutter_gallery/lib/demo/material/text_form_field_demo.dart index adbc2deebf..39458e7462 100644 --- a/dev/integration_tests/flutter_gallery/lib/demo/material/text_form_field_demo.dart +++ b/dev/integration_tests/flutter_gallery/lib/demo/material/text_form_field_demo.dart @@ -143,7 +143,7 @@ class TextFormFieldDemoState extends State { if (form == null || !_formWasEdited || form.validate()) return true; - return await (showDialog( + return showDialog( context: context, builder: (BuildContext context) { return AlertDialog( @@ -161,7 +161,7 @@ class TextFormFieldDemoState extends State { ], ); }, - ) as Future); + ) as Future; } @override diff --git a/dev/tools/gen_keycodes/bin/gen_keycodes.dart b/dev/tools/gen_keycodes/bin/gen_keycodes.dart index 626196284d..34cb7b4fb5 100644 --- a/dev/tools/gen_keycodes/bin/gen_keycodes.dart +++ b/dev/tools/gen_keycodes/bin/gen_keycodes.dart @@ -38,7 +38,7 @@ Future getAndroidKeyCodes() async { Future getWindowsKeyCodes() async { final Uri keyCodesUri = Uri.parse('https://raw.githubusercontent.com/tpn/winsdk-10/master/Include/10.0.10240.0/um/WinUser.h'); - return await http.read(keyCodesUri); + return http.read(keyCodesUri); } /// Get contents of the file that contains the scan codes in Android source. @@ -54,12 +54,12 @@ Future getAndroidScanCodes() async { Future getGlfwKeyCodes() async { final Uri keyCodesUri = Uri.parse('https://raw.githubusercontent.com/glfw/glfw/master/include/GLFW/glfw3.h'); - return await http.read(keyCodesUri); + return http.read(keyCodesUri); } Future getGtkKeyCodes() async { final Uri keyCodesUri = Uri.parse('https://gitlab.gnome.org/GNOME/gtk/-/raw/master/gdk/gdkkeysyms.h'); - return await http.read(keyCodesUri); + return http.read(keyCodesUri); } Future main(List rawArguments) async { diff --git a/dev/tools/test/codesign_test.dart b/dev/tools/test/codesign_test.dart index 3200616394..51897d2c4f 100644 --- a/dev/tools/test/codesign_test.dart +++ b/dev/tools/test/codesign_test.dart @@ -69,7 +69,7 @@ void main() { test('throws exception if not run from macos', () async { createRunner(operatingSystem: 'linux'); expect( - () async => await runner.run(['codesign']), + () async => runner.run(['codesign']), throwsExceptionWith('Error! Expected operating system "macos"'), ); }); @@ -77,7 +77,7 @@ void main() { test('throws exception if verify flag is not provided', () async { createRunner(); expect( - () async => await runner.run(['codesign']), + () async => runner.run(['codesign']), throwsExceptionWith( 'Sorry, but codesigning is not implemented yet. Please pass the --$kVerify flag to verify signatures'), ); @@ -240,7 +240,7 @@ void main() { ...codesignCheckCommands, ]); expect( - () async => await runner.run(['codesign', '--$kVerify', '--$kRevision', revision]), + () async => runner.run(['codesign', '--$kVerify', '--$kRevision', revision]), throwsExceptionWith('Test failed because unsigned binaries detected.'), ); expect(processManager.hasRemainingExpectations, false); @@ -325,7 +325,7 @@ void main() { ...codesignCheckCommands, ]); expect( - () async => await runner.run(['codesign', '--$kVerify', '--$kRevision', revision]), + () async => runner.run(['codesign', '--$kVerify', '--$kRevision', revision]), throwsExceptionWith('Test failed because files found with the wrong entitlements'), ); expect(processManager.hasRemainingExpectations, false); diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart index 4062663cea..5cbf951ab5 100644 --- a/packages/flutter/lib/src/material/time_picker.dart +++ b/packages/flutter/lib/src/material/time_picker.dart @@ -2215,7 +2215,7 @@ Future showTimePicker({ confirmText: confirmText, helpText: helpText, ); - return await showDialog( + return showDialog( context: context, useRootNavigator: useRootNavigator, builder: (BuildContext context) { diff --git a/packages/flutter/lib/src/painting/image_provider.dart b/packages/flutter/lib/src/painting/image_provider.dart index f9ca3234b2..3223d30cb3 100644 --- a/packages/flutter/lib/src/painting/image_provider.dart +++ b/packages/flutter/lib/src/painting/image_provider.dart @@ -676,7 +676,7 @@ abstract class AssetBundleImageProvider extends ImageProvider { throw StateError('$file is empty and cannot be loaded as an image.'); } - return await decode(bytes); + return decode(bytes); } @override diff --git a/packages/flutter/lib/src/widgets/app.dart b/packages/flutter/lib/src/widgets/app.dart index 338ad88001..d2a78a15c1 100644 --- a/packages/flutter/lib/src/widgets/app.dart +++ b/packages/flutter/lib/src/widgets/app.dart @@ -1259,7 +1259,7 @@ class _WidgetsAppState extends State with WidgetsBindingObserver { final NavigatorState? navigator = _navigator?.currentState; if (navigator == null) return false; - return await navigator.maybePop(); + return navigator.maybePop(); } @override diff --git a/packages/flutter/lib/src/widgets/routes.dart b/packages/flutter/lib/src/widgets/routes.dart index 42b8a1d25d..b70dabd679 100644 --- a/packages/flutter/lib/src/widgets/routes.dart +++ b/packages/flutter/lib/src/widgets/routes.dart @@ -1357,7 +1357,7 @@ abstract class ModalRoute extends TransitionRoute with LocalHistoryRoute getSampleStack() async { - return await Future.sync(() => StackTrace.current); + return Future.sync(() => StackTrace.current); } Future main() async { diff --git a/packages/flutter/test/material/checkbox_test.dart b/packages/flutter/test/material/checkbox_test.dart index 85d4233f9d..8de0be1f55 100644 --- a/packages/flutter/test/material/checkbox_test.dart +++ b/packages/flutter/test/material/checkbox_test.dart @@ -598,7 +598,7 @@ void main() { testWidgets('Checkbox responds to density changes.', (WidgetTester tester) async { const Key key = Key('test'); Future buildTest(VisualDensity visualDensity) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Material( child: Center( diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart index 07d5b756ec..7b0bc813ad 100644 --- a/packages/flutter/test/material/chip_test.dart +++ b/packages/flutter/test/material/chip_test.dart @@ -2690,7 +2690,7 @@ void main() { const Key iconKey = Key('test icon'); const Key avatarKey = Key('test avatar'); Future buildTest(VisualDensity visualDensity) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Material( child: Center( diff --git a/packages/flutter/test/material/elevated_button_test.dart b/packages/flutter/test/material/elevated_button_test.dart index fd6b06bd68..b3fc5749ae 100644 --- a/packages/flutter/test/material/elevated_button_test.dart +++ b/packages/flutter/test/material/elevated_button_test.dart @@ -608,7 +608,7 @@ void main() { const Key childKey = Key('test child'); Future buildTest(VisualDensity visualDensity, {bool useText = false}) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Directionality( textDirection: TextDirection.rtl, diff --git a/packages/flutter/test/material/flat_button_test.dart b/packages/flutter/test/material/flat_button_test.dart index 11f4d9086c..70794d3e18 100644 --- a/packages/flutter/test/material/flat_button_test.dart +++ b/packages/flutter/test/material/flat_button_test.dart @@ -768,7 +768,7 @@ void main() { const Key childKey = Key('test child'); Future buildTest(VisualDensity visualDensity, {bool useText = false}) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Directionality( textDirection: TextDirection.rtl, diff --git a/packages/flutter/test/material/icon_button_test.dart b/packages/flutter/test/material/icon_button_test.dart index dd24077de1..f2495aa562 100644 --- a/packages/flutter/test/material/icon_button_test.dart +++ b/packages/flutter/test/material/icon_button_test.dart @@ -605,7 +605,7 @@ void main() { testWidgets('IconButton responds to density changes.', (WidgetTester tester) async { const Key key = Key('test'); Future buildTest(VisualDensity visualDensity) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Material( child: Center( diff --git a/packages/flutter/test/material/ink_paint_test.dart b/packages/flutter/test/material/ink_paint_test.dart index 878578c60b..cd08bd514f 100644 --- a/packages/flutter/test/material/ink_paint_test.dart +++ b/packages/flutter/test/material/ink_paint_test.dart @@ -258,7 +258,7 @@ void main() { final FocusNode focusNode = FocusNode(debugLabel: 'Test Node'); Future buildTest(Intent intent) async { - return await tester.pumpWidget( + return tester.pumpWidget( Shortcuts( shortcuts: { LogicalKeySet(LogicalKeyboardKey.space): intent, diff --git a/packages/flutter/test/material/input_decorator_test.dart b/packages/flutter/test/material/input_decorator_test.dart index aeabd9b63c..fbc1d3ceea 100644 --- a/packages/flutter/test/material/input_decorator_test.dart +++ b/packages/flutter/test/material/input_decorator_test.dart @@ -3356,7 +3356,7 @@ void main() { bool enabled = true, bool filled = true, }) async { - return await tester.pumpWidget( + return tester.pumpWidget( buildInputDecorator( isHovering: hovering, decoration: InputDecoration( @@ -3435,7 +3435,7 @@ void main() { bool enabled = true, bool filled = true, }) async { - return await tester.pumpWidget( + return tester.pumpWidget( buildInputDecorator( isFocused: focused, decoration: InputDecoration( @@ -3486,7 +3486,7 @@ void main() { bool empty = true, bool directional = false, }) async { - return await tester.pumpWidget( + return tester.pumpWidget( buildInputDecorator( isEmpty: empty, isFocused: focused, diff --git a/packages/flutter/test/material/list_tile_test.dart b/packages/flutter/test/material/list_tile_test.dart index 5e1e924551..04727e926d 100644 --- a/packages/flutter/test/material/list_tile_test.dart +++ b/packages/flutter/test/material/list_tile_test.dart @@ -1419,7 +1419,7 @@ void main() { testWidgets('ListTile responds to density changes.', (WidgetTester tester) async { const Key key = Key('test'); Future buildTest(VisualDensity visualDensity) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Material( child: Center( diff --git a/packages/flutter/test/material/material_button_test.dart b/packages/flutter/test/material/material_button_test.dart index 1db95b43ee..55d96a07f1 100644 --- a/packages/flutter/test/material/material_button_test.dart +++ b/packages/flutter/test/material/material_button_test.dart @@ -787,7 +787,7 @@ void main() { const Key childKey = Key('test child'); Future buildTest(VisualDensity visualDensity, {bool useText = false}) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Directionality( textDirection: TextDirection.rtl, diff --git a/packages/flutter/test/material/outline_button_test.dart b/packages/flutter/test/material/outline_button_test.dart index 9a932c00ea..1b0a1788ae 100644 --- a/packages/flutter/test/material/outline_button_test.dart +++ b/packages/flutter/test/material/outline_button_test.dart @@ -1168,7 +1168,7 @@ void main() { const Key childKey = Key('test child'); Future buildTest(VisualDensity visualDensity, {bool useText = false}) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Directionality( textDirection: TextDirection.rtl, diff --git a/packages/flutter/test/material/outlined_button_test.dart b/packages/flutter/test/material/outlined_button_test.dart index 571883f045..9062ba8102 100644 --- a/packages/flutter/test/material/outlined_button_test.dart +++ b/packages/flutter/test/material/outlined_button_test.dart @@ -921,7 +921,7 @@ void main() { const Key childKey = Key('test child'); Future buildTest(VisualDensity visualDensity, {bool useText = false}) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Directionality( textDirection: TextDirection.rtl, diff --git a/packages/flutter/test/material/radio_test.dart b/packages/flutter/test/material/radio_test.dart index ea8d33054e..1f5ab64465 100644 --- a/packages/flutter/test/material/radio_test.dart +++ b/packages/flutter/test/material/radio_test.dart @@ -632,7 +632,7 @@ void main() { testWidgets('Radio responds to density changes.', (WidgetTester tester) async { const Key key = Key('test'); Future buildTest(VisualDensity visualDensity) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Material( child: Center( diff --git a/packages/flutter/test/material/raised_button_test.dart b/packages/flutter/test/material/raised_button_test.dart index 5392f318ef..eb6d91d8d7 100644 --- a/packages/flutter/test/material/raised_button_test.dart +++ b/packages/flutter/test/material/raised_button_test.dart @@ -633,7 +633,7 @@ void main() { const Key childKey = Key('test child'); Future buildTest(VisualDensity visualDensity, {bool useText = false}) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Directionality( textDirection: TextDirection.rtl, diff --git a/packages/flutter/test/material/raw_material_button_test.dart b/packages/flutter/test/material/raw_material_button_test.dart index 13aca7ea4c..2536ff6153 100644 --- a/packages/flutter/test/material/raw_material_button_test.dart +++ b/packages/flutter/test/material/raw_material_button_test.dart @@ -516,7 +516,7 @@ void main() { const Key childKey = Key('test child'); Future buildTest(VisualDensity visualDensity, {bool useText = false}) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Directionality( textDirection: TextDirection.rtl, diff --git a/packages/flutter/test/material/text_button_test.dart b/packages/flutter/test/material/text_button_test.dart index 159f5aedc4..b4cd28140b 100644 --- a/packages/flutter/test/material/text_button_test.dart +++ b/packages/flutter/test/material/text_button_test.dart @@ -702,7 +702,7 @@ void main() { const Key childKey = Key('test child'); Future buildTest(VisualDensity visualDensity, { bool useText = false }) async { - return await tester.pumpWidget( + return tester.pumpWidget( MaterialApp( home: Directionality( textDirection: TextDirection.rtl, diff --git a/packages/flutter/test/painting/image_provider_resize_image_test.dart b/packages/flutter/test/painting/image_provider_resize_image_test.dart index 46fecb6e68..07223f2409 100644 --- a/packages/flutter/test/painting/image_provider_resize_image_test.dart +++ b/packages/flutter/test/painting/image_provider_resize_image_test.dart @@ -148,7 +148,7 @@ Future _resolveAndGetSize(ImageProvider imageProvider, } ); stream.addListener(listener); - return await completer.future; + return completer.future; } // This version of MemoryImage guarantees obtainKey returns a future that has not been diff --git a/packages/flutter_driver/lib/src/driver/vmservice_driver.dart b/packages/flutter_driver/lib/src/driver/vmservice_driver.dart index c2f531a861..106927fdad 100644 --- a/packages/flutter_driver/lib/src/driver/vmservice_driver.dart +++ b/packages/flutter_driver/lib/src/driver/vmservice_driver.dart @@ -351,7 +351,7 @@ class VMServiceFlutterDriver extends FlutterDriver { } Future _getVMTimelineMicros() async { - return await _serviceClient.getVMTimelineMicros(); + return _serviceClient.getVMTimelineMicros(); } @override diff --git a/packages/flutter_driver/test/src/real_tests/extension_test.dart b/packages/flutter_driver/test/src/real_tests/extension_test.dart index 5a43b59a19..638baccbe3 100644 --- a/packages/flutter_driver/test/src/real_tests/extension_test.dart +++ b/packages/flutter_driver/test/src/real_tests/extension_test.dart @@ -956,7 +956,7 @@ void main() { Future> getText(SerializableFinder finder) async { final Map arguments = GetText(finder, timeout: const Duration(seconds: 1)).serialize(); - return await driverExtension.call(arguments); + return driverExtension.call(arguments); } await tester.pumpWidget(debugTree); @@ -1023,7 +1023,7 @@ void main() { Future> tap(SerializableFinder finder) async { final Map arguments = Tap(finder, timeout: const Duration(seconds: 1)).serialize(); - return await driverExtension.call(arguments); + return driverExtension.call(arguments); } await tester.pumpWidget(debugTree); @@ -1066,7 +1066,7 @@ void main() { Future> invokeCommand(SerializableFinder finder, int times) async { final Map arguments = StubNestedCommand(finder, times).serialize(); - return await driverExtension.call(arguments); + return driverExtension.call(arguments); } await tester.pumpWidget(debugTree); diff --git a/packages/flutter_test/lib/src/event_simulation.dart b/packages/flutter_test/lib/src/event_simulation.dart index b99dab818c..6ad1878aae 100644 --- a/packages/flutter_test/lib/src/event_simulation.dart +++ b/packages/flutter_test/lib/src/event_simulation.dart @@ -625,7 +625,7 @@ class KeyEventSimulator { /// /// - [simulateKeyUpEvent] to simulate the corresponding key up event. static Future simulateKeyDownEvent(LogicalKeyboardKey key, {String? platform, PhysicalKeyboardKey? physicalKey}) async { - return await TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { platform ??= Platform.operatingSystem; assert(_osIsSupported(platform!), 'Platform $platform not supported for key simulation'); diff --git a/packages/flutter_test/lib/src/image.dart b/packages/flutter_test/lib/src/image.dart index 038ed0f985..50606d4a09 100644 --- a/packages/flutter_test/lib/src/image.dart +++ b/packages/flutter_test/lib/src/image.dart @@ -50,7 +50,7 @@ Future createTestImage({ Future _createImage(int width, int height) async { if (kIsWeb) { - return await _webCreateTestImage( + return _webCreateTestImage( width: width, height: height, ); @@ -66,7 +66,7 @@ Future _createImage(int width, int height) async { completer.complete(image); }, ); - return await completer.future; + return completer.future; } /// Web doesn't support [decodeImageFromPixels]. Instead, generate a 1bpp BMP diff --git a/packages/flutter_tools/lib/runner.dart b/packages/flutter_tools/lib/runner.dart index 1ece23839c..dc7ab59fc6 100644 --- a/packages/flutter_tools/lib/runner.dart +++ b/packages/flutter_tools/lib/runner.dart @@ -57,7 +57,7 @@ Future run( String getVersion() => flutterVersion ?? globals.flutterVersion.getVersionString(redactUnknownBranches: true); Object firstError; StackTrace firstStackTrace; - return await runZoned>(() async { + return runZoned>(() async { try { await runner.run(args); @@ -74,7 +74,7 @@ Future run( } catch (error, stackTrace) { // ignore: avoid_catches_without_on_clauses firstError = error; firstStackTrace = stackTrace; - return await _handleToolError( + return _handleToolError( error, stackTrace, verbose, args, reportCrashes, getVersion); } }, onError: (Object error, StackTrace stackTrace) async { // ignore: deprecated_member_use diff --git a/packages/flutter_tools/lib/src/application_package.dart b/packages/flutter_tools/lib/src/application_package.dart index 521babf457..8cbe068245 100644 --- a/packages/flutter_tools/lib/src/application_package.dart +++ b/packages/flutter_tools/lib/src/application_package.dart @@ -65,7 +65,7 @@ class ApplicationPackageFactory { case TargetPlatform.android_x64: case TargetPlatform.android_x86: if (applicationBinary == null) { - return await AndroidApk.fromAndroidProject( + return AndroidApk.fromAndroidProject( FlutterProject.current().android, processManager: _processManager, processUtils: _processUtils, diff --git a/packages/flutter_tools/lib/src/base/context.dart b/packages/flutter_tools/lib/src/base/context.dart index d2fb46d99f..7917e870da 100644 --- a/packages/flutter_tools/lib/src/base/context.dart +++ b/packages/flutter_tools/lib/src/base/context.dart @@ -148,7 +148,7 @@ class AppContext { Map.unmodifiable(overrides ?? const {}), Map.unmodifiable(fallbacks ?? const {}), ); - return await runZoned>( + return runZoned>( () async => await body(), zoneValues: <_Key, AppContext>{_Key.key: child}, zoneSpecification: zoneSpecification, diff --git a/packages/flutter_tools/lib/src/base/dds.dart b/packages/flutter_tools/lib/src/base/dds.dart index 3b6cccdb5f..4253ddf027 100644 --- a/packages/flutter_tools/lib/src/base/dds.dart +++ b/packages/flutter_tools/lib/src/base/dds.dart @@ -95,5 +95,5 @@ class DartDevelopmentService { } } - Future shutdown() async => await _ddsInstance?.shutdown(); + Future shutdown() async => _ddsInstance?.shutdown(); } diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart index e4b8e052c9..33b5bbf462 100644 --- a/packages/flutter_tools/lib/src/base/process.dart +++ b/packages/flutter_tools/lib/src/base/process.dart @@ -543,7 +543,7 @@ class _DefaultProcessUtils implements ProcessUtils { unawaited(stdoutSubscription.cancel()); unawaited(stderrSubscription.cancel()); - return await process.exitCode; + return process.exitCode; } @override diff --git a/packages/flutter_tools/lib/src/context_runner.dart b/packages/flutter_tools/lib/src/context_runner.dart index 4a4b3db73f..2dfec2b7e0 100644 --- a/packages/flutter_tools/lib/src/context_runner.dart +++ b/packages/flutter_tools/lib/src/context_runner.dart @@ -74,7 +74,7 @@ Future runInContext( return runner(); } - return await context.run( + return context.run( name: 'global fallbacks', body: runnerWrapper, overrides: overrides, diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart index 37674476c5..e3d106fcc0 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart +++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart @@ -661,7 +661,7 @@ class FuchsiaDevice extends Device { throwToolExit('Cannot interact with device. No ssh config.\n' 'Try setting FUCHSIA_SSH_CONFIG or FUCHSIA_BUILD_DIR.'); } - return await globals.processUtils.run([ + return globals.processUtils.run([ 'ssh', '-F', globals.fuchsiaArtifacts.sshConfig.absolute.path, @@ -676,7 +676,7 @@ class FuchsiaDevice extends Device { throwToolExit('Cannot interact with device. No ssh config.\n' 'Try setting FUCHSIA_SSH_CONFIG or FUCHSIA_BUILD_DIR.'); } - return await globals.processUtils.run([ + return globals.processUtils.run([ 'scp', '-F', globals.fuchsiaArtifacts.sshConfig.absolute.path, diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart index 10ed29152a..9eb5fa84d2 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart +++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart @@ -245,7 +245,7 @@ class FuchsiaPackageServer { if (_process == null) { return false; } - return await fuchsiaSdk.fuchsiaPM.publish(_repo, package.path); + return fuchsiaSdk.fuchsiaPM.publish(_repo, package.path); } @override diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index fa3a00ed7c..2bf18d1acf 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -119,7 +119,7 @@ class IOSDevices extends PollingDeviceDiscovery { ); } - return await _xcdevice.getAvailableIOSDevices(timeout: timeout); + return _xcdevice.getAvailableIOSDevices(timeout: timeout); } @override @@ -130,7 +130,7 @@ class IOSDevices extends PollingDeviceDiscovery { ]; } - return await _xcdevice.getDiagnostics(); + return _xcdevice.getDiagnostics(); } } diff --git a/packages/flutter_tools/lib/src/mdns_discovery.dart b/packages/flutter_tools/lib/src/mdns_discovery.dart index edd2d0996f..2bd939cb06 100644 --- a/packages/flutter_tools/lib/src/mdns_discovery.dart +++ b/packages/flutter_tools/lib/src/mdns_discovery.dart @@ -162,7 +162,7 @@ class MDnsObservatoryDiscovery { final String host = usesIpv6 ? InternetAddress.loopbackIPv6.address : InternetAddress.loopbackIPv4.address; - return await buildObservatoryUri( + return buildObservatoryUri( device, host, result.port, diff --git a/packages/flutter_tools/lib/src/reporting/github_template.dart b/packages/flutter_tools/lib/src/reporting/github_template.dart index 6307bb8bbf..af52c90ccc 100644 --- a/packages/flutter_tools/lib/src/reporting/github_template.dart +++ b/packages/flutter_tools/lib/src/reporting/github_template.dart @@ -102,7 +102,7 @@ ${_projectMetadataInformation()} '&body=${Uri.encodeQueryComponent(body)}' '&labels=${Uri.encodeQueryComponent('tool,severe: crash')}'; - return await _shortURL(fullURL); + return _shortURL(fullURL); } /// Provide information about the Flutter project in the working directory, if present. diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart index 598c67249a..83d3b3d956 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart @@ -1183,7 +1183,7 @@ abstract class FlutterCommand extends Command { Usage.command(commandPath, parameters: additionalUsageValues); } - return await runCommand(); + return runCommand(); } Future _sendNullSafetyAnalyticsEvents(FlutterProject project) async { diff --git a/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart index 8f3a0e6f9a..ff1c343815 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart @@ -250,7 +250,7 @@ void main() { daemon.deviceDomain.addDeviceDiscoverer(discoverer); discoverer.addDevice(MockAndroidDevice()); - return await responses.stream.skipWhile(_isConnectedEvent).first.then((Map response) async { + return responses.stream.skipWhile(_isConnectedEvent).first.then((Map response) async { expect(response['event'], 'device.added'); expect(response['params'], isMap); diff --git a/packages/flutter_tools/test/commands.shard/hermetic/install_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/install_test.dart index 9aea64ba9c..f847a6fae7 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/install_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/install_test.dart @@ -49,7 +49,7 @@ void main() { .thenAnswer((_) async => true); testDeviceManager.addDevice(device); - expect(() async => await createTestCommandRunner(command).run(['install', '--device-user', '10']), + expect(() async => createTestCommandRunner(command).run(['install', '--device-user', '10']), throwsToolExit(message: '--device-user is only supported for Android')); }, overrides: { Cache: () => Cache.test(), diff --git a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart index d4e90b9039..c5e2e042ab 100755 --- a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart @@ -164,7 +164,7 @@ void main() { testUsingContext('cannot create a project if non-empty non-project directory exists with .metadata', () async { await projectDir.absolute.childDirectory('blag').create(recursive: true); await projectDir.absolute.childFile('.metadata').writeAsString('project_type: blag\n'); - expect(() async => await _createAndAnalyzeProject( + expect(() async => _createAndAnalyzeProject( projectDir, [], [], diff --git a/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart b/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart index a201f53a97..3a58d0c091 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart @@ -200,7 +200,7 @@ void main() { ]); await expectLater( - () async => await realCommandRunner.fetchLatestVersion(), + () async => realCommandRunner.fetchLatestVersion(), throwsToolExit(message: 'You are not currently on a release branch.'), ); expect(processManager.hasRemainingExpectations, isFalse); @@ -225,7 +225,7 @@ void main() { ]); await expectLater( - () async => await realCommandRunner.fetchLatestVersion(), + () async => realCommandRunner.fetchLatestVersion(), throwsToolExit( message: 'Unable to upgrade Flutter: no origin repository configured.', ), @@ -251,7 +251,7 @@ void main() { ); await expectLater( - () async => await realCommandRunner.attemptReset(revision), + () async => realCommandRunner.attemptReset(revision), throwsToolExit(message: errorMessage), ); expect(processManager.hasRemainingExpectations, isFalse); diff --git a/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart b/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart index 62c1ca9d3a..9622e90168 100644 --- a/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart +++ b/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart @@ -854,7 +854,7 @@ void main() { fileSystem.directory('build/outputs/repo').createSync(recursive: true); await expectLater(() async => - await builder.buildGradleAar( + builder.buildGradleAar( androidBuildInfo: const AndroidBuildInfo(BuildInfo(BuildMode.release, null, treeShakeIcons: false)), project: FlutterProject.fromDirectoryTest(fileSystem.currentDirectory), outputDirectory: fileSystem.directory('build/'), diff --git a/packages/flutter_tools/test/general.shard/artifact_updater_test.dart b/packages/flutter_tools/test/general.shard/artifact_updater_test.dart index bc970bd4fe..0969431820 100644 --- a/packages/flutter_tools/test/general.shard/artifact_updater_test.dart +++ b/packages/flutter_tools/test/general.shard/artifact_updater_test.dart @@ -175,7 +175,7 @@ void main() { ..createSync(), ); - await expectLater(() async => await artifactUpdater.downloadZipArchive( + await expectLater(() async => artifactUpdater.downloadZipArchive( 'test message', Uri.parse('http://test.zip'), fileSystem.currentDirectory.childDirectory('out'), @@ -230,7 +230,7 @@ void main() { ..createSync(), ); - await expectLater(() async => await artifactUpdater.downloadZipArchive( + await expectLater(() async => artifactUpdater.downloadZipArchive( 'test message', Uri.parse('http://test.zip'), fileSystem.currentDirectory.childDirectory('out'), @@ -260,7 +260,7 @@ void main() { ..createSync(), ); - await expectLater(() async => await artifactUpdater.downloadZipArchive( + await expectLater(() async => artifactUpdater.downloadZipArchive( 'test message', Uri.parse('http:///foo-bar/test.zip'), fileSystem.currentDirectory.childDirectory('out'), @@ -286,7 +286,7 @@ void main() { ..createSync(), ); - await expectLater(() async => await artifactUpdater.downloadZipArchive( + await expectLater(() async => artifactUpdater.downloadZipArchive( 'test message', Uri.parse('http://test.zip'), fileSystem.currentDirectory.childDirectory('out'), @@ -461,7 +461,7 @@ void main() { ..createSync(recursive: true); handler.addError(errorDirectory, FileSystemOp.delete, const FileSystemException('', '', OSError('', kSharingViolation))); - await expectLater(() async => await artifactUpdater.downloadZippedTarball( + await expectLater(() async => artifactUpdater.downloadZippedTarball( 'test message', Uri.parse('http://test.zip'), fileSystem.currentDirectory.childDirectory('out'), diff --git a/packages/flutter_tools/test/general.shard/base/error_handling_io_test.dart b/packages/flutter_tools/test/general.shard/base/error_handling_io_test.dart index 621f9dbbc1..6bec81fc19 100644 --- a/packages/flutter_tools/test/general.shard/base/error_handling_io_test.dart +++ b/packages/flutter_tools/test/general.shard/base/error_handling_io_test.dart @@ -226,9 +226,9 @@ void main() { final File file = fs.file('file'); const String expectedMessage = 'The flutter tool cannot access the file'; - expect(() async => await file.writeAsBytes([0]), + expect(() async => file.writeAsBytes([0]), throwsToolExit(message: expectedMessage)); - expect(() async => await file.writeAsString(''), + expect(() async => file.writeAsString(''), throwsToolExit(message: expectedMessage)); expect(() => file.writeAsBytesSync([0]), throwsToolExit(message: expectedMessage)); @@ -250,9 +250,9 @@ void main() { final File file = fs.file('file'); const String expectedMessage = 'The target device is full'; - expect(() async => await file.writeAsBytes([0]), + expect(() async => file.writeAsBytes([0]), throwsToolExit(message: expectedMessage)); - expect(() async => await file.writeAsString(''), + expect(() async => file.writeAsString(''), throwsToolExit(message: expectedMessage)); expect(() => file.writeAsBytesSync([0]), throwsToolExit(message: expectedMessage)); @@ -270,9 +270,9 @@ void main() { final File file = fs.file('file'); const String expectedMessage = 'The file is being used by another program'; - expect(() async => await file.writeAsBytes([0]), + expect(() async => file.writeAsBytes([0]), throwsToolExit(message: expectedMessage)); - expect(() async => await file.writeAsString(''), + expect(() async => file.writeAsString(''), throwsToolExit(message: expectedMessage)); expect(() => file.writeAsBytesSync([0]), throwsToolExit(message: expectedMessage)); @@ -291,9 +291,9 @@ void main() { const String expectedMessage = 'There is a problem with the device driver ' 'that this file or directory is stored on'; - expect(() async => await file.writeAsBytes([0]), + expect(() async => file.writeAsBytes([0]), throwsToolExit(message: expectedMessage)); - expect(() async => await file.writeAsString(''), + expect(() async => file.writeAsString(''), throwsToolExit(message: expectedMessage)); expect(() => file.writeAsBytesSync([0]), throwsToolExit(message: expectedMessage)); @@ -315,7 +315,7 @@ void main() { final Directory directory = fs.directory('directory'); const String expectedMessage = 'The target device is full'; - expect(() async => await directory.createTemp('prefix'), + expect(() async => directory.createTemp('prefix'), throwsToolExit(message: expectedMessage)); expect(() => directory.createTempSync('prefix'), throwsToolExit(message: expectedMessage)); @@ -392,9 +392,9 @@ void main() { final File file = fs.file('file'); const String expectedMessage = 'The flutter tool cannot access the file or directory'; - expect(() async => await file.writeAsBytes([0]), + expect(() async => file.writeAsBytes([0]), throwsToolExit(message: expectedMessage)); - expect(() async => await file.writeAsString(''), + expect(() async => file.writeAsString(''), throwsToolExit(message: expectedMessage)); expect(() => file.writeAsBytesSync([0]), throwsToolExit(message: expectedMessage)); @@ -416,9 +416,9 @@ void main() { final Directory directory = fs.directory('file'); const String expectedMessage = 'The flutter tool cannot access the file or directory'; - expect(() async => await directory.create(), + expect(() async => directory.create(), throwsToolExit(message: expectedMessage)); - expect(() async => await directory.delete(), + expect(() async => directory.delete(), throwsToolExit(message: expectedMessage)); expect(() => directory.createSync(), throwsToolExit(message: expectedMessage)); @@ -436,9 +436,9 @@ void main() { final File file = fs.file('file'); const String expectedMessage = 'The target device is full'; - expect(() async => await file.writeAsBytes([0]), + expect(() async => file.writeAsBytes([0]), throwsToolExit(message: expectedMessage)); - expect(() async => await file.writeAsString(''), + expect(() async => file.writeAsString(''), throwsToolExit(message: expectedMessage)); expect(() => file.writeAsBytesSync([0]), throwsToolExit(message: expectedMessage)); @@ -456,7 +456,7 @@ void main() { final Directory directory = fs.directory('directory'); const String expectedMessage = 'The target device is full'; - expect(() async => await directory.createTemp('prefix'), + expect(() async => directory.createTemp('prefix'), throwsToolExit(message: expectedMessage)); expect(() => directory.createTempSync('prefix'), throwsToolExit(message: expectedMessage)); @@ -503,9 +503,9 @@ void main() { final File file = fs.file('file'); const String expectedMessage = 'The flutter tool cannot access the file'; - expect(() async => await file.writeAsBytes([0]), + expect(() async => file.writeAsBytes([0]), throwsToolExit(message: expectedMessage)); - expect(() async => await file.writeAsString(''), + expect(() async => file.writeAsString(''), throwsToolExit(message: expectedMessage)); expect(() => file.writeAsBytesSync([0]), throwsToolExit(message: expectedMessage)); @@ -525,9 +525,9 @@ void main() { final Directory directory = fs.directory('file'); const String expectedMessage = 'The flutter tool cannot access the file or directory'; - expect(() async => await directory.create(), + expect(() async => directory.create(), throwsToolExit(message: expectedMessage)); - expect(() async => await directory.delete(), + expect(() async => directory.delete(), throwsToolExit(message: expectedMessage)); expect(() => directory.createSync(), throwsToolExit(message: expectedMessage)); @@ -545,9 +545,9 @@ void main() { final File file = fs.file('file'); const String expectedMessage = 'The target device is full'; - expect(() async => await file.writeAsBytes([0]), + expect(() async => file.writeAsBytes([0]), throwsToolExit(message: expectedMessage)); - expect(() async => await file.writeAsString(''), + expect(() async => file.writeAsString(''), throwsToolExit(message: expectedMessage)); expect(() => file.writeAsBytesSync([0]), throwsToolExit(message: expectedMessage)); @@ -565,7 +565,7 @@ void main() { final Directory directory = fs.directory('directory'); const String expectedMessage = 'The target device is full'; - expect(() async => await directory.createTemp('prefix'), + expect(() async => directory.createTemp('prefix'), throwsToolExit(message: expectedMessage)); expect(() => directory.createTempSync('prefix'), throwsToolExit(message: expectedMessage)); @@ -709,9 +709,9 @@ void main() { const String expectedMessage = 'The target device is full'; - expect(() async => await processManager.start(['foo']), + expect(() async => processManager.start(['foo']), throwsToolExit(message: expectedMessage)); - expect(() async => await processManager.run(['foo']), + expect(() async => processManager.run(['foo']), throwsToolExit(message: expectedMessage)); expect(() => processManager.runSync(['foo']), throwsToolExit(message: expectedMessage)); @@ -730,9 +730,9 @@ void main() { ); const String expectedMessage = 'The file is being used by another program'; - expect(() async => await processManager.start(['foo']), + expect(() async => processManager.start(['foo']), throwsToolExit(message: expectedMessage)); - expect(() async => await processManager.run(['foo']), + expect(() async => processManager.run(['foo']), throwsToolExit(message: expectedMessage)); expect(() => processManager.runSync(['foo']), throwsToolExit(message: expectedMessage)); @@ -751,9 +751,9 @@ void main() { ); const String expectedMessage = 'The flutter tool cannot access the file'; - expect(() async => await processManager.start(['foo']), + expect(() async => processManager.start(['foo']), throwsToolExit(message: expectedMessage)); - expect(() async => await processManager.run(['foo']), + expect(() async => processManager.run(['foo']), throwsToolExit(message: expectedMessage)); expect(() => processManager.runSync(['foo']), throwsToolExit(message: expectedMessage)); @@ -777,9 +777,9 @@ void main() { ); const String expectedMessage = 'The target device is full'; - expect(() async => await processManager.start(['foo']), + expect(() async => processManager.start(['foo']), throwsToolExit(message: expectedMessage)); - expect(() async => await processManager.run(['foo']), + expect(() async => processManager.run(['foo']), throwsToolExit(message: expectedMessage)); expect(() => processManager.runSync(['foo']), throwsToolExit(message: expectedMessage)); @@ -798,9 +798,9 @@ void main() { const String expectedMessage = 'The flutter tool cannot access the file'; - expect(() async => await processManager.start(['foo']), + expect(() async => processManager.start(['foo']), throwsToolExit(message: expectedMessage)); - expect(() async => await processManager.run(['foo']), + expect(() async => processManager.run(['foo']), throwsToolExit(message: expectedMessage)); expect(() => processManager.runSync(['foo']), throwsToolExit(message: expectedMessage)); @@ -824,9 +824,9 @@ void main() { const String expectedMessage = 'The target device is full'; - expect(() async => await processManager.start(['foo']), + expect(() async => processManager.start(['foo']), throwsToolExit(message: expectedMessage)); - expect(() async => await processManager.run(['foo']), + expect(() async => processManager.run(['foo']), throwsToolExit(message: expectedMessage)); expect(() => processManager.runSync(['foo']), throwsToolExit(message: expectedMessage)); @@ -845,9 +845,9 @@ void main() { const String expectedMessage = 'The flutter tool cannot access the file'; - expect(() async => await processManager.start(['foo']), + expect(() async => processManager.start(['foo']), throwsToolExit(message: expectedMessage)); - expect(() async => await processManager.run(['foo']), + expect(() async => processManager.run(['foo']), throwsToolExit(message: expectedMessage)); expect(() => processManager.runSync(['foo']), throwsToolExit(message: expectedMessage)); 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 78c63fa77d..6ab1177acd 100644 --- a/packages/flutter_tools/test/general.shard/base/logger_test.dart +++ b/packages/flutter_tools/test/general.shard/base/logger_test.dart @@ -340,8 +340,8 @@ void main() { logger.printStatus('message'); logger.printError('error message'); - expect(() async => await stdout.done, throwsA(isA())); - expect(() async => await stderr.done, throwsA(isA())); + expect(() async => stdout.done, throwsA(isA())); + expect(() async => stderr.done, throwsA(isA())); }); group('Spinners', () { diff --git a/packages/flutter_tools/test/general.shard/base/process_test.dart b/packages/flutter_tools/test/general.shard/base/process_test.dart index 30f89decd0..ba2f39d8a3 100644 --- a/packages/flutter_tools/test/general.shard/base/process_test.dart +++ b/packages/flutter_tools/test/general.shard/base/process_test.dart @@ -40,7 +40,7 @@ void main() { exitCode: 1, )); - expect(() async => await processUtils.run(['false'], throwOnError: true), + expect(() async => processUtils.run(['false'], throwOnError: true), throwsA(isA())); }); }); @@ -518,7 +518,7 @@ void main() { ArgumentError('Bad input'), ); expect( - () async => await processUtils.exitsHappy(['invalid']), + () async => processUtils.exitsHappy(['invalid']), throwsArgumentError, ); }); 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 bc48963f74..d9b3b9a02d 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 @@ -113,7 +113,7 @@ flutter: '''); - expect(() async => await const CopyAssets().build(environment), + expect(() async => const CopyAssets().build(environment), throwsA(isA())); }, overrides: { FileSystem: () => fileSystem, diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart index 2af1234ae9..5d20ed5be3 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/icon_tree_shaker_test.dart @@ -222,7 +222,7 @@ void main() { ); expect( - () async => await iconTreeShaker.subsetFont( + () async => iconTreeShaker.subsetFont( input: fileSystem.file(inputPath), outputPath: outputPath, relativePath: relativePath, @@ -362,7 +362,7 @@ void main() { _addConstFinderInvocation(appDill.path, stdout: constFinderResultWithInvalid); await expectLater( - () async => await iconTreeShaker.subsetFont( + () async => iconTreeShaker.subsetFont( input: fileSystem.file(inputPath), outputPath: outputPath, relativePath: relativePath, @@ -401,7 +401,7 @@ void main() { _resetFontSubsetInvocation(exitCode: -1, stdinSink: stdinSink); await expectLater( - () async => await iconTreeShaker.subsetFont( + () async => iconTreeShaker.subsetFont( input: fileSystem.file(inputPath), outputPath: outputPath, relativePath: relativePath, @@ -435,7 +435,7 @@ void main() { _resetFontSubsetInvocation(exitCode: -1, stdinSink: stdinSink); await expectLater( - () async => await iconTreeShaker.subsetFont( + () async => iconTreeShaker.subsetFont( input: fileSystem.file(inputPath), outputPath: outputPath, relativePath: relativePath, @@ -469,7 +469,7 @@ void main() { _addConstFinderInvocation(appDill.path, stdout: validConstFinderResult); await expectLater( - () async => await iconTreeShaker.subsetFont( + () async => iconTreeShaker.subsetFont( input: fileSystem.file(inputPath), outputPath: outputPath, relativePath: relativePath, @@ -503,7 +503,7 @@ void main() { _addConstFinderInvocation(appDill.path, exitCode: -1); await expectLater( - () async => await iconTreeShaker.subsetFont( + () async => iconTreeShaker.subsetFont( input: fileSystem.file(inputPath), outputPath: outputPath, relativePath: relativePath, 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 86c3cd4b27..9c2c928db3 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 @@ -94,7 +94,7 @@ void main() { ..createSync(recursive: true) ..writeAsStringSync('testing'); - expect(() async => await const DebugMacOSBundleFlutterAssets().build(environment), + expect(() async => const DebugMacOSBundleFlutterAssets().build(environment), throwsException); }, overrides: { FileSystem: () => fileSystem, diff --git a/packages/flutter_tools/test/general.shard/cache_test.dart b/packages/flutter_tools/test/general.shard/cache_test.dart index 6094ef4664..c8b7b3109e 100644 --- a/packages/flutter_tools/test/general.shard/cache_test.dart +++ b/packages/flutter_tools/test/general.shard/cache_test.dart @@ -95,7 +95,7 @@ void main() { fileSystem.file(fileSystem.path.join('bin', 'cache', 'lockfile')) .createSync(recursive: true); - expect(() async => await cache.lock(), throwsToolExit()); + expect(() async => cache.lock(), throwsToolExit()); }, skip: true); // TODO(jonahwilliams): implement support for lock so this can be tested with the memory file system. testWithoutContext('should not throw when FLUTTER_ALREADY_LOCKED is set', () { diff --git a/packages/flutter_tools/test/general.shard/devfs_test.dart b/packages/flutter_tools/test/general.shard/devfs_test.dart index 16d8374fb2..c20683b7a4 100644 --- a/packages/flutter_tools/test/general.shard/devfs_test.dart +++ b/packages/flutter_tools/test/general.shard/devfs_test.dart @@ -127,7 +127,7 @@ void main() { logger: BufferLogger.test(), httpClient: FakeHttpClient.any(), ); - expect(() async => await devFS.create(), throwsA(isA())); + expect(() async => devFS.create(), throwsA(isA())); }); testWithoutContext('DevFS destroy is resilient to vmservice disconnection', () async { @@ -423,7 +423,7 @@ void main() { final File file = MockFile(); when(file.copySync(any)).thenThrow(const FileSystemException('foo')); - await expectLater(() async => await writer.write({ + await expectLater(() async => writer.write({ Uri.parse('goodbye'): DevFSFileContent(file), }, Uri.parse('/foo/bar/devfs/')), throwsA(isA())); }); diff --git a/packages/flutter_tools/test/general.shard/device_test.dart b/packages/flutter_tools/test/general.shard/device_test.dart index 3e3589c096..ef70d47f57 100644 --- a/packages/flutter_tools/test/general.shard/device_test.dart +++ b/packages/flutter_tools/test/general.shard/device_test.dart @@ -334,7 +334,7 @@ void main() { terminal: mockTerminal, ); await expectLater( - () async => await deviceManager.findTargetDevices(FakeFlutterProject()), + () async => deviceManager.findTargetDevices(FakeFlutterProject()), throwsA(isA()) ); }); diff --git a/packages/flutter_tools/test/general.shard/drive/drive_service_test.dart b/packages/flutter_tools/test/general.shard/drive/drive_service_test.dart index 6332d125fe..1ce45fcabd 100644 --- a/packages/flutter_tools/test/general.shard/drive/drive_service_test.dart +++ b/packages/flutter_tools/test/general.shard/drive/drive_service_test.dart @@ -145,7 +145,7 @@ void main() { ))..failOnce = true; await expectLater( - () async => await driverService.start(BuildInfo.profile, device, DebuggingOptions.enabled(BuildInfo.profile), true), + () async => driverService.start(BuildInfo.profile, device, DebuggingOptions.enabled(BuildInfo.profile), true), returnsNormally, ); }); diff --git a/packages/flutter_tools/test/general.shard/emulator_test.dart b/packages/flutter_tools/test/general.shard/emulator_test.dart index 4cbd3f57ef..e9579cb6d8 100644 --- a/packages/flutter_tools/test/general.shard/emulator_test.dart +++ b/packages/flutter_tools/test/general.shard/emulator_test.dart @@ -83,7 +83,7 @@ void main() { ), ); - await expectLater(() async => await emulatorManager.getAllAvailableEmulators(), + await expectLater(() async => emulatorManager.getAllAvailableEmulators(), returnsNormally); }); @@ -106,7 +106,7 @@ void main() { ), ); - await expectLater(() async => await emulatorManager.getAllAvailableEmulators(), + await expectLater(() async => emulatorManager.getAllAvailableEmulators(), returnsNormally); }); diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_dev_finder_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_dev_finder_test.dart index cde59a24db..d096ac0eec 100644 --- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_dev_finder_test.dart +++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_dev_finder_test.dart @@ -38,7 +38,7 @@ void main() { processManager: FakeProcessManager.any(), ); - expect(() async => await fuchsiaDevFinder.list(), + expect(() async => fuchsiaDevFinder.list(), throwsToolExit(message: 'Fuchsia device-finder tool not found.')); }); diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart index 66aa3d93f9..7e06f7cf85 100644 --- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart +++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart @@ -333,7 +333,7 @@ void main() { return ProcessResult(1, 1, '', ''); }); final FuchsiaDevice device = FuchsiaDevice('id'); - expect(() async => await device.hostAddress, throwsToolExit()); + expect(() async => device.hostAddress, throwsToolExit()); }, overrides: { FuchsiaArtifacts: () => FuchsiaArtifacts(sshConfig: sshConfig), FuchsiaSdk: () => MockFuchsiaSdk(), @@ -345,7 +345,7 @@ void main() { return ProcessResult(1, 0, '', ''); }); final FuchsiaDevice device = FuchsiaDevice('id'); - expect(() async => await device.hostAddress, throwsToolExit()); + expect(() async => device.hostAddress, throwsToolExit()); }, overrides: { FuchsiaArtifacts: () => FuchsiaArtifacts(sshConfig: sshConfig), FuchsiaSdk: () => MockFuchsiaSdk(), @@ -745,7 +745,7 @@ void main() { environment: anyNamed('environment'), )).thenAnswer((_) async => ProcessResult(0, 0, '', '')); - expect(() async => await device.takeScreenshot(globals.fs.file('file.ppm')), + expect(() async => device.takeScreenshot(globals.fs.file('file.ppm')), returnsNormally); }, overrides: { ProcessManager: () => MockProcessManager(), @@ -1013,7 +1013,7 @@ void main() { } final DebuggingOptions debuggingOptions = DebuggingOptions.disabled(BuildInfo(mode, null, treeShakeIcons: false)); - return await device.startApp( + return device.startApp( app, prebuiltApplication: prebuilt, debuggingOptions: debuggingOptions, @@ -1123,7 +1123,7 @@ void main() { testUsingContext('fail when cant get ssh config', () async { expect(() async => - await setupAndStartApp(prebuilt: true, mode: BuildMode.release), + setupAndStartApp(prebuilt: true, mode: BuildMode.release), throwsToolExit(message: 'Cannot interact with device. No ssh config.\n' 'Try setting FUCHSIA_SSH_CONFIG or FUCHSIA_BUILD_DIR.')); }, overrides: { @@ -1137,7 +1137,7 @@ void main() { testUsingContext('fail when cant get host address', () async { expect(() async => - await setupAndStartApp(prebuilt: true, mode: BuildMode.release), + setupAndStartApp(prebuilt: true, mode: BuildMode.release), throwsToolExit(message: 'Failed to get local address, aborting.')); }, overrides: { Artifacts: () => artifacts, diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart index bd347f45e9..17e90a88e3 100644 --- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart +++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart @@ -38,7 +38,7 @@ void main() { processManager: FakeProcessManager.any(), ); - expect(() async => await fuchsiaFfx.list(), + expect(() async => fuchsiaFfx.list(), throwsToolExit(message: 'Fuchsia ffx tool not found.')); }); diff --git a/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart b/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart index 465948e026..8f205294aa 100644 --- a/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart @@ -113,7 +113,7 @@ void main() { workingDirectory: anyNamed('workingDirectory'), )).thenAnswer((_) => Future.value(exitsHappy)); - expect(() async => await getCodeSigningIdentityDevelopmentTeam( + expect(() async => getCodeSigningIdentityDevelopmentTeam( iosApp: app, processManager: mockProcessManager, logger: logger, diff --git a/packages/flutter_tools/test/general.shard/ios/mac_test.dart b/packages/flutter_tools/test/general.shard/ios/mac_test.dart index 1e73f9bc9e..222648a78c 100644 --- a/packages/flutter_tools/test/general.shard/ios/mac_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/mac_test.dart @@ -79,7 +79,7 @@ void main() { logger: logger, ); - expect(() async => await iMobileDevice.takeScreenshot( + expect(() async => iMobileDevice.takeScreenshot( outputFile, '1234', IOSDeviceInterface.usb, diff --git a/packages/flutter_tools/test/general.shard/ios/simulators_test.dart b/packages/flutter_tools/test/general.shard/ios/simulators_test.dart index 0194c0177f..74fda5149f 100644 --- a/packages/flutter_tools/test/general.shard/ios/simulators_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/simulators_test.dart @@ -808,7 +808,7 @@ Dec 20 17:04:32 md32-11-vm1 Another App[88374]: Ignore this text''' )); expect( - () async => await simControl.install(deviceId, appId), + () async => simControl.install(deviceId, appId), throwsToolExit(message: r'Unable to install'), ); }); @@ -826,7 +826,7 @@ Dec 20 17:04:32 md32-11-vm1 Another App[88374]: Ignore this text''' )); expect( - () async => await simControl.uninstall(deviceId, appId), + () async => simControl.uninstall(deviceId, appId), throwsToolExit(message: r'Unable to uninstall'), ); }); @@ -844,7 +844,7 @@ Dec 20 17:04:32 md32-11-vm1 Another App[88374]: Ignore this text''' )); expect( - () async => await simControl.launch(deviceId, appId), + () async => simControl.launch(deviceId, appId), throwsToolExit(message: r'Unable to launch'), ); }); diff --git a/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart index eb71580ed4..e2fc97538b 100644 --- a/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart @@ -454,7 +454,7 @@ void main() { ); expect( - () async => await xcodeProjectInterpreter.getInfo(workingDirectory), + () async => xcodeProjectInterpreter.getInfo(workingDirectory), throwsToolExit(message: stderr)); expect(fakeProcessManager.hasRemainingExpectations, isFalse); }); diff --git a/packages/flutter_tools/test/general.shard/macos/xcode_test.dart b/packages/flutter_tools/test/general.shard/macos/xcode_test.dart index cfe4426e57..01175f2ce4 100644 --- a/packages/flutter_tools/test/general.shard/macos/xcode_test.dart +++ b/packages/flutter_tools/test/general.shard/macos/xcode_test.dart @@ -328,7 +328,7 @@ void main() { stderr: 'xcrun: error:', )); - expect(() async => await xcode.sdkLocation(EnvironmentType.physical), + expect(() async => xcode.sdkLocation(EnvironmentType.physical), throwsToolExit(message: 'Could not find SDK location')); expect(fakeProcessManager.hasRemainingExpectations, isFalse); }); diff --git a/packages/flutter_tools/test/general.shard/mdns_discovery_test.dart b/packages/flutter_tools/test/general.shard/mdns_discovery_test.dart index 3fb21eb1a6..c41f1101bd 100644 --- a/packages/flutter_tools/test/general.shard/mdns_discovery_test.dart +++ b/packages/flutter_tools/test/general.shard/mdns_discovery_test.dart @@ -213,7 +213,7 @@ void main() { flutterUsage: TestUsage(), ); expect( - () async => await portDiscovery.query(), + () async => portDiscovery.query(), throwsA(isA()), ); }); diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart index d88f24175b..ce62b19f00 100644 --- a/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart @@ -82,7 +82,7 @@ void main() { testUsingContext('ResidentWebRunner calls appFailedToStart if initial compilation fails', () async { _setupMocks(); - expect(() async => await residentWebRunner.run(), throwsToolExit()); + expect(() async => residentWebRunner.run(), throwsToolExit()); expect(await residentWebRunner.waitForAppToFinish(), 1); }, overrides: { BuildSystem: () => TestBuildSystem.all(BuildResult(success: false)), @@ -94,7 +94,7 @@ void main() { testUsingContext('ResidentWebRunner calls appFailedToStart if error is thrown during startup', () async { _setupMocks(); - expect(() async => await residentWebRunner.run(), throwsA(isA())); + expect(() async => residentWebRunner.run(), throwsA(isA())); expect(await residentWebRunner.waitForAppToFinish(), 1); }, overrides: { BuildSystem: () => TestBuildSystem.error(Exception('foo')), diff --git a/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart b/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart index 4e2590b2dd..25e9cc96d6 100644 --- a/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart +++ b/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart @@ -135,7 +135,7 @@ void main() { final FakeTargetCommand fakeTargetCommand = FakeTargetCommand(); final CommandRunner runner = createTestCommandRunner(fakeTargetCommand); - expect(() async => await runner.run(['test', '-t', 'lib/foo.dart']), throwsToolExit()); + expect(() async => runner.run(['test', '-t', 'lib/foo.dart']), throwsToolExit()); }, overrides: { FileSystem: () => MemoryFileSystem.test(), ProcessManager: () => FakeProcessManager.any(), diff --git a/packages/flutter_tools/test/general.shard/tracing_test.dart b/packages/flutter_tools/test/general.shard/tracing_test.dart index 958eaf0ce4..a4d7857eb6 100644 --- a/packages/flutter_tools/test/general.shard/tracing_test.dart +++ b/packages/flutter_tools/test/general.shard/tracing_test.dart @@ -149,7 +149,7 @@ void main() { ), ]); - await expectLater(() async => await downloadStartupTrace(fakeVmServiceHost.vmService, + await expectLater(() async => downloadStartupTrace(fakeVmServiceHost.vmService, output: fileSystem.currentDirectory, logger: logger, ), throwsToolExit(message: 'The device disconnected before the timeline could be retrieved.')); @@ -176,7 +176,7 @@ void main() { ), ]); - await expectLater(() async => await downloadStartupTrace(fakeVmServiceHost.vmService, + await expectLater(() async => downloadStartupTrace(fakeVmServiceHost.vmService, output: fileSystem.currentDirectory, logger: logger, ), throwsToolExit(message: 'Engine start event is missing in the timeline')); @@ -212,7 +212,7 @@ void main() { ), ]); - await expectLater(() async => await downloadStartupTrace(fakeVmServiceHost.vmService, + await expectLater(() async => downloadStartupTrace(fakeVmServiceHost.vmService, output: fileSystem.currentDirectory, logger: logger, ), throwsToolExit(message: 'First frame events are missing in the timeline')); diff --git a/packages/flutter_tools/test/general.shard/web/chrome_test.dart b/packages/flutter_tools/test/general.shard/web/chrome_test.dart index 8571b9374a..5e32e931c1 100644 --- a/packages/flutter_tools/test/general.shard/web/chrome_test.dart +++ b/packages/flutter_tools/test/general.shard/web/chrome_test.dart @@ -61,7 +61,7 @@ void main() { testWithoutContext('can launch chrome and connect to the devtools', () async { expect( - () async => await _testLaunchChrome( + () async => _testLaunchChrome( '/.tmp_rand0/flutter_tools_chrome_device.rand0', processManager, chromeLauncher, @@ -78,7 +78,7 @@ void main() { ); expect( - () async => await _testLaunchChrome( + () async => _testLaunchChrome( '/.tmp_rand0/flutter_tools_chrome_device.rand1', processManager, chromeLauncher, @@ -96,7 +96,7 @@ void main() { await chrome.close(); expect( - () async => await _testLaunchChrome( + () async => _testLaunchChrome( '/.tmp_rand0/flutter_tools_chrome_device.rand1', processManager, chromeLauncher, @@ -206,7 +206,7 @@ void main() { )); expect( - () async => await chromeLauncher.launch( + () async => chromeLauncher.launch( 'example_url', skipCheck: true, debugPort: 10000, @@ -232,7 +232,7 @@ void main() { )); expect( - () async => await chromeLauncher.launch( + () async => chromeLauncher.launch( 'example_url', skipCheck: true, headless: true, @@ -320,7 +320,7 @@ void main() { )); expect( - () async => await chromeLauncher.launch( + () async => chromeLauncher.launch( 'example_url', skipCheck: true, headless: true, @@ -346,7 +346,7 @@ void main() { )); expect( - () async => await chromeLauncher.launch( + () async => chromeLauncher.launch( 'example_url', skipCheck: true, headless: true, diff --git a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart index ca4faf4807..bccf367ccc 100644 --- a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart +++ b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart @@ -1022,7 +1022,7 @@ void main() { expect(await webAssetServer.metadataContents('foo/main_module.ddc_merged_metadata'), null); // Not base href. - expect(() async => await webAssetServer.metadataContents('bar/main_module.ddc_merged_metadata'), throwsException); + expect(() async => webAssetServer.metadataContents('bar/main_module.ddc_merged_metadata'), throwsException); })); test('DevFS URI includes any specified base path.', () => testbed.run(() async { diff --git a/packages/flutter_tools/test/integration.shard/test_driver.dart b/packages/flutter_tools/test/integration.shard/test_driver.dart index 3c2461f1bb..911745ad2d 100644 --- a/packages/flutter_tools/test/integration.shard/test_driver.dart +++ b/packages/flutter_tools/test/integration.shard/test_driver.dart @@ -175,7 +175,7 @@ abstract class FlutterTestDriver { final int port = _vmServiceWsUri != null ? vmServicePort : _attachPort; final VmService vmService = await vmServiceConnectUri('ws://localhost:$port/ws'); final Isolate isolate = await waitForExtension(vmService, extension); - return await vmService.callServiceExtension( + return vmService.callServiceExtension( extension, isolateId: isolate.id, args: args, @@ -300,9 +300,9 @@ abstract class FlutterTestDriver { Future stepOverOrOverAsyncSuspension({ bool waitForNextPause = true }) async { if (await isAtAsyncSuspension()) { - return await stepOverAsync(waitForNextPause: waitForNextPause); + return stepOverAsync(waitForNextPause: waitForNextPause); } - return await stepOver(waitForNextPause: waitForNextPause); + return stepOver(waitForNextPause: waitForNextPause); } Future _resume(String step, bool waitForNextPause) async { diff --git a/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart b/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart index 04153904b1..e73068d46a 100644 --- a/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart +++ b/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart @@ -206,7 +206,7 @@ class FuchsiaRemoteConnection { interface = addressAndInterface[1]; } - return await FuchsiaRemoteConnection.connectWithSshCommandRunner( + return FuchsiaRemoteConnection.connectWithSshCommandRunner( SshCommandRunner( address: address, interface: interface, @@ -356,7 +356,7 @@ class FuchsiaRemoteConnection { } final List> flutterViewLists = await _invokeForAllVms>((DartVm vmService) async { - return await vmService.getAllFlutterViews(); + return vmService.getAllFlutterViews(); }); final List results = flutterViewLists.fold>( [], (List acc, List element) { diff --git a/packages/integration_test/lib/integration_test.dart b/packages/integration_test/lib/integration_test.dart index 79f8441979..b820f59879 100644 --- a/packages/integration_test/lib/integration_test.dart +++ b/packages/integration_test/lib/integration_test.dart @@ -162,7 +162,7 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding /// The callback function to response the driver side input. @visibleForTesting Future> callback(Map params) async { - return await callbackManager.callback( + return callbackManager.callback( params, this /* as IntegrationTestResults */); } @@ -239,14 +239,14 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding await enableTimeline(streams: streams); if (retainPriorEvents) { await action(); - return await _vmService!.getVMTimeline(); + return _vmService!.getVMTimeline(); } await _vmService!.clearVMTimeline(); final vm.Timestamp startTime = await _vmService!.getVMTimelineMicros(); await action(); final vm.Timestamp endTime = await _vmService!.getVMTimelineMicros(); - return await _vmService!.getVMTimeline( + return _vmService!.getVMTimeline( timeOriginMicros: startTime.timestamp, timeExtentMicros: endTime.timestamp, );