diff --git a/analysis_options.yaml b/analysis_options.yaml index cccb763414..b5101c749c 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -216,6 +216,7 @@ linter: - type_literal_in_constant_pattern # - unawaited_futures # too many false positives, especially with the way AnimationController works # - unintended_html_in_doc_comment # blocked on https://github.com/dart-lang/linter/issues/5065 + # - unnecessary_async # not yet tested - unnecessary_await_in_return - unnecessary_brace_in_string_interps - unnecessary_breaks @@ -241,6 +242,7 @@ linter: - unnecessary_string_interpolations - unnecessary_this - unnecessary_to_list_in_spreads + - unnecessary_underscores - unreachable_from_main - unrelated_type_equality_checks # - unsafe_variance # not yet tested diff --git a/dev/tools/gen_defaults/test/gen_defaults_test.dart b/dev/tools/gen_defaults/test/gen_defaults_test.dart index 96c60c8a52..4400def7b9 100644 --- a/dev/tools/gen_defaults/test/gen_defaults_test.dart +++ b/dev/tools/gen_defaults/test/gen_defaults_test.dart @@ -295,7 +295,7 @@ static final String tokenBar = 'foo'; // Add to printLog instead of printing to stdout void Function() overridePrint(void Function() testFn) => () { final ZoneSpecification spec = ZoneSpecification( - print: (_, __, ___, String msg) { + print: (_, _, _, String msg) { printLog.add(msg); }, ); diff --git a/engine/src/flutter/lib/ui/painting.dart b/engine/src/flutter/lib/ui/painting.dart index 5331bd664d..05f9738b15 100644 --- a/engine/src/flutter/lib/ui/painting.dart +++ b/engine/src/flutter/lib/ui/painting.dart @@ -7,8 +7,8 @@ part of dart.ui; // // (for the example in Color) // // ignore_for_file: use_full_hex_values_for_flutter_colors // late ui.Image _image; -// dynamic _cacheImage(dynamic _, [dynamic __]) { } -// dynamic _drawImage(dynamic _, [dynamic __]) { } +// dynamic _cacheImage(dynamic _, [dynamic _]) { } +// dynamic _drawImage(dynamic _, [dynamic _]) { } // Some methods in this file assert that their arguments are not null. These // asserts are just to improve the error messages; they should only cover diff --git a/examples/api/lib/services/text_input/text_input_control.0.dart b/examples/api/lib/services/text_input/text_input_control.0.dart index 85ca94ddf4..fd1c997d84 100644 --- a/examples/api/lib/services/text_input/text_input_control.0.dart +++ b/examples/api/lib/services/text_input/text_input_control.0.dart @@ -92,7 +92,7 @@ class MyVirtualKeyboardState extends State { Widget build(BuildContext context) { return ValueListenableBuilder( valueListenable: _inputControl.visible, - builder: (_, bool visible, __) { + builder: (_, bool visible, _) { return Visibility( visible: visible, child: FocusScope( diff --git a/examples/api/lib/widgets/magnifier/cupertino_text_magnifier.0.dart b/examples/api/lib/widgets/magnifier/cupertino_text_magnifier.0.dart index 2c54a48697..e9bd645908 100644 --- a/examples/api/lib/widgets/magnifier/cupertino_text_magnifier.0.dart +++ b/examples/api/lib/widgets/magnifier/cupertino_text_magnifier.0.dart @@ -39,7 +39,7 @@ class _CupertinoTextMagnifierExampleAppState extends State magnifierInfo) { + magnifierBuilder: (_, _, ValueNotifier magnifierInfo) { return CupertinoTextMagnifier( controller: _controller, magnifierInfo: magnifierInfo, diff --git a/examples/api/lib/widgets/scroll_position/scroll_controller_notification.0.dart b/examples/api/lib/widgets/scroll_position/scroll_controller_notification.0.dart index 4ab205fa94..0a1186a3ce 100644 --- a/examples/api/lib/widgets/scroll_position/scroll_controller_notification.0.dart +++ b/examples/api/lib/widgets/scroll_position/scroll_controller_notification.0.dart @@ -73,7 +73,7 @@ class _ScrollNotificationDemoState extends State { child: Text('Item $index'), ); }, - separatorBuilder: (_, __) => const Divider(indent: 20, endIndent: 20, thickness: 2), + separatorBuilder: (_, _) => const Divider(indent: 20, endIndent: 20, thickness: 2), ), ], ); diff --git a/examples/api/lib/widgets/text_magnifier/text_magnifier.0.dart b/examples/api/lib/widgets/text_magnifier/text_magnifier.0.dart index 7a82782114..eed5ac5f85 100644 --- a/examples/api/lib/widgets/text_magnifier/text_magnifier.0.dart +++ b/examples/api/lib/widgets/text_magnifier/text_magnifier.0.dart @@ -31,7 +31,7 @@ class TextMagnifierExampleApp extends StatelessWidget { // this `TextField` will use to build a magnifier with. magnifierConfiguration: TextMagnifierConfiguration( magnifierBuilder: - (_, __, ValueNotifier magnifierInfo) => + (_, _, ValueNotifier magnifierInfo) => CustomMagnifier(magnifierInfo: magnifierInfo), ), controller: TextEditingController(text: text), diff --git a/packages/flutter/lib/src/material/about.dart b/packages/flutter/lib/src/material/about.dart index ea2855d027..f85568c8fd 100644 --- a/packages/flutter/lib/src/material/about.dart +++ b/packages/flutter/lib/src/material/about.dart @@ -1453,7 +1453,7 @@ class _MasterDetailFlowState extends State<_MasterDetailFlow> implements _PageOp Widget _lateralUI(BuildContext context) { _builtLayout = _LayoutMode.lateral; return _MasterDetailScaffold( - actionBuilder: (_, __) => const [], + actionBuilder: (_, _) => const [], detailPageBuilder: (BuildContext context, Object? args, ScrollController? scrollController) => widget.detailPageBuilder(context, args ?? _cachedDetailArguments, scrollController), diff --git a/packages/flutter/lib/src/painting/_network_image_web.dart b/packages/flutter/lib/src/painting/_network_image_web.dart index 7e556f5091..22b809b9de 100644 --- a/packages/flutter/lib/src/painting/_network_image_web.dart +++ b/packages/flutter/lib/src/painting/_network_image_web.dart @@ -304,7 +304,7 @@ class _ForwardingImageStreamCompleter extends ImageStreamCompleter { if (_disposed) { // Add a listener since the delegate completer won't dispose if it never // had a listener. - value.addListener(ImageStreamListener((_, __) {})); + value.addListener(ImageStreamListener((_, _) {})); value.maybeDispose(); return; } diff --git a/packages/flutter/lib/src/widgets/navigator.dart b/packages/flutter/lib/src/widgets/navigator.dart index f6e7d3423a..aa593aafce 100644 --- a/packages/flutter/lib/src/widgets/navigator.dart +++ b/packages/flutter/lib/src/widgets/navigator.dart @@ -1454,10 +1454,10 @@ const TraversalEdgeBehavior kDefaultRouteTraversalEdgeBehavior = TraversalEdgeBe /// ```dart /// Navigator.push(context, PageRouteBuilder( /// opaque: false, -/// pageBuilder: (BuildContext context, _, __) { +/// pageBuilder: (BuildContext context, _, _) { /// return const Center(child: Text('My PageRoute')); /// }, -/// transitionsBuilder: (___, Animation animation, ____, Widget child) { +/// transitionsBuilder: (_, Animation animation, _, Widget child) { /// return FadeTransition( /// opacity: animation, /// child: RotationTransition( @@ -1473,7 +1473,7 @@ const TraversalEdgeBehavior kDefaultRouteTraversalEdgeBehavior = TraversalEdgeBe /// "transitions". The page becomes a descendant of the child passed to /// the `transitionsBuilder` function. Typically the page is only built once, /// because it doesn't depend on its animation parameters (elided with `_` -/// and `__` in this example). The transition is built on every frame +/// in this example). The transition is built on every frame /// for its duration. /// /// (In this example, `void` is used as the return type for the route, because diff --git a/packages/flutter/test/cupertino/route_test.dart b/packages/flutter/test/cupertino/route_test.dart index ccb0a936a2..07554e240c 100644 --- a/packages/flutter/test/cupertino/route_test.dart +++ b/packages/flutter/test/cupertino/route_test.dart @@ -1824,7 +1824,7 @@ void main() { observers: [nestedObserver], onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return GestureDetector( onTap: () async { await showCupertinoModalPopup( @@ -1935,7 +1935,7 @@ void main() { observers: [nestedObserver], onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return GestureDetector( onTap: () async { await showCupertinoModalPopup( @@ -1971,7 +1971,7 @@ void main() { observers: [nestedObserver], onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return GestureDetector( onTap: () async { await showCupertinoDialog( @@ -2008,7 +2008,7 @@ void main() { observers: [nestedObserver], onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return GestureDetector( onTap: () async { await showCupertinoDialog( @@ -2043,7 +2043,7 @@ void main() { home: Navigator( onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return GestureDetector( onTap: () async { await showCupertinoModalPopup( @@ -2087,7 +2087,7 @@ void main() { home: Navigator( onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return GestureDetector( onTap: () async { await showCupertinoModalPopup( @@ -2131,7 +2131,7 @@ void main() { home: Navigator( onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return GestureDetector( onTap: () async { await showCupertinoModalPopup( @@ -2807,7 +2807,7 @@ void main() { home: Navigator( onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return GestureDetector( onTap: () async { await showCupertinoModalPopup( @@ -2836,7 +2836,7 @@ void main() { home: Navigator( onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return GestureDetector( onTap: () async { await showCupertinoDialog( @@ -3254,7 +3254,7 @@ class _TestPageUpdateState extends State<_TestPageUpdate> { const CupertinoPage(name: '/home', child: Text('home')), CupertinoPage(name: '/home/old', child: buildMainPage()), ], - onPopPage: (_, __) { + onPopPage: (_, _) { return false; }, ), diff --git a/packages/flutter/test/cupertino/text_field_test.dart b/packages/flutter/test/cupertino/text_field_test.dart index fd0a64de0b..38cb82a910 100644 --- a/packages/flutter/test/cupertino/text_field_test.dart +++ b/packages/flutter/test/cupertino/text_field_test.dart @@ -8851,7 +8851,7 @@ void main() { final Widget customMagnifier = Container(key: UniqueKey()); final CupertinoTextField defaultCupertinoTextField = CupertinoTextField( magnifierConfiguration: TextMagnifierConfiguration( - magnifierBuilder: (_, __, ___) => customMagnifier, + magnifierBuilder: (_, _, _) => customMagnifier, ), ); diff --git a/packages/flutter/test/material/about_test.dart b/packages/flutter/test/material/about_test.dart index 404db59d79..28327366b6 100644 --- a/packages/flutter/test/material/about_test.dart +++ b/packages/flutter/test/material/about_test.dart @@ -555,11 +555,11 @@ void main() { onGenerateRoute: (_) { return PageRouteBuilder( pageBuilder: - (_, __, ___) => Navigator( + (_, _, _) => Navigator( observers: [nestedObserver], onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, _, __) { + pageBuilder: (BuildContext context, _, _) { return ElevatedButton( onPressed: () { showLicensePage(context: context, applicationName: 'A'); @@ -595,11 +595,11 @@ void main() { onGenerateRoute: (_) { return PageRouteBuilder( pageBuilder: - (_, __, ___) => Navigator( + (_, _, _) => Navigator( observers: [nestedObserver], onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, _, __) { + pageBuilder: (BuildContext context, _, _) { return ElevatedButton( onPressed: () { showLicensePage( diff --git a/packages/flutter/test/material/app_test.dart b/packages/flutter/test/material/app_test.dart index ee4b4b45bf..996d5c38bb 100644 --- a/packages/flutter/test/material/app_test.dart +++ b/packages/flutter/test/material/app_test.dart @@ -380,7 +380,7 @@ void main() { color: const Color.fromARGB(255, 255, 255, 255), onGenerateRoute: (_) { return PageRouteBuilder( - pageBuilder: (_, __, ___) { + pageBuilder: (_, _, _) { routeBuildCount++; return Builder( builder: (BuildContext context) { diff --git a/packages/flutter/test/material/circle_avatar_test.dart b/packages/flutter/test/material/circle_avatar_test.dart index 13c6da3f1d..a0b85178d8 100644 --- a/packages/flutter/test/material/circle_avatar_test.dart +++ b/packages/flutter/test/material/circle_avatar_test.dart @@ -12,6 +12,7 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; + import '../image_data.dart'; import '../painting/mocks_for_image_cache.dart'; @@ -99,7 +100,7 @@ void main() { foregroundImage: errorImage, backgroundImage: MemoryImage(Uint8List.fromList(kBlueRectPng)), radius: 50.0, - onForegroundImageError: (_, __) => caughtForegroundImageError = true, + onForegroundImageError: (_, _) => caughtForegroundImageError = true, ), ), ), diff --git a/packages/flutter/test/material/data_table_test.dart b/packages/flutter/test/material/data_table_test.dart index 6b474c2574..0e5d62c64e 100644 --- a/packages/flutter/test/material/data_table_test.dart +++ b/packages/flutter/test/material/data_table_test.dart @@ -1159,7 +1159,7 @@ void main() { DataColumn( label: const Expanded(child: Center(child: Text('Name'))), tooltip: 'Name', - onSort: sortEnabled ? (_, __) {} : null, + onSort: sortEnabled ? (_, _) {} : null, ), ], rows: const [ @@ -1219,7 +1219,7 @@ void main() { DataColumn( label: const Expanded(child: Center(child: Text('column2'))), tooltip: 'Column2', - onSort: (_, __) {}, + onSort: (_, _) {}, ), ], rows: const [ diff --git a/packages/flutter/test/material/date_range_picker_test.dart b/packages/flutter/test/material/date_range_picker_test.dart index 96859509ed..9c103d4a64 100644 --- a/packages/flutter/test/material/date_range_picker_test.dart +++ b/packages/flutter/test/material/date_range_picker_test.dart @@ -432,7 +432,7 @@ void main() { end: DateTime(2016, DateTime.january, 14), ), ); - }, selectableDayPredicate: (DateTime day, _, __) => day.day != 13); + }, selectableDayPredicate: (DateTime day, _, _) => day.day != 13); }); testWidgets('Cannot select a day inside bounds but not selectable', (WidgetTester tester) async { @@ -448,7 +448,7 @@ void main() { await tester.tap(find.text('SAVE')); // We should still be on the initial date. expect(await range, initialDateRange); - }, selectableDayPredicate: (DateTime day, _, __) => day.day != 15); + }, selectableDayPredicate: (DateTime day, _, _) => day.day != 15); }); testWidgets('Selectable date becoming non selectable when selected start day', ( diff --git a/packages/flutter/test/material/dropdown_menu_test.dart b/packages/flutter/test/material/dropdown_menu_test.dart index 508d1d9af0..78de820f64 100644 --- a/packages/flutter/test/material/dropdown_menu_test.dart +++ b/packages/flutter/test/material/dropdown_menu_test.dart @@ -2858,7 +2858,7 @@ void main() { ); // Because "Unread" contains "read". // Test custom search algorithm. - await tester.pumpWidget(dropdownMenu(searchCallback: (_, __) => 0)); + await tester.pumpWidget(dropdownMenu(searchCallback: (_, _) => 0)); await tester.pump(); await tester.enterText(find.byType(TextField), 'read'); await tester.pump(); diff --git a/packages/flutter/test/material/reorderable_list_test.dart b/packages/flutter/test/material/reorderable_list_test.dart index 4193071e20..faec80e639 100644 --- a/packages/flutter/test/material/reorderable_list_test.dart +++ b/packages/flutter/test/material/reorderable_list_test.dart @@ -78,7 +78,7 @@ void main() { final List currentListItems = listItems.take(1).toList(); final ReorderableListView reorderableListView = ReorderableListView( header: const Text('Header'), - onReorder: (_, __) => onReorderWasCalled = true, + onReorder: (_, _) => onReorderWasCalled = true, children: currentListItems.map(listItemToWidget).toList(), ); final List currentOriginalListItems = originalListItems.take(1).toList(); @@ -368,7 +368,7 @@ void main() { height: 100, child: ReorderableListView( children: const [SizedBox(key: firstBox, width: 10, height: 10)], - onReorder: (_, __) {}, + onReorder: (_, _) {}, ), ), ), @@ -839,7 +839,7 @@ void main() { final ReorderableListView reorderableListView = ReorderableListView( header: const Text('Header'), scrollDirection: Axis.horizontal, - onReorder: (_, __) => onReorderWasCalled = true, + onReorder: (_, _) => onReorderWasCalled = true, children: currentListItems.map(listItemToWidget).toList(), ); final List currentOriginalListItems = originalListItems.take(1).toList(); @@ -1147,7 +1147,7 @@ void main() { child: ReorderableListView( scrollDirection: Axis.horizontal, children: const [SizedBox(key: firstBox, width: 10, height: 10)], - onReorder: (_, __) {}, + onReorder: (_, _) {}, ), ), ), diff --git a/packages/flutter/test/material/tabs_test.dart b/packages/flutter/test/material/tabs_test.dart index e1bb8fc5bd..80051bad69 100644 --- a/packages/flutter/test/material/tabs_test.dart +++ b/packages/flutter/test/material/tabs_test.dart @@ -6347,7 +6347,7 @@ void main() { : null, ), body: LayoutBuilder( - builder: (_, __) { + builder: (_, _) { return tabTextContent.isNotEmpty ? TabBarView( children: diff --git a/packages/flutter/test/material/text_field_focus_test.dart b/packages/flutter/test/material/text_field_focus_test.dart index 0d339b494d..329491df85 100644 --- a/packages/flutter/test/material/text_field_focus_test.dart +++ b/packages/flutter/test/material/text_field_focus_test.dart @@ -527,7 +527,7 @@ class _APage extends Page { @override Route createRoute(BuildContext context) => PageRouteBuilder( settings: this, - pageBuilder: (_, __, ___) => const TextField(autofocus: true), + pageBuilder: (_, _, _) => const TextField(autofocus: true), ); } @@ -536,5 +536,5 @@ class _BPage extends Page { @override Route createRoute(BuildContext context) => - PageRouteBuilder(settings: this, pageBuilder: (_, __, ___) => const Text('B')); + PageRouteBuilder(settings: this, pageBuilder: (_, _, _) => const Text('B')); } diff --git a/packages/flutter/test/painting/image_cache_test.dart b/packages/flutter/test/painting/image_cache_test.dart index 0c58b252dd..7a2c1658bd 100644 --- a/packages/flutter/test/painting/image_cache_test.dart +++ b/packages/flutter/test/painting/image_cache_test.dart @@ -339,7 +339,7 @@ void main() { as TestImageStreamCompleter; // Make the image seem live. - final ImageStreamListener listener = ImageStreamListener((_, __) {}); + final ImageStreamListener listener = ImageStreamListener((_, _) {}); completer1.addListener(listener); expect(imageCache.statusForKey(testImage).pending, true); @@ -582,7 +582,7 @@ void main() { expect(imageCache.statusForKey(testImage).live, true); expect(imageCache.statusForKey(testImage).keepAlive, false); - completer1.addListener(ImageStreamListener((_, __) {})); + completer1.addListener(ImageStreamListener((_, _) {})); imageCache.evict(testImage, includeLive: false); expect(imageCache.statusForKey(testImage).pending, false); expect(imageCache.statusForKey(testImage).live, true); diff --git a/packages/flutter/test/rendering/sliver_tree_test.dart b/packages/flutter/test/rendering/sliver_tree_test.dart index 123779e440..bc83ab014f 100644 --- a/packages/flutter/test/rendering/sliver_tree_test.dart +++ b/packages/flutter/test/rendering/sliver_tree_test.dart @@ -212,7 +212,7 @@ void main() { expect(find.text('Fourth'), findsOneWidget); expect(tester.getRect(find.text('Fourth')), const Rect.fromLTRB(46.0, 248.0, 334.0, 272.0)); - treeSliver = TreeSliver(tree: treeNodes, treeRowExtentBuilder: (_, __) => 100); + treeSliver = TreeSliver(tree: treeNodes, treeRowExtentBuilder: (_, _) => 100); await tester.pumpWidget(MaterialApp(home: CustomScrollView(slivers: [treeSliver]))); await tester.pump(); expect( @@ -599,7 +599,7 @@ void main() { addTearDown(scrollController.dispose); treeNodes = _setUpNodes(); final TreeSliver treeSliver = TreeSliver( - treeRowExtentBuilder: (_, __) => 200, + treeRowExtentBuilder: (_, _) => 200, tree: treeNodes, ); await tester.pumpWidget( diff --git a/packages/flutter/test/widgets/app_test.dart b/packages/flutter/test/widgets/app_test.dart index a8f2aa9839..e8a3cbeea2 100644 --- a/packages/flutter/test/widgets/app_test.dart +++ b/packages/flutter/test/widgets/app_test.dart @@ -585,7 +585,7 @@ void main() { color: const Color.fromARGB(255, 255, 255, 255), onGenerateRoute: (_) { return PageRouteBuilder( - pageBuilder: (_, __, ___) { + pageBuilder: (_, _, _) { routeBuildCount++; return const Placeholder(); }, diff --git a/packages/flutter/test/widgets/draggable_scrollable_sheet_test.dart b/packages/flutter/test/widgets/draggable_scrollable_sheet_test.dart index 08b17c91a9..4f44965fba 100644 --- a/packages/flutter/test/widgets/draggable_scrollable_sheet_test.dart +++ b/packages/flutter/test/widgets/draggable_scrollable_sheet_test.dart @@ -99,7 +99,7 @@ void main() { child: ListView.separated( physics: const BouncingScrollPhysics(), controller: scrollController, - separatorBuilder: (_, __) => const Divider(), + separatorBuilder: (_, _) => const Divider(), itemCount: 100, itemBuilder: (_, int index) => SizedBox( @@ -415,7 +415,7 @@ void main() { return ListView.separated( physics: const BouncingScrollPhysics(), controller: scrollController, - separatorBuilder: (_, __) => const Divider(), + separatorBuilder: (_, _) => const Divider(), itemCount: 100, itemBuilder: (_, int index) => SizedBox( diff --git a/packages/flutter/test/widgets/draggable_test.dart b/packages/flutter/test/widgets/draggable_test.dart index 39cb823a36..a794f9a1ef 100644 --- a/packages/flutter/test/widgets/draggable_test.dart +++ b/packages/flutter/test/widgets/draggable_test.dart @@ -3721,7 +3721,7 @@ void main() { ValueListenableBuilder( valueListenable: mountedNotifier, builder: - (_, bool value, __) => + (_, bool value, _) => value ? const MaterialApp( home: Scaffold( diff --git a/packages/flutter/test/widgets/focus_traversal_test.dart b/packages/flutter/test/widgets/focus_traversal_test.dart index f15f4cf467..9d64ca85a6 100644 --- a/packages/flutter/test/widgets/focus_traversal_test.dart +++ b/packages/flutter/test/widgets/focus_traversal_test.dart @@ -557,7 +557,7 @@ void main() { ), ), ], - onPopPage: (_, __) => false, + onPopPage: (_, _) => false, ), ), Focus(focusNode: node3, child: const SizedBox(width: 100, height: 100)), @@ -3563,7 +3563,7 @@ void main() { class TestRoute extends PageRouteBuilder { TestRoute({required Widget child}) : super( - pageBuilder: (BuildContext _, Animation __, Animation ___) { + pageBuilder: (BuildContext _, Animation _, Animation _) { return child; }, ); diff --git a/packages/flutter/test/widgets/framework_test.dart b/packages/flutter/test/widgets/framework_test.dart index b720b04947..ca737c07bb 100644 --- a/packages/flutter/test/widgets/framework_test.dart +++ b/packages/flutter/test/widgets/framework_test.dart @@ -2346,7 +2346,7 @@ class _RenderTestLeaderLayerWidget extends RenderProxyBox { void paint(PaintingContext context, Offset offset) { super.paint(context, offset); if (_link != null) { - context.pushLayer(LeaderLayer(link: _link!, offset: offset), (_, __) {}, Offset.zero); + context.pushLayer(LeaderLayer(link: _link!, offset: offset), (_, _) {}, Offset.zero); } } } diff --git a/packages/flutter/test/widgets/grid_view_test.dart b/packages/flutter/test/widgets/grid_view_test.dart index 6c3bed1b63..a40d455722 100644 --- a/packages/flutter/test/widgets/grid_view_test.dart +++ b/packages/flutter/test/widgets/grid_view_test.dart @@ -741,7 +741,7 @@ void main() { child: GridView.builder( gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3), itemCount: 10, - itemBuilder: (BuildContext _, int __) => Container(height: 2000.0), + itemBuilder: (BuildContext _, int _) => Container(height: 2000.0), clipBehavior: Clip.antiAlias, ), ), diff --git a/packages/flutter/test/widgets/heroes_test.dart b/packages/flutter/test/widgets/heroes_test.dart index 491b3ec1ca..baa46161ec 100644 --- a/packages/flutter/test/widgets/heroes_test.dart +++ b/packages/flutter/test/widgets/heroes_test.dart @@ -679,7 +679,7 @@ Future main() async { pageBuilder: ( BuildContext context, Animation _, - Animation __, + Animation _, ) { return const Text('fail'); }, @@ -2529,7 +2529,7 @@ Future main() async { home: Navigator( observers: [controller], pages: >[page1], - onPopPage: (_, __) => false, + onPopPage: (_, _) => false, ), ), ); @@ -2545,7 +2545,7 @@ Future main() async { home: Navigator( observers: [controller], pages: >[page1, page2, page3], - onPopPage: (_, __) => false, + onPopPage: (_, _) => false, ), ), ); @@ -2635,7 +2635,7 @@ Future main() async { home: Navigator( observers: [controller], pages: >[unrelatedPage1, page1], - onPopPage: (_, __) => false, + onPopPage: (_, _) => false, ), ), ); @@ -2651,7 +2651,7 @@ Future main() async { home: Navigator( observers: [controller], pages: >[unrelatedPage2, page2], - onPopPage: (_, __) => false, + onPopPage: (_, _) => false, ), ), ); @@ -3069,7 +3069,7 @@ Future main() async { pageBuilder: ( BuildContext context, Animation _, - Animation __, + Animation _, ) { return Card( child: Hero( @@ -3142,7 +3142,7 @@ Future main() async { pageBuilder: ( BuildContext context, Animation _, - Animation __, + Animation _, ) { return Card( child: Hero( diff --git a/packages/flutter/test/widgets/image_test.dart b/packages/flutter/test/widgets/image_test.dart index 24e20d5e17..0c721f15cc 100644 --- a/packages/flutter/test/widgets/image_test.dart +++ b/packages/flutter/test/widgets/image_test.dart @@ -1461,7 +1461,7 @@ void main() { await tester.pumpWidget( Container( key: key, - child: Image(image: imageProvider1, errorBuilder: (_, __, ___) => Container()), + child: Image(image: imageProvider1, errorBuilder: (_, _, _) => Container()), ), ); // listener from resolveStreamForKey is always added. diff --git a/packages/flutter/test/widgets/implicit_animations_test.dart b/packages/flutter/test/widgets/implicit_animations_test.dart index 42b53e4771..07ab9456cf 100644 --- a/packages/flutter/test/widgets/implicit_animations_test.dart +++ b/packages/flutter/test/widgets/implicit_animations_test.dart @@ -610,7 +610,7 @@ void main() { child: ValueListenableBuilder( valueListenable: curve, builder: - (_, Curve c, __) => AnimatedOpacity( + (_, Curve c, _) => AnimatedOpacity( key: key, opacity: 1.0, duration: const Duration(seconds: 1), diff --git a/packages/flutter/test/widgets/inherited_theme_test.dart b/packages/flutter/test/widgets/inherited_theme_test.dart index 9517e04faa..a7f1fcc26b 100644 --- a/packages/flutter/test/widgets/inherited_theme_test.dart +++ b/packages/flutter/test/widgets/inherited_theme_test.dart @@ -7,7 +7,7 @@ import 'package:flutter_test/flutter_test.dart'; class TestRoute extends PageRouteBuilder { TestRoute(Widget child) - : super(pageBuilder: (BuildContext _, Animation __, Animation ___) => child); + : super(pageBuilder: (BuildContext _, Animation _, Animation _) => child); } class IconTextBox extends StatelessWidget { diff --git a/packages/flutter/test/widgets/list_view_test.dart b/packages/flutter/test/widgets/list_view_test.dart index 6e56d78b2a..2f000c81ff 100644 --- a/packages/flutter/test/widgets/list_view_test.dart +++ b/packages/flutter/test/widgets/list_view_test.dart @@ -131,7 +131,7 @@ void main() { finderCalled = true; return null; }, - separatorBuilder: (BuildContext _, int __) => const Divider(), + separatorBuilder: (BuildContext _, int _) => const Divider(), ); }, ), @@ -928,7 +928,7 @@ void main() { textDirection: TextDirection.ltr, child: ListView.builder( itemCount: 10, - itemBuilder: (BuildContext _, int __) => Container(height: 2000.0), + itemBuilder: (BuildContext _, int _) => Container(height: 2000.0), clipBehavior: Clip.antiAlias, ), ), @@ -960,8 +960,8 @@ void main() { textDirection: TextDirection.ltr, child: ListView.separated( itemCount: 10, - itemBuilder: (BuildContext _, int __) => Container(height: 2000.0), - separatorBuilder: (BuildContext _, int __) => const Divider(), + itemBuilder: (BuildContext _, int _) => Container(height: 2000.0), + separatorBuilder: (BuildContext _, int _) => const Divider(), clipBehavior: Clip.antiAlias, ), ), diff --git a/packages/flutter/test/widgets/list_view_viewporting_test.dart b/packages/flutter/test/widgets/list_view_viewporting_test.dart index 77c9e66ead..918a76a8bc 100644 --- a/packages/flutter/test/widgets/list_view_viewporting_test.dart +++ b/packages/flutter/test/widgets/list_view_viewporting_test.dart @@ -499,7 +499,7 @@ void main() { ListView.builder( itemExtent: 100.0, itemCount: 100, - itemBuilder: (_, __) => const SizedBox(height: 40.0, child: Text('hey')), + itemBuilder: (_, _) => const SizedBox(height: 40.0, child: Text('hey')), ).childrenDelegate, ), ], diff --git a/packages/flutter/test/widgets/navigator_restoration_test.dart b/packages/flutter/test/widgets/navigator_restoration_test.dart index 6f9feddd8b..43e8cbb9a1 100644 --- a/packages/flutter/test/widgets/navigator_restoration_test.dart +++ b/packages/flutter/test/widgets/navigator_restoration_test.dart @@ -844,14 +844,14 @@ void main() { expect( () => tester .state(find.byType(Navigator)) - .restorablePush((BuildContext _, Object? __) => FakeRoute()), + .restorablePush((BuildContext _, Object? _) => FakeRoute()), throwsBuilderAssertionError, skip: isBrowser, // https://github.com/flutter/flutter/issues/33615 ); expect( () => tester .state(find.byType(Navigator)) - .restorablePushReplacement((BuildContext _, Object? __) => FakeRoute()), + .restorablePushReplacement((BuildContext _, Object? _) => FakeRoute()), throwsBuilderAssertionError, skip: isBrowser, // https://github.com/flutter/flutter/issues/33615 ); @@ -859,7 +859,7 @@ void main() { () => tester .state(find.byType(Navigator)) .restorablePushAndRemoveUntil( - (BuildContext _, Object? __) => FakeRoute(), + (BuildContext _, Object? _) => FakeRoute(), (Route _) => false, ), throwsBuilderAssertionError, @@ -869,7 +869,7 @@ void main() { () => tester .state(find.byType(Navigator)) .restorableReplace( - newRouteBuilder: (BuildContext _, Object? __) => FakeRoute(), + newRouteBuilder: (BuildContext _, Object? _) => FakeRoute(), oldRoute: oldRoute, ), throwsBuilderAssertionError, @@ -879,7 +879,7 @@ void main() { () => tester .state(find.byType(Navigator)) .restorableReplaceRouteBelow( - newRouteBuilder: (BuildContext _, Object? __) => FakeRoute(), + newRouteBuilder: (BuildContext _, Object? _) => FakeRoute(), anchorRoute: oldRoute, ), throwsBuilderAssertionError, diff --git a/packages/flutter/test/widgets/navigator_test.dart b/packages/flutter/test/widgets/navigator_test.dart index a95a7dde3b..935e58297f 100644 --- a/packages/flutter/test/widgets/navigator_test.dart +++ b/packages/flutter/test/widgets/navigator_test.dart @@ -215,7 +215,7 @@ void main() { data: MediaQueryData.fromView(tester.view), child: Directionality( textDirection: TextDirection.ltr, - child: Navigator(pages: const >[page], onPopPage: (_, __) => false), + child: Navigator(pages: const >[page], onPopPage: (_, _) => false), ), ), ); @@ -230,7 +230,7 @@ void main() { child: Navigator( pages: const >[page], clipBehavior: Clip.none, - onPopPage: (_, __) => false, + onPopPage: (_, _) => false, ), ), ), @@ -1285,7 +1285,7 @@ void main() { onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( settings: settings, - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return routes[settings.name]!(context); }, ); @@ -1358,7 +1358,7 @@ void main() { onGenerateRoute: (RouteSettings settings) { routes[settings.name!] = PageRouteBuilder( settings: settings, - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return pageBuilders[settings.name!]!(context); }, ); @@ -1448,7 +1448,7 @@ void main() { onGenerateRoute: (RouteSettings settings) { routes[settings.name!] = PageRouteBuilder( settings: settings, - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return pageBuilders[settings.name!]!(context); }, ); @@ -3263,7 +3263,7 @@ void main() { DefaultMaterialLocalizations.delegate, DefaultWidgetsLocalizations.delegate, ], - child: Navigator(pages: myPages, onPopPage: (_, __) => false), + child: Navigator(pages: myPages, onPopPage: (_, _) => false), ), ), ); @@ -3284,7 +3284,7 @@ void main() { DefaultMaterialLocalizations.delegate, DefaultWidgetsLocalizations.delegate, ], - child: Navigator(pages: myPages, onPopPage: (_, __) => false), + child: Navigator(pages: myPages, onPopPage: (_, _) => false), ), ), ); @@ -3308,7 +3308,7 @@ void main() { DefaultMaterialLocalizations.delegate, DefaultWidgetsLocalizations.delegate, ], - child: Navigator(pages: myPages, onPopPage: (_, __) => false), + child: Navigator(pages: myPages, onPopPage: (_, _) => false), ), ), ); @@ -4284,7 +4284,7 @@ void main() { onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( settings: settings, - pageBuilder: (BuildContext _, Animation __, Animation ___) { + pageBuilder: (BuildContext _, Animation _, Animation _) { return Container(); }, ); @@ -4331,7 +4331,7 @@ void main() { onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( settings: settings, - pageBuilder: (BuildContext _, Animation __, Animation ___) { + pageBuilder: (BuildContext _, Animation _, Animation _) { return routes[settings.name!]!; }, ); @@ -4408,7 +4408,7 @@ void main() { onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( settings: settings, - pageBuilder: (BuildContext _, Animation __, Animation ___) { + pageBuilder: (BuildContext _, Animation _, Animation _) { return routes[settings.name!]!; }, ); @@ -4463,7 +4463,7 @@ void main() { onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( settings: settings, - pageBuilder: (BuildContext _, Animation __, Animation ___) { + pageBuilder: (BuildContext _, Animation _, Animation _) { return Container(); }, ); @@ -4497,7 +4497,7 @@ void main() { onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( settings: settings, - pageBuilder: (BuildContext context, Animation __, Animation ___) { + pageBuilder: (BuildContext context, Animation _, Animation _) { policy = FocusTraversalGroup.of(context); return const SizedBox(); }, @@ -4520,7 +4520,7 @@ void main() { onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( settings: settings, - pageBuilder: (BuildContext context, Animation __, Animation ___) { + pageBuilder: (BuildContext context, Animation _, Animation _) { policy = FocusTraversalGroup.of(context); return const SizedBox(); }, @@ -5784,7 +5784,7 @@ class NoAnimationPageRoute extends PageRouteBuilder { : super( transitionDuration: Duration.zero, reverseTransitionDuration: Duration.zero, - pageBuilder: (BuildContext context, __, ___) { + pageBuilder: (BuildContext context, _, _) { return pageBuilder(context); }, ); diff --git a/packages/flutter/test/widgets/page_route_builder_test.dart b/packages/flutter/test/widgets/page_route_builder_test.dart index 5e57cb7d88..1fd73b033e 100644 --- a/packages/flutter/test/widgets/page_route_builder_test.dart +++ b/packages/flutter/test/widgets/page_route_builder_test.dart @@ -39,7 +39,7 @@ class _HomePageState extends State { PageRouteBuilder( barrierColor: Colors.black54, opaque: false, - pageBuilder: (BuildContext context, _, __) { + pageBuilder: (BuildContext context, _, _) { return const ModalPage(); }, ), diff --git a/packages/flutter/test/widgets/reorderable_list_test.dart b/packages/flutter/test/widgets/reorderable_list_test.dart index 773e088bd9..6a79e8d12d 100644 --- a/packages/flutter/test/widgets/reorderable_list_test.dart +++ b/packages/flutter/test/widgets/reorderable_list_test.dart @@ -159,7 +159,7 @@ void main() { ), ); }, - onReorder: (int _, int __) {}, + onReorder: (int _, int _) {}, ), ], ), diff --git a/packages/flutter/test/widgets/restoration_scope_test.dart b/packages/flutter/test/widgets/restoration_scope_test.dart index 831b3bb4a1..0a51570db8 100644 --- a/packages/flutter/test/widgets/restoration_scope_test.dart +++ b/packages/flutter/test/widgets/restoration_scope_test.dart @@ -45,7 +45,7 @@ void main() { await tester.pumpWidget( WidgetsApp( color: const Color(0xD0FF0000), - builder: (_, __) { + builder: (_, _) { return RestorationScope( restorationId: 'test', child: Builder( @@ -75,7 +75,7 @@ void main() { WidgetsApp( restorationScopeId: 'test scope', color: const Color(0xD0FF0000), - builder: (_, __) { + builder: (_, _) { return RestorationScope( restorationId: 'test', child: Builder( diff --git a/packages/flutter/test/widgets/router_test.dart b/packages/flutter/test/widgets/router_test.dart index 5f95875379..21b8666dab 100644 --- a/packages/flutter/test/widgets/router_test.dart +++ b/packages/flutter/test/widgets/router_test.dart @@ -1665,7 +1665,7 @@ void main() { addTearDown(provider.dispose); provider.value = RouteInformation(uri: Uri.parse('/')); final SimpleRouterDelegate delegate = SimpleRouterDelegate( - builder: (_, __) => const Text(expected), + builder: (_, _) => const Text(expected), ); addTearDown(delegate.dispose); final RouterConfig config = RouterConfig( diff --git a/packages/flutter/test/widgets/routes_test.dart b/packages/flutter/test/widgets/routes_test.dart index 3479cf938a..fe4b1e00fd 100644 --- a/packages/flutter/test/widgets/routes_test.dart +++ b/packages/flutter/test/widgets/routes_test.dart @@ -959,7 +959,7 @@ void main() { barrierLabel: 'barrier_label', barrierColor: const Color(0x00000000), transitionDuration: Duration.zero, - pageBuilder: (BuildContext innerContext, _, __) { + pageBuilder: (BuildContext innerContext, _, _) { return const SizedBox(); }, ); @@ -994,7 +994,7 @@ void main() { showGeneralDialog( context: context, transitionDuration: Duration.zero, - pageBuilder: (BuildContext innerContext, _, __) { + pageBuilder: (BuildContext innerContext, _, _) { return const SizedBox(); }, ); @@ -1034,7 +1034,7 @@ void main() { showGeneralDialog( context: context, transitionDuration: Duration.zero, - pageBuilder: (BuildContext innerContext, _, __) { + pageBuilder: (BuildContext innerContext, _, _) { return const SizedBox(); }, ); @@ -1079,7 +1079,7 @@ void main() { showGeneralDialog( context: context, transitionDuration: Duration.zero, - pageBuilder: (BuildContext innerContext, _, __) { + pageBuilder: (BuildContext innerContext, _, _) { return const SizedBox(); }, ); @@ -1120,7 +1120,7 @@ void main() { useRootNavigator: false, context: context, transitionDuration: Duration.zero, - pageBuilder: (BuildContext innerContext, _, __) { + pageBuilder: (BuildContext innerContext, _, _) { return const SizedBox(); }, ); @@ -1155,7 +1155,7 @@ void main() { onPressed: () { showGeneralDialog( context: context, - pageBuilder: (BuildContext innerContext, _, __) { + pageBuilder: (BuildContext innerContext, _, _) { return const SizedBox(); }, ); @@ -1205,7 +1205,7 @@ void main() { showGeneralDialog( context: context, - pageBuilder: (BuildContext context, _, __) { + pageBuilder: (BuildContext context, _, _) { return const Placeholder(); }, anchorPoint: const Offset(1000, 0), @@ -1243,7 +1243,7 @@ void main() { showGeneralDialog( context: context, - pageBuilder: (BuildContext context, _, __) { + pageBuilder: (BuildContext context, _, _) { return const Placeholder(); }, ); @@ -1280,7 +1280,7 @@ void main() { showGeneralDialog( context: context, - pageBuilder: (BuildContext context, _, __) { + pageBuilder: (BuildContext context, _, _) { return const Placeholder(); }, ); diff --git a/packages/flutter/test/widgets/scroll_delegate_test.dart b/packages/flutter/test/widgets/scroll_delegate_test.dart index fc5a7ba1f9..d4689b21fa 100644 --- a/packages/flutter/test/widgets/scroll_delegate_test.dart +++ b/packages/flutter/test/widgets/scroll_delegate_test.dart @@ -10,7 +10,7 @@ void main() { test('TwoDimensionalChildBuilderDelegate dispatches memory events', () async { await expectLater( await memoryEvents( - () => TwoDimensionalChildBuilderDelegate(builder: (_, __) => null).dispose(), + () => TwoDimensionalChildBuilderDelegate(builder: (_, _) => null).dispose(), TwoDimensionalChildBuilderDelegate, ), areCreateAndDispose, diff --git a/packages/flutter/test/widgets/selectable_region_test.dart b/packages/flutter/test/widgets/selectable_region_test.dart index 4ec314fccd..27e85bd6b3 100644 --- a/packages/flutter/test/widgets/selectable_region_test.dart +++ b/packages/flutter/test/widgets/selectable_region_test.dart @@ -174,7 +174,7 @@ void main() { ), const MaterialPage(child: Scaffold(body: Text('Foreground Page'))), ], - onPopPage: (_, __) => false, + onPopPage: (_, _) => false, ), ), ); diff --git a/packages/flutter/test/widgets/slivers_test.dart b/packages/flutter/test/widgets/slivers_test.dart index e7478b1e56..66399e23bf 100644 --- a/packages/flutter/test/widgets/slivers_test.dart +++ b/packages/flutter/test/widgets/slivers_test.dart @@ -629,7 +629,7 @@ void main() { final ErrorWidgetBuilder oldBuilder = ErrorWidget.builder; ErrorWidget.builder = (FlutterErrorDetails details) => errorText; final SliverChildBuilderDelegate builderThrowsDelegate = SliverChildBuilderDelegate( - (_, __) => throw 'builder', + (_, _) => throw 'builder', addAutomaticKeepAlives: false, addRepaintBoundaries: false, addSemanticIndexes: false, @@ -1392,7 +1392,7 @@ void main() { slivers: [ SliverGrid.builder( itemCount: 0, - itemBuilder: (_, __) => Container(), + itemBuilder: (_, _) => Container(), gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 1, mainAxisSpacing: 10, @@ -1417,7 +1417,7 @@ void main() { slivers: [ SliverGrid.builder( itemCount: 0, - itemBuilder: (_, __) => Container(), + itemBuilder: (_, _) => Container(), gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent( maxCrossAxisExtent: 30, ), diff --git a/packages/flutter/test/widgets/two_dimensional_scroll_view_test.dart b/packages/flutter/test/widgets/two_dimensional_scroll_view_test.dart index bbb61c05f6..fff238a1e9 100644 --- a/packages/flutter/test/widgets/two_dimensional_scroll_view_test.dart +++ b/packages/flutter/test/widgets/two_dimensional_scroll_view_test.dart @@ -33,7 +33,7 @@ void main() { await tester.pumpWidget( MaterialApp( home: SimpleBuilderTableView( - delegate: delegate1 = TwoDimensionalChildBuilderDelegate(builder: (_, __) => null), + delegate: delegate1 = TwoDimensionalChildBuilderDelegate(builder: (_, _) => null), horizontalDetails: const ScrollableDetails.vertical(), // Horizontal has default const ScrollableDetails.horizontal() ), @@ -46,7 +46,7 @@ void main() { await tester.pumpWidget( MaterialApp( home: SimpleBuilderTableView( - delegate: delegate2 = TwoDimensionalChildBuilderDelegate(builder: (_, __) => null), + delegate: delegate2 = TwoDimensionalChildBuilderDelegate(builder: (_, _) => null), verticalDetails: const ScrollableDetails.horizontal(), // Horizontal has default const ScrollableDetails.horizontal() ), @@ -59,7 +59,7 @@ void main() { await tester.pumpWidget( MaterialApp( home: SimpleBuilderTableView( - delegate: delegate3 = TwoDimensionalChildBuilderDelegate(builder: (_, __) => null), + delegate: delegate3 = TwoDimensionalChildBuilderDelegate(builder: (_, _) => null), verticalDetails: const ScrollableDetails.horizontal(), horizontalDetails: const ScrollableDetails.vertical(), ), diff --git a/packages/flutter_localizations/test/widgets_test.dart b/packages/flutter_localizations/test/widgets_test.dart index fbb57e6443..a8fb8db238 100644 --- a/packages/flutter_localizations/test/widgets_test.dart +++ b/packages/flutter_localizations/test/widgets_test.dart @@ -156,7 +156,7 @@ Widget buildFrame({ supportedLocales: supportedLocales, onGenerateRoute: (RouteSettings settings) { return PageRouteBuilder( - pageBuilder: (BuildContext context, Animation _, Animation __) { + pageBuilder: (BuildContext context, Animation _, Animation _) { return buildContent(context); }, ); diff --git a/packages/flutter_test/test/view_test.dart b/packages/flutter_test/test/view_test.dart index cc1a7a9163..cda281b0f0 100644 --- a/packages/flutter_test/test/view_test.dart +++ b/packages/flutter_test/test/view_test.dart @@ -146,7 +146,7 @@ void main() { realValue: trueImplicitView().physicalConstraints, fakeValue: ViewConstraints.tight(fakeSize), propertyRetriever: () => boundImplicitView().physicalConstraints, - propertyFaker: (_, __) { + propertyFaker: (_, _) { tester.view.physicalSize = fakeSize; }, ); diff --git a/packages/flutter_tools/test/commands.shard/hermetic/custom_devices_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/custom_devices_test.dart index 9ca0c402c7..9bb631b93e 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/custom_devices_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/custom_devices_test.dart @@ -923,7 +923,7 @@ void main() { config.add(CustomDeviceConfig.exampleUnix.copyWith(id: 'testid')); final CommandRunner runner = createCustomDevicesCommandRunner( - config: (_, __) => config, + config: (_, _) => config, fileSystem: fs, featureEnabled: true, ); diff --git a/packages/flutter_tools/test/general.shard/resident_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_runner_test.dart index d67b02a6a6..2f49b423ad 100644 --- a/packages/flutter_tools/test/general.shard/resident_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_runner_test.dart @@ -2178,7 +2178,7 @@ flutter: debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), ) .then((_) => done.complete()), - (_, __) => done.complete(), + (_, _) => done.complete(), ), ); await done.future; diff --git a/packages/flutter_web_plugins/lib/src/navigation_non_web/url_strategy.dart b/packages/flutter_web_plugins/lib/src/navigation_non_web/url_strategy.dart index cc4eb26704..b4684941b0 100644 --- a/packages/flutter_web_plugins/lib/src/navigation_non_web/url_strategy.dart +++ b/packages/flutter_web_plugins/lib/src/navigation_non_web/url_strategy.dart @@ -129,5 +129,5 @@ class PathUrlStrategy extends HashUrlStrategy { /// /// The [PlatformLocation] parameter is useful for testing to mock out browser /// integrations. - const PathUrlStrategy([PlatformLocation? _, bool __ = false]); + const PathUrlStrategy([PlatformLocation? _, bool _ = false]); }