Fix 1292 (#1293)

Author: jonsequitur

src/System.CommandLine.Tests/ArgumentTests.cs

@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace System.CommandLine.Tests
 {
@@ -498,8 +499,11 @@ public void Parse_delegate_is_called_once_per_parse_operation()
                 i.Should().Be(2);
             }
 
-            [Fact]
-            public void Custom_parser_can_pass_on_remaining_tokens()
+            [Theory]
+            [InlineData("1 2 3 4 5 6 7 8")]
+            [InlineData("-o 999 1 2 3 4 5 6 7 8")]
+            [InlineData("1 2 3 -o 999 4 5 6 7 8")]
+            public void Custom_parser_can_pass_on_remaining_tokens(string commandLine)
             {
                 var argument1 = new Argument<int[]>(
                     "one",
@@ -520,10 +524,11 @@ public void Custom_parser_can_pass_on_remaining_tokens()
                 var command = new RootCommand
                 {
                     argument1,
-                    argument2
+                    argument2,
+                    new Option<int>("-o")
                 };
 
-                var parseResult = command.Parse("1 2 3 4 5 6 7 8");
+                var parseResult = command.Parse(commandLine);
 
                 parseResult.FindResultFor(argument1)
                            .GetValueOrDefault()

src/System.CommandLine.Tests/ParsingValidationTests.cs

@@ -227,6 +227,47 @@ public void A_custom_validator_can_be_added_to_an_argument()
                   .Be("Argument x cannot be set to 123");
         }
 
+        [Theory]
+        [InlineData("-o=optionValue argValue")]
+        [InlineData("argValue -o=optionValue")]
+        public void All_custom_validators_are_called(string commandLine)
+        {
+            var commandValidatorWasCalled = false;
+            var optionValidatorWasCalled = false;
+            var argumentValidatorWasCalled = false;
+
+            var option = new Option<string>("-o");
+            option.AddValidator(_ =>
+            {
+                optionValidatorWasCalled = true;
+                return null;
+            });
+
+            var argument = new Argument<string>("the-arg");
+            argument.AddValidator(_ =>
+            {
+                argumentValidatorWasCalled = true;
+                return null;
+            });
+
+            var rootCommand = new RootCommand
+            {
+                option,
+                argument
+            };
+            rootCommand.AddValidator(_ =>
+            {
+                commandValidatorWasCalled = true;
+                return null;
+            });
+
+            rootCommand.Invoke(commandLine);
+
+            commandValidatorWasCalled.Should().BeTrue();
+            optionValidatorWasCalled.Should().BeTrue();
+            argumentValidatorWasCalled.Should().BeTrue();
+        }
+
         [Theory]
         [InlineData("--file \"Foo\" subcommand")]
         [InlineData("subcommand --file \"Foo\"")]

src/System.CommandLine/Parsing/ParseResult.cs

@@ -105,7 +105,7 @@ public T ValueForArgument<T>(Argument<T> argument)
                 return t;
             }
 
-            return (T)Binder.GetDefaultValue(argument.ArgumentType);
+            return (T)Binder.GetDefaultValue(argument.ArgumentType)!;
         }
 
         [return: MaybeNull]
@@ -117,7 +117,7 @@ public T ValueForArgument<T>(Argument argument)
                 return t;
             }
 
-            return (T)Binder.GetDefaultValue(argument.ArgumentType);
+            return (T)Binder.GetDefaultValue(argument.ArgumentType)!;
         }
 
         [return: MaybeNull]
@@ -147,7 +147,7 @@ public T ValueForOption<T>(Option<T> option)
                 return t;
             }
 
-            return (T)Binder.GetDefaultValue(option.Argument.ArgumentType);
+            return (T)Binder.GetDefaultValue(option.Argument.ArgumentType)!;
         }
 
         [return: MaybeNull]
@@ -159,7 +159,7 @@ public T ValueForOption<T>(Option option)
                 return t;
             }
 
-            return (T)Binder.GetDefaultValue(option.Argument.ArgumentType);
+            return (T)Binder.GetDefaultValue(option.Argument.ArgumentType)!;
         }
 
         [return: MaybeNull]

src/System.CommandLine/Parsing/ParseResultVisitor.cs

@@ -164,17 +164,25 @@ protected override void Stop(SyntaxNode node)
                 ValidateAndConvertOptionResult(optionResult);
             }
 
-            var argumentResults = _rootCommandResult!
-                                  .AllArgumentResults
-                                  .ToList();
+            var argumentResults = new List<ArgumentResult>();
+            foreach (var result in _rootCommandResult.AllArgumentResults)
+            {
+                if (!(result.Parent is OptionResult))  
+                {
+                    argumentResults.Add(result);
+                }
+            }
 
             if (argumentResults.Count > 0)
             {
-                var arguments = _innermostCommandResult!.Command.Arguments;
+                var arguments = _innermostCommandResult.Command.Arguments;
+
+                var commandArgumentResultCount = argumentResults.Count;
 
                 for (var i = 0; i < arguments.Count; i++)
                 {
-                    if (argumentResults.Count == i)
+                    // If this is the current last result but there are more arguments, see if we can shift tokens to the next argument
+                    if (commandArgumentResultCount == i)
                     {
                         var nextArgument = arguments[i];
                         var nextArgumentResult = new ArgumentResult(
@@ -201,7 +209,7 @@ protected override void Stop(SyntaxNode node)
 
                         if (previousArgumentResult.Parent is CommandResult commandResult)
                         {
-                             commandResult.Children.Add(nextArgumentResult);
+                            commandResult.Children.Add(nextArgumentResult);
                         }
 
                         _rootCommandResult.AddToSymbolMap(nextArgumentResult);
@@ -211,12 +219,25 @@ protected override void Stop(SyntaxNode node)
 
                     ValidateAndConvertArgumentResult(argumentResult);
 
-                    if (argumentResult.PassedOnTokens is {} &&
+                    if (argumentResult.PassedOnTokens is { } &&
                         i == arguments.Count - 1)
                     {
                         _unparsedTokens.AddRange(argumentResult.PassedOnTokens);
                     }
                 }
+
+                if (argumentResults.Count > arguments.Count)
+                {
+                    for (var i = arguments.Count; i < argumentResults.Count; i++)
+                    {
+                        var result = argumentResults[i];
+
+                        if (result.Parent is CommandResult cr)
+                        {
+                            ValidateAndConvertArgumentResult(result);
+                        }
+                    }
+                }
             }
         }