Merge branch 'main' into dependabot/pub/example/very_good_analysis-7.0.0

tomarra · web-flow · commit f8efcce2c462 · 2024-12-20T10:22:15.000-06:00
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
 linter:
   rules:
     public_member_api_docs: false
diff --git a/example/lib/example.dart b/example/lib/example.dart
@@ -7,4 +7,4 @@
 /// # see usage
 /// example_cli --help
 /// ```
-library example;
+library;
diff --git a/example/test/integration/completion_integration_test.dart b/example/test/integration/completion_integration_test.dart
@@ -1,5 +1,5 @@
 @Tags(['integration'])
-library integration_tests;
+library;
 
 import 'package:test/test.dart';
 
diff --git a/lib/cli_completion.dart b/lib/cli_completion.dart
@@ -1,6 +1,6 @@
 /// Contains the completion command runner based elements to add completion to
 /// dart command line applications.
-library cli_completion;
+library;
 
 export 'src/command_runner/commands/commands.dart';
 export 'src/command_runner/completion_command_runner.dart';
diff --git a/lib/installer.dart b/lib/installer.dart
@@ -1,6 +1,6 @@
 /// Contains the functions related to the installation process
 /// {@canonicalFor system_shell.SystemShell}
-library installer;
+library;
 
 export 'src/installer/installer.dart';
 export 'src/system_shell.dart';
diff --git a/lib/parser.dart b/lib/parser.dart
@@ -1,6 +1,6 @@
 /// Contains the classes and functions related to the creation of suggestions
 /// for the completion of commands.
-library parser;
+library;
 
 export 'src/parser/completion_level.dart';
 export 'src/parser/completion_result.dart';
diff --git a/lib/src/parser/arg_parser_extension.dart b/lib/src/parser/arg_parser_extension.dart
@@ -23,7 +23,7 @@ extension ArgParserExtension on ArgParser {
     while (currentArgs.isNotEmpty) {
       try {
         return loosenOptionsGramamar.parse(currentArgs);
-      } catch (_) {
+      } on Exception catch (_) {
         currentArgs = currentArgs.take(currentArgs.length - 1).toList();
       }
     }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -21,4 +21,4 @@ dependencies:
 dev_dependencies:
   mocktail: ^1.0.4
   test: ^1.25.8
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
diff --git a/test/src/command_runner/commands/handle_completion_command_test.dart b/test/src/command_runner/commands/handle_completion_command_test.dart
@@ -24,6 +24,7 @@ class _TestCompletionCommandRunner extends CompletionCommandRunner<int> {
   String get executableName => 'test_cli';
 
   @override
+  // Override acceptable for test files
   // ignore: overridden_fields
   final Logger completionLogger = MockLogger();
 }
diff --git a/test/src/command_runner/commands/install_completion_files_command_test.dart b/test/src/command_runner/commands/install_completion_files_command_test.dart
@@ -13,6 +13,7 @@ class _TestCompletionCommandRunner extends CompletionCommandRunner<int> {
   _TestCompletionCommandRunner() : super('test', 'Test command runner');
 
   @override
+  // Override acceptable for test files
   // ignore: overridden_fields
   final Logger completionInstallationLogger = _MockLogger();
 
diff --git a/test/src/command_runner/commands/uninstall_completion_files_command_test.dart b/test/src/command_runner/commands/uninstall_completion_files_command_test.dart
@@ -13,6 +13,7 @@ class _TestCompletionCommandRunner extends CompletionCommandRunner<int> {
   _TestCompletionCommandRunner() : super('test', 'Test command runner');
 
   @override
+  // Override acceptable for test files
   // ignore: overridden_fields
   final Logger completionInstallationLogger = _MockLogger();
 
diff --git a/test/src/command_runner/completion_command_runner_test.dart b/test/src/command_runner/completion_command_runner_test.dart
@@ -18,10 +18,12 @@ class _TestCompletionCommandRunner extends CompletionCommandRunner<int> {
   bool enableAutoInstall = true;
 
   @override
+  // Override acceptable for test files
   // ignore: overridden_fields
   final Logger completionLogger = MockLogger();
 
   @override
+  // Override acceptable for test files
   // ignore: overridden_fields
   final Logger completionInstallationLogger = MockLogger();
 
diff --git a/test/src/installer/completion_configuration_test.dart b/test/src/installer/completion_configuration_test.dart
@@ -1,3 +1,4 @@
+// Not required for test files
 // ignore_for_file: prefer_const_constructors
 
 import 'dart:collection';
diff --git a/test/src/installer/completion_installation_test.dart b/test/src/installer/completion_installation_test.dart
@@ -224,6 +224,7 @@ void main() {
 
         expect(configFile.existsSync(), true);
 
+        // Different format needed for matching cli output
         // ignore: leading_newlines_in_multiline_strings
         expect(configFile.readAsStringSync(), '''
 \n## [very_good]
@@ -285,6 +286,7 @@ void main() {
 
         installation.writeToShellConfigFile('very_good');
 
+        // Different format needed for matching cli output
         // ignore: leading_newlines_in_multiline_strings
         expect(rcFile.readAsStringSync(), '''
 \n## [Completion]
@@ -432,6 +434,7 @@ void main() {
 
           // rc fle includes one reference to the global config
 
+          // Different format needed for matching cli output
           // ignore: leading_newlines_in_multiline_strings
           expect(rcFile.readAsStringSync(), '''
 \n## [Completion]
@@ -446,6 +449,7 @@ void main() {
             path.join(configDir.path, 'zsh-config.zsh'),
           );
 
+          // Different format needed for matching cli output
           // ignore: leading_newlines_in_multiline_strings
           expect(globalConfig.readAsStringSync(), '''
 \n## [very_good]
@@ -486,6 +490,7 @@ void main() {
             ..install('very_good')
             ..install('not_good');
 
+          // Different format needed for matching cli output
           // ignore: leading_newlines_in_multiline_strings
           expect(bashProfile.readAsStringSync(), '''
 \n## [Completion]
diff --git a/test/src/installer/script_configuration_entry_test.dart b/test/src/installer/script_configuration_entry_test.dart
@@ -1,3 +1,4 @@
+// Not needed for test files
 // ignore_for_file: prefer_const_constructors
 
 import 'dart:io';

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include: package:very_good_analysis/analysis_options.6.0.0.yaml`
	`1`	`+include: package:very_good_analysis/analysis_options.7.0.0.yaml`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ extension ArgParserExtension on ArgParser {`
`23`	`23`	`while (currentArgs.isNotEmpty) {`
`24`	`24`	`try {`
`25`	`25`	`return loosenOptionsGramamar.parse(currentArgs);`
`26`		`- } catch (_) {`
	`26`	`+ } on Exception catch (_) {`
`27`	`27`	`currentArgs = currentArgs.take(currentArgs.length - 1).toList();`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ class _TestCompletionCommandRunner extends CompletionCommandRunner<int> {`
`24`	`24`	`String get executableName => 'test_cli';`
`25`	`25`
`26`	`26`	`@override`
	`27`	`+ // Override acceptable for test files`
`27`	`28`	`// ignore: overridden_fields`
`28`	`29`	`final Logger completionLogger = MockLogger();`
`29`	`30`	`}`