Clean up during PR review

Author: KathleenDollard

src/System.CommandLine.Tests/ParserTests.cs

@@ -562,8 +562,7 @@ public void An_inner_command_with_the_same_name_does_not_capture()
         [Fact]
         public void When_nested_commands_all_accept_arguments_then_the_nearest_captures_the_arguments()
         {
-            var command = new CliCommand(
-                "outer")
+            var command = new CliCommand("outer")
                     {
                         new CliArgument<string[]>("arg1"),
                         new CliCommand("inner")
@@ -803,11 +802,12 @@ public void Subsequent_occurrences_of_tokens_matching_command_names_are_parsed_a
                         }
                     };
 
-            ParseResult result = CliParser.Parse(command, new[] { "the-command",
-                                                       "complete",
-                                                       "--position",
-                                                       "7",
-                                                       "the-command" });
+            ParseResult result = CliParser.Parse(command, new[] { 
+                        "the-command",
+                        "complete",
+                        "--position",
+                        "7",
+                        "the-command" });
 
             CommandResult completeResult = result.CommandResult;
 
@@ -975,7 +975,6 @@ public void Command_default_argument_value_does_not_override_parsed_value()
         }
         */
 
-
         [Fact]
         public void Unmatched_tokens_that_look_like_options_are_not_split_into_smaller_tokens()
         {

src/System.CommandLine.Tests/TokenizerTests.cs

@@ -23,7 +23,6 @@ public void The_tokenizer_can_handle_single_option()
             List<CliToken> tokens = null;
             List<string> errors = null;
             Tokenizer.Tokenize(args, command, new CliConfiguration(command), true, out tokens, out errors);
-            Tokenizer.Tokenize(args, command, new CliConfiguration(command), true, out tokens, out errors);
 
             tokens
                 .Skip(1)

src/System.CommandLine/ParseResult.cs

@@ -34,7 +34,7 @@ public ValueResult ValueResult
                     var conversionValue = GetArgumentConversionResult().Value;
                     var locations = Tokens.Select(token => token.Location).ToArray();
                     //TODO: Remove this wrapper later
-                    _valueResult = new ValueResult(Argument, conversionValue, locations, ValueResultExtensions.GetValueResultOutcome(GetArgumentConversionResult()?.Result)); // null is temporary here
+                    _valueResult = new ValueResult(Argument, conversionValue, locations, ArgumentResult.GetValueResultOutcome(GetArgumentConversionResult()?.Result)); // null is temporary here
                 }
                 return _valueResult;
             }
@@ -47,7 +47,6 @@ public ValueResult ValueResult
 
         internal bool ArgumentLimitReached => Argument.Arity.MaximumNumberOfValues == (_tokens?.Count ?? 0);
 
-
         internal ArgumentConversionResult GetArgumentConversionResult() =>
             _conversionResult ??= ValidateAndConvert(useValidators: true);
 
@@ -236,5 +235,13 @@ ArgumentConversionResult ReportErrorIfNeeded(ArgumentConversionResult result)
         /// </summary>
         private SymbolResult AppliesToPublicSymbolResult =>
             Parent is OptionResult optionResult ? optionResult : this;
+
+        internal static ValueResultOutcome GetValueResultOutcome(ArgumentConversionResultType? resultType)
+            => resultType switch
+            {
+                ArgumentConversionResultType.NoArgument => ValueResultOutcome.NoArgument,
+                ArgumentConversionResultType.Successful => ValueResultOutcome.Success,
+                _ => ValueResultOutcome.HasErrors
+            };
     }
 }

src/System.CommandLine/Parsing/ArgumentResult.cs

@@ -15,10 +15,11 @@ internal sealed class CliToken : IEquatable<CliToken>
         public static CliToken CreateFromOtherToken(CliToken otherToken, string? arg, Location location)
             => new(arg, otherToken.Type, otherToken.Symbol, location);
 
+        /*
         /// <param name="value">The string value of the token.</param>
         /// <param name="type">The type of the token.</param>
         /// <param name="symbol">The symbol represented by the token</param>
-        /*
+
         public CliToken(string? value, CliTokenType type, CliSymbol symbol)
         {
             Value = value ?? "";
@@ -28,6 +29,10 @@ public CliToken(string? value, CliTokenType type, CliSymbol symbol)
         }
         */
 
+        /// <param name="value">The string value of the token.</param>
+        /// <param name="type">The type of the token.</param>
+        /// <param name="symbol">The symbol represented by the token</param>
+        /// <param name="location">The location of the token in the args array or a response file</param>
         internal CliToken(string? value, CliTokenType type, CliSymbol? symbol, Location location)
         {
             Value = value ?? "";

src/System.CommandLine/Parsing/CliToken.cs

@@ -1,17 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace System.CommandLine.Parsing;
 
 public class CommandValueResult
 {
-    IEnumerable<ValueResult> ValueResults { get; } = new List<ValueResult>();
-
-
+    public IEnumerable<ValueResult> ValueResults { get; } = new List<ValueResult>();
 }

src/System.CommandLine/Parsing/CommandValueResult.cs

@@ -37,7 +37,7 @@ public ValueResult ValueResult
                     var conversionValue = ArgumentConversionResult.Value;
                     var locations = Tokens.Select(token => token.Location).ToArray();
                     //TODO: Remove this wrapper later
-                    _valueResult = new ValueResult(Option, conversionValue, locations, ValueResultExtensions.GetValueResultOutcome(ArgumentConversionResult?.Result)); // null is temporary here
+                    _valueResult = new ValueResult(Option, conversionValue, locations, ArgumentResult.GetValueResultOutcome(ArgumentConversionResult?.Result)); // null is temporary here
                 }
                 return _valueResult;
             }

src/System.CommandLine/Parsing/OptionResult.cs

@@ -72,7 +72,7 @@ internal Dictionary<CliSymbol, ValueResult> GetValueResultDictionary()
             var dict = new Dictionary<CliSymbol, ValueResult>();
             foreach (KeyValuePair<CliSymbol, SymbolResult> pair in this)
             {               
-                    var result = pair.Value;
+                var result = pair.Value;
                 if (result is OptionResult optionResult)
                 {
                     dict.Add(pair.Key, optionResult.ValueResult);

src/System.CommandLine/Parsing/SymbolResultTree.cs

@@ -28,7 +28,6 @@
     <Compile Include="ArgumentArity.cs" />
     <Compile Include="Binding\ArgumentConversionResult.cs" />
     <Compile Include="Parsing\CommandValueResult.cs" />
-    <Compile Include="Parsing\ValueResultExtensions.cs" />
     <Compile Include="Parsing\ValueResultOutcome.cs" />
     <Compile Include="Binding\ArgumentConversionResultType.cs" />
     <Compile Include="Binding\ArgumentConverter.cs" />