Enable no_leading_underscores_for_local_identifiers (flutter#96422)

andrewkolos · Jan 21, 2022 · 5684b9f · 5684b9f
1 parent 53ca7f6
commit 5684b9f
Show file tree

Hide file tree

Showing 89 changed files with 948 additions and 949 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -136,7 +136,7 @@ linter:
     - no_default_cases
     - no_duplicate_case_values
     - no_leading_underscores_for_library_prefixes
-    # - no_leading_underscores_for_local_identifiers # not yet tested
+    - no_leading_underscores_for_local_identifiers
     - no_logic_in_create_state
     # - no_runtimeType_toString # ok in tests; we enable this only in packages/
     - non_constant_identifier_names

diff --git a/dev/benchmarks/complex_layout/test/measure_scroll_smoothness.dart b/dev/benchmarks/complex_layout/test/measure_scroll_smoothness.dart
@@ -120,9 +120,9 @@ class ResampleFlagVariant extends TestVariant<TestScenario> {
 }
 
 Future<void> main() async {
-  final WidgetsBinding _binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  assert(_binding is IntegrationTestWidgetsFlutterBinding);
-  final IntegrationTestWidgetsFlutterBinding binding = _binding as IntegrationTestWidgetsFlutterBinding;
+  final WidgetsBinding widgetsBinding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+  assert(widgetsBinding is IntegrationTestWidgetsFlutterBinding);
+  final IntegrationTestWidgetsFlutterBinding binding = widgetsBinding as IntegrationTestWidgetsFlutterBinding;
   binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.benchmarkLive;
   binding.reportData ??= <String, dynamic>{};
   final ResampleFlagVariant variant = ResampleFlagVariant(binding);

diff --git a/dev/benchmarks/macrobenchmarks/test/util.dart b/dev/benchmarks/macrobenchmarks/test/util.dart
@@ -38,9 +38,9 @@ void macroPerfTestMultiPageE2E(
       ControlCallback? body,
       ControlCallback? setup,
     }) {
-  final WidgetsBinding _binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  assert(_binding is IntegrationTestWidgetsFlutterBinding);
-  final IntegrationTestWidgetsFlutterBinding binding = _binding as IntegrationTestWidgetsFlutterBinding;
+  final WidgetsBinding widgetsBinding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+  assert(widgetsBinding is IntegrationTestWidgetsFlutterBinding);
+  final IntegrationTestWidgetsFlutterBinding binding = widgetsBinding as IntegrationTestWidgetsFlutterBinding;
   binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.benchmarkLive;
 
   testWidgets(testName, (WidgetTester tester) async {

diff --git a/dev/benchmarks/microbenchmarks/lib/geometry/matrix_utils_transform_bench.dart b/dev/benchmarks/microbenchmarks/lib/geometry/matrix_utils_transform_bench.dart
@@ -23,56 +23,56 @@ void main() {
     );
   }
 
-  final List<Matrix4> _affineTransforms = <Matrix4>[
+  final List<Matrix4> affineTransforms = <Matrix4>[
     Matrix4.identity()..scale(1.2, 1.3, 1.0)..rotateZ(0.1),
     Matrix4.identity()..translate(12.0, 13.0, 10.0),
     Matrix4.identity()..scale(1.2, 1.3, 1.0)..translate(12.0, 13.0, 10.0),
   ];
-  final List<Matrix4> _perspectiveTransforms = <Matrix4>[
+  final List<Matrix4> perspectiveTransforms = <Matrix4>[
     _makePerspective(10.0, math.pi / 8.0, 0.3),
     _makePerspective( 8.0, math.pi / 8.0, 0.2),
     _makePerspective( 1.0, math.pi / 4.0, 0.1)..rotateX(0.1),
   ];
-  final List<Rect> _rectangles = <Rect>[
+  final List<Rect> rectangles = <Rect>[
     const Rect.fromLTRB(1.1, 1.2, 1.5, 1.8),
     const Rect.fromLTRB(1.1, 1.2, 0.0, 1.0),
     const Rect.fromLTRB(1.1, 1.2, 1.3, 1.0),
     const Rect.fromLTRB(-1.1, -1.2, 0.0, 1.0),
     const Rect.fromLTRB(-1.1, -1.2, -1.5, -1.8),
   ];
-  final List<Offset> _offsets = <Offset>[
+  final List<Offset> offsets = <Offset>[
     const Offset(1.1, 1.2),
     const Offset(1.5, 1.8),
     Offset.zero,
     const Offset(-1.1, -1.2),
     const Offset(-1.5, -1.8),
   ];
-  final int nAffine = _affineTransforms.length;
-  final int nPerspective = _perspectiveTransforms.length;
-  final int nRectangles = _rectangles.length;
-  final int nOffsets = _offsets.length;
+  final int nAffine = affineTransforms.length;
+  final int nPerspective = perspectiveTransforms.length;
+  final int nRectangles = rectangles.length;
+  final int nOffsets = offsets.length;
 
   // Warm up lap
   for (int i = 0; i < _kNumWarmUp; i += 1) {
-    final Matrix4 transform = _perspectiveTransforms[i % nPerspective];
-    final Rect rect = _rectangles[(i ~/ nPerspective) % nRectangles];
-    final Offset offset = _offsets[(i ~/ nPerspective) % nOffsets];
+    final Matrix4 transform = perspectiveTransforms[i % nPerspective];
+    final Rect rect = rectangles[(i ~/ nPerspective) % nRectangles];
+    final Offset offset = offsets[(i ~/ nPerspective) % nOffsets];
     MatrixUtils.transformRect(transform, rect);
     MatrixUtils.transformPoint(transform, offset);
   }
   for (int i = 0; i < _kNumWarmUp; i += 1) {
-    final Matrix4 transform = _affineTransforms[i % nAffine];
-    final Rect rect = _rectangles[(i ~/ nAffine) % nRectangles];
-    final Offset offset = _offsets[(i ~/ nAffine) % nOffsets];
+    final Matrix4 transform = affineTransforms[i % nAffine];
+    final Rect rect = rectangles[(i ~/ nAffine) % nRectangles];
+    final Offset offset = offsets[(i ~/ nAffine) % nOffsets];
     MatrixUtils.transformRect(transform, rect);
     MatrixUtils.transformPoint(transform, offset);
   }
 
   final Stopwatch watch = Stopwatch();
   watch.start();
   for (int i = 0; i < _kNumIterations; i += 1) {
-    final Matrix4 transform = _perspectiveTransforms[i % nPerspective];
-    final Rect rect = _rectangles[(i ~/ nPerspective) % nRectangles];
+    final Matrix4 transform = perspectiveTransforms[i % nPerspective];
+    final Rect rect = rectangles[(i ~/ nPerspective) % nRectangles];
     MatrixUtils.transformRect(transform, rect);
   }
   watch.stop();
@@ -81,8 +81,8 @@ void main() {
   watch.reset();
   watch.start();
   for (int i = 0; i < _kNumIterations; i += 1) {
-    final Matrix4 transform = _affineTransforms[i % nAffine];
-    final Rect rect = _rectangles[(i ~/ nAffine) % nRectangles];
+    final Matrix4 transform = affineTransforms[i % nAffine];
+    final Rect rect = rectangles[(i ~/ nAffine) % nRectangles];
     MatrixUtils.transformRect(transform, rect);
   }
   watch.stop();
@@ -91,8 +91,8 @@ void main() {
   watch.reset();
   watch.start();
   for (int i = 0; i < _kNumIterations; i += 1) {
-    final Matrix4 transform = _perspectiveTransforms[i % nPerspective];
-    final Offset offset = _offsets[(i ~/ nPerspective) % nOffsets];
+    final Matrix4 transform = perspectiveTransforms[i % nPerspective];
+    final Offset offset = offsets[(i ~/ nPerspective) % nOffsets];
     MatrixUtils.transformPoint(transform, offset);
   }
   watch.stop();
@@ -101,8 +101,8 @@ void main() {
   watch.reset();
   watch.start();
   for (int i = 0; i < _kNumIterations; i += 1) {
-    final Matrix4 transform = _affineTransforms[i % nAffine];
-    final Offset offset = _offsets[(i ~/ nAffine) % nOffsets];
+    final Matrix4 transform = affineTransforms[i % nAffine];
+    final Offset offset = offsets[(i ~/ nAffine) % nOffsets];
     MatrixUtils.transformPoint(transform, offset);
   }
   watch.stop();

diff --git a/dev/devicelab/lib/framework/browser.dart b/dev/devicelab/lib/framework/browser.dart
@@ -351,7 +351,7 @@ class BlinkTraceSummary {
         averageBeginFrameTime: _computeAverageDuration(frames.map((BlinkFrame frame) => frame.beginFrame).whereType<BlinkTraceEvent>().toList()),
         averageUpdateLifecyclePhasesTime: _computeAverageDuration(frames.map((BlinkFrame frame) => frame.updateAllLifecyclePhases).whereType<BlinkTraceEvent>().toList()),
       );
-    } catch (_, __) {
+    } catch (_) {
       final io.File traceFile = io.File('./chrome-trace.json');
       io.stderr.writeln('Failed to interpret the Chrome trace contents. The trace was saved in ${traceFile.path}');
       traceFile.writeAsStringSync(const JsonEncoder.withIndent('  ').convert(traceJson));

diff --git a/dev/devicelab/lib/tasks/gallery.dart b/dev/devicelab/lib/tasks/gallery.dart
@@ -177,12 +177,12 @@ class GalleryTransitionTest {
 }
 
 int _countMissedTransitions(Map<String, List<int>> transitions) {
-  const int _kTransitionBudget = 100000; // µs
+  const int kTransitionBudget = 100000; // µs
   int count = 0;
   transitions.forEach((String demoName, List<int> durations) {
     final int longestDuration = durations.reduce(math.max);
-    if (longestDuration > _kTransitionBudget) {
-      print('$demoName missed transition time budget ($longestDuration µs > $_kTransitionBudget µs)');
+    if (longestDuration > kTransitionBudget) {
+      print('$demoName missed transition time budget ($longestDuration µs > $kTransitionBudget µs)');
       count++;
     }
   });

diff --git a/dev/devicelab/test/cocoon_test.dart b/dev/devicelab/test/cocoon_test.dart
@@ -16,15 +16,15 @@ import 'package:http/testing.dart';
 import 'common.dart';
 
 void main() {
-  late ProcessResult _processResult;
+  late ProcessResult processResult;
   ProcessResult runSyncStub(String executable, List<String> args,
           {Map<String, String>? environment,
           bool includeParentEnvironment = true,
           bool runInShell = false,
           Encoding? stderrEncoding,
           Encoding? stdoutEncoding,
           String? workingDirectory}) =>
-      _processResult;
+      processResult;
 
   // Expected test values.
   const String commitSha = 'a4952838bf288a81d8ea11edfd4b4cd649fa94cc';
@@ -45,7 +45,7 @@ void main() {
     });
 
     test('returns expected commit sha', () {
-      _processResult = ProcessResult(1, 0, commitSha, '');
+      processResult = ProcessResult(1, 0, commitSha, '');
       cocoon = Cocoon(
         serviceAccountTokenPath: serviceAccountTokenPath,
         fs: fs,
@@ -57,7 +57,7 @@ void main() {
     });
 
     test('throws exception on git cli errors', () {
-      _processResult = ProcessResult(1, 1, '', '');
+      processResult = ProcessResult(1, 1, '', '');
       cocoon = Cocoon(
         serviceAccountTokenPath: serviceAccountTokenPath,
         fs: fs,
@@ -69,7 +69,7 @@ void main() {
     });
 
     test('writes expected update task json', () async {
-      _processResult = ProcessResult(1, 0, commitSha, '');
+      processResult = ProcessResult(1, 0, commitSha, '');
       final TaskResult result = TaskResult.fromJson(<String, dynamic>{
         'success': true,
         'data': <String, dynamic>{
@@ -105,7 +105,7 @@ void main() {
     });
 
     test('uploads metrics sends expected post body', () async {
-      _processResult = ProcessResult(1, 0, commitSha, '');
+      processResult = ProcessResult(1, 0, commitSha, '');
       const String uploadMetricsRequestWithSpaces =
           '{"CommitBranch":"master","CommitSha":"a4952838bf288a81d8ea11edfd4b4cd649fa94cc","BuilderName":"builder a b c","NewStatus":"Succeeded","ResultData":{},"BenchmarkScoreKeys":[],"TestFlaky":false}';
       final MockClient client = MockClient((Request request) async {
@@ -136,7 +136,7 @@ void main() {
     });
 
     test('uploads expected update task payload from results file', () async {
-      _processResult = ProcessResult(1, 0, commitSha, '');
+      processResult = ProcessResult(1, 0, commitSha, '');
       cocoon = Cocoon(
         fs: fs,
         httpClient: mockClient,
@@ -168,7 +168,7 @@ void main() {
         }
       });
 
-      _processResult = ProcessResult(1, 0, commitSha, '');
+      processResult = ProcessResult(1, 0, commitSha, '');
       cocoon = Cocoon(
         fs: fs,
         httpClient: mockClient,
@@ -202,7 +202,7 @@ void main() {
         }
       });
 
-      _processResult = ProcessResult(1, 0, commitSha, '');
+      processResult = ProcessResult(1, 0, commitSha, '');
       cocoon = Cocoon(
         fs: fs,
         httpClient: mockClient,
@@ -237,7 +237,7 @@ void main() {
         }
       });
 
-      _processResult = ProcessResult(1, 0, commitSha, '');
+      processResult = ProcessResult(1, 0, commitSha, '');
       cocoon = Cocoon(
         fs: fs,
         httpClient: mockClient,
@@ -270,7 +270,7 @@ void main() {
         }
       });
 
-      _processResult = ProcessResult(1, 0, commitSha, '');
+      processResult = ProcessResult(1, 0, commitSha, '');
       cocoon = Cocoon(
         fs: fs,
         httpClient: mockClient,

diff --git a/examples/api/lib/widgets/interactive_viewer/interactive_viewer.constrained.0.dart b/examples/api/lib/widgets/interactive_viewer/interactive_viewer.constrained.0.dart
@@ -30,23 +30,23 @@ class MyStatelessWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    const int _rowCount = 48;
-    const int _columnCount = 6;
+    const int rowCount = 48;
+    const int columnCount = 6;
 
     return InteractiveViewer(
       alignPanAxis: true,
       constrained: false,
       scaleEnabled: false,
       child: Table(
         columnWidths: <int, TableColumnWidth>{
-          for (int column = 0; column < _columnCount; column += 1)
+          for (int column = 0; column < columnCount; column += 1)
             column: const FixedColumnWidth(200.0),
         },
         children: <TableRow>[
-          for (int row = 0; row < _rowCount; row += 1)
+          for (int row = 0; row < rowCount; row += 1)
             TableRow(
               children: <Widget>[
-                for (int column = 0; column < _columnCount; column += 1)
+                for (int column = 0; column < columnCount; column += 1)
                   Container(
                     height: 26,
                     color: row % 2 + column % 2 == 1

diff --git a/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.0.dart b/examples/api/lib/widgets/nested_scroll_view/nested_scroll_view.0.dart
@@ -27,9 +27,9 @@ class MyStatelessWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final List<String> _tabs = <String>['Tab 1', 'Tab 2'];
+    final List<String> tabs = <String>['Tab 1', 'Tab 2'];
     return DefaultTabController(
-      length: _tabs.length, // This is the number of tabs.
+      length: tabs.length, // This is the number of tabs.
       child: Scaffold(
         body: NestedScrollView(
           headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
@@ -61,15 +61,15 @@ class MyStatelessWidget extends StatelessWidget {
                   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(),
                   ),
                 ),
               ),
             ];
           },
           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/examples/api/lib/widgets/notification_listener/notification.0.dart b/examples/api/lib/widgets/notification_listener/notification.0.dart
@@ -25,19 +25,20 @@ class MyApp extends StatelessWidget {
 class MyStatelessWidget extends StatelessWidget {
   const MyStatelessWidget({Key? key}) : super(key: key);
 
+  static const List<String> _tabs = <String>['Months', 'Days'];
+  static const List<String> _months = <String>[
+    'January',
+    'February',
+    'March',
+  ];
+  static const List<String> _days = <String>[
+    'Sunday',
+    'Monday',
+    'Tuesday',
+  ];
+
   @override
   Widget build(BuildContext context) {
-    const List<String> _tabs = <String>['Months', 'Days'];
-    const List<String> _months = <String>[
-      'January',
-      'February',
-      'March',
-    ];
-    const List<String> _days = <String>[
-      'Sunday',
-      'Monday',
-      'Tuesday',
-    ];
     return DefaultTabController(
       length: _tabs.length,
       child: Scaffold(

diff --git a/packages/flutter/lib/src/animation/animation_controller.dart b/packages/flutter/lib/src/animation/animation_controller.dart
@@ -898,9 +898,9 @@ class _RepeatingSimulation extends Simulation {
 
     final double totalTimeInSeconds = timeInSeconds + _initialT;
     final double t = (totalTimeInSeconds / _periodInSeconds) % 1.0;
-    final bool _isPlayingReverse = (totalTimeInSeconds ~/ _periodInSeconds).isOdd;
+    final bool isPlayingReverse = (totalTimeInSeconds ~/ _periodInSeconds).isOdd;
 
-    if (reverse && _isPlayingReverse) {
+    if (reverse && isPlayingReverse) {
       directionSetter(_AnimationDirection.reverse);
       return ui.lerpDouble(max, min, t)!;
     } else {

diff --git a/packages/flutter/lib/src/cupertino/colors.dart b/packages/flutter/lib/src/cupertino/colors.dart
@@ -1003,9 +1003,9 @@ class CupertinoDynamicColor extends Color with Diagnosticable {
         }
     }
 
-    Element? _debugContext;
+    Element? debugContext;
     assert(() {
-      _debugContext = context as Element;
+      debugContext = context as Element;
       return true;
     }());
     return CupertinoDynamicColor._(
@@ -1018,7 +1018,7 @@ class CupertinoDynamicColor extends Color with Diagnosticable {
       darkElevatedColor,
       highContrastElevatedColor,
       darkHighContrastElevatedColor,
-      _debugContext,
+      debugContext,
       _debugLabel,
     );
   }