From 3961306badd313a3f34c5c25a754c1e53a581caf Mon Sep 17 00:00:00 2001 From: Alexandre Ardhuin Date: Fri, 9 Mar 2018 23:37:06 +0100 Subject: [PATCH] enable lints prefer_const_declarations and prefer_const_literals_to_create_immutables (#14848) --- analysis_options.yaml | 4 ++-- analysis_options_repo.yaml | 4 ++-- packages/flutter/test/cupertino/dialog_test.dart | 2 +- packages/flutter/test/material/app_bar_test.dart | 2 +- packages/flutter/test/material/chip_test.dart | 8 ++++---- packages/flutter/test/material/dialog_test.dart | 2 +- packages/flutter/test/material/dropdown_test.dart | 2 +- .../test/material/modal_bottom_sheet_test.dart | 2 +- packages/flutter/test/material/popup_menu_test.dart | 2 +- packages/flutter/test/material/scaffold_test.dart | 4 ++-- packages/flutter/test/material/snack_bar_test.dart | 2 +- packages/flutter/test/material/tabs_test.dart | 4 ++-- packages/flutter/test/material/time_picker_test.dart | 2 +- .../test/widgets/nested_scroll_view_test.dart | 2 +- packages/flutter/test/widgets/parent_data_test.dart | 4 ++-- packages/flutter/test/widgets/semantics_test.dart | 4 ++-- .../widgets/slivers_appbar_floating_pinned_test.dart | 2 +- .../flutter/test/widgets/slivers_block_test.dart | 12 ++++++------ .../flutter_localizations/test/date_time_test.dart | 4 ++-- packages/flutter_tools/lib/src/base/utils.dart | 2 +- 20 files changed, 35 insertions(+), 35 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index b202799746..78a2e88974 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -109,8 +109,8 @@ linter: - prefer_conditional_assignment - prefer_const_constructors - prefer_const_constructors_in_immutables - # - prefer_const_declarations # not yet tested - # - prefer_const_literals_to_create_immutables # not yet tested + - prefer_const_declarations + - prefer_const_literals_to_create_immutables # - prefer_constructors_over_static_methods # not yet tested - prefer_contains # - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods diff --git a/analysis_options_repo.yaml b/analysis_options_repo.yaml index fed4ed546e..65ebfb7de5 100644 --- a/analysis_options_repo.yaml +++ b/analysis_options_repo.yaml @@ -102,8 +102,8 @@ linter: - prefer_conditional_assignment - prefer_const_constructors - prefer_const_constructors_in_immutables - # - prefer_const_declarations # not yet tested - # - prefer_const_literals_to_create_immutables # not yet tested + - prefer_const_declarations + - prefer_const_literals_to_create_immutables # - prefer_constructors_over_static_methods # not yet tested - prefer_contains # - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods diff --git a/packages/flutter/test/cupertino/dialog_test.dart b/packages/flutter/test/cupertino/dialog_test.dart index 368ba56ed8..53c837948a 100644 --- a/packages/flutter/test/cupertino/dialog_test.dart +++ b/packages/flutter/test/cupertino/dialog_test.dart @@ -116,7 +116,7 @@ void main() { child: new CupertinoAlertDialog( title: const Text('The Title'), content: new Text('Very long content ' * 20), - actions: [ + actions: const [ const CupertinoDialogAction( child: const Text('Cancel'), ), diff --git a/packages/flutter/test/material/app_bar_test.dart b/packages/flutter/test/material/app_bar_test.dart index 64783b51a8..a0c626e8e0 100644 --- a/packages/flutter/test/material/app_bar_test.dart +++ b/packages/flutter/test/material/app_bar_test.dart @@ -10,7 +10,7 @@ import 'package:flutter_test/flutter_test.dart'; Widget buildSliverAppBarApp({ bool floating, bool pinned, double expandedHeight, bool snap: false }) { return new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultMaterialLocalizations.delegate, DefaultWidgetsLocalizations.delegate, ], diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart index c10e4d22b5..32de24a600 100644 --- a/packages/flutter/test/material/chip_test.dart +++ b/packages/flutter/test/material/chip_test.dart @@ -241,7 +241,7 @@ void main() { await tester.pumpWidget( new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultWidgetsLocalizations.delegate, DefaultMaterialLocalizations.delegate, ], @@ -256,7 +256,7 @@ void main() { await tester.pumpWidget( new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultWidgetsLocalizations.delegate, DefaultMaterialLocalizations.delegate, ], @@ -428,7 +428,7 @@ void main() { await tester.pumpWidget( new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultWidgetsLocalizations.delegate, DefaultMaterialLocalizations.delegate, ], @@ -468,7 +468,7 @@ void main() { await tester.pumpWidget( new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultWidgetsLocalizations.delegate, DefaultMaterialLocalizations.delegate, ], diff --git a/packages/flutter/test/material/dialog_test.dart b/packages/flutter/test/material/dialog_test.dart index 0c1f0f6a2c..a8d08f6b97 100644 --- a/packages/flutter/test/material/dialog_test.dart +++ b/packages/flutter/test/material/dialog_test.dart @@ -236,7 +236,7 @@ void main() { await tester.pumpWidget(new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultWidgetsLocalizations.delegate, DefaultMaterialLocalizations.delegate, ], diff --git a/packages/flutter/test/material/dropdown_test.dart b/packages/flutter/test/material/dropdown_test.dart index 966da83095..09132c14f0 100644 --- a/packages/flutter/test/material/dropdown_test.dart +++ b/packages/flutter/test/material/dropdown_test.dart @@ -65,7 +65,7 @@ class _TestAppState extends State { Widget build(BuildContext context) { return new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultWidgetsLocalizations.delegate, DefaultMaterialLocalizations.delegate, ], diff --git a/packages/flutter/test/material/modal_bottom_sheet_test.dart b/packages/flutter/test/material/modal_bottom_sheet_test.dart index 0881a40f7f..fb393a65e1 100644 --- a/packages/flutter/test/material/modal_bottom_sheet_test.dart +++ b/packages/flutter/test/material/modal_bottom_sheet_test.dart @@ -160,7 +160,7 @@ void main() { await tester.pumpWidget(new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultWidgetsLocalizations.delegate, DefaultMaterialLocalizations.delegate, ], diff --git a/packages/flutter/test/material/popup_menu_test.dart b/packages/flutter/test/material/popup_menu_test.dart index daedc4d4ed..905ff04dcc 100644 --- a/packages/flutter/test/material/popup_menu_test.dart +++ b/packages/flutter/test/material/popup_menu_test.dart @@ -442,7 +442,7 @@ class _TestAppState extends State { Widget build(BuildContext context) { return new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultWidgetsLocalizations.delegate, DefaultMaterialLocalizations.delegate, ], diff --git a/packages/flutter/test/material/scaffold_test.dart b/packages/flutter/test/material/scaffold_test.dart index 13df2a7e8b..72ea8f8ffb 100644 --- a/packages/flutter/test/material/scaffold_test.dart +++ b/packages/flutter/test/material/scaffold_test.dart @@ -363,7 +363,7 @@ void main() { child: const Text('body'), ), ), - persistentFooterButtons: [const Placeholder()], + persistentFooterButtons: const [const Placeholder()], ), ), ), @@ -1056,7 +1056,7 @@ class GeometryListenerState extends State { if (geometryListenable != null) geometryListenable.removeListener(onGeometryChanged); - + geometryListenable = newListenable; geometryListenable.addListener(onGeometryChanged); cache = new GeometryCachePainter(geometryListenable); diff --git a/packages/flutter/test/material/snack_bar_test.dart b/packages/flutter/test/material/snack_bar_test.dart index b3fbe0cd3c..da3dd43949 100644 --- a/packages/flutter/test/material/snack_bar_test.dart +++ b/packages/flutter/test/material/snack_bar_test.dart @@ -360,7 +360,7 @@ void main() { ), child: new Scaffold( bottomNavigationBar: new BottomNavigationBar( - items: [ + items: const [ const BottomNavigationBarItem(icon: const Icon(Icons.favorite), title: const Text('Animutation')), const BottomNavigationBarItem(icon: const Icon(Icons.block), title: const Text('Zombo.com')), ], diff --git a/packages/flutter/test/material/tabs_test.dart b/packages/flutter/test/material/tabs_test.dart index 89de8f2f1a..316122c7f1 100644 --- a/packages/flutter/test/material/tabs_test.dart +++ b/packages/flutter/test/material/tabs_test.dart @@ -17,7 +17,7 @@ import '../widgets/semantics_tester.dart'; Widget boilerplate({ Widget child, TextDirection textDirection: TextDirection.ltr }) { return new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultMaterialLocalizations.delegate, DefaultWidgetsLocalizations.delegate, ], @@ -1661,7 +1661,7 @@ void main() { alignment: Alignment.topLeft, child: new TabBar( controller: controller, - tabs: [ + tabs: const [ const Tab(text: 'LEFT'), const Tab(text: 'RIGHT'), ], diff --git a/packages/flutter/test/material/time_picker_test.dart b/packages/flutter/test/material/time_picker_test.dart index bd7cd2dd5a..6ec59c1cd4 100644 --- a/packages/flutter/test/material/time_picker_test.dart +++ b/packages/flutter/test/material/time_picker_test.dart @@ -229,7 +229,7 @@ void _tests() { await tester.pumpWidget( new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultMaterialLocalizations.delegate, DefaultWidgetsLocalizations.delegate, ], diff --git a/packages/flutter/test/widgets/nested_scroll_view_test.dart b/packages/flutter/test/widgets/nested_scroll_view_test.dart index 4b07098561..b8791166ca 100644 --- a/packages/flutter/test/widgets/nested_scroll_view_test.dart +++ b/packages/flutter/test/widgets/nested_scroll_view_test.dart @@ -25,7 +25,7 @@ class _CustomPhysics extends ClampingScrollPhysics { Widget buildTest({ ScrollController controller, String title:'TTTTTTTT' }) { return new Localizations( locale: const Locale('en', 'US'), - delegates: >[ + delegates: const >[ DefaultMaterialLocalizations.delegate, DefaultWidgetsLocalizations.delegate, ], diff --git a/packages/flutter/test/widgets/parent_data_test.dart b/packages/flutter/test/widgets/parent_data_test.dart index 418675e31d..04d3259f2c 100644 --- a/packages/flutter/test/widgets/parent_data_test.dart +++ b/packages/flutter/test/widgets/parent_data_test.dart @@ -253,7 +253,7 @@ void main() { await tester.pumpWidget( new Stack( textDirection: TextDirection.ltr, - children: [ + children: const [ const Positioned( top: 5.0, bottom: 8.0, @@ -275,7 +275,7 @@ void main() { await tester.pumpWidget( new Container( child: new Row( - children: [ + children: const [ const Positioned( top: 6.0, left: 7.0, diff --git a/packages/flutter/test/widgets/semantics_test.dart b/packages/flutter/test/widgets/semantics_test.dart index d6ad7cba6c..e43748d006 100644 --- a/packages/flutter/test/widgets/semantics_test.dart +++ b/packages/flutter/test/widgets/semantics_test.dart @@ -913,7 +913,7 @@ void main() { const Text('Label 1'), const Text('Label 2'), new Row( - children: [ + children: const [ const Text('Label 3'), const Text('Label 4'), const Text('Label 5'), @@ -976,7 +976,7 @@ void main() { new Transform.rotate( angle: pi / 2.0, child: new Row( - children: [ + children: const [ const Text('Label 3'), const Text('Label 4'), const Text('Label 5'), diff --git a/packages/flutter/test/widgets/slivers_appbar_floating_pinned_test.dart b/packages/flutter/test/widgets/slivers_appbar_floating_pinned_test.dart index d7d2932cb2..7f03bf6b34 100644 --- a/packages/flutter/test/widgets/slivers_appbar_floating_pinned_test.dart +++ b/packages/flutter/test/widgets/slivers_appbar_floating_pinned_test.dart @@ -15,7 +15,7 @@ void main() { data: const MediaQueryData(), child: new CustomScrollView( controller: controller, - slivers: [ + slivers: const [ const SliverAppBar(floating: true, pinned: true, expandedHeight: 200.0, title: const Text('A')), const SliverAppBar(primary: false, pinned: true, title: const Text('B')), const SliverList( diff --git a/packages/flutter/test/widgets/slivers_block_test.dart b/packages/flutter/test/widgets/slivers_block_test.dart index 4a056436b1..5984c8b3c1 100644 --- a/packages/flutter/test/widgets/slivers_block_test.dart +++ b/packages/flutter/test/widgets/slivers_block_test.dart @@ -14,7 +14,7 @@ Future test(WidgetTester tester, double offset) { textDirection: TextDirection.ltr, child: new Viewport( offset: new ViewportOffset.fixed(offset), - slivers: [ + slivers: const [ const SliverList( delegate: const SliverChildListDelegate(const [ const SizedBox(height: 400.0, child: const Text('a')), @@ -150,7 +150,7 @@ void main() { textDirection: TextDirection.ltr, child: new Viewport( offset: offset, - slivers: [ + slivers: const [ const SliverList( delegate: const SliverChildListDelegate(const [ const SizedBox(height: 251.0, child: const Text('a')), @@ -261,7 +261,7 @@ void main() { textDirection: TextDirection.ltr, child: new Viewport( offset: new ViewportOffset.zero(), - slivers: [ + slivers: const [ const SliverList( delegate: const SliverChildListDelegate(const [ const SizedBox(height: 400.0, child: const Text('a')), @@ -279,7 +279,7 @@ void main() { textDirection: TextDirection.ltr, child: new Viewport( offset: new ViewportOffset.fixed(100.0), - slivers: [ + slivers: const [ const SliverList( delegate: const SliverChildListDelegate(const [ const SizedBox(height: 400.0, child: const Text('a')), @@ -297,7 +297,7 @@ void main() { textDirection: TextDirection.ltr, child: new Viewport( offset: new ViewportOffset.fixed(100.0), - slivers: [ + slivers: const [ const SliverList( delegate: const SliverChildListDelegate(const [ const SizedBox(height: 4000.0, child: const Text('a')), @@ -315,7 +315,7 @@ void main() { textDirection: TextDirection.ltr, child: new Viewport( offset: new ViewportOffset.zero(), - slivers: [ + slivers: const [ const SliverList( delegate: const SliverChildListDelegate(const [ const SizedBox(height: 4000.0, child: const Text('a')), diff --git a/packages/flutter_localizations/test/date_time_test.dart b/packages/flutter_localizations/test/date_time_test.dart index 4f282b1740..00138e3a74 100644 --- a/packages/flutter_localizations/test/date_time_test.dart +++ b/packages/flutter_localizations/test/date_time_test.dart @@ -31,7 +31,7 @@ void main() { await tester.pumpWidget(new MaterialApp( supportedLocales: [locale], locale: locale, - localizationsDelegates: >[ + localizationsDelegates: const >[ GlobalMaterialLocalizations.delegate, ], home: new Builder(builder: (BuildContext context) { @@ -85,7 +85,7 @@ void main() { await tester.pumpWidget(new MaterialApp( supportedLocales: [locale], locale: locale, - localizationsDelegates: >[ + localizationsDelegates: const >[ GlobalMaterialLocalizations.delegate, ], home: new Builder(builder: (BuildContext context) { diff --git a/packages/flutter_tools/lib/src/base/utils.dart b/packages/flutter_tools/lib/src/base/utils.dart index 5d3399764c..cbbc5ddb99 100644 --- a/packages/flutter_tools/lib/src/base/utils.dart +++ b/packages/flutter_tools/lib/src/base/utils.dart @@ -15,7 +15,7 @@ import 'context.dart'; import 'file_system.dart'; import 'platform.dart'; -final BotDetector _kBotDetector = const BotDetector(); +const BotDetector _kBotDetector = const BotDetector(); class BotDetector { const BotDetector();