From f62afdcf57c0a3e59f1837d905bc3a709d0686b9 Mon Sep 17 00:00:00 2001 From: Alexandre Ardhuin Date: Mon, 1 Oct 2018 21:29:08 +0200 Subject: [PATCH] add missing type parameter on methods (#22096) --- dev/benchmarks/complex_layout/lib/main.dart | 2 +- dev/bots/analyze.dart | 14 +++++----- dev/bots/prepare_package.dart | 2 +- dev/bots/run_command.dart | 6 ++--- dev/bots/test/analyze-sample-code_test.dart | 4 +-- dev/devicelab/bin/tasks/commands_test.dart | 18 ++++++------- dev/devicelab/bin/tasks/dartdocs.dart | 4 +-- .../bin/tasks/flutter_attach_test.dart | 10 +++---- .../bin/tasks/flutter_test_performance.dart | 4 +-- .../bin/tasks/gradle_plugin_test.dart | 2 +- dev/devicelab/bin/tasks/routing_test.dart | 18 ++++++------- .../run_machine_concurrent_hot_reload.dart | 4 +-- dev/devicelab/bin/tasks/run_release_test.dart | 10 +++---- .../bin/tasks/service_extensions_test.dart | 10 +++---- .../bin/tasks/technical_debt__cost.dart | 2 +- dev/devicelab/lib/framework/adb.dart | 16 ++++++------ dev/devicelab/lib/framework/manifest.dart | 2 +- dev/devicelab/lib/framework/runner.dart | 8 +++--- dev/devicelab/lib/framework/utils.dart | 26 +++++++++---------- dev/devicelab/lib/tasks/analysis.dart | 4 +-- dev/devicelab/lib/tasks/gallery.dart | 2 +- dev/devicelab/lib/tasks/hot_mode_tests.dart | 20 +++++++------- .../lib/tasks/integration_tests.dart | 2 +- dev/devicelab/lib/tasks/integration_ui.dart | 2 +- dev/devicelab/lib/tasks/microbenchmarks.dart | 8 +++--- dev/devicelab/lib/tasks/perf_tests.dart | 10 +++---- .../lib/tasks/sample_catalog_generator.dart | 2 +- .../lib/tasks/save_catalog_screenshots.dart | 4 +-- .../android_semantics_testing/lib/main.dart | 2 +- .../android_views/lib/main.dart | 2 +- dev/manual_tests/lib/animated_icons.dart | 2 +- dev/manual_tests/lib/material_arc.dart | 4 +-- dev/manual_tests/lib/page_view.dart | 2 +- dev/manual_tests/lib/text.dart | 14 +++++----- .../test/card_collection_test.dart | 2 +- .../test/color_testing_demo_test.dart | 2 +- dev/tools/dartdoc.dart | 8 +++--- dev/tools/gen_date_localizations.dart | 2 +- dev/tools/gen_localizations.dart | 2 +- dev/tools/lib/roll_dev.dart | 2 +- dev/tools/localizations_utils.dart | 4 +-- dev/tools/update_icons.dart | 4 +-- dev/tools/vitool/lib/vitool.dart | 4 +-- examples/catalog/bin/sample_page.dart | 12 ++++----- examples/catalog/lib/app_bar_bottom.dart | 2 +- examples/catalog/lib/basic_app_bar.dart | 2 +- examples/catalog/lib/custom_semantics.dart | 2 +- .../catalog/lib/expansion_tile_sample.dart | 2 +- examples/catalog/lib/tabbed_app_bar.dart | 4 +-- .../lib/demo/animation/home.dart | 4 +-- .../flutter_gallery/lib/demo/colors_demo.dart | 8 +++--- .../lib/demo/contacts_demo.dart | 2 +- .../cupertino/cupertino_refresh_demo.dart | 2 +- .../demo/material/bottom_app_bar_demo.dart | 2 +- .../demo/material/bottom_navigation_demo.dart | 2 +- .../lib/demo/material/buttons_demo.dart | 8 +++--- .../lib/demo/material/cards_demo.dart | 2 +- .../lib/demo/material/chip_demo.dart | 2 +- .../material/date_and_time_picker_demo.dart | 2 +- .../lib/demo/material/dialog_demo.dart | 2 +- .../lib/demo/material/drawer_demo.dart | 2 +- .../lib/demo/material/elevation_demo.dart | 2 +- .../demo/material/expansion_panels_demo.dart | 2 +- .../material/full_screen_dialog_demo.dart | 2 +- .../lib/demo/material/grid_list_demo.dart | 2 +- .../lib/demo/material/leave_behind_demo.dart | 2 +- .../lib/demo/material/list_demo.dart | 2 +- .../lib/demo/material/overscroll_demo.dart | 2 +- .../lib/demo/material/page_selector_demo.dart | 2 +- .../material/progress_indicator_demo.dart | 2 +- .../demo/material/reorderable_list_demo.dart | 4 +-- .../demo/material/scrollable_tabs_demo.dart | 2 +- .../lib/demo/material/search_demo.dart | 2 +- .../lib/demo/material/snack_bar_demo.dart | 2 +- .../lib/demo/material/tabs_demo.dart | 4 +-- .../lib/demo/material/tabs_fab_demo.dart | 4 +-- .../lib/demo/material/tooltip_demo.dart | 2 +- .../flutter_gallery/lib/demo/pesto_demo.dart | 4 +-- .../lib/demo/shrine/shrine_home.dart | 2 +- .../lib/demo/shrine/shrine_order.dart | 2 +- .../flutter_gallery/lib/demo/video_demo.dart | 2 +- .../flutter_gallery/lib/gallery/demo.dart | 4 +-- .../lib/gallery/example_code.dart | 4 +-- .../flutter_gallery/lib/gallery/options.dart | 2 +- examples/layers/services/isolate.dart | 2 +- examples/layers/widgets/media_query.dart | 4 +-- examples/layers/widgets/sectors.dart | 2 +- examples/layers/widgets/styled_text.dart | 2 +- examples/stocks/lib/stock_strings.dart | 2 +- .../flutter/lib/src/cupertino/button.dart | 2 +- .../flutter/lib/src/cupertino/dialog.dart | 2 +- .../flutter/lib/src/foundation/isolates.dart | 2 +- .../flutter/lib/src/foundation/print.dart | 4 +-- .../animated_icons/animated_icons.dart | 12 ++++----- .../src/material/bottom_navigation_bar.dart | 2 +- .../lib/src/material/mergeable_material.dart | 4 +-- .../material/user_accounts_drawer_header.dart | 2 +- .../lib/src/painting/image_resolution.dart | 2 +- .../flutter/lib/src/painting/text_span.dart | 2 +- .../lib/src/rendering/custom_layout.dart | 2 +- packages/flutter/lib/src/rendering/layer.dart | 2 +- .../lib/src/rendering/platform_view.dart | 4 +-- .../flutter/lib/src/scheduler/ticker.dart | 2 +- .../flutter/lib/src/semantics/semantics.dart | 6 ++--- .../lib/src/services/platform_views.dart | 4 +-- .../lib/src/services/text_formatter.dart | 2 +- packages/flutter/lib/src/widgets/image.dart | 2 +- .../src/widgets/list_wheel_scroll_view.dart | 2 +- .../lib/src/widgets/localizations.dart | 6 ++--- packages/flutter/lib/src/widgets/routes.dart | 3 ++- .../lib/src/widgets/scroll_controller.dart | 2 +- .../flutter/lib/src/widgets/scrollable.dart | 2 +- packages/flutter/lib/src/widgets/table.dart | 6 ++--- .../lib/src/widgets/widget_inspector.dart | 2 +- .../flutter/test/cupertino/nav_bar_test.dart | 4 +-- .../flutter/test/cupertino/route_test.dart | 2 +- .../foundation/caching_iterable_test.dart | 6 ++--- .../flutter/test/material/app_bar_test.dart | 2 +- .../flutter/test/material/colors_test.dart | 6 ++--- .../test/material/data_table_test.dart | 2 +- .../flutter/test/material/dropdown_test.dart | 4 +-- .../flutter/test/material/list_tile_test.dart | 2 +- .../test/material/page_selector_test.dart | 2 +- .../test/material/refresh_indicator_test.dart | 8 +++--- .../test/material/reorderable_list_test.dart | 2 +- packages/flutter/test/material/tabs_test.dart | 16 ++++++------ .../test/material/text_field_test.dart | 2 +- .../flutter/test/material/theme_test.dart | 2 +- .../test/scheduler/scheduler_test.dart | 2 +- .../test/widgets/custom_painter_test.dart | 2 +- .../test/widgets/dismissible_test.dart | 2 +- .../flutter/test/widgets/grid_view_test.dart | 4 +-- .../flutter/test/widgets/heroes_test.dart | 2 +- .../test/widgets/image_headers_test.dart | 2 +- .../widgets/list_view_horizontal_test.dart | 2 +- .../test/widgets/list_view_vertical_test.dart | 4 +-- .../test/widgets/nested_scroll_view_test.dart | 4 +-- .../test/widgets/pageable_list_test.dart | 4 +-- .../scrollable_list_hit_testing_test.dart | 10 +++---- .../flutter/test/widgets/semantics_test.dart | 2 +- .../test/widgets/semantics_tester.dart | 12 ++++----- ...xpressionForCurrentSemanticsTree_test.dart | 4 +-- .../test/widgets/sliver_list_test.dart | 2 +- .../slivers_block_global_key_test.dart | 2 +- .../flutter_driver/lib/src/driver/driver.dart | 8 +++--- .../lib/src/driver/timeline.dart | 2 +- .../lib/src/driver/timeline_summary.dart | 8 +++--- .../test/flutter_driver_test.dart | 2 +- packages/flutter_test/lib/src/binding.dart | 14 +++++----- packages/flutter_test/lib/src/controller.dart | 18 ++++++------- packages/flutter_test/lib/src/finders.dart | 2 +- packages/flutter_test/lib/src/goldens.dart | 2 +- .../flutter_test/lib/src/test_pointer.dart | 8 +++--- .../flutter_test/lib/src/widget_tester.dart | 20 +++++++------- packages/flutter_test/test/goldens_test.dart | 2 +- .../flutter_test/test/widget_tester_test.dart | 6 ++--- .../bin/fuchsia_asset_builder.dart | 2 +- .../lib/src/android/android_device.dart | 6 ++--- .../lib/src/android/android_emulator.dart | 4 +-- .../lib/src/android/android_sdk.dart | 4 +-- .../lib/src/android/android_studio.dart | 2 +- .../src/android/android_studio_validator.dart | 6 ++--- .../lib/src/android/android_workflow.dart | 10 +++---- packages/flutter_tools/lib/src/asset.dart | 4 +-- .../lib/src/base/fingerprint.dart | 4 +-- packages/flutter_tools/lib/src/base/io.dart | 2 +- .../flutter_tools/lib/src/base/logger.dart | 2 +- packages/flutter_tools/lib/src/base/os.dart | 4 +-- .../flutter_tools/lib/src/base/process.dart | 8 +++--- .../flutter_tools/lib/src/base/terminal.dart | 2 +- .../flutter_tools/lib/src/base/utils.dart | 2 +- packages/flutter_tools/lib/src/bundle.dart | 4 +-- packages/flutter_tools/lib/src/cache.dart | 2 +- .../lib/src/commands/analyze_once.dart | 2 +- .../lib/src/commands/build_aot.dart | 10 +++---- .../lib/src/commands/config.dart | 2 +- .../lib/src/commands/daemon.dart | 10 +++---- .../flutter_tools/lib/src/commands/drive.dart | 2 +- .../lib/src/commands/fuchsia_reload.dart | 14 +++++----- .../flutter_tools/lib/src/commands/run.dart | 4 +-- packages/flutter_tools/lib/src/compile.dart | 14 +++++----- .../flutter_tools/lib/src/dart/analysis.dart | 4 +-- packages/flutter_tools/lib/src/devfs.dart | 10 +++---- packages/flutter_tools/lib/src/device.dart | 6 ++--- packages/flutter_tools/lib/src/doctor.dart | 10 +++---- packages/flutter_tools/lib/src/emulator.dart | 18 ++++++------- .../lib/src/flutter_manifest.dart | 2 +- .../flutter_tools/lib/src/ios/devices.dart | 4 +-- packages/flutter_tools/lib/src/ios/mac.dart | 2 +- .../flutter_tools/lib/src/ios/simulators.dart | 16 ++++++------ .../flutter_tools/lib/src/ios/xcodeproj.dart | 2 +- packages/flutter_tools/lib/src/plugins.dart | 6 ++--- packages/flutter_tools/lib/src/project.dart | 2 +- .../lib/src/resident_runner.dart | 8 +++--- packages/flutter_tools/lib/src/run_hot.dart | 4 +-- .../src/runner/flutter_command_runner.dart | 4 +-- packages/flutter_tools/lib/src/services.dart | 2 +- .../lib/src/test/flutter_platform.dart | 12 ++++----- .../lib/src/tester/flutter_tester.dart | 10 +++---- packages/flutter_tools/lib/src/version.dart | 2 +- packages/flutter_tools/lib/src/vmservice.dart | 10 +++---- .../lib/src/vscode/vscode_validator.dart | 6 ++--- .../test/android/android_workflow_test.dart | 2 +- .../flutter_tools/test/base/context_test.dart | 6 ++--- .../test/commands/daemon_test.dart | 4 +-- .../test/commands/packages_test.dart | 4 +-- .../test/integration/test_driver.dart | 8 +++--- packages/flutter_tools/test/src/context.dart | 4 +-- packages/flutter_tools/test/src/mocks.dart | 4 +-- .../flutter_tools/tool/daemon_client.dart | 6 ++--- .../lib/src/fuchsia_remote_connection.dart | 6 ++--- 211 files changed, 504 insertions(+), 503 deletions(-) diff --git a/dev/benchmarks/complex_layout/lib/main.dart b/dev/benchmarks/complex_layout/lib/main.dart index 9b95c744f9a..efae0a2e06c 100644 --- a/dev/benchmarks/complex_layout/lib/main.dart +++ b/dev/benchmarks/complex_layout/lib/main.dart @@ -494,7 +494,7 @@ class ItemGalleryBox extends StatelessWidget { children: [ Expanded( child: TabBarView( - children: tabNames.map((String tabName) { + children: tabNames.map((String tabName) { return Container( key: PageStorageKey(tabName), child: Padding( diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart index ec41f2c8553..20b70d92d1a 100644 --- a/dev/bots/analyze.dart +++ b/dev/bots/analyze.dart @@ -207,8 +207,8 @@ Future _evalCommand(String executable, List arguments, { final Future>> savedStderr = process.stderr.toList(); final int exitCode = await process.exitCode; final EvalResult result = EvalResult( - stdout: utf8.decode((await savedStdout).expand((List ints) => ints).toList()), - stderr: utf8.decode((await savedStderr).expand((List ints) => ints).toList()), + stdout: utf8.decode((await savedStdout).expand((List ints) => ints).toList()), + stderr: utf8.decode((await savedStderr).expand((List ints) => ints).toList()), exitCode: exitCode, ); @@ -328,13 +328,13 @@ Future _verifyNoBadImportsInFlutter(String workingDirectory) async { .whereType() .map((Directory entity) => path.basename(entity.path)) .toList()..sort(); - if (!_matches(packages, directories)) { + if (!_matches(packages, directories)) { errors.add( 'flutter/lib/*.dart does not match flutter/lib/src/*/:\n' 'These are the exported packages:\n' + - packages.map((String path) => ' lib/$path.dart').join('\n') + + packages.map((String path) => ' lib/$path.dart').join('\n') + 'These are the directories:\n' + - directories.map((String path) => ' lib/src/$path/').join('\n') + directories.map((String path) => ' lib/src/$path/').join('\n') ); } // Verify that the imports are well-ordered. @@ -350,7 +350,7 @@ Future _verifyNoBadImportsInFlutter(String workingDirectory) async { } } for (String package in dependencyMap.keys) { - final List loop = _deepSearch(dependencyMap, package); + final List loop = _deepSearch(dependencyMap, package); if (loop != null) { errors.add( '${yellow}Dependency loop:$reset ' + @@ -421,7 +421,7 @@ List _deepSearch(Map> map, T start, [ Set seen ]) { continue; // we catch these separately if (seen != null && seen.contains(key)) return [start, key]; - final List result = _deepSearch( + final List result = _deepSearch( map, key, (seen == null ? Set.from([start]) : Set.from(seen))..add(key), diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart index b3b8fbbda11..116018e7f9d 100644 --- a/dev/bots/prepare_package.dart +++ b/dev/bots/prepare_package.dart @@ -587,7 +587,7 @@ Future main(List argList) async { argParser.addOption( 'branch', defaultsTo: null, - allowed: Branch.values.map((Branch branch) => getBranchName(branch)), + allowed: Branch.values.map((Branch branch) => getBranchName(branch)), help: 'The Flutter branch to build the archive with. Required.', ); argParser.addOption( diff --git a/dev/bots/run_command.dart b/dev/bots/run_command.dart index 539192c9778..0f32200513d 100644 --- a/dev/bots/run_command.dart +++ b/dev/bots/run_command.dart @@ -56,7 +56,7 @@ Future runCommand(String executable, List arguments, { Future>> savedStdout, savedStderr; if (printOutput) { - await Future.wait(>[ + await Future.wait(>[ stdout.addStream(process.stdout), stderr.addStream(process.stderr) ]); @@ -75,8 +75,8 @@ Future runCommand(String executable, List arguments, { print(failureMessage); } if (!printOutput) { - stdout.writeln(utf8.decode((await savedStdout).expand((List ints) => ints).toList())); - stderr.writeln(utf8.decode((await savedStderr).expand((List ints) => ints).toList())); + stdout.writeln(utf8.decode((await savedStdout).expand((List ints) => ints).toList())); + stderr.writeln(utf8.decode((await savedStderr).expand((List ints) => ints).toList())); } print( '$redLine\n' diff --git a/dev/bots/test/analyze-sample-code_test.dart b/dev/bots/test/analyze-sample-code_test.dart index 7b50ad7fa60..41ac7c4775c 100644 --- a/dev/bots/test/analyze-sample-code_test.dart +++ b/dev/bots/test/analyze-sample-code_test.dart @@ -13,8 +13,8 @@ void main() { '../../bin/cache/dart-sdk/bin/dart', ['analyze-sample-code.dart', 'test/analyze-sample-code-test-input'], ); - final List stdout = await process.stdout.transform(utf8.decoder).transform(const LineSplitter()).toList(); - final List stderr = await process.stderr.transform(utf8.decoder).transform(const LineSplitter()).toList(); + final List stdout = await process.stdout.transform(utf8.decoder).transform(const LineSplitter()).toList(); + final List stderr = await process.stderr.transform(utf8.decoder).transform(const LineSplitter()).toList(); final Match line = RegExp(r'^(.+)/main\.dart:[0-9]+:[0-9]+: .+$').matchAsPrefix(stdout[1]); expect(line, isNot(isNull)); final String directory = line.group(1); diff --git a/dev/devicelab/bin/tasks/commands_test.dart b/dev/devicelab/bin/tasks/commands_test.dart index f23f4b8e195..a1e695d6f46 100644 --- a/dev/devicelab/bin/tasks/commands_test.dart +++ b/dev/devicelab/bin/tasks/commands_test.dart @@ -30,8 +30,8 @@ void main() { ); final StreamController stdout = StreamController.broadcast(); run.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('run:stdout: $line'); stdout.add(line); @@ -46,12 +46,12 @@ void main() { } }); run.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { stderr.writeln('run:stderr: $line'); }); - run.exitCode.then((int exitCode) { ok = false; }); + run.exitCode.then((int exitCode) { ok = false; }); await Future.any(>[ ready.future, run.exitCode ]); if (!ok) throw 'Failed to run test app.'; @@ -114,14 +114,14 @@ class DriveHelper { ['drive', '--use-existing-app', 'http://127.0.0.1:$vmServicePort/', '--keep-app-running', '--driver', 'test_driver/commands_${name}_test.dart'], ); drive.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('drive:stdout: $line'); }); drive.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { stderr.writeln('drive:stderr: $line'); }); diff --git a/dev/devicelab/bin/tasks/dartdocs.dart b/dev/devicelab/bin/tasks/dartdocs.dart index bac9d9b0ff0..174ca243bcb 100644 --- a/dev/devicelab/bin/tasks/dartdocs.dart +++ b/dev/devicelab/bin/tasks/dartdocs.dart @@ -21,7 +21,7 @@ Future main() async { int publicMembers = 0; int otherErrors = 0; int otherLines = 0; - await for (String entry in analysis.stdout.transform(utf8.decoder).transform(const LineSplitter())) { + await for (String entry in analysis.stdout.transform(utf8.decoder).transform(const LineSplitter())) { entry = entry.trim(); print('analyzer stdout: $entry'); if (entry == 'Building flutter tool...') { @@ -36,7 +36,7 @@ Future main() async { otherLines += 1; } } - await for (String entry in analysis.stderr.transform(utf8.decoder).transform(const LineSplitter())) { + await for (String entry in analysis.stderr.transform(utf8.decoder).transform(const LineSplitter())) { print('analyzer stderr: $entry'); if (entry.startsWith('[lint] ')) { // ignore this line diff --git a/dev/devicelab/bin/tasks/flutter_attach_test.dart b/dev/devicelab/bin/tasks/flutter_attach_test.dart index 3c6641f42a9..f39faf21d22 100644 --- a/dev/devicelab/bin/tasks/flutter_attach_test.dart +++ b/dev/devicelab/bin/tasks/flutter_attach_test.dart @@ -26,8 +26,8 @@ Future testReload(Process process, { Future Function() onListening } int exitCode; process.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('attach:stdout: $line'); stdout.add(line); @@ -43,14 +43,14 @@ Future testReload(Process process, { Future Function() onListening } finished.complete(); }); process.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('run:stderr: $line'); stdout.add(line); }); - process.exitCode.then((int processExitCode) { exitCode = processExitCode; }); + process.exitCode.then((int processExitCode) { exitCode = processExitCode; }); Future eventOrExit(Future event) { return Future.any(>[ event, process.exitCode ]); diff --git a/dev/devicelab/bin/tasks/flutter_test_performance.dart b/dev/devicelab/bin/tasks/flutter_test_performance.dart index 2434680267b..0e5ef8d9796 100644 --- a/dev/devicelab/bin/tasks/flutter_test_performance.dart +++ b/dev/devicelab/bin/tasks/flutter_test_performance.dart @@ -45,7 +45,7 @@ Future runTest() async { ); int badLines = 0; TestStep step = TestStep.starting; - await for (String entry in analysis.stdout.transform(utf8.decoder).transform(const LineSplitter())) { + await for (String entry in analysis.stdout.transform(utf8.decoder).transform(const LineSplitter())) { print('test stdout ($step): $entry'); if (step == TestStep.starting && entry == 'Building flutter tool...') { // ignore this line @@ -76,7 +76,7 @@ Future runTest() async { } } } - await for (String entry in analysis.stderr.transform(utf8.decoder).transform(const LineSplitter())) { + await for (String entry in analysis.stderr.transform(utf8.decoder).transform(const LineSplitter())) { print('test stderr: $entry'); badLines += 1; } diff --git a/dev/devicelab/bin/tasks/gradle_plugin_test.dart b/dev/devicelab/bin/tasks/gradle_plugin_test.dart index 32442d982e2..8521314ea74 100644 --- a/dev/devicelab/bin/tasks/gradle_plugin_test.dart +++ b/dev/devicelab/bin/tasks/gradle_plugin_test.dart @@ -297,7 +297,7 @@ class _Dependencies { .replaceAllMapped(_separatorExpr, (Match match) => '${match.group(1)}\n') .split('\n') // Expand escape sequences, so that '\ ', for example,ß becomes ' ' - .map((String path) => path.replaceAllMapped(_escapeExpr, (Match match) => match.group(1)).trim()) + .map((String path) => path.replaceAllMapped(_escapeExpr, (Match match) => match.group(1)).trim()) .where((String path) => path.isNotEmpty) .toSet(); } diff --git a/dev/devicelab/bin/tasks/routing_test.dart b/dev/devicelab/bin/tasks/routing_test.dart index d001aa536fa..851d9dc2355 100644 --- a/dev/devicelab/bin/tasks/routing_test.dart +++ b/dev/devicelab/bin/tasks/routing_test.dart @@ -37,8 +37,8 @@ void main() { ['run', '--verbose', '-d', device.deviceId, '--route', '/smuggle-it', 'lib/route.dart'], ); run.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('run:stdout: $line'); if (vmServicePort == null) { @@ -52,12 +52,12 @@ void main() { } }); run.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { stderr.writeln('run:stderr: $line'); }); - run.exitCode.then((int exitCode) { ok = false; }); + run.exitCode.then((int exitCode) { ok = false; }); await Future.any(>[ ready.future, run.exitCode ]); if (!ok) throw 'Failed to run test app.'; @@ -67,14 +67,14 @@ void main() { ['drive', '--use-existing-app', 'http://127.0.0.1:$vmServicePort/', '--no-keep-app-running', 'lib/route.dart'], ); drive.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('drive:stdout: $line'); }); drive.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { stderr.writeln('drive:stderr: $line'); }); diff --git a/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart b/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart index 19d48d331ed..aa441e50a8a 100644 --- a/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart +++ b/dev/devicelab/bin/tasks/run_machine_concurrent_hot_reload.dart @@ -27,7 +27,7 @@ void main() { } Stream transformToLines(Stream> byteStream) { - return byteStream.transform(utf8.decoder).transform(const LineSplitter()); + return byteStream.transform(utf8.decoder).transform(const LineSplitter()); } task(() async { @@ -74,7 +74,7 @@ void main() { transformToLines(run.stderr).listen((String line) { stderr.writeln('run:stderr: $line'); }); - run.exitCode.then((int exitCode) { + run.exitCode.then((int exitCode) { ok = false; }); await Future.any(>[ready.future, run.exitCode]); diff --git a/dev/devicelab/bin/tasks/run_release_test.dart b/dev/devicelab/bin/tasks/run_release_test.dart index d3a8851ffd0..7ebcb421825 100644 --- a/dev/devicelab/bin/tasks/run_release_test.dart +++ b/dev/devicelab/bin/tasks/run_release_test.dart @@ -29,8 +29,8 @@ void main() { final List stderr = []; int runExitCode; run.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('run:stdout: $line'); stdout.add(line); @@ -38,13 +38,13 @@ void main() { ready.complete(); }); run.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('run:stderr: $line'); stdout.add(line); }); - run.exitCode.then((int exitCode) { runExitCode = exitCode; }); + run.exitCode.then((int exitCode) { runExitCode = exitCode; }); await Future.any(>[ ready.future, run.exitCode ]); if (runExitCode != null) throw 'Failed to run test app; runner unexpected exited, with exit code $runExitCode.'; diff --git a/dev/devicelab/bin/tasks/service_extensions_test.dart b/dev/devicelab/bin/tasks/service_extensions_test.dart index dda1676dec1..898d76f5306 100644 --- a/dev/devicelab/bin/tasks/service_extensions_test.dart +++ b/dev/devicelab/bin/tasks/service_extensions_test.dart @@ -29,8 +29,8 @@ void main() { ['run', '--verbose', '-d', device.deviceId, 'lib/main.dart'], ); run.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('run:stdout: $line'); if (vmServicePort == null) { @@ -44,12 +44,12 @@ void main() { } }); run.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { stderr.writeln('run:stderr: $line'); }); - run.exitCode.then((int exitCode) { ok = false; }); + run.exitCode.then((int exitCode) { ok = false; }); await Future.any(>[ ready.future, run.exitCode ]); if (!ok) throw 'Failed to run test app.'; diff --git a/dev/devicelab/bin/tasks/technical_debt__cost.dart b/dev/devicelab/bin/tasks/technical_debt__cost.dart index dc2d076f7a3..7cc137d3018 100644 --- a/dev/devicelab/bin/tasks/technical_debt__cost.dart +++ b/dev/devicelab/bin/tasks/technical_debt__cost.dart @@ -54,7 +54,7 @@ Future findCostsForRepo() async { workingDirectory: flutterDirectory.path, ); double total = 0.0; - await for (String entry in git.stdout.transform(utf8.decoder).transform(const LineSplitter())) + await for (String entry in git.stdout.transform(utf8.decoder).transform(const LineSplitter())) total += await findCostsForFile(File(path.join(flutterDirectory.path, entry))); final int gitExitCode = await git.exitCode; if (gitExitCode != 0) diff --git a/dev/devicelab/lib/framework/adb.dart b/dev/devicelab/lib/framework/adb.dart index 8098d709116..2ea21c8c4a3 100644 --- a/dev/devicelab/lib/framework/adb.dart +++ b/dev/devicelab/lib/framework/adb.dart @@ -129,7 +129,7 @@ class AndroidDeviceDiscovery implements DeviceDiscovery { @override Future chooseWorkingDevice() async { final List allDevices = (await discoverDevices()) - .map((String id) => AndroidDevice(deviceId: id)) + .map((String id) => AndroidDevice(deviceId: id)) .toList(); if (allDevices.isEmpty) @@ -298,19 +298,19 @@ class AndroidDevice implements Device { await adb(['logcat', '--clear']); final Process process = await startProcess(adbPath, ['-s', deviceId, 'logcat']); process.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('adb logcat: $line'); stream.sink.add(line); }, onDone: () { stdoutDone.complete(); }); process.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('adb logcat stderr: $line'); }, onDone: () { stderrDone.complete(); }); - process.exitCode.then((int exitCode) { + process.exitCode.then((int exitCode) { print('adb logcat process terminated with exit code $exitCode'); if (!aborted) { stream.addError(BuildFailedError('adb logcat failed with exit code $exitCode.')); @@ -374,7 +374,7 @@ class IosDeviceDiscovery implements DeviceDiscovery { @override Future chooseWorkingDevice() async { final List allDevices = (await discoverDevices()) - .map((String id) => IosDevice(deviceId: id)) + .map((String id) => IosDevice(deviceId: id)) .toList(); if (allDevices.isEmpty) @@ -387,7 +387,7 @@ class IosDeviceDiscovery implements DeviceDiscovery { @override Future> discoverDevices() async { final List iosDeviceIDs = LineSplitter.split(await eval('idevice_id', ['-l'])) - .map((String line) => line.trim()) + .map((String line) => line.trim()) .where((String line) => line.isNotEmpty) .toList(); if (iosDeviceIDs.isEmpty) diff --git a/dev/devicelab/lib/framework/manifest.dart b/dev/devicelab/lib/framework/manifest.dart index f5e28545a5e..dc0eca378ce 100644 --- a/dev/devicelab/lib/framework/manifest.dart +++ b/dev/devicelab/lib/framework/manifest.dart @@ -83,7 +83,7 @@ Manifest _validateAndParseManifest(Map manifestYaml) { List _validateAndParseTasks(dynamic tasksYaml) { _checkType(tasksYaml is Map, tasksYaml, 'Value of "tasks"', 'dictionary'); final List sortedKeys = tasksYaml.keys.toList()..sort(); - return sortedKeys.map((dynamic taskName) => _validateAndParseTask(taskName, tasksYaml[taskName])).toList(); + return sortedKeys.map((dynamic taskName) => _validateAndParseTask(taskName, tasksYaml[taskName])).toList(); } ManifestTask _validateAndParseTask(dynamic taskName, dynamic taskYaml) { diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart index e836d9f5706..87ad3190095 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart @@ -44,8 +44,8 @@ Future> runTask(String taskName, { bool silent = false }) a final Completer port = Completer(); final StreamSubscription stdoutSub = runner.stdout - .transform(const Utf8Decoder()) - .transform(const LineSplitter()) + .transform(const Utf8Decoder()) + .transform(const LineSplitter()) .listen((String line) { if (!port.isCompleted) { final int portValue = parseServicePort(line, prefix: 'Observatory listening on '); @@ -58,8 +58,8 @@ Future> runTask(String taskName, { bool silent = false }) a }); final StreamSubscription stderrSub = runner.stderr - .transform(const Utf8Decoder()) - .transform(const LineSplitter()) + .transform(const Utf8Decoder()) + .transform(const LineSplitter()) .listen((String line) { stderr.writeln('[$taskName] [STDERR] $line'); }); diff --git a/dev/devicelab/lib/framework/utils.dart b/dev/devicelab/lib/framework/utils.dart index c90adf481e6..8ec8345056b 100644 --- a/dev/devicelab/lib/framework/utils.dart +++ b/dev/devicelab/lib/framework/utils.dart @@ -172,14 +172,14 @@ Future getCurrentFlutterRepoCommit() { return null; } - return inDirectory(flutterDirectory, () { + return inDirectory(flutterDirectory, () { return eval('git', ['rev-parse', 'HEAD']); }); } Future getFlutterRepoCommitTimestamp(String commit) { // git show -s --format=%at 4b546df7f0b3858aaaa56c4079e5be1ba91fbb65 - return inDirectory(flutterDirectory, () async { + return inDirectory(flutterDirectory, () async { final String unixTimestamp = await eval('git', [ 'show', '-s', @@ -235,7 +235,7 @@ Future startProcess( final ProcessInfo processInfo = ProcessInfo(command, process); _runningProcesses.add(processInfo); - process.exitCode.then((int exitCode) { + process.exitCode.then((int exitCode) { print('"$executable" exit code: $exitCode'); _runningProcesses.remove(processInfo); }); @@ -273,14 +273,14 @@ Future exec( final Completer stdoutDone = Completer(); final Completer stderrDone = Completer(); process.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('stdout: $line'); }, onDone: () { stdoutDone.complete(); }); process.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('stderr: $line'); }, onDone: () { stderrDone.complete(); }); @@ -310,15 +310,15 @@ Future eval( final Completer stdoutDone = Completer(); final Completer stderrDone = Completer(); process.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('stdout: $line'); output.writeln(line); }, onDone: () { stdoutDone.complete(); }); process.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('stderr: $line'); }, onDone: () { stderrDone.complete(); }); @@ -427,11 +427,11 @@ Future getFlutter(String revision) async { flutterDirectory.deleteSync(recursive: true); } - await inDirectory(flutterDirectory.parent, () async { + await inDirectory(flutterDirectory.parent, () async { await exec('git', ['clone', 'https://github.com/flutter/flutter.git']); }); - await inDirectory(flutterDirectory, () async { + await inDirectory(flutterDirectory, () async { await exec('git', ['checkout', revision]); }); diff --git a/dev/devicelab/lib/tasks/analysis.dart b/dev/devicelab/lib/tasks/analysis.dart index 495935895d0..cbf4366d562 100644 --- a/dev/devicelab/lib/tasks/analysis.dart +++ b/dev/devicelab/lib/tasks/analysis.dart @@ -22,7 +22,7 @@ const int _kRunsPerBenchmark = 3; Directory get _megaGalleryDirectory => dir(path.join(Directory.systemTemp.path, 'mega_gallery')); Future analyzerBenchmarkTask() async { - await inDirectory(flutterDirectory, () async { + await inDirectory(flutterDirectory, () async { rmTree(_megaGalleryDirectory); mkdirs(_megaGalleryDirectory); await dart(['dev/tools/mega_gallery.dart', '--out=${_megaGalleryDirectory.path}']); @@ -74,7 +74,7 @@ abstract class _Benchmark { Future execute(int iteration, int targetIterations) async { section('Analyze $title ${watch ? 'with watcher' : ''} - ${iteration + 1} / $targetIterations'); final Stopwatch stopwatch = Stopwatch(); - await inDirectory(directory, () async { + await inDirectory(directory, () async { stopwatch.start(); await flutter('analyze', options: options); stopwatch.stop(); diff --git a/dev/devicelab/lib/tasks/gallery.dart b/dev/devicelab/lib/tasks/gallery.dart index 6044e4e1966..7fdc271466d 100644 --- a/dev/devicelab/lib/tasks/gallery.dart +++ b/dev/devicelab/lib/tasks/gallery.dart @@ -28,7 +28,7 @@ class GalleryTransitionTest { final String deviceId = device.deviceId; final Directory galleryDirectory = dir('${flutterDirectory.path}/examples/flutter_gallery'); - await inDirectory(galleryDirectory, () async { + await inDirectory(galleryDirectory, () async { await flutter('packages', options: ['get']); if (deviceOperatingSystem == DeviceOperatingSystem.ios) diff --git a/dev/devicelab/lib/tasks/hot_mode_tests.dart b/dev/devicelab/lib/tasks/hot_mode_tests.dart index c938318bde4..e24ff66d12c 100644 --- a/dev/devicelab/lib/tasks/hot_mode_tests.dart +++ b/dev/devicelab/lib/tasks/hot_mode_tests.dart @@ -29,11 +29,11 @@ TaskFunction createHotModeTest() { int hotReloadCount = 0; Map twoReloadsData; Map freshRestartReloadsData; - await inDirectory(flutterDirectory, () async { + await inDirectory(flutterDirectory, () async { rmTree(_editedFlutterGalleryDir); mkdirs(_editedFlutterGalleryDir); recursiveCopy(flutterGalleryDir, _editedFlutterGalleryDir); - await inDirectory(_editedFlutterGalleryDir, () async { + await inDirectory(_editedFlutterGalleryDir, () async { if (deviceOperatingSystem == DeviceOperatingSystem.ios) await prepareProvisioningCertificates(_editedFlutterGalleryDir.path); { @@ -46,8 +46,8 @@ TaskFunction createHotModeTest() { final Completer stdoutDone = Completer(); final Completer stderrDone = Completer(); process.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { if (line.contains('\] Reloaded ')) { if (hotReloadCount == 0) { @@ -72,8 +72,8 @@ TaskFunction createHotModeTest() { stdoutDone.complete(); }); process.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('stderr: $line'); }, onDone: () { @@ -99,8 +99,8 @@ TaskFunction createHotModeTest() { final Completer stdoutDone = Completer(); final Completer stderrDone = Completer(); process.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { if (line.contains('\] Reloaded ')) { process.stdin.writeln('q'); @@ -110,8 +110,8 @@ TaskFunction createHotModeTest() { stdoutDone.complete(); }); process.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { print('stderr: $line'); }, onDone: () { diff --git a/dev/devicelab/lib/tasks/integration_tests.dart b/dev/devicelab/lib/tasks/integration_tests.dart index 0064c1b5a46..05ec5564224 100644 --- a/dev/devicelab/lib/tasks/integration_tests.dart +++ b/dev/devicelab/lib/tasks/integration_tests.dart @@ -73,7 +73,7 @@ class DriverTest { final List extraOptions; Future call() { - return inDirectory(testDirectory, () async { + return inDirectory(testDirectory, () async { final Device device = await devices.workingDevice; await device.unlock(); final String deviceId = device.deviceId; diff --git a/dev/devicelab/lib/tasks/integration_ui.dart b/dev/devicelab/lib/tasks/integration_ui.dart index c40495ff08f..335130fcc75 100644 --- a/dev/devicelab/lib/tasks/integration_ui.dart +++ b/dev/devicelab/lib/tasks/integration_ui.dart @@ -15,7 +15,7 @@ Future runEndToEndTests() async { await device.unlock(); final String deviceId = device.deviceId; final Directory testDirectory = dir('${flutterDirectory.path}/dev/integration_tests/ui'); - await inDirectory(testDirectory, () async { + await inDirectory(testDirectory, () async { await flutter('packages', options: ['get']); if (deviceOperatingSystem == DeviceOperatingSystem.ios) diff --git a/dev/devicelab/lib/tasks/microbenchmarks.dart b/dev/devicelab/lib/tasks/microbenchmarks.dart index ae96483bd20..91892be2e64 100644 --- a/dev/devicelab/lib/tasks/microbenchmarks.dart +++ b/dev/devicelab/lib/tasks/microbenchmarks.dart @@ -78,8 +78,8 @@ Future> _readJsonResults(Process process) { final Completer> completer = Completer>(); final StreamSubscription stderrSub = process.stderr - .transform(const Utf8Decoder()) - .transform(const LineSplitter()) + .transform(const Utf8Decoder()) + .transform(const LineSplitter()) .listen((String line) { stderr.writeln('[STDERR] $line'); }); @@ -87,8 +87,8 @@ Future> _readJsonResults(Process process) { bool processWasKilledIntentionally = false; bool resultsHaveBeenParsed = false; final StreamSubscription stdoutSub = process.stdout - .transform(const Utf8Decoder()) - .transform(const LineSplitter()) + .transform(const Utf8Decoder()) + .transform(const LineSplitter()) .listen((String line) async { print(line); diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart index 345fd7c588d..1c0901201ef 100644 --- a/dev/devicelab/lib/tasks/perf_tests.dart +++ b/dev/devicelab/lib/tasks/perf_tests.dart @@ -75,7 +75,7 @@ TaskFunction createBasicMaterialCompileTest() { rmTree(sampleDir); - await inDirectory(Directory.systemTemp, () async { + await inDirectory(Directory.systemTemp, () async { await flutter('create', options: [sampleAppName]); }); @@ -95,7 +95,7 @@ class StartupTest { final bool reportMetrics; Future run() async { - return await inDirectory(testDirectory, () async { + return await inDirectory(testDirectory, () async { final String deviceId = (await devices.workingDevice).deviceId; await flutter('packages', options: ['get']); @@ -131,7 +131,7 @@ class PerfTest { final String timelineFileName; Future run() { - return inDirectory(testDirectory, () async { + return inDirectory(testDirectory, () async { final Device device = await devices.workingDevice; await device.unlock(); final String deviceId = device.deviceId; @@ -183,7 +183,7 @@ class CompileTest { final bool reportPackageContentSizes; Future run() async { - return await inDirectory(testDirectory, () async { + return await inDirectory(testDirectory, () async { final Device device = await devices.workingDevice; await device.unlock(); await flutter('packages', options: ['get']); @@ -402,7 +402,7 @@ class MemoryTest { Device _device; Future run() { - return inDirectory(project, () async { + return inDirectory(project, () async { // This test currently only works on Android, because device.logcat, // device.getMemoryStats, etc, aren't implemented for iOS. diff --git a/dev/devicelab/lib/tasks/sample_catalog_generator.dart b/dev/devicelab/lib/tasks/sample_catalog_generator.dart index ef52a3d6253..376cc67abc0 100644 --- a/dev/devicelab/lib/tasks/sample_catalog_generator.dart +++ b/dev/devicelab/lib/tasks/sample_catalog_generator.dart @@ -18,7 +18,7 @@ Future samplePageCatalogGenerator(String authorizationToken) async { final String deviceId = device.deviceId; final Directory catalogDirectory = dir('${flutterDirectory.path}/examples/catalog'); - await inDirectory(catalogDirectory, () async { + await inDirectory(catalogDirectory, () async { await flutter('packages', options: ['get']); final bool isIosDevice = deviceOperatingSystem == DeviceOperatingSystem.ios; diff --git a/dev/devicelab/lib/tasks/save_catalog_screenshots.dart b/dev/devicelab/lib/tasks/save_catalog_screenshots.dart index 727358bd19c..e1bd4d07019 100644 --- a/dev/devicelab/lib/tasks/save_catalog_screenshots.dart +++ b/dev/devicelab/lib/tasks/save_catalog_screenshots.dart @@ -65,7 +65,7 @@ class Upload { } else { // TODO(hansmuller): only retry on 5xx and 429 responses logMessage('Request to save "$name" (length ${content.length}) failed with status ${response.statusCode}, will retry'); - logMessage(await response.transform(utf8.decoder).join()); + logMessage(await response.transform(utf8.decoder).join()); } return response.statusCode == HttpStatus.ok; } on TimeoutException catch (_) { @@ -104,7 +104,7 @@ Future saveScreenshots(List fromPaths, List largeNames, Li while (uploads.any(Upload.isNotComplete)) { final HttpClient client = HttpClient(); uploads = uploads.where(Upload.isNotComplete).toList(); - await Future.wait(uploads.map((Upload upload) => upload.run(client))); + await Future.wait(uploads.map>((Upload upload) => upload.run(client))); client.close(force: true); } } diff --git a/dev/integration_tests/android_semantics_testing/lib/main.dart b/dev/integration_tests/android_semantics_testing/lib/main.dart index 1b7bf656e5a..d0f52854ae9 100644 --- a/dev/integration_tests/android_semantics_testing/lib/main.dart +++ b/dev/integration_tests/android_semantics_testing/lib/main.dart @@ -59,7 +59,7 @@ class TestApp extends StatelessWidget { builder: (BuildContext context) { return Scaffold( body: ListView( - children: routes.map((String value) { + children: routes.map((String value) { return MaterialButton( child: Text(value), onPressed: () { diff --git a/dev/integration_tests/android_views/lib/main.dart b/dev/integration_tests/android_views/lib/main.dart index e1d0679a2d7..a9e79faf266 100644 --- a/dev/integration_tests/android_views/lib/main.dart +++ b/dev/integration_tests/android_views/lib/main.dart @@ -123,7 +123,7 @@ class PlatformViewState extends State { final List unTypedRecordedEvents = codec.decodeMessage(data); final List> recordedEvents = unTypedRecordedEvents .cast>() - .map((Map e) =>e.cast()) + .map>((Map e) =>e.cast()) .toList(); await channel.invokeMethod('pipeFlutterViewEvents'); await viewChannel.invokeMethod('pipeTouchEvents'); diff --git a/dev/manual_tests/lib/animated_icons.dart b/dev/manual_tests/lib/animated_icons.dart index 3cf6f10e1f1..b857423982b 100644 --- a/dev/manual_tests/lib/animated_icons.dart +++ b/dev/manual_tests/lib/animated_icons.dart @@ -22,7 +22,7 @@ class IconsList extends StatelessWidget { @override Widget build(BuildContext context) { return ListView( - children: samples.map((IconSample s) => IconSampleRow(s)).toList(), + children: samples.map((IconSample s) => IconSampleRow(s)).toList(), ); } } diff --git a/dev/manual_tests/lib/material_arc.dart b/dev/manual_tests/lib/material_arc.dart index 5b7fadaef35..4d9ece50540 100644 --- a/dev/manual_tests/lib/material_arc.dart +++ b/dev/manual_tests/lib/material_arc.dart @@ -452,7 +452,7 @@ class _AnimationDemoState extends State with TickerProviderStateM appBar: AppBar( title: const Text('Animation'), bottom: TabBar( - tabs: _allDemos.map((_ArcDemo demo) => Tab(text: demo.title)).toList(), + tabs: _allDemos.map((_ArcDemo demo) => Tab(text: demo.title)).toList(), ), ), floatingActionButton: Builder( @@ -466,7 +466,7 @@ class _AnimationDemoState extends State with TickerProviderStateM }, ), body: TabBarView( - children: _allDemos.map((_ArcDemo demo) => demo.builder(demo)).toList() + children: _allDemos.map((_ArcDemo demo) => demo.builder(demo)).toList() ) ) ); diff --git a/dev/manual_tests/lib/page_view.dart b/dev/manual_tests/lib/page_view.dart index 5487f084b6e..b882f3132f3 100644 --- a/dev/manual_tests/lib/page_view.dart +++ b/dev/manual_tests/lib/page_view.dart @@ -119,7 +119,7 @@ class PageViewAppState extends State { Widget _buildBody(BuildContext context) { return PageView( - children: cardModels.map(buildCard).toList(), + children: cardModels.map(buildCard).toList(), // TODO(abarth): itemsWrap: itemsWrap, scrollDirection: scrollDirection, ); diff --git a/dev/manual_tests/lib/text.dart b/dev/manual_tests/lib/text.dart index 938b532b02a..0244f3e6c05 100644 --- a/dev/manual_tests/lib/text.dart +++ b/dev/manual_tests/lib/text.dart @@ -189,7 +189,7 @@ class _FuzzerState extends State with SingleTickerProviderStateMixin { switch (_random.nextInt(10)) { case 0: if (value == null) - return pickFromList(_random, Colors.primaries)[(_random.nextInt(9) + 1) * 100]; + return pickFromList(_random, Colors.primaries)[(_random.nextInt(9) + 1) * 100]; switch (_random.nextInt(4)) { case 0: return value.withAlpha(value.alpha + _random.nextInt(10) - 5); @@ -240,7 +240,7 @@ class _FuzzerState extends State with SingleTickerProviderStateMixin { case 0: return null; case 1: - return pickFromList(_random, TextDecorationStyle.values); + return pickFromList(_random, TextDecorationStyle.values); } return value; } @@ -250,7 +250,7 @@ class _FuzzerState extends State with SingleTickerProviderStateMixin { case 0: return null; case 1: - return pickFromList(_random, FontWeight.values); + return pickFromList(_random, FontWeight.values); } return value; } @@ -260,7 +260,7 @@ class _FuzzerState extends State with SingleTickerProviderStateMixin { case 0: return null; case 1: - return pickFromList(_random, FontStyle.values); + return pickFromList(_random, FontStyle.values); } return value; } @@ -938,7 +938,7 @@ class _PaintingState extends State with SingleTickerProviderStateMixin if (mounted && intrinsicKey.currentContext.size.height != controlKey.currentContext.size.height) { debugPrint('Found some text that unexpectedly renders at different heights.'); debugPrint('Text: $_text'); - debugPrint(_text.runes.map((int index) => 'U+' + index.toRadixString(16).padLeft(4, '0')).join(' ')); + debugPrint(_text.runes.map((int index) => 'U+' + index.toRadixString(16).padLeft(4, '0')).join(' ')); setState(() { _ticker.stop(); }); @@ -1045,7 +1045,7 @@ class _PaintingState extends State with SingleTickerProviderStateMixin FlatButton( onPressed: _ticker.isActive ? null : () { print('The currently visible text is: $_text'); - print(_text.runes.map((int value) => 'U+${value.toRadixString(16).padLeft(4, '0').toUpperCase()}').join(' ')); + print(_text.runes.map((int value) => 'U+${value.toRadixString(16).padLeft(4, '0').toUpperCase()}').join(' ')); }, child: const Text('DUMP TEXT TO LOGS'), ), @@ -2109,7 +2109,7 @@ int randomCharacter(math.Random random) { Range(0x2ceb0, 0x2ebe0), Range(0x2f800, 0x2fa1d), ]; - final Range range = pickFromList(random, characterRanges); + final Range range = pickFromList(random, characterRanges); if (range.start == range.end) return range.start; return range.start + random.nextInt(range.end - range.start); diff --git a/dev/manual_tests/test/card_collection_test.dart b/dev/manual_tests/test/card_collection_test.dart index 3ed2a1b9f19..8de4efbf2b3 100644 --- a/dev/manual_tests/test/card_collection_test.dart +++ b/dev/manual_tests/test/card_collection_test.dart @@ -12,7 +12,7 @@ import 'mock_image_http.dart'; void main() { testWidgets('Card Collection smoke test', (WidgetTester tester) async { - HttpOverrides.runZoned(() async { + HttpOverrides.runZoned>(() async { card_collection.main(); // builds the app and schedules a frame but doesn't trigger one await tester.pump(); // see https://github.com/flutter/flutter/issues/1865 await tester.pump(); // triggers a frame diff --git a/dev/manual_tests/test/color_testing_demo_test.dart b/dev/manual_tests/test/color_testing_demo_test.dart index 9c3b16e18bd..eca5509dbb3 100644 --- a/dev/manual_tests/test/color_testing_demo_test.dart +++ b/dev/manual_tests/test/color_testing_demo_test.dart @@ -12,7 +12,7 @@ import 'mock_image_http.dart'; void main() { testWidgets('Color testing demo smoke test', (WidgetTester tester) async { - HttpOverrides.runZoned(() async { + HttpOverrides.runZoned>(() async { color_testing_demo.main(); // builds the app and schedules a frame but doesn't trigger one await tester.pump(); // see https://github.com/flutter/flutter/issues/1865 await tester.pump(); // triggers a frame diff --git a/dev/tools/dartdoc.dart b/dev/tools/dartdoc.dart index 20ca85d8649..cde62e9205a 100644 --- a/dev/tools/dartdoc.dart +++ b/dev/tools/dartdoc.dart @@ -146,7 +146,7 @@ Future main(List arguments) async { } String quote(String arg) => arg.contains(' ') ? "'$arg'" : arg; - print('Executing: (cd dev/docs ; $pubExecutable ${dartdocArgs.map(quote).join(' ')})'); + print('Executing: (cd dev/docs ; $pubExecutable ${dartdocArgs.map(quote).join(' ')})'); process = await Process.start( pubExecutable, @@ -302,7 +302,7 @@ void putRedirectInOldIndexLocation() { } List findPackageNames() { - return findPackages().map((FileSystemEntity file) => path.basename(file.path)).toList(); + return findPackages().map((FileSystemEntity file) => path.basename(file.path)).toList(); } /// Finds all packages in the Flutter SDK @@ -350,8 +350,8 @@ void printStream(Stream> stream, { String prefix = '', List f assert(prefix != null); assert(filter != null); stream - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { if (!filter.any((Pattern pattern) => line.contains(pattern))) print('$prefix$line'.trim()); diff --git a/dev/tools/gen_date_localizations.dart b/dev/tools/gen_date_localizations.dart index 6a72ced3544..59c3a42b19c 100644 --- a/dev/tools/gen_date_localizations.dart +++ b/dev/tools/gen_date_localizations.dart @@ -135,7 +135,7 @@ String _jsonToMap(dynamic json) { } if (json is Iterable) - return '[${json.map(_jsonToMap).join(',')}]'; + return '[${json.map(_jsonToMap).join(',')}]'; if (json is Map) { final StringBuffer buffer = StringBuffer('{'); diff --git a/dev/tools/gen_localizations.dart b/dev/tools/gen_localizations.dart index da4a34c1443..7419912f652 100644 --- a/dev/tools/gen_localizations.dart +++ b/dev/tools/gen_localizations.dart @@ -202,7 +202,7 @@ String generateTranslationBundles() { /// /// * [getTranslation], whose documentation describes these values. final Set kSupportedLanguages = HashSet.from(const [ -${languageCodes.map((String value) => " '$value', // ${describeLocale(value)}").toList().join('\n')} +${languageCodes.map((String value) => " '$value', // ${describeLocale(value)}").toList().join('\n')} ]); /// Creates a [GlobalMaterialLocalizations] instance for the given `locale`. diff --git a/dev/tools/lib/roll_dev.dart b/dev/tools/lib/roll_dev.dart index 143db305bba..d513ba0c0ad 100644 --- a/dev/tools/lib/roll_dev.dart +++ b/dev/tools/lib/roll_dev.dart @@ -105,7 +105,7 @@ void main(List args) { exit(1); } - final List parts = match.groups([1, 2, 3]).map(int.parse).toList(); + final List parts = match.groups([1, 2, 3]).map(int.parse).toList(); if (match.group(4) == '0') { print('This commit has already been released, as version ${parts.join(".")}.'); diff --git a/dev/tools/localizations_utils.dart b/dev/tools/localizations_utils.dart index bcfadd59515..dfd7a83cffc 100644 --- a/dev/tools/localizations_utils.dart +++ b/dev/tools/localizations_utils.dart @@ -29,7 +29,7 @@ void checkCwdIsRepoRoot(String commandName) { String camelCase(String locale) { return locale .split('_') - .map((String part) => part.substring(0, 1).toUpperCase() + part.substring(1).toLowerCase()) + .map((String part) => part.substring(0, 1).toUpperCase() + part.substring(1).toLowerCase()) .join(''); } @@ -91,7 +91,7 @@ Future precacheLanguageAndRegionTags() async { final HttpClient client = HttpClient(); final HttpClientRequest request = await client.getUrl(Uri.parse(registry)); final HttpClientResponse response = await request.close(); - final String body = (await response.transform(utf8.decoder).toList()).join(''); + final String body = (await response.transform(utf8.decoder).toList()).join(''); client.close(force: true); final List>> sections = body.split('%%').skip(1).map>>(_parseSection).toList(); for (Map> section in sections) { diff --git a/dev/tools/update_icons.dart b/dev/tools/update_icons.dart index 43a1f795c99..1984cdf2ce1 100644 --- a/dev/tools/update_icons.dart +++ b/dev/tools/update_icons.dart @@ -199,9 +199,9 @@ String regenerateIconsFile(String iconData, String codepointData) { String generateIconDeclarations(String codepointData) { return LineSplitter.split(codepointData) - .map((String l) => l.trim()) + .map((String l) => l.trim()) .where((String l) => l.isNotEmpty) - .map(getIconDeclaration) + .map(getIconDeclaration) .join(); } diff --git a/dev/tools/vitool/lib/vitool.dart b/dev/tools/vitool/lib/vitool.dart index f89a93ac0ba..0e1ab4e9a8e 100644 --- a/dev/tools/vitool/lib/vitool.dart +++ b/dev/tools/vitool/lib/vitool.dart @@ -314,7 +314,7 @@ class SvgPath { SvgPath applyTransform(_Transform transform) { final List transformedCommands = - commands.map((SvgPathCommand c) => c.applyTransform(transform)).toList(); + commands.map((SvgPathCommand c) => c.applyTransform(transform)).toList(); return SvgPath(id, transformedCommands, opacity: opacity * transform.opacity); } @@ -400,7 +400,7 @@ class SvgPathCommandBuilder { SvgPathCommand build(String type, List> points) { List> absPoints = points; if (_isRelativeCommand(type)) { - absPoints = points.map((Point p) => p + lastPoint).toList(); + absPoints = points.map>((Point p) => p + lastPoint).toList(); } if (type == 'M' || type == 'm') diff --git a/examples/catalog/bin/sample_page.dart b/examples/catalog/bin/sample_page.dart index 42afe9288c1..d2780412f73 100644 --- a/examples/catalog/bin/sample_page.dart +++ b/examples/catalog/bin/sample_page.dart @@ -89,7 +89,7 @@ class SampleInfo { final String classNames = commentValues['classes']; if (classNames == null) return const []; - return classNames.split(',').map((String s) => s.trim()).where((String s) => s.isNotEmpty); + return classNames.split(',').map((String s) => s.trim()).where((String s) => s.isNotEmpty); } // The relative import path for this sample, like '../lib/foo.dart'. @@ -163,7 +163,7 @@ void generate(String commit) { final String entryTemplate = inputFile('bin', 'entry.md.template').readAsStringSync(); // Write the sample catalog's home page: index.md - final Iterable entries = samples.map((SampleInfo sample) { + final Iterable entries = samples.map((SampleInfo sample) { return expandTemplate(entryTemplate, sample.commentValues); }); writeExpandedTemplate( @@ -195,7 +195,7 @@ void generate(String commit) { } } for (String className in classToSamples.keys) { - final Iterable entries = classToSamples[className].map((SampleInfo sample) { + final Iterable entries = classToSamples[className].map((SampleInfo sample) { return expandTemplate(entryTemplate, sample.commentValues); }); writeExpandedTemplate( @@ -215,10 +215,10 @@ void generate(String commit) { outputFile('screenshot.dart', driverDirectory), inputFile('bin', 'screenshot.dart.template').readAsStringSync(), { - 'imports': samples.map((SampleInfo page) { + 'imports': samples.map((SampleInfo page) { return "import '${page.importPath}' show ${page.sampleClass};\n"; }).toList().join(), - 'widgets': samples.map((SampleInfo sample) { + 'widgets': samples.map((SampleInfo sample) { return 'new ${sample.sampleClass}(),\n'; }).toList().join(), }, @@ -230,7 +230,7 @@ void generate(String commit) { outputFile('screenshot_test.dart', driverDirectory), inputFile('bin', 'screenshot_test.dart.template').readAsStringSync(), { - 'paths': samples.map((SampleInfo sample) { + 'paths': samples.map((SampleInfo sample) { return "'${outputFile(sample.sourceName + '.png').path}'"; }).toList().join(',\n'), }, diff --git a/examples/catalog/lib/app_bar_bottom.dart b/examples/catalog/lib/app_bar_bottom.dart index fd6be4dd14c..2fd1a60fe63 100644 --- a/examples/catalog/lib/app_bar_bottom.dart +++ b/examples/catalog/lib/app_bar_bottom.dart @@ -63,7 +63,7 @@ class _AppBarBottomSampleState extends State with SingleTick ), body: TabBarView( controller: _tabController, - children: choices.map((Choice choice) { + children: choices.map((Choice choice) { return Padding( padding: const EdgeInsets.all(16.0), child: ChoiceCard(choice: choice), diff --git a/examples/catalog/lib/basic_app_bar.dart b/examples/catalog/lib/basic_app_bar.dart index 3638d64f607..6bf4cac2cc3 100644 --- a/examples/catalog/lib/basic_app_bar.dart +++ b/examples/catalog/lib/basic_app_bar.dart @@ -37,7 +37,7 @@ class _BasicAppBarSampleState extends State { PopupMenuButton( // overflow menu onSelected: _select, itemBuilder: (BuildContext context) { - return choices.skip(2).map((Choice choice) { + return choices.skip(2).map>((Choice choice) { return PopupMenuItem( value: choice, child: Text(choice.title), diff --git a/examples/catalog/lib/custom_semantics.dart b/examples/catalog/lib/custom_semantics.dart index f9dc9e4316b..e8bd86cb42a 100644 --- a/examples/catalog/lib/custom_semantics.dart +++ b/examples/catalog/lib/custom_semantics.dart @@ -50,7 +50,7 @@ class AdjustableDropdownListTile extends StatelessWidget { trailing: DropdownButton( value: value, onChanged: onChanged, - items: items.map((String item) { + items: items.map>((String item) { return DropdownMenuItem( value: item, child: Text(item), diff --git a/examples/catalog/lib/expansion_tile_sample.dart b/examples/catalog/lib/expansion_tile_sample.dart index 9e0264d0304..1d9fdfe3529 100644 --- a/examples/catalog/lib/expansion_tile_sample.dart +++ b/examples/catalog/lib/expansion_tile_sample.dart @@ -78,7 +78,7 @@ class EntryItem extends StatelessWidget { return ExpansionTile( key: PageStorageKey(root), title: Text(root.title), - children: root.children.map(_buildTiles).toList(), + children: root.children.map(_buildTiles).toList(), ); } diff --git a/examples/catalog/lib/tabbed_app_bar.dart b/examples/catalog/lib/tabbed_app_bar.dart index 6bcfc1d326d..99aba1e5202 100644 --- a/examples/catalog/lib/tabbed_app_bar.dart +++ b/examples/catalog/lib/tabbed_app_bar.dart @@ -15,7 +15,7 @@ class TabbedAppBarSample extends StatelessWidget { title: const Text('Tabbed AppBar'), bottom: TabBar( isScrollable: true, - tabs: choices.map((Choice choice) { + tabs: choices.map((Choice choice) { return Tab( text: choice.title, icon: Icon(choice.icon), @@ -24,7 +24,7 @@ class TabbedAppBarSample extends StatelessWidget { ), ), body: TabBarView( - children: choices.map((Choice choice) { + children: choices.map((Choice choice) { return Padding( padding: const EdgeInsets.all(16.0), child: ChoiceCard(choice: choice), diff --git a/examples/flutter_gallery/lib/demo/animation/home.dart b/examples/flutter_gallery/lib/demo/animation/home.dart index 4a0de2d54b8..6f3d9e4cb5b 100644 --- a/examples/flutter_gallery/lib/demo/animation/home.dart +++ b/examples/flutter_gallery/lib/demo/animation/home.dart @@ -493,7 +493,7 @@ class _AnimationDemoHomeState extends State { } Iterable _detailItemsFor(Section section) { - final Iterable detailItems = section.details.map((SectionDetail detail) { + final Iterable detailItems = section.details.map((SectionDetail detail) { return SectionDetailView(detail: detail); }); return ListTile.divideTiles(context: context, tiles: detailItems); @@ -591,7 +591,7 @@ class _AnimationDemoHomeState extends State { }, child: PageView( controller: _detailsPageController, - children: allSections.map((Section section) { + children: allSections.map((Section section) { return Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: _detailItemsFor(section).toList(), diff --git a/examples/flutter_gallery/lib/demo/colors_demo.dart b/examples/flutter_gallery/lib/demo/colors_demo.dart index a38999ba2d6..59a94274f83 100644 --- a/examples/flutter_gallery/lib/demo/colors_demo.dart +++ b/examples/flutter_gallery/lib/demo/colors_demo.dart @@ -99,7 +99,7 @@ class PaletteTabView extends StatelessWidget { final TextTheme textTheme = Theme.of(context).textTheme; final TextStyle whiteTextStyle = textTheme.body1.copyWith(color: Colors.white); final TextStyle blackTextStyle = textTheme.body1.copyWith(color: Colors.black); - final List colorItems = primaryKeys.map((int index) { + final List colorItems = primaryKeys.map((int index) { return DefaultTextStyle( style: index > colors.threshold ? whiteTextStyle : blackTextStyle, child: ColorItem(index: index, color: colors.primary[index]), @@ -107,7 +107,7 @@ class PaletteTabView extends StatelessWidget { }).toList(); if (colors.accent != null) { - colorItems.addAll(accentKeys.map((int index) { + colorItems.addAll(accentKeys.map((int index) { return DefaultTextStyle( style: index > colors.threshold ? whiteTextStyle : blackTextStyle, child: ColorItem(index: index, color: colors.accent[index], prefix: 'A'), @@ -135,11 +135,11 @@ class ColorsDemo extends StatelessWidget { title: const Text('Colors'), bottom: TabBar( isScrollable: true, - tabs: allPalettes.map((Palette swatch) => Tab(text: swatch.name)).toList(), + tabs: allPalettes.map((Palette swatch) => Tab(text: swatch.name)).toList(), ), ), body: TabBarView( - children: allPalettes.map((Palette colors) { + children: allPalettes.map((Palette colors) { return PaletteTabView(colors: colors); }).toList(), ), diff --git a/examples/flutter_gallery/lib/demo/contacts_demo.dart b/examples/flutter_gallery/lib/demo/contacts_demo.dart index 3ff7e6f80d1..5566f8c25aa 100644 --- a/examples/flutter_gallery/lib/demo/contacts_demo.dart +++ b/examples/flutter_gallery/lib/demo/contacts_demo.dart @@ -54,7 +54,7 @@ class _ContactItem extends StatelessWidget { @override Widget build(BuildContext context) { final ThemeData themeData = Theme.of(context); - final List columnChildren = lines.sublist(0, lines.length - 1).map((String line) => Text(line)).toList(); + final List columnChildren = lines.sublist(0, lines.length - 1).map((String line) => Text(line)).toList(); columnChildren.add(Text(lines.last, style: themeData.textTheme.caption)); final List rowChildren = [ diff --git a/examples/flutter_gallery/lib/demo/cupertino/cupertino_refresh_demo.dart b/examples/flutter_gallery/lib/demo/cupertino/cupertino_refresh_demo.dart index cd4aecf1f14..84f8dc7bf74 100644 --- a/examples/flutter_gallery/lib/demo/cupertino/cupertino_refresh_demo.dart +++ b/examples/flutter_gallery/lib/demo/cupertino/cupertino_refresh_demo.dart @@ -58,7 +58,7 @@ class _CupertinoRefreshControlDemoState extends State.delayed(const Duration(seconds: 2)) - ..then((_) { + ..then((_) { if (mounted) { setState(() => repopulateList()); } diff --git a/examples/flutter_gallery/lib/demo/material/bottom_app_bar_demo.dart b/examples/flutter_gallery/lib/demo/material/bottom_app_bar_demo.dart index 9b1d14dd801..bf327f041bf 100644 --- a/examples/flutter_gallery/lib/demo/material/bottom_app_bar_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/bottom_app_bar_demo.dart @@ -281,7 +281,7 @@ class _ColorsItem extends StatelessWidget { Widget build(BuildContext context) { return Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: colors.map((_NamedColor namedColor) { + children: colors.map((_NamedColor namedColor) { return RawMaterialButton( onPressed: () { onChanged(namedColor.color); diff --git a/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart b/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart index 479c81a85bf..3046c74b08d 100644 --- a/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/bottom_navigation_demo.dart @@ -194,7 +194,7 @@ class _BottomNavigationDemoState extends State Widget build(BuildContext context) { final BottomNavigationBar botNavBar = BottomNavigationBar( items: _navigationViews - .map((NavigationIconView navigationView) => navigationView.item) + .map((NavigationIconView navigationView) => navigationView.item) .toList(), currentIndex: _currentIndex, type: _type, diff --git a/examples/flutter_gallery/lib/demo/material/buttons_demo.dart b/examples/flutter_gallery/lib/demo/material/buttons_demo.dart index a590f1f5246..9de0655709a 100644 --- a/examples/flutter_gallery/lib/demo/material/buttons_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/buttons_demo.dart @@ -280,7 +280,7 @@ class _ButtonsDemoState extends State { dropdown1Value = newValue; }); }, - items: ['One', 'Two', 'Free', 'Four'].map((String value) { + items: ['One', 'Two', 'Free', 'Four'].map>((String value) { return DropdownMenuItem( value: value, child: Text(value), @@ -301,7 +301,7 @@ class _ButtonsDemoState extends State { dropdown2Value = newValue; }); }, - items: ['One', 'Two', 'Free', 'Four'].map((String value) { + items: ['One', 'Two', 'Free', 'Four'].map>((String value) { return DropdownMenuItem( value: value, child: Text(value), @@ -325,7 +325,7 @@ class _ButtonsDemoState extends State { 'One', 'Two', 'Free', 'Four', 'Can', 'I', 'Have', 'A', 'Little', 'Bit', 'More', 'Five', 'Six', 'Seven', 'Eight', 'Nine', 'Ten' ] - .map((String value) { + .map>((String value) { return DropdownMenuItem( value: value, child: Text(value), @@ -365,7 +365,7 @@ class _ButtonsDemoState extends State { onPressed: null, ) ] - .map((Widget button) => SizedBox(width: 64.0, height: 64.0, child: button)) + .map((Widget button) => SizedBox(width: 64.0, height: 64.0, child: button)) .toList(), ), ); diff --git a/examples/flutter_gallery/lib/demo/material/cards_demo.dart b/examples/flutter_gallery/lib/demo/material/cards_demo.dart index e318eb79de6..2a09e8cabda 100644 --- a/examples/flutter_gallery/lib/demo/material/cards_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/cards_demo.dart @@ -191,7 +191,7 @@ class _CardsDemoState extends State { body: ListView( itemExtent: TravelDestinationItem.height, padding: const EdgeInsets.only(top: 8.0, left: 8.0, right: 8.0), - children: destinations.map((TravelDestination destination) { + children: destinations.map((TravelDestination destination) { return Container( margin: const EdgeInsets.only(bottom: 8.0), child: TravelDestinationItem( diff --git a/examples/flutter_gallery/lib/demo/material/chip_demo.dart b/examples/flutter_gallery/lib/demo/material/chip_demo.dart index 48be2b1ea68..3590c0295c9 100644 --- a/examples/flutter_gallery/lib/demo/material/chip_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/chip_demo.dart @@ -92,7 +92,7 @@ class _ChipsTile extends StatelessWidget { ]; if (children.isNotEmpty) { cardChildren.add(Wrap( - children: children.map((Widget chip) { + children: children.map((Widget chip) { return Padding( padding: const EdgeInsets.all(2.0), child: chip, diff --git a/examples/flutter_gallery/lib/demo/material/date_and_time_picker_demo.dart b/examples/flutter_gallery/lib/demo/material/date_and_time_picker_demo.dart index 76ccf441e25..64701fe2169 100644 --- a/examples/flutter_gallery/lib/demo/material/date_and_time_picker_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/date_and_time_picker_demo.dart @@ -201,7 +201,7 @@ class _DateAndTimePickerDemoState extends State { _activity = newValue; }); }, - items: _allActivities.map((String value) { + items: _allActivities.map>((String value) { return DropdownMenuItem( value: value, child: Text(value), diff --git a/examples/flutter_gallery/lib/demo/material/dialog_demo.dart b/examples/flutter_gallery/lib/demo/material/dialog_demo.dart index dc48a7e9a1f..27c7bffc875 100644 --- a/examples/flutter_gallery/lib/demo/material/dialog_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/dialog_demo.dart @@ -201,7 +201,7 @@ class DialogDemoState extends State { ), ] // Add a little space between the buttons - .map((Widget button) { + .map((Widget button) { return Container( padding: const EdgeInsets.symmetric(vertical: 8.0), child: button diff --git a/examples/flutter_gallery/lib/demo/material/drawer_demo.dart b/examples/flutter_gallery/lib/demo/material/drawer_demo.dart index 5590fd58fdd..3f08bdea837 100644 --- a/examples/flutter_gallery/lib/demo/material/drawer_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/drawer_demo.dart @@ -159,7 +159,7 @@ class _DrawerDemoState extends State with TickerProviderStateMixin { child: Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.stretch, - children: _drawerContents.map((String id) { + children: _drawerContents.map((String id) { return ListTile( leading: CircleAvatar(child: Text(id)), title: Text('Drawer item $id'), diff --git a/examples/flutter_gallery/lib/demo/material/elevation_demo.dart b/examples/flutter_gallery/lib/demo/material/elevation_demo.dart index 651854fc2ae..c2500a4ddd0 100644 --- a/examples/flutter_gallery/lib/demo/material/elevation_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/elevation_demo.dart @@ -25,7 +25,7 @@ class _ElevationDemoState extends State { 24.0, ]; - return elevations.map((double elevation) { + return elevations.map((double elevation) { return Center( child: Card( margin: const EdgeInsets.all(20.0), diff --git a/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart b/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart index 861d578b51f..c3f2b86d078 100644 --- a/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart @@ -356,7 +356,7 @@ class _ExpansionPanelsDemoState extends State { _demoItems[index].isExpanded = !isExpanded; }); }, - children: _demoItems.map((DemoItem item) { + children: _demoItems.map((DemoItem item) { return ExpansionPanel( isExpanded: item.isExpanded, headerBuilder: item.headerBuilder, diff --git a/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart b/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart index 99db465b167..9d268feae04 100644 --- a/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart @@ -251,7 +251,7 @@ class FullScreenDialogDemoState extends State { ) ) ] - .map((Widget child) { + .map((Widget child) { return Container( padding: const EdgeInsets.symmetric(vertical: 8.0), height: 96.0, diff --git a/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart b/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart index e6f2c609684..eaa72b39181 100644 --- a/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart @@ -374,7 +374,7 @@ class GridListDemoState extends State { crossAxisSpacing: 4.0, padding: const EdgeInsets.all(4.0), childAspectRatio: (orientation == Orientation.portrait) ? 1.0 : 1.3, - children: photos.map((Photo photo) { + children: photos.map((Photo photo) { return GridDemoPhotoItem( photo: photo, tileStyle: _tileStyle, diff --git a/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart b/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart index 3cce01a3c3b..c723baf9206 100644 --- a/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/leave_behind_demo.dart @@ -126,7 +126,7 @@ class LeaveBehindDemoState extends State { ); } else { body = ListView( - children: leaveBehindItems.map((LeaveBehindItem item) { + children: leaveBehindItems.map((LeaveBehindItem item) { return _LeaveBehindListItem( item: item, onArchive: _handleArchive, diff --git a/examples/flutter_gallery/lib/demo/material/list_demo.dart b/examples/flutter_gallery/lib/demo/material/list_demo.dart index a3fdb96c76e..0f35f96fdf8 100644 --- a/examples/flutter_gallery/lib/demo/material/list_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/list_demo.dart @@ -209,7 +209,7 @@ class _ListDemoState extends State { break; } - Iterable listTiles = items.map((String item) => buildListTile(context, item)); + Iterable listTiles = items.map((String item) => buildListTile(context, item)); if (_showDividers) listTiles = ListTile.divideTiles(context: context, tiles: listTiles); diff --git a/examples/flutter_gallery/lib/demo/material/overscroll_demo.dart b/examples/flutter_gallery/lib/demo/material/overscroll_demo.dart index 6720de9f90e..58634444ca9 100644 --- a/examples/flutter_gallery/lib/demo/material/overscroll_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/overscroll_demo.dart @@ -29,7 +29,7 @@ class OverscrollDemoState extends State { Future _handleRefresh() { final Completer completer = Completer(); Timer(const Duration(seconds: 3), () { completer.complete(null); }); - return completer.future.then((_) { + return completer.future.then((_) { _scaffoldKey.currentState?.showSnackBar(SnackBar( content: const Text('Refresh complete'), action: SnackBarAction( diff --git a/examples/flutter_gallery/lib/demo/material/page_selector_demo.dart b/examples/flutter_gallery/lib/demo/material/page_selector_demo.dart index 3c9a47ceb39..4a7dfe570e8 100644 --- a/examples/flutter_gallery/lib/demo/material/page_selector_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/page_selector_demo.dart @@ -54,7 +54,7 @@ class _PageSelector extends StatelessWidget { color: color, ), child: TabBarView( - children: icons.map((Icon icon) { + children: icons.map((Icon icon) { return Container( padding: const EdgeInsets.all(12.0), child: Card( diff --git a/examples/flutter_gallery/lib/demo/material/progress_indicator_demo.dart b/examples/flutter_gallery/lib/demo/material/progress_indicator_demo.dart index cdd086f510f..edfa5496e4a 100644 --- a/examples/flutter_gallery/lib/demo/material/progress_indicator_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/progress_indicator_demo.dart @@ -94,7 +94,7 @@ class _ProgressIndicatorDemoState extends State with Sing ]; return Column( children: indicators - .map((Widget c) => Container(child: c, margin: const EdgeInsets.symmetric(vertical: 15.0, horizontal: 20.0))) + .map((Widget c) => Container(child: c, margin: const EdgeInsets.symmetric(vertical: 15.0, horizontal: 20.0))) .toList(), ); } diff --git a/examples/flutter_gallery/lib/demo/material/reorderable_list_demo.dart b/examples/flutter_gallery/lib/demo/material/reorderable_list_demo.dart index af386a7dd91..4cda720dfcb 100644 --- a/examples/flutter_gallery/lib/demo/material/reorderable_list_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/reorderable_list_demo.dart @@ -44,7 +44,7 @@ class _ListDemoState extends State { bool _reverseSort = false; final List<_ListItem> _items = [ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', - ].map((String item) => _ListItem(item, false)).toList(); + ].map<_ListItem>((String item) => _ListItem(item, false)).toList(); void changeItemType(_ReorderableListType type) { setState(() { @@ -191,7 +191,7 @@ class _ListDemoState extends State { onReorder: _onReorder, scrollDirection: _itemType == _ReorderableListType.horizontalAvatar ? Axis.horizontal : Axis.vertical, padding: const EdgeInsets.symmetric(vertical: 8.0), - children: _items.map(buildListTile).toList(), + children: _items.map(buildListTile).toList(), ), ), ); diff --git a/examples/flutter_gallery/lib/demo/material/scrollable_tabs_demo.dart b/examples/flutter_gallery/lib/demo/material/scrollable_tabs_demo.dart index 2d2364888f2..0135c30e357 100644 --- a/examples/flutter_gallery/lib/demo/material/scrollable_tabs_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/scrollable_tabs_demo.dart @@ -174,7 +174,7 @@ class ScrollableTabsDemoState extends State with SingleTicke ), body: TabBarView( controller: _controller, - children: _allPages.map((_Page page) { + children: _allPages.map((_Page page) { return SafeArea( top: false, bottom: false, diff --git a/examples/flutter_gallery/lib/demo/material/search_demo.dart b/examples/flutter_gallery/lib/demo/material/search_demo.dart index afc618616cf..e1be3ea94eb 100644 --- a/examples/flutter_gallery/lib/demo/material/search_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/search_demo.dart @@ -160,7 +160,7 @@ class _SearchDemoSearchDelegate extends SearchDelegate { return _SuggestionList( query: query, - suggestions: suggestions.map((int i) => '$i').toList(), + suggestions: suggestions.map((int i) => '$i').toList(), onSelected: (String suggestion) { query = suggestion; showResults(context); diff --git a/examples/flutter_gallery/lib/demo/material/snack_bar_demo.dart b/examples/flutter_gallery/lib/demo/material/snack_bar_demo.dart index 830ceba09b8..6f135bf0966 100644 --- a/examples/flutter_gallery/lib/demo/material/snack_bar_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/snack_bar_demo.dart @@ -60,7 +60,7 @@ class _SnackBarDemoState extends State { ), const Text(_text3), ] - .map((Widget child) { + .map((Widget child) { return Container( margin: const EdgeInsets.symmetric(vertical: 12.0), child: child diff --git a/examples/flutter_gallery/lib/demo/material/tabs_demo.dart b/examples/flutter_gallery/lib/demo/material/tabs_demo.dart index 5cdfdcbb3a0..a9064b15131 100644 --- a/examples/flutter_gallery/lib/demo/material/tabs_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/tabs_demo.dart @@ -157,7 +157,7 @@ class TabsDemo extends StatelessWidget { expandedHeight: 150.0, forceElevated: innerBoxIsScrolled, bottom: TabBar( - tabs: _allPages.keys.map( + tabs: _allPages.keys.map( (_Page page) => Tab(text: page.label), ).toList(), ), @@ -166,7 +166,7 @@ class TabsDemo extends StatelessWidget { ]; }, body: TabBarView( - children: _allPages.keys.map((_Page page) { + children: _allPages.keys.map((_Page page) { return SafeArea( top: false, bottom: false, diff --git a/examples/flutter_gallery/lib/demo/material/tabs_fab_demo.dart b/examples/flutter_gallery/lib/demo/material/tabs_fab_demo.dart index 2a7371a9348..0ebb592ef78 100644 --- a/examples/flutter_gallery/lib/demo/material/tabs_fab_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/tabs_fab_demo.dart @@ -136,7 +136,7 @@ class _TabsFabDemoState extends State with SingleTickerProviderStat title: const Text('FAB per tab'), bottom: TabBar( controller: _controller, - tabs: _allPages.map((_Page page) => Tab(text: page.label.toUpperCase())).toList(), + tabs: _allPages.map((_Page page) => Tab(text: page.label.toUpperCase())).toList(), ), actions: [ MaterialDemoDocumentationButton(TabsFabDemo.routeName), @@ -153,7 +153,7 @@ class _TabsFabDemoState extends State with SingleTickerProviderStat floatingActionButton: buildFloatingActionButton(_selectedPage), body: TabBarView( controller: _controller, - children: _allPages.map(buildTabView).toList() + children: _allPages.map(buildTabView).toList() ), ); } diff --git a/examples/flutter_gallery/lib/demo/material/tooltip_demo.dart b/examples/flutter_gallery/lib/demo/material/tooltip_demo.dart index 69639085d9e..20707a3801d 100644 --- a/examples/flutter_gallery/lib/demo/material/tooltip_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/tooltip_demo.dart @@ -59,7 +59,7 @@ class TooltipDemo extends StatelessWidget { ) ) ] - .map((Widget widget) { + .map((Widget widget) { return Padding( padding: const EdgeInsets.only(top: 16.0, left: 16.0, right: 16.0), child: widget diff --git a/examples/flutter_gallery/lib/demo/pesto_demo.dart b/examples/flutter_gallery/lib/demo/pesto_demo.dart index 29ed01f2fd7..8683c339752 100644 --- a/examples/flutter_gallery/lib/demo/pesto_demo.dart +++ b/examples/flutter_gallery/lib/demo/pesto_demo.dart @@ -492,7 +492,7 @@ class RecipeSheet extends StatelessWidget { ), ] ), - ]..addAll(recipe.ingredients.map( + ]..addAll(recipe.ingredients.map( (RecipeIngredient ingredient) { return _buildItemRow(ingredient.amount, ingredient.description); } @@ -506,7 +506,7 @@ class RecipeSheet extends StatelessWidget { ), ] ) - )..addAll(recipe.steps.map( + )..addAll(recipe.steps.map( (RecipeStep step) { return _buildItemRow(step.duration ?? '', step.description); } diff --git a/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart b/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart index 6e30227b4a0..9382df9f0fe 100644 --- a/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart +++ b/examples/flutter_gallery/lib/demo/shrine/shrine_home.dart @@ -395,7 +395,7 @@ class _ShrineHomeState extends State { sliver: SliverGrid( gridDelegate: gridDelegate, delegate: SliverChildListDelegate( - _products.map((Product product) { + _products.map((Product product) { return _ProductItem( product: product, onPressed: () { _showOrderPage(product); }, diff --git a/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart b/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart index 453b16e9b56..45f0bb5362f 100644 --- a/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart +++ b/examples/flutter_gallery/lib/demo/shrine/shrine_order.dart @@ -46,7 +46,7 @@ class _ProductItem extends StatelessWidget { ), ), child: DropdownButton( - items: [0, 1, 2, 3, 4, 5].map((int value) { + items: [0, 1, 2, 3, 4, 5].map>((int value) { return DropdownMenuItem( value: value, child: Padding( diff --git a/examples/flutter_gallery/lib/demo/video_demo.dart b/examples/flutter_gallery/lib/demo/video_demo.dart index ef4b9ff28bf..59bbc1cece0 100644 --- a/examples/flutter_gallery/lib/demo/video_demo.dart +++ b/examples/flutter_gallery/lib/demo/video_demo.dart @@ -381,7 +381,7 @@ class _VideoDemoState extends State initController(butterflyController); initController(beeController); - isIOSSimulator().then((bool result) { + isIOSSimulator().then((bool result) { isSupported = !result; }); } diff --git a/examples/flutter_gallery/lib/gallery/demo.dart b/examples/flutter_gallery/lib/gallery/demo.dart index d6e11683c52..9b428b7595d 100644 --- a/examples/flutter_gallery/lib/gallery/demo.dart +++ b/examples/flutter_gallery/lib/gallery/demo.dart @@ -96,11 +96,11 @@ class TabbedComponentDemoScaffold extends StatelessWidget { ), bottom: TabBar( isScrollable: true, - tabs: demos.map((ComponentDemoTabData data) => Tab(text: data.tabName)).toList(), + tabs: demos.map((ComponentDemoTabData data) => Tab(text: data.tabName)).toList(), ), ), body: TabBarView( - children: demos.map((ComponentDemoTabData demo) { + children: demos.map((ComponentDemoTabData demo) { return SafeArea( top: false, bottom: false, diff --git a/examples/flutter_gallery/lib/gallery/example_code.dart b/examples/flutter_gallery/lib/gallery/example_code.dart index 595b149f9ac..96969393dbe 100644 --- a/examples/flutter_gallery/lib/gallery/example_code.dart +++ b/examples/flutter_gallery/lib/gallery/example_code.dart @@ -104,7 +104,7 @@ DropdownButton( }); }, items: ['One', 'Two', 'Free', 'Four'] - .map((String value) { + .map>((String value) { return DropdownMenuItem( value: value, child: Text(value)); @@ -263,7 +263,7 @@ GridView.count( 'https://example.com/image-2.jpg', '...', 'https://example.com/image-n.jpg' - ].map((String url) { + ].map((String url) { return GridTile( footer: GridTileBar( title: Text(url) diff --git a/examples/flutter_gallery/lib/gallery/options.dart b/examples/flutter_gallery/lib/gallery/options.dart index 29e09f2c4ec..d40b31a0d6e 100644 --- a/examples/flutter_gallery/lib/gallery/options.dart +++ b/examples/flutter_gallery/lib/gallery/options.dart @@ -252,7 +252,7 @@ class _TextScaleFactorItem extends StatelessWidget { padding: const EdgeInsetsDirectional.only(end: 16.0), icon: const Icon(Icons.arrow_drop_down), itemBuilder: (BuildContext context) { - return kAllGalleryTextScaleValues.map((GalleryTextScaleValue scaleValue) { + return kAllGalleryTextScaleValues.map>((GalleryTextScaleValue scaleValue) { return PopupMenuItem( value: scaleValue, child: Text(scaleValue.label), diff --git a/examples/layers/services/isolate.dart b/examples/layers/services/isolate.dart index 6feeda9256a..d7bfae7a60f 100644 --- a/examples/layers/services/isolate.dart +++ b/examples/layers/services/isolate.dart @@ -141,7 +141,7 @@ class CalculationManager { final CalculationMessage message = CalculationMessage(data, _receivePort.sendPort); // Spawn an isolate to JSON-parse the file contents. The JSON parsing // is synchronous, so if done in the main isolate, the UI would block. - Isolate.spawn(_calculate, message).then((Isolate isolate) { + Isolate.spawn(_calculate, message).then((Isolate isolate) { if (!isRunning) { isolate.kill(priority: Isolate.immediate); } else { diff --git a/examples/layers/widgets/media_query.dart b/examples/layers/widgets/media_query.dart index 69ed7f34970..091fadb9c1c 100644 --- a/examples/layers/widgets/media_query.dart +++ b/examples/layers/widgets/media_query.dart @@ -74,12 +74,12 @@ class AdaptiveContainer extends StatelessWidget { if (MediaQuery.of(context).size.width < _kGridViewBreakpoint) { return ListView( itemExtent: _kListItemExtent, - children: names.map((String name) => AdaptedListItem(name: name)).toList(), + children: names.map((String name) => AdaptedListItem(name: name)).toList(), ); } else { return GridView.extent( maxCrossAxisExtent: _kMaxTileWidth, - children: names.map((String name) => AdaptedGridItem(name: name)).toList(), + children: names.map((String name) => AdaptedGridItem(name: name)).toList(), ); } } diff --git a/examples/layers/widgets/sectors.dart b/examples/layers/widgets/sectors.dart index b8fae26c008..553e8af668e 100644 --- a/examples/layers/widgets/sectors.dart +++ b/examples/layers/widgets/sectors.dart @@ -28,7 +28,7 @@ class SectorAppState extends State { List wantedSectorSizes = []; List actualSectorSizes = []; - double get currentTheta => wantedSectorSizes.fold(0.0, (double total, double value) => total + value); + double get currentTheta => wantedSectorSizes.fold(0.0, (double total, double value) => total + value); void addSector() { final double currentTheta = this.currentTheta; diff --git a/examples/layers/widgets/styled_text.dart b/examples/layers/widgets/styled_text.dart index b3dae6ca8f0..633d55e7220 100644 --- a/examples/layers/widgets/styled_text.dart +++ b/examples/layers/widgets/styled_text.dart @@ -20,7 +20,7 @@ HAL: This mission is too important for me to allow you to jeopardize it.'''; // [["Dave", "Open the pod bay..."] ...] final List> _kNameLines = _kDialogText .split('\n') - .map((String line) => line.split(':')) + .map>((String line) => line.split(':')) .toList(); final TextStyle _kDaveStyle = TextStyle(color: Colors.indigo.shade400, height: 1.8); diff --git a/examples/stocks/lib/stock_strings.dart b/examples/stocks/lib/stock_strings.dart index 136d0792632..ed1422476ee 100644 --- a/examples/stocks/lib/stock_strings.dart +++ b/examples/stocks/lib/stock_strings.dart @@ -19,7 +19,7 @@ class StockStrings { static Future load(Locale locale) { return initializeMessages(locale.toString()) - .then((Object _) { + .then((Object _) { return StockStrings(locale); }); } diff --git a/packages/flutter/lib/src/cupertino/button.dart b/packages/flutter/lib/src/cupertino/button.dart index 046cc113d46..323d2c6cda1 100644 --- a/packages/flutter/lib/src/cupertino/button.dart +++ b/packages/flutter/lib/src/cupertino/button.dart @@ -191,7 +191,7 @@ class _CupertinoButtonState extends State with SingleTickerProv final Future ticker = _buttonHeldDown ? _animationController.animateTo(1.0, duration: kFadeOutDuration) : _animationController.animateTo(0.0, duration: kFadeInDuration); - ticker.then((Null value) { + ticker.then((Null value) { if (mounted && wasHeldDown != _buttonHeldDown) _animate(); }); diff --git a/packages/flutter/lib/src/cupertino/dialog.dart b/packages/flutter/lib/src/cupertino/dialog.dart index 092beb0a145..4f5c7ce6d63 100644 --- a/packages/flutter/lib/src/cupertino/dialog.dart +++ b/packages/flutter/lib/src/cupertino/dialog.dart @@ -1564,7 +1564,7 @@ class _RenderCupertinoDialogActions extends RenderBox ) : Rect.zero; - final List pressedButtonRects = _pressedButtons.map((RenderBox pressedButton) { + final List pressedButtonRects = _pressedButtons.map((RenderBox pressedButton) { final MultiChildLayoutParentData buttonParentData = pressedButton.parentData; return Rect.fromLTWH( diff --git a/packages/flutter/lib/src/foundation/isolates.dart b/packages/flutter/lib/src/foundation/isolates.dart index 603e05239eb..7eaf6181b01 100644 --- a/packages/flutter/lib/src/foundation/isolates.dart +++ b/packages/flutter/lib/src/foundation/isolates.dart @@ -50,7 +50,7 @@ Future compute(ComputeCallback callback, Q message, { String debu Timeline.startSync('$debugLabel: start', flow: flow); final ReceivePort resultPort = ReceivePort(); Timeline.finishSync(); - final Isolate isolate = await Isolate.spawn( + final Isolate isolate = await Isolate.spawn<_IsolateConfiguration>( _spawn, _IsolateConfiguration( callback, diff --git a/packages/flutter/lib/src/foundation/print.dart b/packages/flutter/lib/src/foundation/print.dart index 2e8acd114f7..434dbb2436c 100644 --- a/packages/flutter/lib/src/foundation/print.dart +++ b/packages/flutter/lib/src/foundation/print.dart @@ -32,7 +32,7 @@ DebugPrintCallback debugPrint = debugPrintThrottled; /// Used by tests. void debugPrintSynchronously(String message, { int wrapWidth }) { if (wrapWidth != null) { - print(message.split('\n').expand((String line) => debugWordWrap(line, wrapWidth)).join('\n')); + print(message.split('\n').expand((String line) => debugWordWrap(line, wrapWidth)).join('\n')); } else { print(message); } @@ -42,7 +42,7 @@ void debugPrintSynchronously(String message, { int wrapWidth }) { /// messages on platforms that rate-limit their logging (for example, Android). void debugPrintThrottled(String message, { int wrapWidth }) { if (wrapWidth != null) { - _debugPrintBuffer.addAll(message.split('\n').expand((String line) => debugWordWrap(line, wrapWidth))); + _debugPrintBuffer.addAll(message.split('\n').expand((String line) => debugWordWrap(line, wrapWidth))); } else { _debugPrintBuffer.addAll(message.split('\n')); } diff --git a/packages/flutter/lib/src/material/animated_icons/animated_icons.dart b/packages/flutter/lib/src/material/animated_icons/animated_icons.dart index 1077544c32f..6284d47248f 100644 --- a/packages/flutter/lib/src/material/animated_icons/animated_icons.dart +++ b/packages/flutter/lib/src/material/animated_icons/animated_icons.dart @@ -195,7 +195,7 @@ class _PathFrames { final List opacities; void paint(ui.Canvas canvas, Color color, _UiPathFactory uiPathFactory, double progress) { - final double opacity = _interpolate(opacities, progress, lerpDouble); + final double opacity = _interpolate(opacities, progress, lerpDouble); final ui.Paint paint = ui.Paint() ..style = PaintingStyle.fill ..color = color.withOpacity(color.opacity * opacity); @@ -227,7 +227,7 @@ class _PathMoveTo extends _PathCommand { @override void apply(Path path, double progress) { - final Offset offset = _interpolate(points, progress, Offset.lerp); + final Offset offset = _interpolate(points, progress, Offset.lerp); path.moveTo(offset.dx, offset.dy); } } @@ -241,9 +241,9 @@ class _PathCubicTo extends _PathCommand { @override void apply(Path path, double progress) { - final Offset controlPoint1 = _interpolate(controlPoints1, progress, Offset.lerp); - final Offset controlPoint2 = _interpolate(controlPoints2, progress, Offset.lerp); - final Offset targetPoint = _interpolate(targetPoints, progress, Offset.lerp); + final Offset controlPoint1 = _interpolate(controlPoints1, progress, Offset.lerp); + final Offset controlPoint2 = _interpolate(controlPoints2, progress, Offset.lerp); + final Offset targetPoint = _interpolate(targetPoints, progress, Offset.lerp); path.cubicTo( controlPoint1.dx, controlPoint1.dy, controlPoint2.dx, controlPoint2.dy, @@ -260,7 +260,7 @@ class _PathLineTo extends _PathCommand { @override void apply(Path path, double progress) { - final Offset point = _interpolate(points, progress, Offset.lerp); + final Offset point = _interpolate(points, progress, Offset.lerp); path.lineTo(point.dx, point.dy); } } diff --git a/packages/flutter/lib/src/material/bottom_navigation_bar.dart b/packages/flutter/lib/src/material/bottom_navigation_bar.dart index 1116501fe6c..9024b5328f3 100644 --- a/packages/flutter/lib/src/material/bottom_navigation_bar.dart +++ b/packages/flutter/lib/src/material/bottom_navigation_bar.dart @@ -582,7 +582,7 @@ class _Circle { double weightSum(Iterable> animations) { // We're adding flex values instead of animation values to produce correct // ratios. - return animations.map(state._evaluateFlex).fold(0.0, (double sum, double value) => sum + value); + return animations.map(state._evaluateFlex).fold(0.0, (double sum, double value) => sum + value); } final double allWeights = weightSum(state._animations); diff --git a/packages/flutter/lib/src/material/mergeable_material.dart b/packages/flutter/lib/src/material/mergeable_material.dart index 5e333a2d8f3..757b6d31ccc 100644 --- a/packages/flutter/lib/src/material/mergeable_material.dart +++ b/packages/flutter/lib/src/material/mergeable_material.dart @@ -278,10 +278,10 @@ class _MergeableMaterialState extends State with TickerProvid void didUpdateWidget(MergeableMaterial oldWidget) { super.didUpdateWidget(oldWidget); - final Set oldKeys = oldWidget.children.map( + final Set oldKeys = oldWidget.children.map( (MergeableMaterialItem child) => child.key ).toSet(); - final Set newKeys = widget.children.map( + final Set newKeys = widget.children.map( (MergeableMaterialItem child) => child.key ).toSet(); final Set newOnly = newKeys.difference(oldKeys); diff --git a/packages/flutter/lib/src/material/user_accounts_drawer_header.dart b/packages/flutter/lib/src/material/user_accounts_drawer_header.dart index 7c37659f376..3ca9773cf9c 100644 --- a/packages/flutter/lib/src/material/user_accounts_drawer_header.dart +++ b/packages/flutter/lib/src/material/user_accounts_drawer_header.dart @@ -30,7 +30,7 @@ class _AccountPictures extends StatelessWidget { top: 0.0, end: 0.0, child: Row( - children: (otherAccountsPictures ?? []).take(3).map((Widget picture) { + children: (otherAccountsPictures ?? []).take(3).map((Widget picture) { return Padding( padding: const EdgeInsetsDirectional.only(start: 8.0), child: Semantics( diff --git a/packages/flutter/lib/src/painting/image_resolution.dart b/packages/flutter/lib/src/painting/image_resolution.dart index 7b9bb82f635..2061de09462 100644 --- a/packages/flutter/lib/src/painting/image_resolution.dart +++ b/packages/flutter/lib/src/painting/image_resolution.dart @@ -223,7 +223,7 @@ class AssetImage extends AssetBundleImageProvider { final Iterable keys = parsedJson.keys; final Map> parsedManifest = Map>.fromIterables(keys, - keys.map((String key) => List.from(parsedJson[key]))); + keys.map>((String key) => List.from(parsedJson[key]))); // TODO(ianh): convert that data structure to the right types. return SynchronousFuture>>(parsedManifest); } diff --git a/packages/flutter/lib/src/painting/text_span.dart b/packages/flutter/lib/src/painting/text_span.dart index f2a08d5135f..55a8f1530a0 100644 --- a/packages/flutter/lib/src/painting/text_span.dart +++ b/packages/flutter/lib/src/painting/text_span.dart @@ -355,7 +355,7 @@ class TextSpan extends DiagnosticableTree { List debugDescribeChildren() { if (children == null) return const []; - return children.map((TextSpan child) { + return children.map((TextSpan child) { if (child != null) { return child.toDiagnosticsNode(); } else { diff --git a/packages/flutter/lib/src/rendering/custom_layout.dart b/packages/flutter/lib/src/rendering/custom_layout.dart index 79f057785e6..1b44d04408d 100644 --- a/packages/flutter/lib/src/rendering/custom_layout.dart +++ b/packages/flutter/lib/src/rendering/custom_layout.dart @@ -214,7 +214,7 @@ abstract class MultiChildLayoutDelegate { if (_debugChildrenNeedingLayout.length > 1) { throw FlutterError( 'The $this custom multichild layout delegate forgot to lay out the following children:\n' - ' ${_debugChildrenNeedingLayout.map(_debugDescribeChild).join("\n ")}\n' + ' ${_debugChildrenNeedingLayout.map(_debugDescribeChild).join("\n ")}\n' 'Each child must be laid out exactly once.' ); } else { diff --git a/packages/flutter/lib/src/rendering/layer.dart b/packages/flutter/lib/src/rendering/layer.dart index 2c12b3e989a..c0188192b62 100644 --- a/packages/flutter/lib/src/rendering/layer.dart +++ b/packages/flutter/lib/src/rendering/layer.dart @@ -1140,7 +1140,7 @@ class LeaderLayer extends ContainerLayer { @override S find(Offset regionOffset) { - return super.find(regionOffset - offset); + return super.find(regionOffset - offset); } @override diff --git a/packages/flutter/lib/src/rendering/platform_view.dart b/packages/flutter/lib/src/rendering/platform_view.dart index dc87c7703e1..bf03b1296b2 100644 --- a/packages/flutter/lib/src/rendering/platform_view.dart +++ b/packages/flutter/lib/src/rendering/platform_view.dart @@ -382,8 +382,8 @@ class _MotionEventsDispatcher { eventTime: event.timeStamp.inMilliseconds, action: action, pointerCount: pointerPositions.length, - pointerProperties: pointers.map((int i) => pointerProperties[i]).toList(), - pointerCoords: pointers.map((int i) => pointerPositions[i]).toList(), + pointerProperties: pointers.map((int i) => pointerProperties[i]).toList(), + pointerCoords: pointers.map((int i) => pointerPositions[i]).toList(), metaState: 0, buttonState: 0, xPrecision: 1.0, diff --git a/packages/flutter/lib/src/scheduler/ticker.dart b/packages/flutter/lib/src/scheduler/ticker.dart index a943a916d40..cd4d77ba338 100644 --- a/packages/flutter/lib/src/scheduler/ticker.dart +++ b/packages/flutter/lib/src/scheduler/ticker.dart @@ -389,7 +389,7 @@ class TickerFuture implements Future { callback(); return null; } - orCancel.then(thunk, onError: thunk); + orCancel.then(thunk, onError: thunk); } /// A future that resolves when this future resolves or throws when the ticker diff --git a/packages/flutter/lib/src/semantics/semantics.dart b/packages/flutter/lib/src/semantics/semantics.dart index 6d956ba098d..9837cfbc89d 100644 --- a/packages/flutter/lib/src/semantics/semantics.dart +++ b/packages/flutter/lib/src/semantics/semantics.dart @@ -1844,12 +1844,12 @@ class SemanticsNode extends AbstractNode with DiagnosticableTreeMixin { if (scale != null) { description = '$rect scaled by ${scale.toStringAsFixed(1)}x'; } else if (transform != null && !MatrixUtils.isIdentity(transform)) { - final String matrix = transform.toString().split('\n').take(4).map((String line) => line.substring(4)).join('; '); + final String matrix = transform.toString().split('\n').take(4).map((String line) => line.substring(4)).join('; '); description = '$rect with transform [$matrix]'; } properties.add(DiagnosticsProperty('rect', rect, description: description, showName: false)); } - final List actions = _actions.keys.map((SemanticsAction action) => describeEnum(action)).toList()..sort(); + final List actions = _actions.keys.map((SemanticsAction action) => describeEnum(action)).toList()..sort(); final List customSemanticsActions = _customSemanticsActions.keys .map((CustomSemanticsAction action) => action.label) .toList(); @@ -2118,7 +2118,7 @@ class _SemanticsSortGroup extends Comparable<_SemanticsSortGroup> { sortedIds.add(id); } - startNodes.map((SemanticsNode node) => node.id).forEach(search); + startNodes.map((SemanticsNode node) => node.id).forEach(search); return sortedIds.map((int id) => nodeMap[id]).toList().reversed.toList(); } } diff --git a/packages/flutter/lib/src/services/platform_views.dart b/packages/flutter/lib/src/services/platform_views.dart index e015a985026..0efb9c4bc8e 100644 --- a/packages/flutter/lib/src/services/platform_views.dart +++ b/packages/flutter/lib/src/services/platform_views.dart @@ -328,8 +328,8 @@ class AndroidMotionEvent { eventTime, action, pointerCount, - pointerProperties.map((AndroidPointerProperties p) => p._asList()).toList(), - pointerCoords.map((AndroidPointerCoords p) => p._asList()).toList(), + pointerProperties.map>((AndroidPointerProperties p) => p._asList()).toList(), + pointerCoords.map>((AndroidPointerCoords p) => p._asList()).toList(), metaState, buttonState, xPrecision, diff --git a/packages/flutter/lib/src/services/text_formatter.dart b/packages/flutter/lib/src/services/text_formatter.dart index 1eec81c9be9..e421143e18a 100644 --- a/packages/flutter/lib/src/services/text_formatter.dart +++ b/packages/flutter/lib/src/services/text_formatter.dart @@ -233,7 +233,7 @@ class WhitelistingTextInputFormatter extends TextInputFormatter { (String substring) { return whitelistedPattern .allMatches(substring) - .map((Match match) => match.group(0)) + .map((Match match) => match.group(0)) .join(); } , ); diff --git a/packages/flutter/lib/src/widgets/image.dart b/packages/flutter/lib/src/widgets/image.dart index 59232c0b0bc..91e87ef841d 100644 --- a/packages/flutter/lib/src/widgets/image.dart +++ b/packages/flutter/lib/src/widgets/image.dart @@ -98,7 +98,7 @@ Future precacheImage( } } stream.addListener(listener, onError: errorListener); - completer.future.then((Null _) { stream.removeListener(listener); }); + completer.future.then((Null _) { stream.removeListener(listener); }); return completer.future; } diff --git a/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart b/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart index 78a1af1003e..cf6c9a5cacb 100644 --- a/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart +++ b/packages/flutter/lib/src/widgets/list_wheel_scroll_view.dart @@ -266,7 +266,7 @@ class FixedExtentScrollController extends ScrollController { curve: curve, )); } - await Future.wait(futures); + await Future.wait(futures); } /// Changes which item index is centered in the controlled scroll view. diff --git a/packages/flutter/lib/src/widgets/localizations.dart b/packages/flutter/lib/src/widgets/localizations.dart index 0b4124c2993..e960ec30056 100644 --- a/packages/flutter/lib/src/widgets/localizations.dart +++ b/packages/flutter/lib/src/widgets/localizations.dart @@ -74,7 +74,7 @@ Future> _loadAll(Locale locale, Iterable>(output); // Some of delegate.load() values were asynchronous futures. Wait for them. - return Future.wait(pendingList.map((_Pending p) => p.futureValue)) + return Future.wait(pendingList.map>((_Pending p) => p.futureValue)) .then>((List values) { assert(values.length == pendingList.length); for (int i = 0; i < values.length; i += 1) { @@ -502,7 +502,7 @@ class _LocalizationsState extends State { Map typeToResources; final Future> typeToResourcesFuture = _loadAll(locale, delegates) - .then((Map value) { + .then>((Map value) { return typeToResources = value; }); @@ -516,7 +516,7 @@ class _LocalizationsState extends State { // - If we're running at app startup time then defer reporting the first // "useful" frame until after the async load has completed. WidgetsBinding.instance.deferFirstFrameReport(); - typeToResourcesFuture.then((Map value) { + typeToResourcesFuture.then((Map value) { WidgetsBinding.instance.allowFirstFrameReport(); if (!mounted) return; diff --git a/packages/flutter/lib/src/widgets/routes.dart b/packages/flutter/lib/src/widgets/routes.dart index fd6d3dfadf8..9da5253da1c 100644 --- a/packages/flutter/lib/src/widgets/routes.dart +++ b/packages/flutter/lib/src/widgets/routes.dart @@ -660,6 +660,7 @@ abstract class ModalRoute extends TransitionRoute with LocalHistoryRoute of(BuildContext context) { final _ModalScopeStatus widget = context.inheritFromWidgetOfExactType(_ModalScopeStatus); return widget?.route; @@ -1519,7 +1520,7 @@ Future showGeneralDialog({ }) { assert(pageBuilder != null); assert(!barrierDismissible || barrierLabel != null); - return Navigator.of(context, rootNavigator: true).push(_DialogRoute( + return Navigator.of(context, rootNavigator: true).push(_DialogRoute( pageBuilder: pageBuilder, barrierDismissible: barrierDismissible, barrierLabel: barrierLabel, diff --git a/packages/flutter/lib/src/widgets/scroll_controller.dart b/packages/flutter/lib/src/widgets/scroll_controller.dart index 3c37682678c..abaf543609d 100644 --- a/packages/flutter/lib/src/widgets/scroll_controller.dart +++ b/packages/flutter/lib/src/widgets/scroll_controller.dart @@ -150,7 +150,7 @@ class ScrollController extends ChangeNotifier { final List> animations = List>(_positions.length); for (int i = 0; i < _positions.length; i += 1) animations[i] = _positions[i].animateTo(offset, duration: duration, curve: curve); - return Future.wait(animations).then((List _) => null); + return Future.wait(animations).then((List _) => null); } /// Jumps the scroll position from its current value to the given value, diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart index fac04a306bf..d64c67a4306 100644 --- a/packages/flutter/lib/src/widgets/scrollable.dart +++ b/packages/flutter/lib/src/widgets/scrollable.dart @@ -213,7 +213,7 @@ class Scrollable extends StatefulWidget { return Future.value(); if (futures.length == 1) return futures.single; - return Future.wait(futures).then((List _) => null); + return Future.wait(futures).then((List _) => null); } } diff --git a/packages/flutter/lib/src/widgets/table.dart b/packages/flutter/lib/src/widgets/table.dart index 9023b5725d7..85257f1b32b 100644 --- a/packages/flutter/lib/src/widgets/table.dart +++ b/packages/flutter/lib/src/widgets/table.dart @@ -141,7 +141,7 @@ class Table extends RenderObjectWidget { : null, super(key: key) { assert(() { - final List flatChildren = children.expand((TableRow row) => row.children).toList(growable: false); + final List flatChildren = children.expand((TableRow row) => row.children).toList(growable: false); if (debugChildrenHaveDuplicateKeys(this, flatChildren)) { throw FlutterError( 'Two or more cells in this Table contain widgets with the same key.\n' @@ -255,7 +255,7 @@ class _TableElement extends RenderObjectElement { super.mount(parent, newSlot); assert(!_debugWillReattachChildren); assert(() { _debugWillReattachChildren = true; return true; }()); - _children = widget.children.map((TableRow row) { + _children = widget.children.map<_TableElementRow>((TableRow row) { return _TableElementRow( key: row.key, children: row.children.map((Widget child) { @@ -351,7 +351,7 @@ class _TableElement extends RenderObjectElement { @override void visitChildren(ElementVisitor visitor) { - for (Element child in _children.expand((_TableElementRow row) => row.children)) { + for (Element child in _children.expand((_TableElementRow row) => row.children)) { if (!_forgottenChildren.contains(child)) visitor(child); } diff --git a/packages/flutter/lib/src/widgets/widget_inspector.dart b/packages/flutter/lib/src/widgets/widget_inspector.dart index 9b7a6245bad..941de322b39 100644 --- a/packages/flutter/lib/src/widgets/widget_inspector.dart +++ b/packages/flutter/lib/src/widgets/widget_inspector.dart @@ -1262,7 +1262,7 @@ class WidgetInspectorService { else throw FlutterError('Cannot get parent chain for node of type ${value.runtimeType}'); - return path.map((_DiagnosticsPathNode node) => _pathNodeToJson( + return path.map((_DiagnosticsPathNode node) => _pathNodeToJson( node, _SerializeConfig(groupName: groupName), )).toList(); diff --git a/packages/flutter/test/cupertino/nav_bar_test.dart b/packages/flutter/test/cupertino/nav_bar_test.dart index 3ccadc00ed0..0855c7ed5ef 100644 --- a/packages/flutter/test/cupertino/nav_bar_test.dart +++ b/packages/flutter/test/cupertino/nav_bar_test.dart @@ -262,7 +262,7 @@ void main() { return aParagraph.text.style.fontSize.compareTo(bParagraph.text.style.fontSize); }); - Iterable opacities = titles.map((Element element) { + Iterable opacities = titles.map((Element element) { final RenderAnimatedOpacity renderOpacity = element.ancestorRenderObjectOfType(const TypeMatcher()); return renderOpacity.opacity.value; }); @@ -287,7 +287,7 @@ void main() { return aParagraph.text.style.fontSize.compareTo(bParagraph.text.style.fontSize); }); - opacities = titles.map((Element element) { + opacities = titles.map((Element element) { final RenderAnimatedOpacity renderOpacity = element.ancestorRenderObjectOfType(const TypeMatcher()); return renderOpacity.opacity.value; }); diff --git a/packages/flutter/test/cupertino/route_test.dart b/packages/flutter/test/cupertino/route_test.dart index de721c5ef18..fd706fc382f 100644 --- a/packages/flutter/test/cupertino/route_test.dart +++ b/packages/flutter/test/cupertino/route_test.dart @@ -80,7 +80,7 @@ void main() { ); }); - final Iterable opacities = titles.map((Element element) { + final Iterable opacities = titles.map((Element element) { final RenderAnimatedOpacity renderOpacity = element.ancestorRenderObjectOfType(const TypeMatcher()); return renderOpacity.opacity.value; diff --git a/packages/flutter/test/foundation/caching_iterable_test.dart b/packages/flutter/test/foundation/caching_iterable_test.dart index f93229dce9d..39e345eee05 100644 --- a/packages/flutter/test/foundation/caching_iterable_test.dart +++ b/packages/flutter/test/foundation/caching_iterable_test.dart @@ -63,7 +63,7 @@ void main() { expect(integers.first, equals(1)); expect(yieldCount, equals(2)); - expect(evens.map((int i) => i + 1), equals([3, 5])); + expect(evens.map((int i) => i + 1), equals([3, 5])); expect(yieldCount, equals(5)); expect(evens, equals([2, 4])); @@ -95,13 +95,13 @@ void main() { final Iterable integers = CachingIterable(range(1, 5).iterator); expect(yieldCount, equals(0)); - final Iterable expanded1 = integers.expand((int i) => [i, i]); + final Iterable expanded1 = integers.expand((int i) => [i, i]); expect(yieldCount, equals(0)); expect(expanded1, equals([1, 1, 2, 2, 3, 3, 4, 4, 5, 5])); expect(yieldCount, equals(5)); - final Iterable expanded2 = integers.expand((int i) => [i, i]); + final Iterable expanded2 = integers.expand((int i) => [i, i]); expect(yieldCount, equals(5)); expect(expanded2, equals([1, 1, 2, 2, 3, 3, 4, 4, 5, 5])); diff --git a/packages/flutter/test/material/app_bar_test.dart b/packages/flutter/test/material/app_bar_test.dart index b22df03bbd0..39687a719ab 100644 --- a/packages/flutter/test/material/app_bar_test.dart +++ b/packages/flutter/test/material/app_bar_test.dart @@ -33,7 +33,7 @@ Widget buildSliverAppBarApp({ bool floating, bool pinned, double expandedHeight, expandedHeight: expandedHeight, snap: snap, bottom: TabBar( - tabs: ['A','B','C'].map((String t) => Tab(text: 'TAB $t')).toList(), + tabs: ['A','B','C'].map((String t) => Tab(text: 'TAB $t')).toList(), ), ), SliverToBoxAdapter( diff --git a/packages/flutter/test/material/colors_test.dart b/packages/flutter/test/material/colors_test.dart index 243fb79cf75..7414363c834 100644 --- a/packages/flutter/test/material/colors_test.dart +++ b/packages/flutter/test/material/colors_test.dart @@ -54,12 +54,12 @@ void main() { test('Colors swatches do not contain duplicates', () { for (MaterialColor color in Colors.primaries) - expect(primaryKeys.map((int key) => color[key]).toSet().length, primaryKeys.length); + expect(primaryKeys.map((int key) => color[key]).toSet().length, primaryKeys.length); - expect(primaryKeys.map((int key) => Colors.grey[key]).toSet().length, primaryKeys.length); + expect(primaryKeys.map((int key) => Colors.grey[key]).toSet().length, primaryKeys.length); for (MaterialAccentColor color in Colors.accents) - expect(accentKeys.map((int key) => color[key]).toSet().length, accentKeys.length); + expect(accentKeys.map((int key) => color[key]).toSet().length, accentKeys.length); }); test('All color swatch colors are opaque and equal their primary color', () { diff --git a/packages/flutter/test/material/data_table_test.dart b/packages/flutter/test/material/data_table_test.dart index 88cf8e6db4c..d05561f6103 100644 --- a/packages/flutter/test/material/data_table_test.dart +++ b/packages/flutter/test/material/data_table_test.dart @@ -32,7 +32,7 @@ void main() { } ), ], - rows: kDesserts.map((Dessert dessert) { + rows: kDesserts.map((Dessert dessert) { return DataRow( key: Key(dessert.name), onSelectChanged: (bool selected) { diff --git a/packages/flutter/test/material/dropdown_test.dart b/packages/flutter/test/material/dropdown_test.dart index a5fa90376cb..950629d9ed4 100644 --- a/packages/flutter/test/material/dropdown_test.dart +++ b/packages/flutter/test/material/dropdown_test.dart @@ -43,7 +43,7 @@ Widget buildFrame({ onChanged: onChanged, isDense: isDense, isExpanded: isExpanded, - items: items.map((String item) { + items: items.map>((String item) { return DropdownMenuItem( key: ValueKey(item), value: item, @@ -407,7 +407,7 @@ void main() { // When isDense is true, the button's height is reduced. The menu items' // heights are not. - final double menuItemHeight = itemBoxes.map((RenderBox box) => box.size.height).reduce(math.max); + final double menuItemHeight = itemBoxes.map((RenderBox box) => box.size.height).reduce(math.max); expect(menuItemHeight, greaterThan(buttonBox.size.height)); for (RenderBox itemBox in itemBoxes) { diff --git a/packages/flutter/test/material/list_tile_test.dart b/packages/flutter/test/material/list_tile_test.dart index 39ecd205f23..4102acc73ee 100644 --- a/packages/flutter/test/material/list_tile_test.dart +++ b/packages/flutter/test/material/list_tile_test.dart @@ -235,7 +235,7 @@ void main() { return ListView( children: ListTile.divideTiles( context: context, - tiles: titles.map((String title) => ListTile(title: Text(title))), + tiles: titles.map((String title) => ListTile(title: Text(title))), ).toList(), ); }, diff --git a/packages/flutter/test/material/page_selector_test.dart b/packages/flutter/test/material/page_selector_test.dart index 42a1ae06c47..8a4101324b2 100644 --- a/packages/flutter/test/material/page_selector_test.dart +++ b/packages/flutter/test/material/page_selector_test.dart @@ -52,7 +52,7 @@ List indicatorColors(WidgetTester tester) { matching: find.byType(TabPageSelectorIndicator) ) ); - return indicators.map((TabPageSelectorIndicator indicator) => indicator.backgroundColor).toList(); + return indicators.map((TabPageSelectorIndicator indicator) => indicator.backgroundColor).toList(); } void main() { diff --git a/packages/flutter/test/material/refresh_indicator_test.dart b/packages/flutter/test/material/refresh_indicator_test.dart index ea49f944300..4e6e0be66c5 100644 --- a/packages/flutter/test/material/refresh_indicator_test.dart +++ b/packages/flutter/test/material/refresh_indicator_test.dart @@ -29,7 +29,7 @@ void main() { onRefresh: refresh, child: ListView( physics: const AlwaysScrollableScrollPhysics(), - children: ['A', 'B', 'C', 'D', 'E', 'F'].map((String item) { + children: ['A', 'B', 'C', 'D', 'E', 'F'].map((String item) { return SizedBox( height: 200.0, child: Text(item), @@ -61,7 +61,7 @@ void main() { width: 600.0, child: ListView( physics: const AlwaysScrollableScrollPhysics(), - children: ['A', 'B', 'C', 'D', 'E', 'F'].map((String item) { + children: ['A', 'B', 'C', 'D', 'E', 'F'].map((String item) { return SizedBox( height: 200.0, child: Text(item), @@ -362,7 +362,7 @@ void main() { }, child: ListView( physics: const AlwaysScrollableScrollPhysics(), - children: ['A', 'B', 'C', 'D', 'E', 'F'].map((String item) { + children: ['A', 'B', 'C', 'D', 'E', 'F'].map((String item) { return SizedBox( height: 200.0, child: Text(item), @@ -393,7 +393,7 @@ void main() { child: ListView( controller: controller, physics: const AlwaysScrollableScrollPhysics(), - children: ['A', 'B', 'C', 'D', 'E', 'F'].map((String item) { + children: ['A', 'B', 'C', 'D', 'E', 'F'].map((String item) { return SizedBox( height: 200.0, child: Text(item), diff --git a/packages/flutter/test/material/reorderable_list_test.dart b/packages/flutter/test/material/reorderable_list_test.dart index bc21f799c0c..bab13e2904d 100644 --- a/packages/flutter/test/material/reorderable_list_test.dart +++ b/packages/flutter/test/material/reorderable_list_test.dart @@ -39,7 +39,7 @@ void main() { width: itemHeight * 10, child: ReorderableListView( header: header, - children: listItems.map(listItemToWidget).toList(), + children: listItems.map(listItemToWidget).toList(), scrollDirection: scrollDirection, onReorder: onReorder, ), diff --git a/packages/flutter/test/material/tabs_test.dart b/packages/flutter/test/material/tabs_test.dart index 81dc96b811e..5eab06630c0 100644 --- a/packages/flutter/test/material/tabs_test.dart +++ b/packages/flutter/test/material/tabs_test.dart @@ -78,7 +78,7 @@ Widget buildFrame({ length: tabs.length, child: TabBar( key: tabBarKey, - tabs: tabs.map((String tab) => Tab(text: tab)).toList(), + tabs: tabs.map((String tab) => Tab(text: tab)).toList(), isScrollable: isScrollable, indicatorColor: indicatorColor, ), @@ -134,7 +134,7 @@ Widget buildLeftRightApp({ List tabs, String value }) { appBar: AppBar( title: const Text('tabs'), bottom: TabBar( - tabs: tabs.map((String tab) => Tab(text: tab)).toList(), + tabs: tabs.map((String tab) => Tab(text: tab)).toList(), ), ), body: const TabBarView( @@ -295,7 +295,7 @@ void main() { initialIndex: tabs.indexOf(value), length: tabs.length, child: TabBarView( - children: tabs.map((String name) { + children: tabs.map((String name) { return StateMarker( child: Text(name) ); @@ -483,11 +483,11 @@ void main() { title: const Text('tabs'), bottom: TabBar( isScrollable: true, - tabs: tabs.map((String tab) => Tab(text: tab)).toList(), + tabs: tabs.map((String tab) => Tab(text: tab)).toList(), ), ), body: TabBarView( - children: tabs.map((String name) => Text('${index++}')).toList(), + children: tabs.map((String name) => Text('${index++}')).toList(), ), ), ), @@ -550,7 +550,7 @@ void main() { title: const Text('tabs'), bottom: TabBar( controller: controller, - tabs: tabs.map((String tab) => Tab(text: tab)).toList(), + tabs: tabs.map((String tab) => Tab(text: tab)).toList(), ), ), body: TabBarView( @@ -609,7 +609,7 @@ void main() { title: const Text('tabs'), bottom: TabBar( controller: controller, - tabs: tabs.map((String tab) => Tab(text: tab)).toList(), + tabs: tabs.map((String tab) => Tab(text: tab)).toList(), ), ), body: TabBarView( @@ -1866,7 +1866,7 @@ void main() { title: const Text('tabs'), bottom: TabBar( controller: controller, - tabs: tabs.map((String tab) => Tab(text: tab)).toList(), + tabs: tabs.map((String tab) => Tab(text: tab)).toList(), ), ), body: TabBarView( diff --git a/packages/flutter/test/material/text_field_test.dart b/packages/flutter/test/material/text_field_test.dart index 46979c5fb48..0124ededa57 100644 --- a/packages/flutter/test/material/text_field_test.dart +++ b/packages/flutter/test/material/text_field_test.dart @@ -145,7 +145,7 @@ void main() { } List globalize(Iterable points, RenderBox box) { - return points.map((TextSelectionPoint point) { + return points.map((TextSelectionPoint point) { return TextSelectionPoint( box.localToGlobal(point.point), point.direction, diff --git a/packages/flutter/test/material/theme_test.dart b/packages/flutter/test/material/theme_test.dart index 8ea5f38eb37..81f060d3195 100644 --- a/packages/flutter/test/material/theme_test.dart +++ b/packages/flutter/test/material/theme_test.dart @@ -388,7 +388,7 @@ void main() { } for (TextTheme textTheme in [theme.textTheme, theme.primaryTextTheme, theme.accentTextTheme]) { - for (TextStyle style in extractStyles(textTheme).map((TextStyle style) => _TextStyleProxy(style))) { + for (TextStyle style in extractStyles(textTheme).map((TextStyle style) => _TextStyleProxy(style))) { expect(style.inherit, false); expect(style.color, isNotNull); expect(style.fontFamily, isNotNull); diff --git a/packages/flutter/test/scheduler/scheduler_test.dart b/packages/flutter/test/scheduler/scheduler_test.dart index 60c5178191d..75eb269fdd5 100644 --- a/packages/flutter/test/scheduler/scheduler_test.dart +++ b/packages/flutter/test/scheduler/scheduler_test.dart @@ -94,7 +94,7 @@ void main() { test('2 calls to scheduleWarmUpFrame just schedules it once', () { final List timerQueueTasks = []; bool taskExecuted = false; - runZoned( + runZoned( () { // Run it twice without processing the queued tasks. scheduler.scheduleWarmUpFrame(); diff --git a/packages/flutter/test/widgets/custom_painter_test.dart b/packages/flutter/test/widgets/custom_painter_test.dart index 52369b900a5..03455e53dcc 100644 --- a/packages/flutter/test/widgets/custom_painter_test.dart +++ b/packages/flutter/test/widgets/custom_painter_test.dart @@ -363,7 +363,7 @@ void _defineTests() { TestSemantics.rootChild( id: expectedId, rect: TestSemantics.fullScreen, - actions: allActions.fold(0, (int previous, SemanticsAction action) => previous | action.index), + actions: allActions.fold(0, (int previous, SemanticsAction action) => previous | action.index), ), ] ), diff --git a/packages/flutter/test/widgets/dismissible_test.dart b/packages/flutter/test/widgets/dismissible_test.dart index 71e19d832df..084de05bdc9 100644 --- a/packages/flutter/test/widgets/dismissible_test.dart +++ b/packages/flutter/test/widgets/dismissible_test.dart @@ -53,7 +53,7 @@ Widget buildTest({ double startToEndThreshold, TextDirection textDirection = Tex itemExtent: itemExtent, children: [0, 1, 2, 3, 4] .where((int i) => !dismissedItems.contains(i)) - .map(buildDismissibleItem).toList(), + .map(buildDismissibleItem).toList(), ), ); }, diff --git a/packages/flutter/test/widgets/grid_view_test.dart b/packages/flutter/test/widgets/grid_view_test.dart index 1adc5e787a4..38b478630f3 100644 --- a/packages/flutter/test/widgets/grid_view_test.dart +++ b/packages/flutter/test/widgets/grid_view_test.dart @@ -29,7 +29,7 @@ void main() { textDirection: TextDirection.ltr, child: GridView.count( crossAxisCount: 4, - children: kStates.map((String state) { + children: kStates.map((String state) { return GestureDetector( onTap: () { log.add(state); @@ -100,7 +100,7 @@ void main() { textDirection: TextDirection.ltr, child: GridView.extent( maxCrossAxisExtent: 200.0, - children: kStates.map((String state) { + children: kStates.map((String state) { return GestureDetector( onTap: () { log.add(state); diff --git a/packages/flutter/test/widgets/heroes_test.dart b/packages/flutter/test/widgets/heroes_test.dart index 850ae99f14a..45fd966c840 100644 --- a/packages/flutter/test/widgets/heroes_test.dart +++ b/packages/flutter/test/widgets/heroes_test.dart @@ -948,7 +948,7 @@ void main() { // One Opacity widget per Hero, only one now has opacity 0.0 final Iterable renderers = tester.renderObjectList(find.byType(Opacity)); - final Iterable opacities = renderers.map((RenderOpacity r) => r.opacity); + final Iterable opacities = renderers.map((RenderOpacity r) => r.opacity); expect(opacities.singleWhere((double opacity) => opacity == 0.0), 0.0); // Hero BC's flight finishes normally. diff --git a/packages/flutter/test/widgets/image_headers_test.dart b/packages/flutter/test/widgets/image_headers_test.dart index a4dc552616e..c7f8de1325e 100644 --- a/packages/flutter/test/widgets/image_headers_test.dart +++ b/packages/flutter/test/widgets/image_headers_test.dart @@ -18,7 +18,7 @@ void main() { final MockHttpHeaders headers = MockHttpHeaders(); testWidgets('Headers', (WidgetTester tester) async { - HttpOverrides.runZoned(() async { + HttpOverrides.runZoned>(() async { await tester.pumpWidget(Image.network( 'https://www.example.com/images/frame.png', headers: const {'flutter': 'flutter'}, diff --git a/packages/flutter/test/widgets/list_view_horizontal_test.dart b/packages/flutter/test/widgets/list_view_horizontal_test.dart index 8ed0474ff45..fb425be03cb 100644 --- a/packages/flutter/test/widgets/list_view_horizontal_test.dart +++ b/packages/flutter/test/widgets/list_view_horizontal_test.dart @@ -19,7 +19,7 @@ Widget buildFrame({ bool reverse = false, @required TextDirection textDirection scrollDirection: Axis.horizontal, reverse: reverse, physics: const BouncingScrollPhysics(), - children: items.map((int item) { + children: items.map((int item) { return Container( child: Text('$item') ); diff --git a/packages/flutter/test/widgets/list_view_vertical_test.dart b/packages/flutter/test/widgets/list_view_vertical_test.dart index ebc3fe298d5..617be7eb634 100644 --- a/packages/flutter/test/widgets/list_view_vertical_test.dart +++ b/packages/flutter/test/widgets/list_view_vertical_test.dart @@ -13,7 +13,7 @@ Widget buildFrame() { child: ListView( itemExtent: 290.0, scrollDirection: Axis.vertical, - children: items.map((int item) { + children: items.map((int item) { return Container( child: Text('$item') ); @@ -74,7 +74,7 @@ void main() { itemExtent: 290.0, padding: const EdgeInsets.only(top: 250.0), scrollDirection: Axis.vertical, - children: items.map((int item) { + children: items.map((int item) { return Container( child: Text('$item') ); diff --git a/packages/flutter/test/widgets/nested_scroll_view_test.dart b/packages/flutter/test/widgets/nested_scroll_view_test.dart index fd091f5d81d..b52360bc2a5 100644 --- a/packages/flutter/test/widgets/nested_scroll_view_test.dart +++ b/packages/flutter/test/widgets/nested_scroll_view_test.dart @@ -389,7 +389,7 @@ void main() { forceElevated: innerBoxIsScrolled, bottom: TabBar( // These are the widgets to put in each tab in the tab bar. - tabs: _tabs.map((String name) => Tab(text: name)).toList(), + tabs: _tabs.map((String name) => Tab(text: name)).toList(), ), ), ), @@ -397,7 +397,7 @@ void main() { }, body: TabBarView( // These are the contents of the tab views, below the tabs. - children: _tabs.map((String name) { + children: _tabs.map((String name) { return SafeArea( top: false, bottom: false, diff --git a/packages/flutter/test/widgets/pageable_list_test.dart b/packages/flutter/test/widgets/pageable_list_test.dart index 670a23303ac..79f2dda8a32 100644 --- a/packages/flutter/test/widgets/pageable_list_test.dart +++ b/packages/flutter/test/widgets/pageable_list_test.dart @@ -9,7 +9,7 @@ import 'package:meta/meta.dart'; Size pageSize = const Size(600.0, 300.0); const List defaultPages = [0, 1, 2, 3, 4, 5]; -final List globalKeys = defaultPages.map((_) => GlobalKey()).toList(); +final List globalKeys = defaultPages.map((_) => GlobalKey()).toList(); int currentPage; Widget buildPage(int page) { @@ -30,7 +30,7 @@ Widget buildFrame({ scrollDirection: Axis.horizontal, reverse: reverse, onPageChanged: (int page) { currentPage = page; }, - children: pages.map(buildPage).toList(), + children: pages.map(buildPage).toList(), ); // The test framework forces the frame to be 800x600, so we need to create diff --git a/packages/flutter/test/widgets/scrollable_list_hit_testing_test.dart b/packages/flutter/test/widgets/scrollable_list_hit_testing_test.dart index 862873e9a2b..c06da6d576a 100644 --- a/packages/flutter/test/widgets/scrollable_list_hit_testing_test.dart +++ b/packages/flutter/test/widgets/scrollable_list_hit_testing_test.dart @@ -20,7 +20,7 @@ void main() { child: ListView( itemExtent: 290.0, scrollDirection: Axis.horizontal, - children: items.map((int item) { + children: items.map((int item) { return Container( child: GestureDetector( onTap: () { tapped.add(item); }, @@ -62,7 +62,7 @@ void main() { child: ListView( itemExtent: 290.0, scrollDirection: Axis.vertical, - children: items.map((int item) { + children: items.map((int item) { return Container( child: GestureDetector( onTap: () { tapped.add(item); }, @@ -104,7 +104,7 @@ void main() { child: ListView( itemExtent: 290.0, padding: const EdgeInsets.fromLTRB(5.0, 20.0, 15.0, 10.0), - children: items.map((int item) { + children: items.map((int item) { return Container( child: GestureDetector( onTap: () { tapped.add(item); }, @@ -139,7 +139,7 @@ void main() { itemExtent: 290.0, reverse: true, padding: const EdgeInsets.fromLTRB(5.0, 20.0, 15.0, 10.0), - children: items.map((int item) { + children: items.map((int item) { return Container( child: GestureDetector( onTap: () { tapped.add(item); }, @@ -173,7 +173,7 @@ void main() { textDirection: TextDirection.ltr, child: ListView( itemExtent: 200.0, - children: items.map((int item) { + children: items.map((int item) { return Container( child: GestureDetector( onTap: () { tapped.add(item); }, diff --git a/packages/flutter/test/widgets/semantics_test.dart b/packages/flutter/test/widgets/semantics_test.dart index 82ea8d606d4..c2214c714ee 100644 --- a/packages/flutter/test/widgets/semantics_test.dart +++ b/packages/flutter/test/widgets/semantics_test.dart @@ -427,7 +427,7 @@ void main() { TestSemantics.rootChild( id: expectedId, rect: TestSemantics.fullScreen, - actions: allActions.fold(0, (int previous, SemanticsAction action) => previous | action.index), + actions: allActions.fold(0, (int previous, SemanticsAction action) => previous | action.index), ), ], ); diff --git a/packages/flutter/test/widgets/semantics_tester.dart b/packages/flutter/test/widgets/semantics_tester.dart index 455275a199b..c10779a6f72 100644 --- a/packages/flutter/test/widgets/semantics_tester.dart +++ b/packages/flutter/test/widgets/semantics_tester.dart @@ -325,7 +325,7 @@ class TestSemantics { if (rect != null) buf.writeln('$indent rect: $rect,'); if (transform != null) - buf.writeln('$indent transform:\n${transform.toString().trim().split('\n').map((String line) => '$indent $line').join('\n')},'); + buf.writeln('$indent transform:\n${transform.toString().trim().split('\n').map((String line) => '$indent $line').join('\n')},'); buf.writeln('$indent children: ['); for (TestSemantics child in children) { buf.writeln('${child.toString(indentAmount + 2)},'); @@ -403,13 +403,13 @@ class SemanticsTester { if (textDirection != null && node.textDirection != textDirection) return false; if (actions != null) { - final int expectedActions = actions.fold(0, (int value, SemanticsAction action) => value | action.index); + final int expectedActions = actions.fold(0, (int value, SemanticsAction action) => value | action.index); final int actualActions = node.getSemanticsData().actions; if (expectedActions != actualActions) return false; } if (flags != null) { - final int expectedFlags = flags.fold(0, (int value, SemanticsFlag flag) => value | flag.index); + final int expectedFlags = flags.fold(0, (int value, SemanticsFlag flag) => value | flag.index); final int actualFlags = node.getSemanticsData().flags; if (expectedFlags != actualFlags) return false; @@ -503,7 +503,7 @@ class SemanticsTester { } static String _tagsToSemanticsTagExpression(Set tags) { - return '[${tags.map((SemanticsTag tag) => 'const SemanticsTag(\'${tag.name}\')').join(', ')}]'; + return '[${tags.map((SemanticsTag tag) => 'const SemanticsTag(\'${tag.name}\')').join(', ')}]'; } static String _actionsToSemanticsActionExpression(dynamic actions) { @@ -565,7 +565,7 @@ class SemanticsTester { } buf.write(')'); - return buf.toString().split('\n').map((String l) => '$indent$l').join('\n'); + return buf.toString().split('\n').map((String l) => '$indent$l').join('\n'); } } @@ -614,7 +614,7 @@ class _HasSemantics extends Matcher { } String _indent(String text) { - return text.toString().trimRight().split('\n').map((String line) => ' $line').join('\n'); + return text.toString().trimRight().split('\n').map((String line) => ' $line').join('\n'); } @override diff --git a/packages/flutter/test/widgets/semantics_tester_generateTestSemanticsExpressionForCurrentSemanticsTree_test.dart b/packages/flutter/test/widgets/semantics_tester_generateTestSemanticsExpressionForCurrentSemanticsTree_test.dart index 4b920214073..730d8307aab 100644 --- a/packages/flutter/test/widgets/semantics_tester_generateTestSemanticsExpressionForCurrentSemanticsTree_test.dart +++ b/packages/flutter/test/widgets/semantics_tester_generateTestSemanticsExpressionForCurrentSemanticsTree_test.dart @@ -56,7 +56,7 @@ void _tests() { final String code = semantics .generateTestSemanticsExpressionForCurrentSemanticsTree(DebugSemanticsDumpOrder.inverseHitTest) .split('\n') - .map((String line) => line.trim()) + .map((String line) => line.trim()) .join('\n') .trim() + ','; @@ -82,7 +82,7 @@ void _tests() { expectedCode.indexOf('^' * 12) - 3, ) .split('\n') - .map((String line) => line.trim()) + .map((String line) => line.trim()) .join('\n') .trim(); semantics.dispose(); diff --git a/packages/flutter/test/widgets/sliver_list_test.dart b/packages/flutter/test/widgets/sliver_list_test.dart index 9ab78b700e7..9db3c881cef 100644 --- a/packages/flutter/test/widgets/sliver_list_test.dart +++ b/packages/flutter/test/widgets/sliver_list_test.dart @@ -76,7 +76,7 @@ void main() { expect(find.text('Tile 19'), findsOneWidget); await tester.pumpWidget(_buildSliverList( - items: items.map((int i) => i + 100).toList(), + items: items.map((int i) => i + 100).toList(), controller: controller, itemHeight: itemHeight, viewportHeight: viewportHeight, diff --git a/packages/flutter/test/widgets/slivers_block_global_key_test.dart b/packages/flutter/test/widgets/slivers_block_global_key_test.dart index 92a28604c84..2aa787d84e4 100644 --- a/packages/flutter/test/widgets/slivers_block_global_key_test.dart +++ b/packages/flutter/test/widgets/slivers_block_global_key_test.dart @@ -34,7 +34,7 @@ Future test(WidgetTester tester, double offset, List keys) { offset: ViewportOffset.fixed(offset), slivers: [ SliverList( - delegate: SliverChildListDelegate(keys.map((int key) { + delegate: SliverChildListDelegate(keys.map((int key) { return SizedBox(key: GlobalObjectKey(key), height: 100.0, child: GenerationText(key)); }).toList()), ), diff --git a/packages/flutter_driver/lib/src/driver/driver.dart b/packages/flutter_driver/lib/src/driver/driver.dart index 7e130d77760..5aa1e47dc9b 100644 --- a/packages/flutter_driver/lib/src/driver/driver.dart +++ b/packages/flutter_driver/lib/src/driver/driver.dart @@ -78,7 +78,7 @@ final Duration _kPauseBetweenReconnectAttempts = _kShortTimeout ~/ 5; // See https://github.com/dart-lang/sdk/blob/master/runtime/vm/timeline.cc#L32 String _timelineStreamsToString(List streams) { - final String contents = streams.map((TimelineStream stream) { + final String contents = streams.map((TimelineStream stream) { switch (stream) { case TimelineStream.all: return 'all'; case TimelineStream.api: return 'API'; @@ -428,7 +428,7 @@ class FlutterDriver { /// The move events are generated at a given [frequency] in Hz (or events per /// second). It defaults to 60Hz. Future scroll(SerializableFinder finder, double dx, double dy, Duration duration, { int frequency = 60, Duration timeout }) async { - return await _sendCommand(Scroll(finder, dx, dy, duration, frequency, timeout: timeout)).then((Map _) => null); + return await _sendCommand(Scroll(finder, dx, dy, duration, frequency, timeout: timeout)).then((Map _) => null); } /// Scrolls the Scrollable ancestor of the widget located by [finder] @@ -439,7 +439,7 @@ class FlutterDriver { /// then this method may fail because [finder] doesn't actually exist. /// The [scrollUntilVisible] method can be used in this case. Future scrollIntoView(SerializableFinder finder, { double alignment = 0.0, Duration timeout }) async { - return await _sendCommand(ScrollIntoView(finder, alignment: alignment, timeout: timeout)).then((Map _) => null); + return await _sendCommand(ScrollIntoView(finder, alignment: alignment, timeout: timeout)).then((Map _) => null); } /// Repeatedly [scroll] the widget located by [scrollable] by [dxScroll] and @@ -483,7 +483,7 @@ class FlutterDriver { // the chance to complete if the item is already onscreen; if not, scroll // repeatedly until we either find the item or time out. bool isVisible = false; - waitFor(item, timeout: timeout).then((Null value) { isVisible = true; }); + waitFor(item, timeout: timeout).then((Null value) { isVisible = true; }); await Future.delayed(const Duration(milliseconds: 500)); while (!isVisible) { await scroll(scrollable, dxScroll, dyScroll, const Duration(milliseconds: 100)); diff --git a/packages/flutter_driver/lib/src/driver/timeline.dart b/packages/flutter_driver/lib/src/driver/timeline.dart index 34be834abcf..6bb3087659b 100644 --- a/packages/flutter_driver/lib/src/driver/timeline.dart +++ b/packages/flutter_driver/lib/src/driver/timeline.dart @@ -129,6 +129,6 @@ List _parseEvents(Map json) { // TODO(vegorov): use instance method version of castFrom when it is available. return Iterable.castFrom>(jsonEvents) - .map((Map eventJson) => TimelineEvent(eventJson)) + .map((Map eventJson) => TimelineEvent(eventJson)) .toList(); } diff --git a/packages/flutter_driver/lib/src/driver/timeline_summary.dart b/packages/flutter_driver/lib/src/driver/timeline_summary.dart index 09e61de8814..64e7dc0056e 100644 --- a/packages/flutter_driver/lib/src/driver/timeline_summary.dart +++ b/packages/flutter_driver/lib/src/driver/timeline_summary.dart @@ -98,10 +98,10 @@ class TimelineSummary { 'missed_frame_rasterizer_budget_count': computeMissedFrameRasterizerBudgetCount(), 'frame_count': countFrames(), 'frame_build_times': _extractFrameDurations() - .map((Duration duration) => duration.inMicroseconds) + .map((Duration duration) => duration.inMicroseconds) .toList(), 'frame_rasterizer_times': _extractGpuRasterizerDrawEvents() - .map((TimedEvent event) => event.duration.inMicroseconds) + .map((TimedEvent event) => event.duration.inMicroseconds) .toList(), }; } @@ -143,7 +143,7 @@ class TimelineSummary { } List _extractDurations(String name) { - return _extractNamedEvents(name).map((TimelineEvent event) => event.duration).toList(); + return _extractNamedEvents(name).map((TimelineEvent event) => event.duration).toList(); } /// Extracts timed events that are reported as a pair of begin/end events. @@ -199,7 +199,7 @@ class TimelineSummary { List _extractFrameDurations() => _extractDurations('Frame'); Iterable _extractDuration(Iterable events) { - return events.map((TimedEvent e) => e.duration); + return events.map((TimedEvent e) => e.duration); } } diff --git a/packages/flutter_driver/test/flutter_driver_test.dart b/packages/flutter_driver/test/flutter_driver_test.dart index d8d8adbd993..eed263a2a9d 100644 --- a/packages/flutter_driver/test/flutter_driver_test.dart +++ b/packages/flutter_driver/test/flutter_driver_test.dart @@ -28,7 +28,7 @@ void main() { MockPeer mockPeer; void expectLogContains(String message) { - expect(log.map((LogRecord r) => '$r'), anyElement(contains(message))); + expect(log.map((LogRecord r) => '$r'), anyElement(contains(message))); } setUp(() { diff --git a/packages/flutter_test/lib/src/binding.dart b/packages/flutter_test/lib/src/binding.dart index 2d47644df92..80c3fb8435f 100644 --- a/packages/flutter_test/lib/src/binding.dart +++ b/packages/flutter_test/lib/src/binding.dart @@ -228,7 +228,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase /// Artificially calls dispatchLocaleChanged on the Widget binding, /// then flushes microtasks. Future setLocale(String languageCode, String countryCode) { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { assert(inTest); final Locale locale = Locale(languageCode, countryCode); dispatchLocaleChanged(locale); @@ -243,7 +243,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase /// /// Set to null to use the default surface size. Future setSurfaceSize(Size size) { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { assert(inTest); if (_surfaceSize == size) return null; @@ -273,7 +273,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase /// to recursively schedule new microtasks. Will not run any timers scheduled /// after this method was invoked, even if they are zero-time timers. Future idle() { - return TestAsyncUtils.guard(() { + return TestAsyncUtils.guard(() { final Completer completer = Completer(); Timer.run(() { completer.complete(null); @@ -537,7 +537,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase ); _parentZone = Zone.current; final Zone testZone = _parentZone.fork(specification: errorHandlingZoneSpecification); - testZone.runBinary(_runTestBody, testBody, invariantTester) + testZone.runBinary, Future Function(), VoidCallback>(_runTestBody, testBody, invariantTester) .whenComplete(testCompletionHandler); timeout?.catchError(handleUncaughtError); return testCompleter.future; @@ -689,7 +689,7 @@ class AutomatedTestWidgetsFlutterBinding extends TestWidgetsFlutterBinding { @override Future pump([ Duration duration, EnginePhase newPhase = EnginePhase.sendSemanticsUpdate ]) { - return TestAsyncUtils.guard(() { + return TestAsyncUtils.guard(() { assert(inTest); assert(_clock != null); if (duration != null) @@ -741,7 +741,7 @@ class AutomatedTestWidgetsFlutterBinding extends TestWidgetsFlutterBinding { addTime(additionalTime); - return realAsyncZone.run(() { + return realAsyncZone.run>(() { _pendingAsyncTasks = Completer(); return callback().catchError((dynamic exception, StackTrace stack) { FlutterError.reportError(FlutterErrorDetails( @@ -1197,7 +1197,7 @@ class LiveTestWidgetsFlutterBinding extends TestWidgetsFlutterBinding { assert(inTest); assert(!_expectingFrame); assert(_pendingFrame == null); - return TestAsyncUtils.guard(() { + return TestAsyncUtils.guard(() { if (duration != null) { Timer(duration, () { _expectingFrame = true; diff --git a/packages/flutter_test/lib/src/controller.dart b/packages/flutter_test/lib/src/controller.dart index d2c18d2694d..0d70e844392 100644 --- a/packages/flutter_test/lib/src/controller.dart +++ b/packages/flutter_test/lib/src/controller.dart @@ -46,7 +46,7 @@ abstract class WidgetController { Iterable get allWidgets { TestAsyncUtils.guardSync(); return allElements - .map((Element element) => element.widget); + .map((Element element) => element.widget); } /// The matching widget in the widget tree. @@ -137,7 +137,7 @@ abstract class WidgetController { TestAsyncUtils.guardSync(); return allElements .whereType() - .map((StatefulElement element) => element.state); + .map((StatefulElement element) => element.state); } /// The matching state in the widget tree. @@ -173,7 +173,7 @@ abstract class WidgetController { /// * Use [firstState] if you expect to match several but only want the first. Iterable stateList(Finder finder) { TestAsyncUtils.guardSync(); - return finder.evaluate().map((Element element) => _stateOf(element, finder)); + return finder.evaluate().map((Element element) => _stateOf(element, finder)); } T _stateOf(Element element, Finder finder) { @@ -194,7 +194,7 @@ abstract class WidgetController { Iterable get allRenderObjects { TestAsyncUtils.guardSync(); return allElements - .map((Element element) => element.renderObject); + .map((Element element) => element.renderObject); } /// The render object of the matching widget in the widget tree. @@ -262,7 +262,7 @@ abstract class WidgetController { /// Dispatch a pointer down / pointer up sequence at the given location. Future tapAt(Offset location, { int pointer }) { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { final TestGesture gesture = await startGesture(location, pointer: pointer); await gesture.up(); return null; @@ -293,7 +293,7 @@ abstract class WidgetController { /// Dispatch a pointer down / pointer up sequence at the given location with /// a delay of [kLongPressTimeout] + [kPressTimeout] between the two events. Future longPressAt(Offset location, { int pointer }) { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { final TestGesture gesture = await startGesture(location, pointer: pointer); await pump(kLongPressTimeout + kPressTimeout); await gesture.up(); @@ -371,7 +371,7 @@ abstract class WidgetController { }) { assert(offset.distance > 0.0); assert(speed > 0.0); // speed is pixels/second - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { final TestPointer testPointer = TestPointer(pointer ?? _getNextPointer()); final HitTestResult result = hitTestOnBinding(startLocation); const int kMoveCount = 50; // Needs to be >= kHistorySize, see _LeastSquaresVelocityTrackerStrategy @@ -428,7 +428,7 @@ abstract class WidgetController { /// system identifies the gesture as a fling, consider using [flingFrom] /// instead. Future dragFrom(Offset startLocation, Offset offset, { int pointer }) { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { final TestGesture gesture = await startGesture(startLocation, pointer: pointer); assert(gesture != null); await gesture.moveBy(offset); @@ -469,7 +469,7 @@ abstract class WidgetController { /// Forwards the given pointer event to the binding. Future sendEventToBinding(PointerEvent event, HitTestResult result) { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { binding.dispatchEvent(event, result); return null; }); diff --git a/packages/flutter_test/lib/src/finders.dart b/packages/flutter_test/lib/src/finders.dart index 6341190d4eb..2d41b0334c3 100644 --- a/packages/flutter_test/lib/src/finders.dart +++ b/packages/flutter_test/lib/src/finders.dart @@ -633,7 +633,7 @@ class _DescendantFinder extends Finder { @override Iterable get allCandidates { final Iterable ancestorElements = ancestor.evaluate(); - final List candidates = ancestorElements.expand( + final List candidates = ancestorElements.expand( (Element element) => collectAllElementsFrom(element, skipOffstage: skipOffstage) ).toSet().toList(); if (matchRoot) diff --git a/packages/flutter_test/lib/src/goldens.dart b/packages/flutter_test/lib/src/goldens.dart index eeab00b7f56..5ef149388eb 100644 --- a/packages/flutter_test/lib/src/goldens.dart +++ b/packages/flutter_test/lib/src/goldens.dart @@ -181,7 +181,7 @@ class LocalFileComparator implements GoldenFileComparator { throw test_package.TestFailure('Could not be compared against non-existent file: "$golden"'); } final List goldenBytes = await goldenFile.readAsBytes(); - return _areListsEqual(imageBytes, goldenBytes); + return _areListsEqual(imageBytes, goldenBytes); } @override diff --git a/packages/flutter_test/lib/src/test_pointer.dart b/packages/flutter_test/lib/src/test_pointer.dart index 063440e1390..56f20968e20 100644 --- a/packages/flutter_test/lib/src/test_pointer.dart +++ b/packages/flutter_test/lib/src/test_pointer.dart @@ -142,7 +142,7 @@ class TestGesture { assert(hitTester != null); assert(dispatcher != null); TestGesture result; - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { // dispatch down event final HitTestResult hitTestResult = hitTester(downLocation); final TestPointer testPointer = TestPointer(pointer); @@ -170,7 +170,7 @@ class TestGesture { /// Send a move event moving the pointer to the given location. Future moveTo(Offset location, { Duration timeStamp = Duration.zero }) { - return TestAsyncUtils.guard(() { + return TestAsyncUtils.guard(() { assert(_pointer._isDown); return _dispatcher(_pointer.move(location, timeStamp: timeStamp), _result); }); @@ -180,7 +180,7 @@ class TestGesture { /// /// The object is no longer usable after this method has been called. Future up() { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { assert(_pointer._isDown); await _dispatcher(_pointer.up(), _result); assert(!_pointer._isDown); @@ -194,7 +194,7 @@ class TestGesture { /// /// The object is no longer usable after this method has been called. Future cancel() { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { assert(_pointer._isDown); await _dispatcher(_pointer.cancel(), _result); assert(!_pointer._isDown); diff --git a/packages/flutter_test/lib/src/widget_tester.dart b/packages/flutter_test/lib/src/widget_tester.dart index 4a766fc171c..bcdee59e699 100644 --- a/packages/flutter_test/lib/src/widget_tester.dart +++ b/packages/flutter_test/lib/src/widget_tester.dart @@ -221,7 +221,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker Duration duration, EnginePhase phase = EnginePhase.sendSemanticsUpdate, ]) { - return TestAsyncUtils.guard(() { + return TestAsyncUtils.guard(() { binding.attachRootWidget(widget); binding.scheduleFrame(); return binding.pump(duration, phase); @@ -244,7 +244,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker Duration duration, EnginePhase phase = EnginePhase.sendSemanticsUpdate, ]) { - return TestAsyncUtils.guard(() => binding.pump(duration, phase)); + return TestAsyncUtils.guard(() => binding.pump(duration, phase)); } /// Repeatedly calls [pump] with the given `duration` until there are no @@ -292,7 +292,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker return true; }()); int count = 0; - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { final DateTime endTime = binding.clock.fromNowBy(timeout); do { if (binding.clock.now().isAfter(endTime)) @@ -325,7 +325,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker /// [TestFailure] error being thrown. Future runAsync(Future callback(), { Duration additionalTime = const Duration(milliseconds: 250), - }) => binding.runAsync(callback, additionalTime: additionalTime); + }) => binding.runAsync(callback, additionalTime: additionalTime); /// Whether there are any any transient callbacks scheduled. /// @@ -351,7 +351,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker @override Future sendEventToBinding(PointerEvent event, HitTestResult result) { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { binding.dispatchEvent(event, result, source: TestBindingEventSource.test); return null; }); @@ -485,7 +485,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker /// Does not run timers. May result in an infinite loop or run out of memory /// if microtasks continue to recursively schedule new microtasks. Future idle() { - return TestAsyncUtils.guard(() => binding.idle()); + return TestAsyncUtils.guard(() => binding.idle()); } Set _tickers; @@ -570,8 +570,8 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker /// Tests that just need to add text to widgets like [TextField] /// or [TextFormField] only need to call [enterText]. Future showKeyboard(Finder finder) async { - return TestAsyncUtils.guard(() async { - final EditableTextState editable = state( + return TestAsyncUtils.guard(() async { + final EditableTextState editable = state( find.descendant( of: finder, matching: find.byType(EditableText), @@ -593,7 +593,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker /// To just give [finder] the focus without entering any text, /// see [showKeyboard]. Future enterText(Finder finder, String text) async { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { await showKeyboard(finder); testTextInput.enterText(text); await idle(); @@ -605,7 +605,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker /// /// Will throw an error if there is no back button in the page. Future pageBack() async { - return TestAsyncUtils.guard(() async { + return TestAsyncUtils.guard(() async { Finder backButton = find.byTooltip('Back'); if (backButton.evaluate().isEmpty) { backButton = find.byType(CupertinoNavigationBarBackButton); diff --git a/packages/flutter_test/test/goldens_test.dart b/packages/flutter_test/test/goldens_test.dart index 147ed2daea8..0c084ad99c5 100644 --- a/packages/flutter_test/test/goldens_test.dart +++ b/packages/flutter_test/test/goldens_test.dart @@ -34,7 +34,7 @@ void main() { void test(String description, FutureOr body()) { test_package.test(description, () { - return io.IOOverrides.runZoned( + return io.IOOverrides.runZoned>( body, createDirectory: (String path) => fs.directory(path), createFile: (String path) => fs.file(path), diff --git a/packages/flutter_test/test/widget_tester_test.dart b/packages/flutter_test/test/widget_tester_test.dart index ecb5ba05024..924939826a5 100644 --- a/packages/flutter_test/test/widget_tester_test.dart +++ b/packages/flutter_test/test/widget_tester_test.dart @@ -24,7 +24,7 @@ void main() { final Completer completer = Completer(); final Future future = expectLater(null, FakeMatcher(completer)); String value; - future.then((void _) { + future.then((void _) { value = '123'; }); test_package.expect(value, isNull); @@ -39,7 +39,7 @@ void main() { final Completer completer = Completer(); final Future future = expectLater(null, FakeMatcher(completer), skip: 'testing skip'); bool completed = false; - future.then((void _) { + future.then((void _) { completed = true; }); test_package.expect(completed, isFalse); @@ -498,7 +498,7 @@ void main() { testWidgets('maintains existing zone values', (WidgetTester tester) async { final Object key = Object(); - await runZoned(() { + await runZoned>(() { expect(Zone.current[key], 'abczed'); return tester.runAsync(() async { expect(Zone.current[key], 'abczed'); diff --git a/packages/flutter_tools/bin/fuchsia_asset_builder.dart b/packages/flutter_tools/bin/fuchsia_asset_builder.dart index e54702545a9..c659f846a50 100644 --- a/packages/flutter_tools/bin/fuchsia_asset_builder.dart +++ b/packages/flutter_tools/bin/fuchsia_asset_builder.dart @@ -77,7 +77,7 @@ Future run(List args) async { final libfs.File outputFile = libfs.fs.file(libfs.fs.path.join(assetDir, fileName)); calls.add(writeFile(outputFile, content)); }); - await Future.wait(calls); + await Future.wait(calls); final String outputMan = argResults[_kOptionAssetManifestOut]; await writeFuchsiaManifest(assets, argResults[_kOptionAsset], outputMan, argResults[_kOptionComponentName]); diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index 339544209bb..9f9545b53f3 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart @@ -474,7 +474,7 @@ class AndroidDevice extends Device { @override Future stopApp(ApplicationPackage app) { final List command = adbCommandForDevice(['shell', 'am', 'force-stop', app.id]); - return runCommandAndStreamOutput(command).then((int exitCode) => exitCode == 0); + return runCommandAndStreamOutput(command).then((int exitCode) => exitCode == 0); } @override @@ -673,8 +673,8 @@ class _AdbLogReader extends DeviceLogReader { runCommand(device.adbCommandForDevice(args)).then((Process process) { _process = process; const Utf8Decoder decoder = Utf8Decoder(allowMalformed: true); - _process.stdout.transform(decoder).transform(const LineSplitter()).listen(_onLine); - _process.stderr.transform(decoder).transform(const LineSplitter()).listen(_onLine); + _process.stdout.transform(decoder).transform(const LineSplitter()).listen(_onLine); + _process.stderr.transform(decoder).transform(const LineSplitter()).listen(_onLine); _process.exitCode.whenComplete(() { if (_linesController.hasListener) _linesController.close(); diff --git a/packages/flutter_tools/lib/src/android/android_emulator.dart b/packages/flutter_tools/lib/src/android/android_emulator.dart index d0ea02dd231..6a0e24de693 100644 --- a/packages/flutter_tools/lib/src/android/android_emulator.dart +++ b/packages/flutter_tools/lib/src/android/android_emulator.dart @@ -112,13 +112,13 @@ Map parseIniLines(List contents) { final Map results = {}; final Iterable> properties = contents - .map((String l) => l.trim()) + .map((String l) => l.trim()) // Strip blank lines/comments .where((String l) => l != '' && !l.startsWith('#')) // Discard anything that isn't simple name=value .where((String l) => l.contains('=')) // Split into name/value - .map((String l) => l.split('=')); + .map>((String l) => l.split('=')); for (List property in properties) { results[property[0].trim()] = property[1].trim(); diff --git a/packages/flutter_tools/lib/src/android/android_sdk.dart b/packages/flutter_tools/lib/src/android/android_sdk.dart index 72344d2b34b..4c9ea229186 100644 --- a/packages/flutter_tools/lib/src/android/android_sdk.dart +++ b/packages/flutter_tools/lib/src/android/android_sdk.dart @@ -382,7 +382,7 @@ class AndroidSdk { } // Match up platforms with the best corresponding build-tools. - _sdkVersions = platforms.map((Directory platformDir) { + _sdkVersions = platforms.map((Directory platformDir) { final String platformName = platformDir.basename; int platformVersion; @@ -394,7 +394,7 @@ class AndroidSdk { final String buildProps = platformDir.childFile('build.prop').readAsStringSync(); final String versionString = const LineSplitter() .convert(buildProps) - .map(_sdkVersionRe.firstMatch) + .map(_sdkVersionRe.firstMatch) .firstWhere((Match match) => match != null) .group(1); platformVersion = int.parse(versionString); diff --git a/packages/flutter_tools/lib/src/android/android_studio.dart b/packages/flutter_tools/lib/src/android/android_studio.dart index 9b416d7f36a..4c3dc986960 100644 --- a/packages/flutter_tools/lib/src/android/android_studio.dart +++ b/packages/flutter_tools/lib/src/android/android_studio.dart @@ -188,7 +188,7 @@ class AndroidStudio implements Comparable { } return candidatePaths - .map((FileSystemEntity e) => AndroidStudio.fromMacOSBundle(e.path)) + .map((FileSystemEntity e) => AndroidStudio.fromMacOSBundle(e.path)) .where((AndroidStudio s) => s != null) .toList(); } diff --git a/packages/flutter_tools/lib/src/android/android_studio_validator.dart b/packages/flutter_tools/lib/src/android/android_studio_validator.dart index fd59e4c392c..3302e943092 100644 --- a/packages/flutter_tools/lib/src/android/android_studio_validator.dart +++ b/packages/flutter_tools/lib/src/android/android_studio_validator.dart @@ -22,7 +22,7 @@ class AndroidStudioValidator extends DoctorValidator { validators.add(NoAndroidStudioValidator()); } else { validators.addAll(studios - .map((AndroidStudio studio) => AndroidStudioValidator(studio))); + .map((AndroidStudio studio) => AndroidStudioValidator(studio))); } return validators; } @@ -46,11 +46,11 @@ class AndroidStudioValidator extends DoctorValidator { if (_studio.isValid) { type = ValidationType.installed; messages.addAll(_studio.validationMessages - .map((String m) => ValidationMessage(m))); + .map((String m) => ValidationMessage(m))); } else { type = ValidationType.partial; messages.addAll(_studio.validationMessages - .map((String m) => ValidationMessage.error(m))); + .map((String m) => ValidationMessage.error(m))); messages.add(ValidationMessage( 'Try updating or re-installing Android Studio.')); if (_studio.configured != null) { diff --git a/packages/flutter_tools/lib/src/android/android_workflow.dart b/packages/flutter_tools/lib/src/android/android_workflow.dart index d3e428554f1..2a532a0c28b 100644 --- a/packages/flutter_tools/lib/src/android/android_workflow.dart +++ b/packages/flutter_tools/lib/src/android/android_workflow.dart @@ -127,7 +127,7 @@ class AndroidValidator extends DoctorValidator { if (validationResult.isNotEmpty) { // Android SDK is not functional. - messages.addAll(validationResult.map((String message) { + messages.addAll(validationResult.map((String message) { return ValidationMessage.error(message); })); messages.add(ValidationMessage( @@ -200,13 +200,13 @@ class AndroidValidator extends DoctorValidator { ); process.stdin.write('n\n'); final Future output = process.stdout - .transform(const Utf8Decoder(allowMalformed: true)) - .transform(const LineSplitter()) + .transform(const Utf8Decoder(allowMalformed: true)) + .transform(const LineSplitter()) .listen(_onLine) .asFuture(null); final Future errors = process.stderr - .transform(const Utf8Decoder(allowMalformed: true)) - .transform(const LineSplitter()) + .transform(const Utf8Decoder(allowMalformed: true)) + .transform(const LineSplitter()) .listen(_onLine) .asFuture(null); try { diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart index 22b7b2465c9..5052e5de1fb 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -354,7 +354,7 @@ Future _obtainLicenses( printStatus(allPackagesList.join(', ')); } - final List combinedLicensesList = packageLicenses.keys.map( + final List combinedLicensesList = packageLicenses.keys.map( (String license) { final List packageNames = packageLicenses[license].toList() ..sort(); @@ -444,7 +444,7 @@ List _parsePackageFonts( } List> _createFontsDescriptor(List fonts) { - return fonts.map((Font font) => font.descriptor).toList(); + return fonts.map>((Font font) => font.descriptor).toList(); } // Given an assets directory like this: diff --git a/packages/flutter_tools/lib/src/base/fingerprint.dart b/packages/flutter_tools/lib/src/base/fingerprint.dart index fed1cbf804a..b898ed7c1b4 100644 --- a/packages/flutter_tools/lib/src/base/fingerprint.dart +++ b/packages/flutter_tools/lib/src/base/fingerprint.dart @@ -97,7 +97,7 @@ class Fingerprinter { /// See [Fingerprinter]. class Fingerprint { Fingerprint.fromBuildInputs(Map properties, Iterable inputPaths) { - final Iterable files = inputPaths.map(fs.file); + final Iterable files = inputPaths.map(fs.file); final Iterable missingInputs = files.where((File file) => !file.existsSync()); if (missingInputs.isNotEmpty) throw ArgumentError('Missing input files:\n' + missingInputs.join('\n')); @@ -179,7 +179,7 @@ Future> readDepfile(String depfilePath) async { return dependencies .replaceAllMapped(_separatorExpr, (Match match) => '${match.group(1)}\n') .split('\n') - .map((String path) => path.replaceAllMapped(_escapeExpr, (Match match) => match.group(1)).trim()) + .map((String path) => path.replaceAllMapped(_escapeExpr, (Match match) => match.group(1)).trim()) .where((String path) => path.isNotEmpty) .toSet(); } diff --git a/packages/flutter_tools/lib/src/base/io.dart b/packages/flutter_tools/lib/src/base/io.dart index fb9be514814..70ca4fe9665 100644 --- a/packages/flutter_tools/lib/src/base/io.dart +++ b/packages/flutter_tools/lib/src/base/io.dart @@ -127,7 +127,7 @@ class ProcessSignal implements io.ProcessSignal { @override Stream watch() { - return _delegate.watch().map((io.ProcessSignal signal) => this); + return _delegate.watch().map((io.ProcessSignal signal) => this); } @override diff --git a/packages/flutter_tools/lib/src/base/logger.dart b/packages/flutter_tools/lib/src/base/logger.dart index de9eabf9791..dd6f0a1d96d 100644 --- a/packages/flutter_tools/lib/src/base/logger.dart +++ b/packages/flutter_tools/lib/src/base/logger.dart @@ -112,7 +112,7 @@ class StdoutLogger extends Logger { message = terminal.color(message, color); if (indent != null && indent > 0) { message = LineSplitter.split(message) - .map((String line) => ' ' * indent + line) + .map((String line) => ' ' * indent + line) .join('\n'); } if (newline != false) diff --git a/packages/flutter_tools/lib/src/base/os.dart b/packages/flutter_tools/lib/src/base/os.dart index 8c3b30dd696..54f59641462 100644 --- a/packages/flutter_tools/lib/src/base/os.dart +++ b/packages/flutter_tools/lib/src/base/os.dart @@ -92,7 +92,7 @@ class _PosixUtils extends OperatingSystemUtils { if (result.exitCode != 0) return const []; final String stdout = result.stdout; - return stdout.trim().split('\n').map((String path) => fs.file(path.trim())).toList(); + return stdout.trim().split('\n').map((String path) => fs.file(path.trim())).toList(); } @override @@ -166,7 +166,7 @@ class _WindowsUtils extends OperatingSystemUtils { return const []; final List lines = result.stdout.trim().split('\n'); if (all) - return lines.map((String path) => fs.file(path.trim())).toList(); + return lines.map((String path) => fs.file(path.trim())).toList(); return [fs.file(lines.first.trim())]; } diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart index caf6349f814..29029d4cebc 100644 --- a/packages/flutter_tools/lib/src/base/process.dart +++ b/packages/flutter_tools/lib/src/base/process.dart @@ -137,8 +137,8 @@ Future runCommandAndStreamOutput(List cmd, { environment: environment ); final StreamSubscription stdoutSubscription = process.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .where((String line) => filter == null ? true : filter.hasMatch(line)) .listen((String line) { if (mapFunction != null) @@ -152,8 +152,8 @@ Future runCommandAndStreamOutput(List cmd, { } }); final StreamSubscription stderrSubscription = process.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .where((String line) => filter == null ? true : filter.hasMatch(line)) .listen((String line) { if (mapFunction != null) diff --git a/packages/flutter_tools/lib/src/base/terminal.dart b/packages/flutter_tools/lib/src/base/terminal.dart index 8e40c59a779..65a5a466bf2 100644 --- a/packages/flutter_tools/lib/src/base/terminal.dart +++ b/packages/flutter_tools/lib/src/base/terminal.dart @@ -107,7 +107,7 @@ class AnsiTerminal { /// /// Useful when the console is in [singleCharMode]. Stream get onCharInput { - _broadcastStdInString ??= io.stdin.transform(const AsciiDecoder(allowInvalid: true)).asBroadcastStream(); + _broadcastStdInString ??= io.stdin.transform(const AsciiDecoder(allowInvalid: true)).asBroadcastStream(); return _broadcastStdInString; } diff --git a/packages/flutter_tools/lib/src/base/utils.dart b/packages/flutter_tools/lib/src/base/utils.dart index 102a0ec5ad1..ee485de5a5a 100644 --- a/packages/flutter_tools/lib/src/base/utils.dart +++ b/packages/flutter_tools/lib/src/base/utils.dart @@ -202,7 +202,7 @@ class SettingsFile { final Map values = {}; void writeContents(File file) { - file.writeAsStringSync(values.keys.map((String key) { + file.writeAsStringSync(values.keys.map((String key) { return '$key=${values[key]}'; }).join('\n')); } diff --git a/packages/flutter_tools/lib/src/bundle.dart b/packages/flutter_tools/lib/src/bundle.dart index db1b56945e5..4a531b29fe7 100644 --- a/packages/flutter_tools/lib/src/bundle.dart +++ b/packages/flutter_tools/lib/src/bundle.dart @@ -193,8 +193,8 @@ Future writeBundle( bundleDir.deleteSync(recursive: true); bundleDir.createSync(recursive: true); - await Future.wait( - assetEntries.entries.map((MapEntry entry) async { + await Future.wait( + assetEntries.entries.map>((MapEntry entry) async { final File file = fs.file(fs.path.join(bundleDir.path, entry.key)); file.parent.createSync(recursive: true); await file.writeAsBytes(await entry.value.contentsAsBytes()); diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index 8e2325c73e3..8ab311c5ed1 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -560,7 +560,7 @@ String _flattenNameNoSubdirs(String fileName) { @visibleForTesting String flattenNameSubdirs(Uri url) { final List pieces = [url.host]..addAll(url.pathSegments); - final Iterable convertedPieces = pieces.map(_flattenNameNoSubdirs); + final Iterable convertedPieces = pieces.map(_flattenNameNoSubdirs); return fs.path.joinAll(convertedPieces); } diff --git a/packages/flutter_tools/lib/src/commands/analyze_once.dart b/packages/flutter_tools/lib/src/commands/analyze_once.dart index ae14c97679b..3d181ad58fb 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_once.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_once.dart @@ -92,7 +92,7 @@ class AnalyzeOnce extends AnalyzeBase { await server.start(); // Completing the future in the callback can't fail. - server.onExit.then((int exitCode) { // ignore: unawaited_futures + server.onExit.then((int exitCode) { // ignore: unawaited_futures if (!analysisCompleter.isCompleted) { analysisCompleter.completeError('analysis server exited: $exitCode'); } diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart index fb07c2311c0..dc5a79fafed 100644 --- a/packages/flutter_tools/lib/src/commands/build_aot.dart +++ b/packages/flutter_tools/lib/src/commands/build_aot.dart @@ -35,8 +35,8 @@ class BuildAotCommand extends BuildSubCommand { ) ..addMultiOption('ios-arch', splitCommas: true, - defaultsTo: defaultIOSArchs.map(getNameForIOSArch), - allowed: IOSArch.values.map(getNameForIOSArch), + defaultsTo: defaultIOSArchs.map(getNameForIOSArch), + allowed: IOSArch.values.map(getNameForIOSArch), help: 'iOS architectures to build.', ) ..addMultiOption(FlutterOptions.kExtraFrontEndOptions, @@ -112,14 +112,14 @@ class BuildAotCommand extends BuildSubCommand { outputPath: outputPath, buildSharedLibrary: false, extraGenSnapshotOptions: argResults[FlutterOptions.kExtraGenSnapshotOptions], - ).then((int buildExitCode) { + ).then((int buildExitCode) { return buildExitCode; }); }); // Merge arch-specific App.frameworks into a multi-arch App.framework. - if ((await Future.wait(exitCodes.values)).every((int buildExitCode) => buildExitCode == 0)) { - final Iterable dylibs = iosBuilds.values.map((String outputDir) => fs.path.join(outputDir, 'App.framework', 'App')); + if ((await Future.wait(exitCodes.values)).every((int buildExitCode) => buildExitCode == 0)) { + final Iterable dylibs = iosBuilds.values.map((String outputDir) => fs.path.join(outputDir, 'App.framework', 'App')); fs.directory(fs.path.join(outputPath, 'App.framework'))..createSync(); await runCheckedAsync(['lipo'] ..addAll(dylibs) diff --git a/packages/flutter_tools/lib/src/commands/config.dart b/packages/flutter_tools/lib/src/commands/config.dart index a69655e592a..2d60e8a0b55 100644 --- a/packages/flutter_tools/lib/src/commands/config.dart +++ b/packages/flutter_tools/lib/src/commands/config.dart @@ -47,7 +47,7 @@ class ConfigCommand extends FlutterCommand { @override String get usageFooter { // List all config settings. - String values = config.keys.map((String key) { + String values = config.keys.map((String key) { return ' $key: ${config.getValue(key)}'; }).join('\n'); if (values.isNotEmpty) diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 6189f2c3ec9..18d38bcd626 100644 --- a/packages/flutter_tools/lib/src/commands/daemon.dart +++ b/packages/flutter_tools/lib/src/commands/daemon.dart @@ -603,7 +603,7 @@ class DeviceDomain extends Domain { _DeviceEventHandler _onDeviceEvent(String eventName) { return (Device device) { - _serializeDeviceEvents = _serializeDeviceEvents.then((_) async { + _serializeDeviceEvents = _serializeDeviceEvents.then((_) async { sendEvent(eventName, await _deviceToMap(device)); }); }; @@ -679,10 +679,10 @@ class DeviceDomain extends Domain { } Stream> get stdinCommandStream => stdin - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .where((String line) => line.startsWith('[{') && line.endsWith('}]')) - .map((String line) { + .map>((String line) { line = line.substring(1, line.length - 1); return json.decode(line); }); @@ -829,7 +829,7 @@ class EmulatorDomain extends Domain { Future>> getEmulators([Map args]) async { final List list = await emulators.getAllAvailableEmulators(); - return list.map(_emulatorToMap).toList(); + return list.map>(_emulatorToMap).toList(); } Future launch(Map args) async { diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart index 419371a4238..dcccb09e80b 100644 --- a/packages/flutter_tools/lib/src/commands/drive.dart +++ b/packages/flutter_tools/lib/src/commands/drive.dart @@ -206,7 +206,7 @@ Future findTargetDevice() async { return null; } else if (devices.length > 1) { printStatus('Found multiple connected devices:'); - printStatus(devices.map((Device d) => ' - ${d.name}\n').join('')); + printStatus(devices.map((Device d) => ' - ${d.name}\n').join('')); } printStatus('Using device ${devices.first.name}.'); return devices.first; diff --git a/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart b/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart index fab29884a7c..3979beb967d 100644 --- a/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart +++ b/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart @@ -120,7 +120,7 @@ class FuchsiaReloadCommand extends FlutterCommand { // Wrap everything in try/finally to make sure we kill the ssh processes // doing the port forwarding. try { - final List servicePorts = forwardedPorts.map( + final List servicePorts = forwardedPorts.map( (_PortForwarder pf) => pf.port).toList(); if (_list) { @@ -145,10 +145,10 @@ class FuchsiaReloadCommand extends FlutterCommand { // Set up a device and hot runner and attach the hot runner to the first // vm service we found. - final List fullAddresses = targetPorts.map( + final List fullAddresses = targetPorts.map( (int p) => '$ipv4Loopback:$p' ).toList(); - final List observatoryUris = fullAddresses.map( + final List observatoryUris = fullAddresses.map( (String a) => Uri.parse('http://$a') ).toList(); final FuchsiaDevice device = FuchsiaDevice( @@ -168,7 +168,7 @@ class FuchsiaReloadCommand extends FlutterCommand { printStatus('Connecting to $_modName'); await hotRunner.attach(viewFilter: isolateName); } finally { - await Future.wait(forwardedPorts.map((_PortForwarder pf) => pf.stop())); + await Future.wait(forwardedPorts.map>((_PortForwarder pf) => pf.stop())); } } @@ -474,11 +474,11 @@ class _PortForwarder { printTrace("_PortForwarder running '${command.join(' ')}'"); final Process process = await processManager.start(command); process.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String data) { printTrace(data); }); // Best effort to print the exit code. - process.exitCode.then((int c) { // ignore: unawaited_futures + process.exitCode.then((int c) { // ignore: unawaited_futures printTrace("'${command.join(' ')}' exited with exit code $c"); }); printTrace('Set up forwarding from $localPort to $address:$remotePort'); diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart index 1f3bbc77620..36efd98b781 100644 --- a/packages/flutter_tools/lib/src/commands/run.dart +++ b/packages/flutter_tools/lib/src/commands/run.dart @@ -344,7 +344,7 @@ class RunCommand extends RunCommandBase { fs.file(pidFile).writeAsStringSync(pid.toString()); } - final List flutterDevices = devices.map((Device device) { + final List flutterDevices = devices.map((Device device) { return FlutterDevice( device, trackWidgetCreation: argResults['track-widget-creation'], @@ -392,7 +392,7 @@ class RunCommand extends RunCommandBase { // Do not add more operations to the future. final Completer appStartedTimeRecorder = Completer.sync(); // This callback can't throw. - appStartedTimeRecorder.future.then( // ignore: unawaited_futures + appStartedTimeRecorder.future.then( // ignore: unawaited_futures (_) { appStartedTime = clock.now(); } ); diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart index c2b0352b037..26c239a9638 100644 --- a/packages/flutter_tools/lib/src/compile.dart +++ b/packages/flutter_tools/lib/src/compile.dart @@ -179,11 +179,11 @@ class KernelCompiler { final _StdoutHandler _stdoutHandler = _StdoutHandler(); server.stderr - .transform(utf8.decoder) + .transform(utf8.decoder) .listen((String message) { printError(message); }); server.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen(_stdoutHandler.handler); final int exitCode = await server.exitCode; if (exitCode == 0) { @@ -372,8 +372,8 @@ class ResidentCompiler { printTrace(command.join(' ')); _server = await processManager.start(command); _server.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen( _stdoutHandler.handler, onDone: () { @@ -385,8 +385,8 @@ class ResidentCompiler { }); _server.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String message) { printError(message); }); _server.stdin.writeln('compile $scriptFilename'); diff --git a/packages/flutter_tools/lib/src/dart/analysis.dart b/packages/flutter_tools/lib/src/dart/analysis.dart index 0815190fe1a..481e4cb66c2 100644 --- a/packages/flutter_tools/lib/src/dart/analysis.dart +++ b/packages/flutter_tools/lib/src/dart/analysis.dart @@ -43,11 +43,11 @@ class AnalysisServer { _process.exitCode.whenComplete(() => _process = null); // ignore: unawaited_futures final Stream errorStream = - _process.stderr.transform(utf8.decoder).transform(const LineSplitter()); + _process.stderr.transform(utf8.decoder).transform(const LineSplitter()); errorStream.listen(printError); final Stream inStream = - _process.stdout.transform(utf8.decoder).transform(const LineSplitter()); + _process.stdout.transform(utf8.decoder).transform(const LineSplitter()); inStream.listen(_handleServerResponse); // Available options (many of these are obsolete): diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart index 0594742d7f1..3dd881943cc 100644 --- a/packages/flutter_tools/lib/src/devfs.dart +++ b/packages/flutter_tools/lib/src/devfs.dart @@ -47,7 +47,7 @@ abstract class DevFSContent { Stream> contentsAsStream(); Stream> contentsAsCompressedStream() { - return contentsAsStream().transform(gzip.encoder); + return contentsAsStream().transform>(gzip.encoder); } /// Return the list of files this content depends on. @@ -445,7 +445,7 @@ class DevFS { if (!content._exists) { final Future> operation = _operations.deleteFile(fsName, deviceUri) - .then((dynamic v) => v?.cast()); + .then>((dynamic v) => v?.cast()); if (operation != null) _pendingOperations.add(operation); toRemove.add(deviceUri); @@ -458,7 +458,7 @@ class DevFS { if (toRemove.isNotEmpty) { printTrace('Removing deleted files'); toRemove.forEach(_entries.remove); - await Future.wait(_pendingOperations); + await Future.wait>(_pendingOperations); _pendingOperations.clear(); } @@ -542,11 +542,11 @@ class DevFS { dirtyEntries.forEach((Uri deviceUri, DevFSContent content) { final Future> operation = _operations.writeFile(fsName, deviceUri, content) - .then((dynamic v) => v?.cast()); + .then>((dynamic v) => v?.cast()); if (operation != null) _pendingOperations.add(operation); }); - await Future.wait(_pendingOperations, eagerError: true); + await Future.wait>(_pendingOperations, eagerError: true); _pendingOperations.clear(); } } diff --git a/packages/flutter_tools/lib/src/device.dart b/packages/flutter_tools/lib/src/device.dart index 61ff0ab6047..29f5c272e69 100644 --- a/packages/flutter_tools/lib/src/device.dart +++ b/packages/flutter_tools/lib/src/device.dart @@ -315,14 +315,14 @@ abstract class Device { // Calculate column widths final List indices = List.generate(table[0].length - 1, (int i) => i); - List widths = indices.map((int i) => 0).toList(); + List widths = indices.map((int i) => 0).toList(); for (List row in table) { - widths = indices.map((int i) => math.max(widths[i], row[i].length)).toList(); + widths = indices.map((int i) => math.max(widths[i], row[i].length)).toList(); } // Join columns into lines of text for (List row in table) { - yield indices.map((int i) => row[i].padRight(widths[i])).join(' • ') + ' • ${row.last}'; + yield indices.map((int i) => row[i].padRight(widths[i])).join(' • ') + ' • ${row.last}'; } } diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart index 1c625b41812..d0fcf2f6938 100644 --- a/packages/flutter_tools/lib/src/doctor.dart +++ b/packages/flutter_tools/lib/src/doctor.dart @@ -569,9 +569,9 @@ class IntelliJValidatorOnMac extends IntelliJValidator { try { final Iterable installDirs = installPaths - .map((String installPath) => fs.directory(installPath)) - .map((Directory dir) => dir.existsSync() ? dir.listSync() : []) - .expand((List mappedDirs) => mappedDirs) + .map((String installPath) => fs.directory(installPath)) + .map>((Directory dir) => dir.existsSync() ? dir.listSync() : []) + .expand((List mappedDirs) => mappedDirs) .whereType(); for (Directory dir in installDirs) { checkForIntelliJ(dir); @@ -626,13 +626,13 @@ class DeviceValidator extends DoctorValidator { if (devices.isEmpty) { final List diagnostics = await deviceManager.getDeviceDiagnostics(); if (diagnostics.isNotEmpty) { - messages = diagnostics.map((String message) => ValidationMessage(message)).toList(); + messages = diagnostics.map((String message) => ValidationMessage(message)).toList(); } else { messages = [ValidationMessage.hint('No devices available')]; } } else { messages = await Device.descriptions(devices) - .map((String msg) => ValidationMessage(msg)).toList(); + .map((String msg) => ValidationMessage(msg)).toList(); } if (devices.isEmpty) { diff --git a/packages/flutter_tools/lib/src/emulator.dart b/packages/flutter_tools/lib/src/emulator.dart index c40497c77af..42e63fe3033 100644 --- a/packages/flutter_tools/lib/src/emulator.dart +++ b/packages/flutter_tools/lib/src/emulator.dart @@ -54,7 +54,7 @@ class EmulatorManager { /// Return the list of all available emulators. Future> getAllAvailableEmulators() async { final List emulators = []; - await Future.forEach(_platformDiscoverers, (EmulatorDiscovery discoverer) async { + await Future.forEach(_platformDiscoverers, (EmulatorDiscovery discoverer) async { emulators.addAll(await discoverer.emulators); }); return emulators; @@ -69,7 +69,7 @@ class EmulatorManager { // so we can keep adding suffixes until we miss. final List all = await getAllAvailableEmulators(); final Set takenNames = all - .map((Emulator e) => e.id) + .map((Emulator e) => e.id) .where((String id) => id.startsWith(autoName)) .toSet(); int suffix = 1; @@ -176,8 +176,8 @@ class EmulatorManager { .toList(); final List availableApiVersions = availableIDs - .map((String id) => androidApiVersion.firstMatch(id).group(1)) - .map((String apiVersion) => int.parse(apiVersion)) + .map((String id) => androidApiVersion.firstMatch(id).group(1)) + .map((String apiVersion) => int.parse(apiVersion)) .toList(); // Get the highest Android API version or whats left @@ -253,21 +253,21 @@ abstract class Emulator { // Calculate column widths final List indices = List.generate(table[0].length - 1, (int i) => i); - List widths = indices.map((int i) => 0).toList(); + List widths = indices.map((int i) => 0).toList(); for (List row in table) { - widths = indices.map((int i) => math.max(widths[i], row[i].length)).toList(); + widths = indices.map((int i) => math.max(widths[i], row[i].length)).toList(); } // Join columns into lines of text final RegExp whiteSpaceAndDots = RegExp(r'[•\s]+$'); return table - .map((List row) { + .map((List row) { return indices - .map((int i) => row[i].padRight(widths[i])) + .map((int i) => row[i].padRight(widths[i])) .join(' • ') + ' • ${row.last}'; }) - .map((String line) => line.replaceAll(whiteSpaceAndDots, '')) + .map((String line) => line.replaceAll(whiteSpaceAndDots, '')) .toList(); } diff --git a/packages/flutter_tools/lib/src/flutter_manifest.dart b/packages/flutter_tools/lib/src/flutter_manifest.dart index 9e937f4ffcb..6fa8efb4950 100644 --- a/packages/flutter_tools/lib/src/flutter_manifest.dart +++ b/packages/flutter_tools/lib/src/flutter_manifest.dart @@ -224,7 +224,7 @@ class Font { Map get descriptor { return { 'family': familyName, - 'fonts': fontAssets.map((FontAsset a) => a.descriptor).toList(), + 'fonts': fontAssets.map>((FontAsset a) => a.descriptor).toList(), }; } diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index 111b654153a..d9f4e2677ca 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -477,8 +477,8 @@ class _IOSDeviceLogReader extends DeviceLogReader { void _start() { iMobileDevice.startLogger().then((Process process) { _process = process; - _process.stdout.transform(utf8.decoder).transform(const LineSplitter()).listen(_newLineHandler()); - _process.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(_newLineHandler()); + _process.stdout.transform(utf8.decoder).transform(const LineSplitter()).listen(_newLineHandler()); + _process.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(_newLineHandler()); _process.exitCode.whenComplete(() { if (_linesController.hasListener) _linesController.close(); diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index d86bf9ba2b2..d77a41de658 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart @@ -662,7 +662,7 @@ Future _copyServiceFrameworks(List> services, Director void _copyServiceDefinitionsManifest(List> services, File manifest) { printTrace("Creating service definitions manifest at '${manifest.path}'"); - final List> jsonServices = services.map((Map service) => { + final List> jsonServices = services.map>((Map service) => { 'name': service['name'], // Since we have already moved it to the Frameworks directory. Strip away // the directory and basenames. diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart index e4ba8301ed2..77dd9d46636 100644 --- a/packages/flutter_tools/lib/src/ios/simulators.dart +++ b/packages/flutter_tools/lib/src/ios/simulators.dart @@ -46,7 +46,7 @@ class IOSSimulatorUtils { if (!xcode.isInstalledAndMeetsVersionCheck) return []; - return SimControl.instance.getConnectedDevices().map((SimDevice device) { + return SimControl.instance.getConnectedDevices().map((SimDevice device) { return IOSSimulator(device.udid, name: device.name, category: device.category); }).toList(); } @@ -339,7 +339,7 @@ class IOSSimulator extends Device { } Future _applicationIsInstalledAndRunning(ApplicationPackage app) async { - final List criteria = await Future.wait(>[ + final List criteria = await Future.wait(>[ isAppInstalled(app), exitsHappyAsync(['/usr/bin/killall', 'Runner']), ]); @@ -510,15 +510,15 @@ class _IOSSimulatorLogReader extends DeviceLogReader { // Device log. await device.ensureLogsExists(); _deviceProcess = await launchDeviceLogTool(device); - _deviceProcess.stdout.transform(utf8.decoder).transform(const LineSplitter()).listen(_onDeviceLine); - _deviceProcess.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(_onDeviceLine); + _deviceProcess.stdout.transform(utf8.decoder).transform(const LineSplitter()).listen(_onDeviceLine); + _deviceProcess.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(_onDeviceLine); // Track system.log crashes. // ReportCrash[37965]: Saved crash report for FlutterRunner[37941]... _systemProcess = await launchSystemLogTool(device); if (_systemProcess != null) { - _systemProcess.stdout.transform(utf8.decoder).transform(const LineSplitter()).listen(_onSystemLine); - _systemProcess.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(_onSystemLine); + _systemProcess.stdout.transform(utf8.decoder).transform(const LineSplitter()).listen(_onSystemLine); + _systemProcess.stderr.transform(utf8.decoder).transform(const LineSplitter()).listen(_onSystemLine); } // We don't want to wait for the process or its callback. Best effort @@ -629,8 +629,8 @@ class _IOSSimulatorLogReader extends DeviceLogReader { } int compareIosVersions(String v1, String v2) { - final List v1Fragments = v1.split('.').map(int.parse).toList(); - final List v2Fragments = v2.split('.').map(int.parse).toList(); + final List v1Fragments = v1.split('.').map(int.parse).toList(); + final List v2Fragments = v2.split('.').map(int.parse).toList(); int i = 0; while (i < v1Fragments.length && i < v2Fragments.length) { diff --git a/packages/flutter_tools/lib/src/ios/xcodeproj.dart b/packages/flutter_tools/lib/src/ios/xcodeproj.dart index 9e638650aa3..2bb2a20c5ee 100644 --- a/packages/flutter_tools/lib/src/ios/xcodeproj.dart +++ b/packages/flutter_tools/lib/src/ios/xcodeproj.dart @@ -171,7 +171,7 @@ class XcodeProjectInterpreter { Map parseXcodeBuildSettings(String showBuildSettingsOutput) { final Map settings = {}; - for (Match match in showBuildSettingsOutput.split('\n').map(_settingExpr.firstMatch)) { + for (Match match in showBuildSettingsOutput.split('\n').map(_settingExpr.firstMatch)) { if (match != null) { settings[match[1]] = match[2]; } diff --git a/packages/flutter_tools/lib/src/plugins.dart b/packages/flutter_tools/lib/src/plugins.dart index e9a16d7a1ec..2b959c794a3 100644 --- a/packages/flutter_tools/lib/src/plugins.dart +++ b/packages/flutter_tools/lib/src/plugins.dart @@ -94,7 +94,7 @@ bool _writeFlutterPluginsList(FlutterProject project, List plugins) { final File pluginsFile = project.flutterPluginsFile; final String oldContents = _readFlutterPluginsList(project); final String pluginManifest = - plugins.map((Plugin p) => '${p.name}=${escapePath(p.path)}').join('\n'); + plugins.map((Plugin p) => '${p.name}=${escapePath(p.path)}').join('\n'); if (pluginManifest.isNotEmpty) { pluginsFile.writeAsStringSync('$pluginManifest\n', flush: true); } else { @@ -147,7 +147,7 @@ public final class GeneratedPluginRegistrant { Future _writeAndroidPluginRegistrant(FlutterProject project, List plugins) async { final List> androidPlugins = plugins .where((Plugin p) => p.androidPackage != null && p.pluginClass != null) - .map((Plugin p) => { + .map>((Plugin p) => { 'name': p.name, 'package': p.androidPackage, 'class': p.pluginClass, @@ -238,7 +238,7 @@ end Future _writeIOSPluginRegistrant(FlutterProject project, List plugins) async { final List> iosPlugins = plugins .where((Plugin p) => p.pluginClass != null) - .map((Plugin p) => { + .map>((Plugin p) => { 'name': p.name, 'prefix': p.iosPrefix, 'class': p.pluginClass, diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart index 9df371afdd5..065461158fd 100644 --- a/packages/flutter_tools/lib/src/project.dart +++ b/packages/flutter_tools/lib/src/project.dart @@ -77,7 +77,7 @@ class FlutterProject { example.ios.productBundleIdentifier, ]; return Set.from(candidates - .map(_organizationNameFromPackageName) + .map(_organizationNameFromPackageName) .where((String name) => name != null)); } diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart index 2824e20e9ed..73cee56b591 100644 --- a/packages/flutter_tools/lib/src/resident_runner.dart +++ b/packages/flutter_tools/lib/src/resident_runner.dart @@ -89,7 +89,7 @@ class FlutterDevice { return vmServices .where((VMService service) => !service.isClosed) - .expand((VMService service) => viewFilter != null + .expand((VMService service) => viewFilter != null ? service.vm.allViewsWithName(viewFilter) : service.vm.views) .toList(); @@ -149,7 +149,7 @@ class FlutterDevice { final Uri deviceAssetsDirectoryUri = devFS.baseUri.resolveUri( fs.path.toUri(getAssetBuildDirectory())); assert(deviceAssetsDirectoryUri != null); - await Future.wait(views.map( + await Future.wait(views.map>( (FlutterView view) => view.setAssetDirectory(deviceAssetsDirectoryUri) )); } @@ -611,8 +611,8 @@ abstract class ResidentRunner { } Future stopEchoingDeviceLog() async { - await Future.wait( - flutterDevices.map((FlutterDevice device) => device.stopEchoingDeviceLog()) + await Future.wait( + flutterDevices.map>((FlutterDevice device) => device.stopEchoingDeviceLog()) ); } diff --git a/packages/flutter_tools/lib/src/run_hot.dart b/packages/flutter_tools/lib/src/run_hot.dart index f973c897e74..1d6a0a865a0 100644 --- a/packages/flutter_tools/lib/src/run_hot.dart +++ b/packages/flutter_tools/lib/src/run_hot.dart @@ -582,11 +582,11 @@ class HotRunner extends ResidentRunner { ); countExpectedReports += reports.length; await Future - .wait(reports) + .wait>(reports) .catchError((dynamic error) { return >[error]; }) - .then( + .then( (List> list) { // TODO(aam): Investigate why we are validating only first reload report, // which seems to be current behavior diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart index edfc07433ca..68cc46f2fca 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart @@ -425,7 +425,7 @@ class FlutterCommandRunner extends CommandRunner { List getRepoRoots() { final String root = fs.path.absolute(Cache.flutterRoot); // not bin, and not the root - return ['dev', 'examples', 'packages'].map((String item) { + return ['dev', 'examples', 'packages'].map((String item) { return fs.path.join(root, item); }).toList(); } @@ -434,7 +434,7 @@ class FlutterCommandRunner extends CommandRunner { List getRepoPackages() { return getRepoRoots() .expand((String root) => _gatherProjectPaths(root)) - .map((String dir) => fs.directory(dir)) + .map((String dir) => fs.directory(dir)) .toList(); } diff --git a/packages/flutter_tools/lib/src/services.dart b/packages/flutter_tools/lib/src/services.dart index 2edceb70de7..bdc61d2c10e 100644 --- a/packages/flutter_tools/lib/src/services.dart +++ b/packages/flutter_tools/lib/src/services.dart @@ -98,7 +98,7 @@ File generateServiceDefinitions( String dir, List> servicesIn ) { final List> services = - servicesIn.map((Map service) => { + servicesIn.map>((Map service) => { 'name': service['name'], 'class': service['android-class'] }).toList(); diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart index 58ae3c6b664..e734fb28c9f 100644 --- a/packages/flutter_tools/lib/src/test/flutter_platform.dart +++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart @@ -526,7 +526,7 @@ class _FlutterPlatform extends PlatformPlugin { watcher?.handleStartedProcess(ProcessEvent(ourTestCount, process, processObservatoryUri)); }, startTimeoutTimer: () { - Future<_InitialResult>.delayed(_kTestStartupTimeout).then((_) => timeout.complete()); + Future<_InitialResult>.delayed(_kTestStartupTimeout).then((_) => timeout.complete()); }, ); @@ -536,7 +536,7 @@ class _FlutterPlatform extends PlatformPlugin { // The local test harness could get bored of us. printTrace('test $ourTestCount: awaiting initial result for pid ${process.pid}'); - final _InitialResult initialResult = await Future.any(>[ + final _InitialResult initialResult = await Future.any<_InitialResult>(>[ process.exitCode.then<_InitialResult>((int exitCode) => _InitialResult.crashed), timeout.future.then<_InitialResult>((void value) => _InitialResult.timedOut), Future<_InitialResult>.delayed(_kTestProcessTimeout, () => _InitialResult.timedOut), @@ -615,13 +615,13 @@ class _FlutterPlatform extends PlatformPlugin { ); printTrace('test $ourTestCount: awaiting test result for pid ${process.pid}'); - final _TestResult testResult = await Future.any(>[ + final _TestResult testResult = await Future.any<_TestResult>(>[ process.exitCode.then<_TestResult>((int exitCode) { return _TestResult.crashed; }), harnessDone.future.then<_TestResult>((void value) { return _TestResult.harnessBailed; }), testDone.future.then<_TestResult>((void value) { return _TestResult.testBailed; }), ]); - await Future.wait(>[ + await Future.wait(>[ harnessToTest.cancel(), testToHarness.cancel(), ]); @@ -870,8 +870,8 @@ class _FlutterPlatform extends PlatformPlugin { const String observatoryString = 'Observatory listening on '; for (Stream> stream in >>[process.stderr, process.stdout]) { - stream.transform(utf8.decoder) - .transform(const LineSplitter()) + stream.transform(utf8.decoder) + .transform(const LineSplitter()) .listen( (String line) { if (line == _kStartTimeoutTimerMessage) { diff --git a/packages/flutter_tools/lib/src/tester/flutter_tester.dart b/packages/flutter_tools/lib/src/tester/flutter_tester.dart index 2487d63fb2e..4e5ff5ff574 100644 --- a/packages/flutter_tools/lib/src/tester/flutter_tester.dart +++ b/packages/flutter_tools/lib/src/tester/flutter_tester.dart @@ -153,16 +153,16 @@ class FlutterTesterDevice extends Device { }, ); // Setting a bool can't fail in the callback. - _process.exitCode.then((_) => _isRunning = false); // ignore: unawaited_futures + _process.exitCode.then((_) => _isRunning = false); // ignore: unawaited_futures _process.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { _logReader.addLine(line); }); _process.stderr - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) { _logReader.addLine(line); }); diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart index e1dea0e1ab5..98612c0d19f 100644 --- a/packages/flutter_tools/lib/src/version.dart +++ b/packages/flutter_tools/lib/src/version.dart @@ -161,7 +161,7 @@ class FlutterVersion { static Future _removeVersionCheckRemoteIfExists() async { final List remotes = (await _run(['git', 'remote'])) .split('\n') - .map((String name) => name.trim()) // to account for OS-specific line-breaks + .map((String name) => name.trim()) // to account for OS-specific line-breaks .toList(); if (remotes.contains(_versionCheckRemote)) await _run(['git', 'remote', 'remove', _versionCheckRemote]); diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart index 3fc389a96ce..ae7652efdef 100644 --- a/packages/flutter_tools/lib/src/vmservice.dart +++ b/packages/flutter_tools/lib/src/vmservice.dart @@ -289,7 +289,7 @@ class VMService { String method, Map params, ) { - return Future.any(>>[ + return Future.any>(>>[ _peer.sendRequest(method, params).then>(castStringKeyedMap), _connectionError.future, ]); @@ -954,7 +954,7 @@ class VM extends ServiceObjectOwner { return; _viewCache.clear(); for (Isolate isolate in isolates.toList()) { - await vmService.vm.invokeRpc('_flutter.listViews', + await vmService.vm.invokeRpc('_flutter.listViews', timeout: kLongRequestTimeout, params: {'isolateId': isolate.id}); } @@ -1208,7 +1208,7 @@ class Isolate extends ServiceObjectOwner { >[]; for (Map element in response['unused']) unusedElements.add(_describeElement(element)); - return Future.wait(unusedElements); + return Future.wait(unusedElements); } /// Resumes the isolate. @@ -1388,7 +1388,7 @@ class ServiceMap extends ServiceObject implements Map { @override void removeWhere(bool test(String key, dynamic value)) => _map.removeWhere(test); @override - Map map(MapEntry transform(String key, dynamic value)) => _map.map(transform); + Map map(MapEntry transform(String key, dynamic value)) => _map.map(transform); @override Iterable> get entries => _map.entries; @override @@ -1440,7 +1440,7 @@ class FlutterView extends ServiceObject { Future setAssetDirectory(Uri assetsDirectory) async { assert(assetsDirectory != null); - await owner.vmService.vm.invokeRpc('_flutter.setAssetBundlePath', + await owner.vmService.vm.invokeRpc('_flutter.setAssetBundlePath', params: { 'isolateId': _uiIsolate.id, 'viewId': id, diff --git a/packages/flutter_tools/lib/src/vscode/vscode_validator.dart b/packages/flutter_tools/lib/src/vscode/vscode_validator.dart index f68a3ec70e4..b93e1d02984 100644 --- a/packages/flutter_tools/lib/src/vscode/vscode_validator.dart +++ b/packages/flutter_tools/lib/src/vscode/vscode_validator.dart @@ -18,7 +18,7 @@ class VsCodeValidator extends DoctorValidator { static Iterable get installedValidators { return VsCode .allInstalled() - .map((VsCode vsCode) => VsCodeValidator(vsCode)); + .map((VsCode vsCode) => VsCodeValidator(vsCode)); } @override @@ -32,11 +32,11 @@ class VsCodeValidator extends DoctorValidator { if (_vsCode.isValid) { type = ValidationType.installed; messages.addAll(_vsCode.validationMessages - .map((String m) => ValidationMessage(m))); + .map((String m) => ValidationMessage(m))); } else { type = ValidationType.partial; messages.addAll(_vsCode.validationMessages - .map((String m) => ValidationMessage.error(m))); + .map((String m) => ValidationMessage.error(m))); messages.add(ValidationMessage( 'Flutter extension not installed; install from\n$extensionMarketplaceUrl')); } diff --git a/packages/flutter_tools/test/android/android_workflow_test.dart b/packages/flutter_tools/test/android/android_workflow_test.dart index 73c9dc1a802..9564bd86c5f 100644 --- a/packages/flutter_tools/test/android/android_workflow_test.dart +++ b/packages/flutter_tools/test/android/android_workflow_test.dart @@ -33,7 +33,7 @@ void main() { MockProcess Function(List) processMetaFactory(List stdout) { final Stream> stdoutStream = Stream>.fromIterable( - stdout.map((String s) => s.codeUnits)); + stdout.map>((String s) => s.codeUnits)); return (List command) => MockProcess(stdout: stdoutStream); } diff --git a/packages/flutter_tools/test/base/context_test.dart b/packages/flutter_tools/test/base/context_test.dart index f7291dc3d0a..94ec5675a79 100644 --- a/packages/flutter_tools/test/base/context_test.dart +++ b/packages/flutter_tools/test/base/context_test.dart @@ -24,7 +24,7 @@ void main() { test('returns root context in child of root zone if zone was manually created', () { final Zone rootZone = Zone.current; final AppContext rootContext = context; - runZoned(() { + runZoned(() { expect(Zone.current, isNot(rootZone)); expect(Zone.current.parent, rootZone); expect(context, rootContext); @@ -61,7 +61,7 @@ void main() { final AppContext rootContext = context; await rootContext.run(name: 'child', body: () { final AppContext childContext = context; - runZoned(() { + runZoned(() { expect(context, isNot(rootContext)); expect(context, same(childContext)); expect(context.name, 'child'); @@ -79,7 +79,7 @@ void main() { String value; await context.run( body: () { - outer.future.then((_) { + outer.future.then((_) { value = context[String]; inner.complete(); }); diff --git a/packages/flutter_tools/test/commands/daemon_test.dart b/packages/flutter_tools/test/commands/daemon_test.dart index 15301da9ffe..b1315ea304c 100644 --- a/packages/flutter_tools/test/commands/daemon_test.dart +++ b/packages/flutter_tools/test/commands/daemon_test.dart @@ -73,7 +73,7 @@ void main() { testUsingContext('printStatus should log to stdout when logToStdout is enabled', () async { final StringBuffer buffer = StringBuffer(); - await runZoned(() async { + await runZoned>(() async { final StreamController> commands = StreamController>(); final StreamController> responses = StreamController>(); daemon = Daemon( @@ -228,7 +228,7 @@ void main() { daemon.deviceDomain.addDeviceDiscoverer(discoverer); discoverer.addDevice(MockAndroidDevice()); - return await responses.stream.skipWhile(_isConnectedEvent).first.then((Map response) async { + return await 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/packages_test.dart b/packages/flutter_tools/test/commands/packages_test.dart index 95c7f461be1..5f74b3a430d 100644 --- a/packages/flutter_tools/test/commands/packages_test.dart +++ b/packages/flutter_tools/test/commands/packages_test.dart @@ -159,7 +159,7 @@ void main() { pubOutput, pluginRegistrants, pluginWitnesses, - ].expand((List list) => list); + ].expand((List list) => list); for (String path in allFiles) { final File file = fs.file(fs.path.join(projectPath, path)); if (file.existsSync()) @@ -285,7 +285,7 @@ void main() { final Future simulateUserInput = Future(() { mockStdio.simulateStdin('y'); }); - await Future.wait(>[runPackages, runPrompt, simulateUserInput]); + await Future.wait(>[runPackages, runPrompt, simulateUserInput]); final List commands = mockProcessManager.commands; expect(commands, hasLength(2)); expect(commands[0], matches(r'dart-sdk[\\/]bin[\\/]pub')); diff --git a/packages/flutter_tools/test/integration/test_driver.dart b/packages/flutter_tools/test/integration/test_driver.dart index e70eb1573c3..b8503a2008c 100644 --- a/packages/flutter_tools/test/integration/test_driver.dart +++ b/packages/flutter_tools/test/integration/test_driver.dart @@ -127,7 +127,7 @@ class FlutterTestDriver { // Proxy the stream/sink for the VM Client so we can debugPrint it. final StreamChannel channel = IOWebSocketChannel.connect(_vmServiceWsUri) .cast() - .changeStream((Stream stream) => stream.map(_debugPrint)) + .changeStream((Stream stream) => stream.map(_debugPrint)) .changeSink((StreamSink sink) => StreamController() ..stream.listen((String s) => sink.add(_debugPrint(s)))); @@ -282,7 +282,7 @@ class FlutterTestDriver { Future evaluateExpression(String expression) async { final VMFrame topFrame = await getTopStackFrame(); - return _timeoutWithMessages(() => topFrame.evaluate(expression), + return _timeoutWithMessages(() => topFrame.evaluate(expression), message: 'Timed out evaluating expression ($expression)'); } @@ -334,7 +334,7 @@ class FlutterTestDriver { } }); - return _timeoutWithMessages(() => response.future, + return _timeoutWithMessages>(() => response.future, timeout: timeout, message: event != null ? 'Did not receive expected $event event.' @@ -406,5 +406,5 @@ class FlutterTestDriver { } Stream _transformToLines(Stream> byteStream) { - return byteStream.transform(utf8.decoder).transform(const LineSplitter()); + return byteStream.transform(utf8.decoder).transform(const LineSplitter()); } diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart index b20bac2a6d1..e91e1559af7 100644 --- a/packages/flutter_tools/test/src/context.dart +++ b/packages/flutter_tools/test/src/context.dart @@ -85,7 +85,7 @@ void testUsingContext(String description, dynamic testMethod(), { body: () { final String flutterRoot = getFlutterRoot(); - return runZoned(() { + return runZoned>(() { try { return context.run( // Apply the overrides to the test context in the zone since their @@ -198,7 +198,7 @@ class MockDoctor extends Doctor { /// the Doctor. List get validators { final List superValidators = super.validators; - return superValidators.map((DoctorValidator v) { + return superValidators.map((DoctorValidator v) { if (v is AndroidValidator) { return MockAndroidWorkflowValidator(); } diff --git a/packages/flutter_tools/test/src/mocks.dart b/packages/flutter_tools/test/src/mocks.dart index d21cc91921e..5bcb4bcce9c 100644 --- a/packages/flutter_tools/test/src/mocks.dart +++ b/packages/flutter_tools/test/src/mocks.dart @@ -303,8 +303,8 @@ class MockStdio extends Stdio { _stdin.add(utf8.encode('$line\n')); } - List get writtenToStdout => _stdout.writes.map(_stdout.encoding.decode).toList(); - List get writtenToStderr => _stderr.writes.map(_stderr.encoding.decode).toList(); + List get writtenToStdout => _stdout.writes.map(_stdout.encoding.decode).toList(); + List get writtenToStderr => _stderr.writes.map(_stderr.encoding.decode).toList(); } class MockPollingDeviceDiscovery extends PollingDeviceDiscovery { diff --git a/packages/flutter_tools/tool/daemon_client.dart b/packages/flutter_tools/tool/daemon_client.dart index 10f48959ef3..d8a1d75994a 100644 --- a/packages/flutter_tools/tool/daemon_client.dart +++ b/packages/flutter_tools/tool/daemon_client.dart @@ -23,13 +23,13 @@ Future main() async { print('daemon process started, pid: ${daemon.pid}'); daemon.stdout - .transform(utf8.decoder) - .transform(const LineSplitter()) + .transform(utf8.decoder) + .transform(const LineSplitter()) .listen((String line) => print('<== $line')); daemon.stderr.listen((dynamic data) => stderr.add(data)); stdout.write('> '); - stdin.transform(utf8.decoder).transform(const LineSplitter()).listen((String line) { + stdin.transform(utf8.decoder).transform(const LineSplitter()).listen((String line) { final List words = line.split(' '); if (line == 'version' || line == 'v') { 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 f9add30b9d5..1fec7cac1bf 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 @@ -306,9 +306,9 @@ class FuchsiaRemoteConnection { } isolates.add(vmService.getMainIsolatesByPattern(pattern)); } - final List result = await Future.wait(isolates) + final List result = await Future.wait>(isolates) .timeout(timeout) - .then((List> listOfLists) { + .then>((List> listOfLists) { final List> mutableListOfLists = List>.from(listOfLists) ..retainWhere((List list) => list.isNotEmpty); @@ -477,7 +477,7 @@ class FuchsiaRemoteConnection { await stop(); final List servicePorts = await getDeviceServicePorts(); final List forwardedVmServicePorts = - await Future.wait(servicePorts.map((int deviceServicePort) { + await Future.wait(servicePorts.map>((int deviceServicePort) { return fuchsiaPortForwardingFunction( _sshCommandRunner.address, deviceServicePort,