Fixes after rebase

Author: KathleenDollard

src/System.CommandLine.Tests/ParserTests.cs

@@ -141,7 +141,7 @@ public void Option_short_forms_can_be_bundled()
 
             result.CommandResult
                 .ValueResults
-                .Select(o => ((OptionResult)o).Option.Name)
+                .Select(o => ((CliValueResult)o).ValueSymbol.Name)
                 .Should()
                 .BeEquivalentTo("-x", "-y", "-z");
         }
@@ -1714,7 +1714,7 @@ public void CommandResult_contains_argument_ValueResults()
             commandResult.ValueResults.Should().HaveCount(2);
             var result1 = commandResult.ValueResults[0];
             result1.GetValue<string>().Should().Be("Kirk");
-            var result2 = commandValueResult.ValueResults[1];
+            var result2 = commandResult.ValueResults[1];
             result2.GetValue<string>().Should().Be("Spock");
         }
 

src/System.CommandLine/ParseResult.cs

@@ -32,7 +32,7 @@ internal ParseResult(
             // TODO: Remove RootCommandResult - it is the root of the CommandValueResult ancestors (fix that)
             CliCommandResultInternal rootCommandResult,
             // TODO: Replace with CommandValueResult and remove CommandResult
-            CliCommandResultInternal commandResult,
+            CliCommandResultInternal commandResultInternal,
             IReadOnlyDictionary<CliSymbol, CliValueResult> valueResultDictionary,
             /*
             List<CliToken> tokens,
@@ -52,8 +52,8 @@ internal ParseResult(
             Configuration = configuration;
             _rootCommandResult = rootCommandResult;
             // TODO: Why do we need this?
-            CommandResultInternal = commandResult;
-            CommandResult = commandResult.CommandValueResult;
+            CommandResultInternal = commandResultInternal;
+            CommandResult = commandResultInternal.CommandResult;
             this.valueResultDictionary = valueResultDictionary;
             // TODO: invocation
             /*

src/System.CommandLine/Parsing/CliArgumentResultInternal.cs

@@ -33,7 +33,7 @@ public CliValueResult ValueResult
                     // TODO: Make sure errors are added
                     var conversionValue = GetArgumentConversionResult().Value;
                     var locations = Tokens.Select(token => token.Location).ToArray();
-                    _valueResult = new ValueResult(Argument, conversionValue, locations, ArgumentResult.GetValueResultOutcome(GetArgumentConversionResult()?.Result)); // null is temporary here
+                    _valueResult = new CliValueResult(Argument, conversionValue, locations, CliArgumentResultInternal.GetValueResultOutcome(GetArgumentConversionResult()?.Result)); // null is temporary here
                 }
                 return _valueResult;
             }

src/System.CommandLine/Parsing/CliCommandResult.cs

@@ -32,7 +32,7 @@ internal CliCommandResult(
     /// <summary>
     /// The ValueResult instances for user entered data. This is a sparse list.
     /// </summary>
-    public IEnumerable<CliValueResult> ValueResults { get; } = [];
+    public IReadOnlyList<CliValueResult> ValueResults { get; internal set; } = [];
 
     /// <summary>
     /// The CliCommand that the result is for. 

src/System.CommandLine/Parsing/CliCommandResultInternal.cs

@@ -47,9 +47,10 @@ public CliCommandResult CommandResult
                 if (commandResult is null)
                 {
                     var parent = Parent is CliCommandResultInternal commandResultInternal
-                        ? commandResultInternal.CommandValueResult 
+                        ? commandResultInternal.CommandResult 
                         : null;
-                    commandResult = new CliCommandResult(Command, parent);
+                    // TODO: Resolve the NRT warning for locations
+                    commandResult = new CliCommandResult(Command, parent?.Locations, parent);
                 }
                 // Reset unless we put tests in place to ensure it is not called in error handling before SymbolTree processing is complete
                 commandResult.ValueResults = Children.Select(GetValueResult).OfType<CliValueResult>().ToList();

src/System.CommandLine/System.CommandLine.csproj

@@ -27,6 +27,7 @@
     <Compile Include="AliasSet.cs" />
     <Compile Include="ArgumentArity.cs" />
     <Compile Include="Binding\ArgumentConversionResult.cs" />
+    <Compile Include="CliValueSymbol.cs" />
     <Compile Include="Parsing\CliCommandResult.cs" />
     <Compile Include="Parsing\CliSymbolResult.cs" />
     <Compile Include="Parsing\SymbolLookupByName.cs" />