chore: upgrade very_good_analysis to ^10.1.0-rc.1

Author: ricardodalarme

bin/very_good.dart

@@ -11,9 +11,7 @@ Future<void> main(List<String> args) async {
 /// This returns a Future that will never complete, since the program will have
 /// exited already. This is useful to prevent Future chains from proceeding
 /// after you've decided to exit.
-Future<void> _flushThenExit(int status) {
-  return Future.wait<void>([
-    stdout.close(),
-    stderr.close(),
-  ]).then<void>((_) => exit(status));
-}
+Future<void> _flushThenExit(int status) => Future.wait<void>([
+  stdout.close(),
+  stderr.close(),
+]).then<void>((_) => exit(status));

bricks/test_optimizer/hooks/lib/pre_gen.dart

@@ -63,9 +63,8 @@ Future<void> run(HookContext context) async {
 }
 
 extension on FileSystemEntity {
-  bool get isTest {
-    return this is File && path.basename(this.path).endsWith('_test.dart');
-  }
+  bool get isTest =>
+      this is File && path.basename(this.path).endsWith('_test.dart');
 }
 
 Future<List<String>> getNotOptimizedTests(

bricks/test_optimizer/hooks/pubspec.yaml

@@ -13,4 +13,4 @@ dependencies:
 dev_dependencies:
   mocktail: ^1.0.0
   test: ^1.25.0
-  very_good_analysis: ^10.0.0
+  very_good_analysis: ^10.1.0-rc.1

e2e/helpers/command_helper.dart

@@ -11,20 +11,16 @@ class _MockProgress extends Mock implements Progress {}
 
 class _MockPubUpdater extends Mock implements PubUpdater {}
 
-void Function() _overridePrint(void Function(List<String>) fn) {
-  return () {
-    final printLogs = <String>[];
-    final spec = ZoneSpecification(
-      print: (_, _, _, String msg) {
-        printLogs.add(msg);
-      },
-    );
+void Function() _overridePrint(void Function(List<String>) fn) => () {
+  final printLogs = <String>[];
+  final spec = ZoneSpecification(
+    print: (_, _, _, msg) {
+      printLogs.add(msg);
+    },
+  );
 
-    return Zone.current
-        .fork(specification: spec)
-        .run<void>(() => fn(printLogs));
-  };
-}
+  return Zone.current.fork(specification: spec).run<void>(() => fn(printLogs));
+};
 
 void Function() withRunner(
   FutureOr<void> Function(
@@ -35,39 +31,37 @@ void Function() withRunner(
     List<String> progressLogs,
   )
   runnerFn,
-) {
-  return _overridePrint((printLogs) async {
-    final logger = _MockLogger();
-    final progress = _MockProgress();
-    final pubUpdater = _MockPubUpdater();
-    final progressLogs = <String>[];
-    final commandRunner = VeryGoodCommandRunner(
-      logger: logger,
-      pubUpdater: pubUpdater,
-      environment: {'CI': 'true'},
-    );
+) => _overridePrint((printLogs) async {
+  final logger = _MockLogger();
+  final progress = _MockProgress();
+  final pubUpdater = _MockPubUpdater();
+  final progressLogs = <String>[];
+  final commandRunner = VeryGoodCommandRunner(
+    logger: logger,
+    pubUpdater: pubUpdater,
+    environment: {'CI': 'true'},
+  );
 
-    when(() => progress.complete(any())).thenAnswer((invocation) {
-      final message = invocation.positionalArguments.first as String?;
-      if (message != null) progressLogs.add(message);
-    });
-    when(() => logger.progress(any())).thenReturn(progress);
-    when(
-      () => pubUpdater.isUpToDate(
-        packageName: any(named: 'packageName'),
-        currentVersion: any(named: 'currentVersion'),
-      ),
-    ).thenAnswer((_) => Future.value(true));
-    when(
-      () => pubUpdater.getLatestVersion(any()),
-    ).thenAnswer((_) => Future.value('1.0.0'));
-
-    await runnerFn(
-      commandRunner,
-      logger,
-      pubUpdater,
-      printLogs,
-      progressLogs,
-    );
+  when(() => progress.complete(any())).thenAnswer((invocation) {
+    final message = invocation.positionalArguments.first as String?;
+    if (message != null) progressLogs.add(message);
   });
-}
+  when(() => logger.progress(any())).thenReturn(progress);
+  when(
+    () => pubUpdater.isUpToDate(
+      packageName: any(named: 'packageName'),
+      currentVersion: any(named: 'currentVersion'),
+    ),
+  ).thenAnswer((_) => Future.value(true));
+  when(
+    () => pubUpdater.getLatestVersion(any()),
+  ).thenAnswer((_) => Future.value('1.0.0'));
+
+  await runnerFn(
+    commandRunner,
+    logger,
+    pubUpdater,
+    printLogs,
+    progressLogs,
+  );
+});

e2e/pubspec.yaml

@@ -13,6 +13,6 @@ dev_dependencies:
   pub_updater: ^0.5.0
   test: ^1.25.0
   universal_io: ^2.0.4
-  very_good_analysis: ^10.0.0
+  very_good_analysis: ^10.1.0-rc.1
   very_good_cli:
     path: ../

lib/src/cli/cli.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:math';
+
 import 'package:collection/collection.dart';
 import 'package:coverage/coverage.dart' as coverage;
 import 'package:glob/glob.dart';
@@ -50,9 +51,8 @@ abstract class ProcessOverrides {
   /// * [ProcessOverrides.runZoned] to provide [ProcessOverrides]
   /// in a fresh [Zone].
   ///
-  static ProcessOverrides? get current {
-    return Zone.current[_token] as ProcessOverrides?;
-  }
+  static ProcessOverrides? get current =>
+      Zone.current[_token] as ProcessOverrides?;
 
   /// Runs [body] in a fresh [Zone] using the provided overrides.
   static R runZoned<R>(R Function() body, {RunProcess? runProcess}) {
@@ -71,9 +71,8 @@ class _ProcessOverridesScope extends ProcessOverrides {
   final RunProcess? _runProcess;
 
   @override
-  RunProcess get runProcess {
-    return _runProcess ?? _previous?.runProcess ?? super.runProcess;
-  }
+  RunProcess get runProcess =>
+      _runProcess ?? _previous?.runProcess ?? super.runProcess;
 }
 
 /// Abstraction for running commands via command-line.

lib/src/cli/dart_cli.dart

@@ -111,24 +111,22 @@ class Dart {
     void Function(String)? stderr,
     GeneratorBuilder buildGenerator = MasonGenerator.fromBundle,
     String? reportOn,
-  }) async {
-    return TestCLIRunner.test(
-      logger: logger,
-      testType: TestRunType.dart,
-      cwd: cwd,
-      recursive: recursive,
-      collectCoverage: collectCoverage,
-      optimizePerformance: optimizePerformance,
-      ignore: ignore,
-      minCoverage: minCoverage,
-      excludeFromCoverage: excludeFromCoverage,
-      randomSeed: randomSeed,
-      forceAnsi: forceAnsi,
-      arguments: arguments,
-      stdout: stdout,
-      stderr: stderr,
-      reportOn: reportOn,
-      buildGenerator: buildGenerator,
-    );
-  }
+  }) async => TestCLIRunner.test(
+    logger: logger,
+    testType: TestRunType.dart,
+    cwd: cwd,
+    recursive: recursive,
+    collectCoverage: collectCoverage,
+    optimizePerformance: optimizePerformance,
+    ignore: ignore,
+    minCoverage: minCoverage,
+    excludeFromCoverage: excludeFromCoverage,
+    randomSeed: randomSeed,
+    forceAnsi: forceAnsi,
+    arguments: arguments,
+    stdout: stdout,
+    stderr: stderr,
+    reportOn: reportOn,
+    buildGenerator: buildGenerator,
+  );
 }

lib/src/cli/flutter_cli.dart

@@ -18,9 +18,8 @@ abstract class ProcessSignalOverrides {
   /// See also:
   /// * [ProcessSignalOverrides.runZoned] to provide [ProcessSignalOverrides]
   /// in a fresh [Zone].
-  static ProcessSignalOverrides? get current {
-    return Zone.current[_token] as ProcessSignalOverrides?;
-  }
+  static ProcessSignalOverrides? get current =>
+      Zone.current[_token] as ProcessSignalOverrides?;
 
   /// Runs [body] in a fresh [Zone] using the provided overrides.
   static R runZoned<R>(
@@ -50,9 +49,7 @@ class _ProcessSignalOverridesScope extends ProcessSignalOverrides {
   }
 
   @override
-  Stream<ProcessSignal>? get sigintWatch {
-    return _sigintStreamController?.stream;
-  }
+  Stream<ProcessSignal>? get sigintWatch => _sigintStreamController?.stream;
 }
 
 /// Thrown when `flutter pub get` is executed without a `pubspec.yaml`.
@@ -165,25 +162,23 @@ class Flutter {
     void Function(String)? stdout,
     void Function(String)? stderr,
     GeneratorBuilder buildGenerator = MasonGenerator.fromBundle,
-  }) async {
-    return TestCLIRunner.test(
-      logger: logger,
-      testType: TestRunType.flutter,
-      cwd: cwd,
-      recursive: recursive,
-      collectCoverage: collectCoverage,
-      optimizePerformance: optimizePerformance,
-      ignore: ignore,
-      minCoverage: minCoverage,
-      excludeFromCoverage: excludeFromCoverage,
-      randomSeed: randomSeed,
-      forceAnsi: forceAnsi,
-      arguments: arguments,
-      stdout: stdout,
-      stderr: stderr,
-      buildGenerator: buildGenerator,
-    );
-  }
+  }) async => TestCLIRunner.test(
+    logger: logger,
+    testType: TestRunType.flutter,
+    cwd: cwd,
+    recursive: recursive,
+    collectCoverage: collectCoverage,
+    optimizePerformance: optimizePerformance,
+    ignore: ignore,
+    minCoverage: minCoverage,
+    excludeFromCoverage: excludeFromCoverage,
+    randomSeed: randomSeed,
+    forceAnsi: forceAnsi,
+    arguments: arguments,
+    stdout: stdout,
+    stderr: stderr,
+    buildGenerator: buildGenerator,
+  );
 }
 
 /// Ensures all git dependencies are reachable for the pubspec
