WIP

Author: KathleenDollard

src/System.CommandLine.Subsystems/ValueProvider.cs

@@ -34,8 +34,8 @@ private bool TryGetValue<T>(CliSymbol symbol, out T? value)
         return false;
     }
 
-    public T? GetValue<T>(CliDataSymbol dataSymbol)
-        => GetValueInternal<T>(dataSymbol);
+    public T? GetValue<T>(CliValueSymbol valueSymbol)
+        => GetValueInternal<T>(valueSymbol);
 
     private T? GetValueInternal<T>(CliSymbol? symbol)
     {
@@ -53,9 +53,9 @@ not null when TryGetValue<T>(symbol, out var value)
             // configuration values go here in precedence
             //not null when GetDefaultFromEnvironmentVariable<T>(symbol, out var envName)
             //    => UseValue(symbol, GetEnvByName(envName)),
-            not null when TryGetAnnotation(symbol, ValueAnnotations.DefaultValueCalculation, out Func<T?>? defaultValueCalculation)
+            not null when symbol.TryGetAnnotation(ValueAnnotations.DefaultValueCalculation, out Func<T?>? defaultValueCalculation)
                 => UseValue(symbol, CalculatedDefault<T>(symbol, (Func<T?>)defaultValueCalculation)),
-            not null when TryGetAnnotation(symbol, ValueAnnotations.DefaultValue, out T? explicitValue)
+            not null when symbol.TryGetAnnotation(ValueAnnotations.DefaultValue, out T? explicitValue)
                 => UseValue(symbol, explicitValue),
             null => throw new ArgumentNullException(nameof(symbol)),
             _ => UseValue(symbol, default(T))

src/System.CommandLine.Tests/ParserTests.cs

@@ -139,7 +139,7 @@ public void Option_short_forms_can_be_bundled()
 
             var result = CliParser.Parse(command, "the-command -xyz");
 
-            result.CommandResult
+            result.CommandValueResult
                 .ValueResults
                 .Select(o => ((CliValueResult)o).ValueSymbol.Name)
                 .Should()
@@ -188,7 +188,7 @@ public void Option_long_forms_do_not_get_unbundled()
 
             var result = CliParser.Parse(command, "the-command --xyz");
 
-            result.CommandResultInternal
+            result.CommandResult
                 .Children
                 .Select(o => ((CliOptionResultInternal)o).Option.Name)
                 .Should()
@@ -210,7 +210,7 @@ public void Options_do_not_get_unbundled_unless_all_resulting_options_would_be_v
 
             ParseResult result = CliParser.Parse(outer, "outer inner -abc");
 
-            result.CommandResultInternal
+            result.CommandResult
                 .Tokens
                 .Select(t => t.Value)
                 .Should()
@@ -422,7 +422,7 @@ public void When_an_option_is_not_respecified_but_limit_is_reached_then_the_foll
                 .Should()
                 .BeEquivalentTo("carrot");
 
-            result.CommandResultInternal
+            result.CommandResult
                 .Tokens
                 .Select(t => t.Value)
                 .Should()
@@ -440,13 +440,13 @@ public void Command_with_multiple_options_is_parsed_correctly()
 
             var result = CliParser.Parse(command, "outer --inner1 argument1 --inner2 argument2");
 
-            result.CommandResultInternal
+            result.CommandResult
                 .Children
                 .Should()
                 .ContainSingle(o =>
                     ((CliOptionResultInternal)o).Option.Name == "--inner1" &&
                     o.Tokens.Single().Value == "argument1");
-            result.CommandResultInternal
+            result.CommandResult
                 .Children
                 .Should()
                 .ContainSingle(o =>

src/System.CommandLine/ParseResult.cs

@@ -52,8 +52,7 @@ internal ParseResult(
             Configuration = configuration;
             _rootCommandResult = rootCommandResult;
             // TODO: Why do we need this?
-            CommandResultInternal = commandResultInternal;
-            CommandResult = commandResultInternal.CommandResult;
+            CommandResult = commandResultInternal;
             this.valueResultDictionary = valueResultDictionary;
             // TODO: invocation
             /*
@@ -102,22 +101,22 @@ internal ParseResult(
         /// <summary>
         /// A result indicating the command specified in the command line input.
         /// </summary>
-        internal CommandResult CommandResult { get; }
+        internal CliCommandResultInternal CommandResult { get; }
 
-        private CommandValueResult? commandValueResult = null;
-        public CommandValueResult CommandValueResult
+        private CliCommandResult? commandValueResult = null;
+        public CliCommandResult CommandValueResult
         {
             get
             {
                 if (commandValueResult is null)
                 {
-                    commandValueResult = new CommandValueResult(CommandResult);
+                    commandValueResult = new CliCommandResult(CommandResult.Command, CommandResult.Tokens.Select(t=>t.Location) );
                 }
                 return commandValueResult;
             }
         }
 
-        public IEnumerable<ValueResult> AllValueResults
+        public IEnumerable<CliValueResult> AllValueResults
             => valueResultDictionary.Values;
 
 

src/System.CommandLine/Parsing/CliValueResult.cs

@@ -41,7 +41,7 @@ internal CliValueResult(
             ValueResultOutcome outcome,
             // TODO: Error should be an Enumerable<Error> and perhaps should not be here at all, only on ParseResult
             string? error = null)
-        : this((CliSymbol)argument, value, locations, outcome, error)
+        : this((CliValueSymbol)argument, value, locations, outcome, error)
     { }
 
     /// <summary>
@@ -59,13 +59,13 @@ internal CliValueResult(
         ValueResultOutcome outcome,
         // TODO: Error should be an Enumerable<Error> and perhaps should not be here at all, only on ParseResult
         string? error = null)
-    : this((CliSymbol)option, value, locations, outcome, error)
+    : this((CliValueSymbol)option, value, locations, outcome, error)
     { }
 
     /// <summary>
     /// The CliSymbol the value is for. This is always a CliOption or CliArgument.
     /// </summary>
-    public CliDataSymbol ValueSymbol { get; }
+    public CliSymbol ValueSymbol { get; }
 
     internal object? Value { get; }
 

src/System.CommandLine/Parsing/SymbolLookupByName.cs

@@ -43,7 +43,7 @@ private List<CommandCache> BuildCache(ParseResult parseResult)
             return cache;
         }
         cache = [];
-        var commandResult = parseResult.CommandResultInternal;
+        var commandResult = parseResult.CommandResult;
         while (commandResult is not null)
         {
             var command = commandResult.Command;