Enable no_leading_underscores_for_local_identifiers (#6509)

flutter · Sep 28, 2022 · 9428081 · 9428081
1 parent 7aa678e
commit 9428081
Show file tree

Hide file tree

Showing 83 changed files with 675 additions and 616 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -143,7 +143,7 @@ linter:
     # - no_default_cases # LOCAL CHANGE - Needs to be enabled and violations fixed.
     - no_duplicate_case_values
     - no_leading_underscores_for_library_prefixes
-    # - no_leading_underscores_for_local_identifiers # LOCAL CHANGE - Needs to be enabled and violations fixed.
+    - 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/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.0+3
+
+* Updates code for `no_leading_underscores_for_local_identifiers` lint.
+
 ## 0.10.0+2
 
 * Updates imports for `prefer_relative_imports`.

diff --git a/packages/camera/camera/example/integration_test/camera_test.dart b/packages/camera/camera/example/integration_test/camera_test.dart
@@ -221,16 +221,16 @@ void main() {
       );
 
       await controller.initialize();
-      bool _isDetecting = false;
+      bool isDetecting = false;
 
       await controller.startImageStream((CameraImage image) {
-        if (_isDetecting) {
+        if (isDetecting) {
           return;
         }
 
-        _isDetecting = true;
+        isDetecting = true;
 
-        expectLater(image, isNotNull).whenComplete(() => _isDetecting = false);
+        expectLater(image, isNotNull).whenComplete(() => isDetecting = false);
       });
 
       expect(controller.value.isStreamingImages, true);
@@ -254,19 +254,19 @@ void main() {
     );
 
     await controller.initialize();
-    final Completer<CameraImage> _completer = Completer<CameraImage>();
+    final Completer<CameraImage> completer = Completer<CameraImage>();
 
     await controller.startImageStream((CameraImage image) {
-      if (!_completer.isCompleted) {
+      if (!completer.isCompleted) {
         Future<void>(() async {
           await controller.stopImageStream();
           await controller.dispose();
         }).then((Object? value) {
-          _completer.complete(image);
+          completer.complete(image);
         });
       }
     });
-    return _completer.future;
+    return completer.future;
   }
 
   testWidgets(
@@ -277,20 +277,20 @@ void main() {
         return;
       }
 
-      CameraImage _image = await startStreaming(cameras, null);
-      expect(_image, isNotNull);
-      expect(_image.format.group, ImageFormatGroup.bgra8888);
-      expect(_image.planes.length, 1);
+      CameraImage image = await startStreaming(cameras, null);
+      expect(image, isNotNull);
+      expect(image.format.group, ImageFormatGroup.bgra8888);
+      expect(image.planes.length, 1);
 
-      _image = await startStreaming(cameras, ImageFormatGroup.yuv420);
-      expect(_image, isNotNull);
-      expect(_image.format.group, ImageFormatGroup.yuv420);
-      expect(_image.planes.length, 2);
+      image = await startStreaming(cameras, ImageFormatGroup.yuv420);
+      expect(image, isNotNull);
+      expect(image.format.group, ImageFormatGroup.yuv420);
+      expect(image.planes.length, 2);
 
-      _image = await startStreaming(cameras, ImageFormatGroup.bgra8888);
-      expect(_image, isNotNull);
-      expect(_image.format.group, ImageFormatGroup.bgra8888);
-      expect(_image.planes.length, 1);
+      image = await startStreaming(cameras, ImageFormatGroup.bgra8888);
+      expect(image, isNotNull);
+      expect(image.format.group, ImageFormatGroup.bgra8888);
+      expect(image.planes.length, 1);
     },
     skip: !Platform.isIOS,
   );

diff --git a/packages/camera/camera/lib/src/camera_controller.dart b/packages/camera/camera/lib/src/camera_controller.dart
@@ -282,7 +282,7 @@ class CameraController extends ValueNotifier<CameraValue> {
       );
     }
     try {
-      final Completer<CameraInitializedEvent> _initializeCompleter =
+      final Completer<CameraInitializedEvent> initializeCompleter =
           Completer<CameraInitializedEvent>();
 
       _deviceOrientationSubscription = CameraPlatform.instance
@@ -303,7 +303,7 @@ class CameraController extends ValueNotifier<CameraValue> {
           .onCameraInitialized(_cameraId)
           .first
           .then((CameraInitializedEvent event) {
-        _initializeCompleter.complete(event);
+        initializeCompleter.complete(event);
       }));
 
       await CameraPlatform.instance.initializeCamera(
@@ -313,18 +313,18 @@ class CameraController extends ValueNotifier<CameraValue> {
 
       value = value.copyWith(
         isInitialized: true,
-        previewSize: await _initializeCompleter.future
+        previewSize: await initializeCompleter.future
             .then((CameraInitializedEvent event) => Size(
                   event.previewWidth,
                   event.previewHeight,
                 )),
-        exposureMode: await _initializeCompleter.future
+        exposureMode: await initializeCompleter.future
             .then((CameraInitializedEvent event) => event.exposureMode),
-        focusMode: await _initializeCompleter.future
+        focusMode: await initializeCompleter.future
             .then((CameraInitializedEvent event) => event.focusMode),
-        exposurePointSupported: await _initializeCompleter.future.then(
+        exposurePointSupported: await initializeCompleter.future.then(
             (CameraInitializedEvent event) => event.exposurePointSupported),
-        focusPointSupported: await _initializeCompleter.future
+        focusPointSupported: await initializeCompleter.future
             .then((CameraInitializedEvent event) => event.focusPointSupported),
       );
     } on PlatformException catch (e) {

diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml
@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
   Dart.
 repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.10.0+2
+version: 0.10.0+3
 
 environment:
   sdk: ">=2.14.0 <3.0.0"

diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.0+3
+
+* Updates code for `no_leading_underscores_for_local_identifiers` lint.
+
 ## 0.10.0+2
 
 * Removes call to `join` on the camera's background `HandlerThread`.

diff --git a/packages/camera/camera_android/example/integration_test/camera_test.dart b/packages/camera/camera_android/example/integration_test/camera_test.dart
@@ -225,16 +225,16 @@ void main() {
       );
 
       await controller.initialize();
-      bool _isDetecting = false;
+      bool isDetecting = false;
 
       await controller.startImageStream((CameraImageData image) {
-        if (_isDetecting) {
+        if (isDetecting) {
           return;
         }
 
-        _isDetecting = true;
+        isDetecting = true;
 
-        expectLater(image, isNotNull).whenComplete(() => _isDetecting = false);
+        expectLater(image, isNotNull).whenComplete(() => isDetecting = false);
       });
 
       expect(controller.value.isStreamingImages, true);

diff --git a/packages/camera/camera_android/example/lib/camera_controller.dart b/packages/camera/camera_android/example/lib/camera_controller.dart
@@ -203,7 +203,7 @@ class CameraController extends ValueNotifier<CameraValue> {
 
   /// Initializes the camera on the device.
   Future<void> initialize() async {
-    final Completer<CameraInitializedEvent> _initializeCompleter =
+    final Completer<CameraInitializedEvent> initializeCompleter =
         Completer<CameraInitializedEvent>();
 
     _deviceOrientationSubscription = CameraPlatform.instance
@@ -224,7 +224,7 @@ class CameraController extends ValueNotifier<CameraValue> {
         .onCameraInitialized(_cameraId)
         .first
         .then((CameraInitializedEvent event) {
-      _initializeCompleter.complete(event);
+      initializeCompleter.complete(event);
     });
 
     await CameraPlatform.instance.initializeCamera(
@@ -234,18 +234,18 @@ class CameraController extends ValueNotifier<CameraValue> {
 
     value = value.copyWith(
       isInitialized: true,
-      previewSize: await _initializeCompleter.future
+      previewSize: await initializeCompleter.future
           .then((CameraInitializedEvent event) => Size(
                 event.previewWidth,
                 event.previewHeight,
               )),
-      exposureMode: await _initializeCompleter.future
+      exposureMode: await initializeCompleter.future
           .then((CameraInitializedEvent event) => event.exposureMode),
-      focusMode: await _initializeCompleter.future
+      focusMode: await initializeCompleter.future
           .then((CameraInitializedEvent event) => event.focusMode),
-      exposurePointSupported: await _initializeCompleter.future
+      exposurePointSupported: await initializeCompleter.future
           .then((CameraInitializedEvent event) => event.exposurePointSupported),
-      focusPointSupported: await _initializeCompleter.future
+      focusPointSupported: await initializeCompleter.future
           .then((CameraInitializedEvent event) => event.focusPointSupported),
     );
 

diff --git a/packages/camera/camera_android/lib/src/android_camera.dart b/packages/camera/camera_android/lib/src/android_camera.dart
@@ -126,10 +126,10 @@ class AndroidCamera extends CameraPlatform {
       return channel;
     });
 
-    final Completer<void> _completer = Completer<void>();
+    final Completer<void> completer = Completer<void>();
 
     onCameraInitialized(cameraId).first.then((CameraInitializedEvent value) {
-      _completer.complete();
+      completer.complete();
     });
 
     _channel.invokeMapMethod<String, dynamic>(
@@ -147,14 +147,14 @@ class AndroidCamera extends CameraPlatform {
         if (error is! PlatformException) {
           throw error;
         }
-        _completer.completeError(
+        completer.completeError(
           CameraException(error.code, error.message),
           stackTrace,
         );
       },
     );
 
-    return _completer.future;
+    return completer.future;
   }
 
   @override

diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera_android
 description: Android implementation of the camera plugin.
 repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.10.0+2
+version: 0.10.0+3
 
 environment:
   sdk: ">=2.14.0 <3.0.0"

diff --git a/packages/camera/camera_avfoundation/CHANGELOG.md b/packages/camera/camera_avfoundation/CHANGELOG.md
@@ -1,5 +1,6 @@
-## NEXT
+## 0.9.8+6
 
+* Updates code for `no_leading_underscores_for_local_identifiers` lint.
 * Updates minimum Flutter version to 2.10.
 
 ## 0.9.8+5

diff --git a/packages/camera/camera_avfoundation/example/integration_test/camera_test.dart b/packages/camera/camera_avfoundation/example/integration_test/camera_test.dart
@@ -213,19 +213,19 @@ void main() {
     );
 
     await controller.initialize();
-    final Completer<CameraImageData> _completer = Completer<CameraImageData>();
+    final Completer<CameraImageData> completer = Completer<CameraImageData>();
 
     await controller.startImageStream((CameraImageData image) {
-      if (!_completer.isCompleted) {
+      if (!completer.isCompleted) {
         Future<void>(() async {
           await controller.stopImageStream();
           await controller.dispose();
         }).then((Object? value) {
-          _completer.complete(image);
+          completer.complete(image);
         });
       }
     });
-    return _completer.future;
+    return completer.future;
   }
 
   testWidgets(
@@ -237,20 +237,20 @@ void main() {
         return;
       }
 
-      CameraImageData _image = await startStreaming(cameras, null);
-      expect(_image, isNotNull);
-      expect(_image.format.group, ImageFormatGroup.bgra8888);
-      expect(_image.planes.length, 1);
+      CameraImageData image = await startStreaming(cameras, null);
+      expect(image, isNotNull);
+      expect(image.format.group, ImageFormatGroup.bgra8888);
+      expect(image.planes.length, 1);
 
-      _image = await startStreaming(cameras, ImageFormatGroup.yuv420);
-      expect(_image, isNotNull);
-      expect(_image.format.group, ImageFormatGroup.yuv420);
-      expect(_image.planes.length, 2);
+      image = await startStreaming(cameras, ImageFormatGroup.yuv420);
+      expect(image, isNotNull);
+      expect(image.format.group, ImageFormatGroup.yuv420);
+      expect(image.planes.length, 2);
 
-      _image = await startStreaming(cameras, ImageFormatGroup.bgra8888);
-      expect(_image, isNotNull);
-      expect(_image.format.group, ImageFormatGroup.bgra8888);
-      expect(_image.planes.length, 1);
+      image = await startStreaming(cameras, ImageFormatGroup.bgra8888);
+      expect(image, isNotNull);
+      expect(image.format.group, ImageFormatGroup.bgra8888);
+      expect(image.planes.length, 1);
     },
   );
 }
diff --git a/packages/camera/camera_avfoundation/example/lib/camera_controller.dart b/packages/camera/camera_avfoundation/example/lib/camera_controller.dart
@@ -203,7 +203,7 @@ class CameraController extends ValueNotifier<CameraValue> {
 
   /// Initializes the camera on the device.
   Future<void> initialize() async {
-    final Completer<CameraInitializedEvent> _initializeCompleter =
+    final Completer<CameraInitializedEvent> initializeCompleter =
         Completer<CameraInitializedEvent>();
 
     _deviceOrientationSubscription = CameraPlatform.instance
@@ -224,7 +224,7 @@ class CameraController extends ValueNotifier<CameraValue> {
         .onCameraInitialized(_cameraId)
         .first
         .then((CameraInitializedEvent event) {
-      _initializeCompleter.complete(event);
+      initializeCompleter.complete(event);
     });
 
     await CameraPlatform.instance.initializeCamera(
@@ -234,18 +234,18 @@ class CameraController extends ValueNotifier<CameraValue> {
 
     value = value.copyWith(
       isInitialized: true,
-      previewSize: await _initializeCompleter.future
+      previewSize: await initializeCompleter.future
           .then((CameraInitializedEvent event) => Size(
                 event.previewWidth,
                 event.previewHeight,
               )),
-      exposureMode: await _initializeCompleter.future
+      exposureMode: await initializeCompleter.future
           .then((CameraInitializedEvent event) => event.exposureMode),
-      focusMode: await _initializeCompleter.future
+      focusMode: await initializeCompleter.future
           .then((CameraInitializedEvent event) => event.focusMode),
-      exposurePointSupported: await _initializeCompleter.future
+      exposurePointSupported: await initializeCompleter.future
           .then((CameraInitializedEvent event) => event.exposurePointSupported),
-      focusPointSupported: await _initializeCompleter.future
+      focusPointSupported: await initializeCompleter.future
           .then((CameraInitializedEvent event) => event.focusPointSupported),
     );
 

diff --git a/packages/camera/camera_avfoundation/lib/src/avfoundation_camera.dart b/packages/camera/camera_avfoundation/lib/src/avfoundation_camera.dart
@@ -126,10 +126,10 @@ class AVFoundationCamera extends CameraPlatform {
       return channel;
     });
 
-    final Completer<void> _completer = Completer<void>();
+    final Completer<void> completer = Completer<void>();
 
     onCameraInitialized(cameraId).first.then((CameraInitializedEvent value) {
-      _completer.complete();
+      completer.complete();
     });
 
     _channel.invokeMapMethod<String, dynamic>(
@@ -147,14 +147,14 @@ class AVFoundationCamera extends CameraPlatform {
         if (error is! PlatformException) {
           throw error;
         }
-        _completer.completeError(
+        completer.completeError(
           CameraException(error.code, error.message),
           stackTrace,
         );
       },
     );
 
-    return _completer.future;
+    return completer.future;
   }
 
   @override