Merge pull request #793 from jonsequitur/fix-792

Fix #792

Author: jonsequitur

src/System.CommandLine.Tests/ParserTests.MultipleArguments.cs

@@ -119,6 +119,35 @@ public void When_multiple_arguments_are_present_then_their_order_relative_to_sib
                              .Should()
                              .BeTrue();
             }
+
+            [Fact]
+            public void Multiple_arguments_of_unspecified_type_are_parsed_correctly()
+            {
+                var root = new RootCommand
+                {
+                    new Argument("source")
+                    {
+                        Arity = ArgumentArity.ExactlyOne
+                    },
+                    new Argument("destination")
+                    {
+                        Arity = ArgumentArity.ExactlyOne
+                    }
+                };
+
+                var result = root.Parse("src.txt", "dest.txt");
+
+                result.RootCommandResult
+                      .GetArgumentValueOrDefault("source")
+                      .Should()
+                      .Be("src.txt");
+                
+                result.RootCommandResult
+                      .GetArgumentValueOrDefault("destination")
+                      .Should()
+                      .Be("dest.txt");
+            }
+
         }
     }
 }

src/System.CommandLine/ArgumentArity.cs

@@ -30,34 +30,18 @@ public ArgumentArity(int minimumNumberOfValues, int maximumNumberOfValues)
 
         public int MaximumNumberOfValues { get; set; }
 
-        internal static FailedArgumentConversionArityResult Validate(
-            ArgumentResult argumentResult) =>
-            Validate(argumentResult.Parent,
-                     argumentResult.Argument,
-                     argumentResult.Argument.Arity.MinimumNumberOfValues,
-                     argumentResult.Argument.Arity.MaximumNumberOfValues);
-
         internal static FailedArgumentConversionArityResult Validate(
             SymbolResult symbolResult,
             IArgument argument,
             int minimumNumberOfValues,
             int maximumNumberOfValues)
         {
-            SymbolResult argumentResult = null;
-
-            switch (symbolResult)
+            var argumentResult = symbolResult switch
             {
-                case CommandResult commandResult:
-                    argumentResult = commandResult.Root.FindResultFor(argument);
-                    break;
-
-                case OptionResult optionResult:
-                    argumentResult = optionResult.Children.ResultFor(argument);
-                    break;
-
-                case ArgumentResult _:
-                    throw new ArgumentException("");
-            }
+                CommandResult commandResult => commandResult.Root.FindResultFor(argument),
+                OptionResult optionResult => optionResult.Children.ResultFor(argument),
+                _ => symbolResult
+            };
 
             var tokenCount = argumentResult?.Tokens.Count ?? 0;
 

src/System.CommandLine/Parsing/ArgumentResult.cs

@@ -74,14 +74,15 @@ internal virtual ArgumentConversionResult Convert(
                 {
                     return conversionResult;
                 }
-                else if (success)
+
+                if (success)
                 {
                     return ArgumentConversionResult.Success(argument, value);
                 }
-                else 
-                {
-                    return ArgumentConversionResult.Failure(argument, ErrorMessage ?? $"Invalid: {parentResult.Token()} {string.Join(" ", parentResult.Tokens.Select(t => t.Value))}");
-                }
+
+                return ArgumentConversionResult.Failure(
+                    argument, 
+                    ErrorMessage ?? $"Invalid: {parentResult.Token()} {string.Join(" ", Tokens.Select(t => t.Value))}");
             }
 
             switch (argument.Arity.MaximumNumberOfValues)
@@ -90,10 +91,14 @@ internal virtual ArgumentConversionResult Convert(
                     return ArgumentConversionResult.Success(argument, null);
 
                 case 1:
-                    return ArgumentConversionResult.Success(argument, parentResult.Tokens.Select(t => t.Value).SingleOrDefault());
+                    return ArgumentConversionResult.Success(
+                        argument, 
+                        Tokens.Select(t => t.Value).SingleOrDefault());
 
                 default:
-                    return ArgumentConversionResult.Success(argument, parentResult.Tokens.Select(t => t.Value).ToArray());
+                    return ArgumentConversionResult.Success(
+                        argument, 
+                        Tokens.Select(t => t.Value).ToArray());
             }
 
             bool ShouldCheckArity()

src/System.CommandLine/Parsing/SymbolResultExtensions.cs

@@ -24,17 +24,12 @@ internal static IEnumerable<SymbolResult> AllSymbolResults(this SymbolResult sym
             }
         }
 
-        internal static Token Token(this SymbolResult symbolResult)
-        {
-            switch (symbolResult)
+        internal static Token Token(this SymbolResult symbolResult) =>
+            symbolResult switch
             {
-                case CommandResult commandResult:
-                    return commandResult.Token;
-                case OptionResult optionResult:
-                    return optionResult.Token;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(symbolResult));
-            }
-        }
+                CommandResult commandResult => commandResult.Token,
+                OptionResult optionResult => optionResult.Token,
+                _ => throw new ArgumentOutOfRangeException(nameof(symbolResult))
+            };
     }
 }