Merge branch 'main' into add-source-2

Signed-off-by: ふぁ <yuki@yuki0311.com>

.github/workflows/test-package.yml

@@ -21,7 +21,7 @@ jobs:
       matrix:
         sdk: [dev]
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
         with:
           sdk: ${{ matrix.sdk }}
@@ -47,7 +47,7 @@ jobs:
         os: [ubuntu-latest]
         sdk: ['3.3', dev]
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
       - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
         with:
           sdk: ${{ matrix.sdk }}

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 2.5.1-wip
+## 2.6.0-wip
 
 * Added source argument when throwing a `ArgParserException`.
 * Fix inconsistent `FormatException` messages

lib/src/arg_parser_exception.dart

@@ -9,11 +9,15 @@ class ArgParserException extends FormatException {
   /// This will be empty if the error was on the root parser.
   final List<String> commands;
 
-  /// The argument that were being parsed when the error was discovered.
-  final String? arg;
+  /// The name of the argument that was being parsed when the error was
+  /// discovered.
+  final String? argumentName;
 
   ArgParserException(super.message,
-      [Iterable<String>? commands, this.arg, super.source, super.offset])
+      [Iterable<String>? commands,
+      this.argumentName,
+      super.source,
+      super.offset])
       : commands = commands == null ? const [] : List.unmodifiable(commands);
 
   /// Returns a string representation of this exception.

lib/src/parser.dart

@@ -115,7 +115,7 @@ class Parser {
           throw ArgParserException(
               error.message,
               [commandName, ...error.commands],
-              error.arg,
+              error.argumentName,
               error.source,
               error.offset);
         }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: args
-version: 2.5.1-wip
+version: 2.6.0-wip
 description: >-
   Library for defining parsers for parsing raw command-line arguments into a set
   of options and values using GNU and POSIX style options.

test/test_utils.dart

@@ -349,14 +349,14 @@ void throwsFormat(ArgParser parser, List<String> args, {String? reason}) {
 }
 
 void throwsArgParserException(ArgParser parser, List<String> args,
-    String message, List<String> commands, String arg, int offset) {
+    String message, List<String> commands, String argumentName, int offset) {
   try {
     parser.parse(args);
     fail('Expected an ArgParserException');
   } on ArgParserException catch (e) {
     expect(e.message, message);
     expect(e.commands, commands);
-    expect(e.arg, arg);
+    expect(e.argumentName, argumentName);
     expect(e.source, args);
     expect(e.offset, offset);
   } catch (e) {