@@ -274,17 +269,11 @@ extension on Duration {
 }
 
 extension on int {
-  String formatSuccess() {
-    return this > 0 ? lightGreen.wrap('+$this')! : '';
-  }
+  String formatSuccess() => this > 0 ? lightGreen.wrap('+$this')! : '';
 
-  String formatFailure() {
-    return this > 0 ? lightRed.wrap('-$this')! : '';
-  }
+  String formatFailure() => this > 0 ? lightRed.wrap('-$this')! : '';
 
-  String formatSkipped() {
-    return this > 0 ? lightYellow.wrap('~$this')! : '';
-  }
+  String formatSkipped() => this > 0 ? lightYellow.wrap('~$this')! : '';
 }
 
 extension on String {
@@ -294,7 +283,6 @@ extension on String {
     return '...$truncated';
   }
 
-  String toSingleLine() {
-    return replaceAll('\n', '').replaceAll(RegExp(r'\s\s+'), ' ');
-  }
+  String toSingleLine() =>
+      replaceAll('\n', '').replaceAll(RegExp(r'\s\s+'), ' ');
 }

lib/src/cli/git_cli.dart

@@ -11,11 +11,10 @@ class UnreachableGitDependency implements Exception {
   final Uri remote;
 
   @override
-  String toString() {
-    return '''
+  String toString() =>
+      '''
 $remote is unreachable.
 Make sure the remote exists and you have the correct access rights.''';
-  }
 }
 
 /// Git CLI

lib/src/cli/test_cli_runner.dart

@@ -256,13 +256,12 @@ class TestCLIRunner {
     );
   }
 
-  static List<File> _dartCoverageFilesToProcess(String absPath) {
-    return Directory(absPath)
-        .listSync(recursive: true)
-        .whereType<File>()
-        .where((e) => e.path.endsWith('.json'))
-        .toList();
-  }
+  static List<File> _dartCoverageFilesToProcess(String absPath) =>
+      Directory(absPath)
+          .listSync(recursive: true)
+          .whereType<File>()
+          .where((e) => e.path.endsWith('.json'))
+          .toList();
 }
 
 Future<int> _testCommand({