From 40a2689b9c6269490af75eb5dfeaed64d379173d Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 12 Jan 2022 21:10:19 -0800 Subject: [PATCH] enable unnecessary_late (#96417) --- analysis_options.yaml | 2 +- dev/tools/gen_keycodes/lib/logical_key_data.dart | 6 +++--- packages/flutter/lib/src/painting/matrix_utils.dart | 2 +- packages/flutter/test/rendering/rendering_tester.dart | 2 +- packages/flutter_test/lib/src/event_simulation.dart | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 91d0a8bcb00..2d4291484e1 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -215,7 +215,7 @@ linter: # - unnecessary_final # conflicts with prefer_final_locals - unnecessary_getters_setters # - unnecessary_lambdas # has false positives: https://github.com/dart-lang/linter/issues/498 - # - unnecessary_late # not yet tested + - unnecessary_late - unnecessary_new - unnecessary_null_aware_assignments - unnecessary_null_checks diff --git a/dev/tools/gen_keycodes/lib/logical_key_data.dart b/dev/tools/gen_keycodes/lib/logical_key_data.dart index 7a40e21b678..a7d0d72843e 100644 --- a/dev/tools/gen_keycodes/lib/logical_key_data.dart +++ b/dev/tools/gen_keycodes/lib/logical_key_data.dart @@ -387,7 +387,7 @@ class LogicalKeyData { } // Map Web key to the pair of key names - static late final Map _chromeModifiers = () { + static final Map _chromeModifiers = () { final String rawJson = File(path.join(dataRoot, 'chromium_modifiers.json',)).readAsStringSync(); return (json.decode(rawJson) as Map).map((String key, dynamic value) { final List pair = value as List; @@ -396,7 +396,7 @@ class LogicalKeyData { }(); /// Returns the static map of printable representations. - static late final Map printable = (() { + static final Map printable = (() { final String printableKeys = File(path.join(dataRoot, 'printable.json',)).readAsStringSync(); return (json.decode(printableKeys) as Map) .cast(); @@ -407,7 +407,7 @@ class LogicalKeyData { /// These include synonyms for keys which don't have printable /// representations, and appear in more than one place on the keyboard (e.g. /// SHIFT, ALT, etc.). - static late final Map> synonyms = (() { + static final Map> synonyms = (() { final String synonymKeys = File(path.join(dataRoot, 'synonyms.json',)).readAsStringSync(); final Map dynamicSynonym = json.decode(synonymKeys) as Map; return dynamicSynonym.map((String name, dynamic values) { diff --git a/packages/flutter/lib/src/painting/matrix_utils.dart b/packages/flutter/lib/src/painting/matrix_utils.dart index f684b7246bd..6543fe3a2b0 100644 --- a/packages/flutter/lib/src/painting/matrix_utils.dart +++ b/packages/flutter/lib/src/painting/matrix_utils.dart @@ -171,7 +171,7 @@ class MatrixUtils { return Rect.fromLTRB(_minMax[0], _minMax[1], _minMax[2], _minMax[3]); } - static late final Float64List _minMax = Float64List(4); + static final Float64List _minMax = Float64List(4); static void _accumulate(Float64List m, double x, double y, bool first, bool isAffine) { final double w = isAffine ? 1.0 : 1.0 / (m[3] * x + m[7] * y + m[15]); final double tx = (m[0] * x + m[4] * y + m[12]) * w; diff --git a/packages/flutter/test/rendering/rendering_tester.dart b/packages/flutter/test/rendering/rendering_tester.dart index 347dd878be7..3b5523ec172 100644 --- a/packages/flutter/test/rendering/rendering_tester.dart +++ b/packages/flutter/test/rendering/rendering_tester.dart @@ -153,7 +153,7 @@ class TestRenderingFlutterBinding extends BindingBase with SchedulerBinding, Ser } } -late final TestRenderingFlutterBinding _renderer = TestRenderingFlutterBinding(); +final TestRenderingFlutterBinding _renderer = TestRenderingFlutterBinding(); TestRenderingFlutterBinding get renderer => _renderer; diff --git a/packages/flutter_test/lib/src/event_simulation.dart b/packages/flutter_test/lib/src/event_simulation.dart index ff91e995f9d..1761b4c98b8 100644 --- a/packages/flutter_test/lib/src/event_simulation.dart +++ b/packages/flutter_test/lib/src/event_simulation.dart @@ -696,7 +696,7 @@ class KeyEventSimulator { }); } - static late final Map _debugNameToPhysicalKey = (() { + static final Map _debugNameToPhysicalKey = (() { final Map result = {}; for (final PhysicalKeyboardKey key in PhysicalKeyboardKey.knownPhysicalKeys) { final String? debugName = key.debugName;