Merge branch 'main' into main

Author: marcossevilla

analysis_options.yaml

@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.7.0.0.yaml
+include: package:very_good_analysis/analysis_options.yaml

example/analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.7.0.0.yaml
+include: package:very_good_analysis/analysis_options.yaml
 linter:
   rules:
     public_member_api_docs: false

example/bin/example_cli.dart

@@ -13,6 +13,8 @@ Future<void> main(List<String> args) async {
 /// 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));
+  return Future.wait<void>([
+    stdout.close(),
+    stderr.close(),
+  ]).then<void>((_) => exit(status));
 }

example/lib/src/command_runner.dart

@@ -18,8 +18,8 @@ class ExampleCommandRunner extends CompletionCommandRunner<int> {
   /// {@macro example_command_runner}
   ExampleCommandRunner({
     Logger? logger,
-  })  : _logger = logger ?? Logger(),
-        super(executableName, description) {
+  }) : _logger = logger ?? Logger(),
+       super(executableName, description) {
     // Add root options and flags
     argParser
       ..addFlag(

example/lib/src/commands/some_commmand.dart

@@ -35,7 +35,8 @@ class SomeCommand extends Command<int> {
       )
       ..addOption(
         'no-option',
-        help: 'An option that starts with "no" just to make confusion '
+        help:
+            'An option that starts with "no" just to make confusion '
             'with negated flags',
       )
       ..addMultiOption(
@@ -95,9 +96,9 @@ class SomeCommand extends Command<int> {
 
   @override
   List<String> get aliases => [
-        'disguised:some_commmand',
-        'melon',
-      ];
+    'disguised:some_commmand',
+    'melon',
+  ];
 
   @override
   Future<int> run() async {

example/pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.8.1
 
 dependencies:
   args: ^2.5.0
@@ -15,7 +15,7 @@ dependencies:
 dev_dependencies:
   mocktail: ^1.0.4
   test: ^1.25.8
-  very_good_analysis: ^7.0.0
+  very_good_analysis: ^9.0.0
 
 executables:
   example_cli:

example/test/integration/completion_integration_test.dart

@@ -196,7 +196,7 @@ void main() {
       '--continuous': r'A continuous option\: any value is allowed',
       '--no-option':
           'An option that starts with "no" just to make confusion with negated '
-              'flags',
+          'flags',
       '--multi-d': 'An discrete option that can be passed multiple times ',
       '--multi-c': 'An continuous option that can be passed multiple times',
       '--flag': null,
@@ -313,7 +313,7 @@ void main() {
           suggests({
             '--no-option':
                 'An option that starts with "no" just to make confusion with '
-                    'negated flags',
+                'negated flags',
             '--no-flag': null,
             '--no-inverseflag': 'A flag that the default value is true',
           }),
@@ -410,13 +410,14 @@ void main() {
         });
 
         test(
-            '**do not** suggest possible options when using equals/quote syntax',
-            () async {
-          await expectLater(
-            'example_cli some_command --discrete="',
-            suggests(noSuggestions),
-          );
-        });
+          '**do not** suggest possible options when using equals/quote syntax',
+          () async {
+            await expectLater(
+              'example_cli some_command --discrete="',
+              suggests(noSuggestions),
+            );
+          },
+        );
       });
 
       group('discrete (aliases)', () {
@@ -431,17 +432,19 @@ void main() {
           );
         });
 
-        test('suggest matching options for alias option when typed 2',
-            () async {
-          await expectLater(
-            'example_cli some_command --defined-values ',
-            suggests({
-              'foo': 'foo help',
-              'bar': 'bar help',
-              'faa': 'faa help',
-            }),
-          );
-        });
+        test(
+          'suggest matching options for alias option when typed 2',
+          () async {
+            await expectLater(
+              'example_cli some_command --defined-values ',
+              suggests({
+                'foo': 'foo help',
+                'bar': 'bar help',
+                'faa': 'faa help',
+              }),
+            );
+          },
+        );
       });
 
       group('continuous', () {
@@ -634,18 +637,20 @@ void main() {
           tags: 'known-issues',
         );
 
-        test('include discrete multi option value after it is specified',
-            () async {
-          await expectLater(
-            'example_cli some_command --multi-d bar -m ',
-            suggests({
-              'fii': 'fii help',
-              'bar': 'bar help',
-              'fee': 'fee help',
-              'i have space': 'an allowed option with space on it',
-            }),
-          );
-        });
+        test(
+          'include discrete multi option value after it is specified',
+          () async {
+            await expectLater(
+              'example_cli some_command --multi-d bar -m ',
+              suggests({
+                'fii': 'fii help',
+                'bar': 'bar help',
+                'fee': 'fee help',
+                'i have space': 'an allowed option with space on it',
+              }),
+            );
+          },
+        );
       });
     });
   });

example/test/integration/utils.dart

@@ -18,10 +18,10 @@ class CliCompletionMatcher extends CustomMatcher {
     Map<String, String?> suggestions, {
     this.cursorIndex,
   }) : super(
-          'Completes with the expected suggestions',
-          'suggestions',
-          completion(suggestions),
-        );
+         'Completes with the expected suggestions',
+         'suggestions',
+         completion(suggestions),
+       );
 
   final int? cursorIndex;
 

example/test/src/commands/some_other_command_test.dart

@@ -25,8 +25,9 @@ void main() {
 
       expect(exitCode, ExitCode.success.code);
 
-      verify(() => logger.info('A sub command of some_other_command'))
-          .called(1);
+      verify(
+        () => logger.info('A sub command of some_other_command'),
+      ).called(1);
       verify(() => logger.info('  - anything')).called(1);
       verify(() => logger.info('  - after')).called(1);
       verify(() => logger.info('  - command')).called(1);

lib/src/command_runner/completion_command_runner.dart

@@ -71,7 +71,7 @@ abstract class CompletionCommandRunner<T> extends CommandRunner<T> {
   }
 
   /// The list of commands that should not trigger the auto installation.
-  static const _reservedCommands = {
+  static const Set<String> _reservedCommands = {
     HandleCompletionRequestCommand.commandName,
     InstallCompletionFilesCommand.commandName,
     UnistallCompletionFilesCommand.commandName,