Merge pull request #2475 from KathleenDollard/symbolvalue-usage

Some argument/option usage CliValueSymbol

Author: KathleenDollard

src/System.CommandLine.Subsystems/ValueProvider.cs

@@ -37,28 +37,26 @@ private bool TryGetValue<T>(CliSymbol symbol, out T? value)
     public T? GetValue<T>(CliValueSymbol valueSymbol)
         => GetValueInternal<T>(valueSymbol);
 
-    private T? GetValueInternal<T>(CliSymbol? symbol)
+    private T? GetValueInternal<T>(CliValueSymbol? valueSymbol)
     {
         // NOTE: We use the subsystem's TryGetAnnotation here instead of the GetDefaultValue etc
         // extension methods, as the subsystem's TryGetAnnotation respects its annotation provider
-        return symbol switch
+        return valueSymbol switch
         {
-            not null when TryGetValue<T>(symbol, out var value)
+            { } when TryGetValue<T>(valueSymbol, out var value)
                 => value, // It has already been retrieved at least once
-            CliArgument argument when parseResult?.GetValueResult(argument) is { } valueResult  // GetValue not used because it  would always return a value
-                => UseValue(symbol, valueResult.GetValue<T>()), // Value was supplied during parsing, 
-            CliOption option when parseResult?.GetValueResult(option) is { } valueResult  // GetValue not used because it would always return a value
-                => UseValue(symbol, valueResult.GetValue<T>()), // Value was supplied during parsing
+            { } when parseResult?.GetValueResult(valueSymbol) is { } valueResult  // GetValue not used because it  would always return a value
+                => UseValue(valueSymbol, valueResult.GetValue<T>()), // Value was supplied during parsing, 
             // Value was not supplied during parsing, determine default now
             // configuration values go here in precedence
             //not null when GetDefaultFromEnvironmentVariable<T>(symbol, out var envName)
             //    => UseValue(symbol, GetEnvByName(envName)),
-            not null when symbol.TryGetAnnotation(ValueAnnotations.DefaultValueCalculation, out Func<T?>? defaultValueCalculation)
-                => UseValue(symbol, CalculatedDefault<T>(symbol, (Func<T?>)defaultValueCalculation)),
-            not null when symbol.TryGetAnnotation(ValueAnnotations.DefaultValue, out T? explicitValue)
-                => UseValue(symbol, explicitValue),
-            null => throw new ArgumentNullException(nameof(symbol)),
-            _ => UseValue(symbol, default(T))
+            { } when valueSymbol.TryGetAnnotation(ValueAnnotations.DefaultValueCalculation, out Func<T?>? defaultValueCalculation)
+                => UseValue(valueSymbol, CalculatedDefault<T>(valueSymbol, (Func<T?>)defaultValueCalculation)),
+            { } when valueSymbol.TryGetAnnotation( ValueAnnotations.DefaultValue, out T? explicitValue)
+                => UseValue(valueSymbol, explicitValue),
+            null => throw new ArgumentNullException(nameof(valueSymbol)),
+            _ => UseValue(valueSymbol, default(T))
         };
 
         TValue? UseValue<TValue>(CliSymbol symbol, TValue? value)
@@ -68,7 +66,7 @@ not null when symbol.TryGetAnnotation(ValueAnnotations.DefaultValue, out T? expl
         }
     }
 
-    private static T? CalculatedDefault<T>(CliSymbol symbol, Func<T?> defaultValueCalculation)
+    private static T? CalculatedDefault<T>(CliValueSymbol valueSymbol, Func<T?> defaultValueCalculation)
     {
         var objectValue = defaultValueCalculation();
         var value = objectValue is null

src/System.CommandLine/ParseResult.cs

@@ -172,8 +172,8 @@ CommandLineText is null
         public T? GetValue<T>(CliOption<T> option)
             => GetValueInternal<T>(option);
 
-        private T? GetValueInternal<T>(CliSymbol symbol)
-            => valueResultDictionary.TryGetValue(symbol, out var result)
+        private T? GetValueInternal<T>(CliValueSymbol valueSymbol)
+            => valueResultDictionary.TryGetValue(valueSymbol, out var result)
                 ? (T?)result.Value
                 : default;
 
@@ -203,15 +203,15 @@ CommandLineText is null
         */
 
         /// <summary>
-        /// Gets the ValueResult, if any, for the specified option or argument
+        /// Gets the <see cref="CliValueResult"/> if any, for the specified option or argument
         /// </summary>
         /// <param name="valueSymbol">The option or argument for which to find a result.</param>
         /// <returns>A result for the specified option, or <see langword="null"/> if it was not entered by the user.</returns>
         public CliValueResult? GetValueResult(CliValueSymbol valueSymbol)
             => GetValueResultInternal(valueSymbol);
 
-        private CliValueResult? GetValueResultInternal(CliSymbol symbol)
-            => valueResultDictionary.TryGetValue(symbol, out var result)
+        private CliValueResult? GetValueResultInternal(CliValueSymbol valueSymbol)
+            => valueResultDictionary.TryGetValue(valueSymbol, out var result)
                 ? result
                 : null;
 

src/System.CommandLine/Parsing/CliSymbolResultInternal.cs

@@ -70,7 +70,7 @@ public IEnumerable<ParseError> Errors
         /// </summary>
         /// <param name="argument">The argument for which to find a result.</param>
         /// <returns>An argument result if the argument was matched by the parser or has a default value; otherwise, <c>null</c>.</returns>
-        internal CliArgumentResultInternal? GetResult(CliArgument argument) => SymbolResultTree.GetResult(argument);
+        internal CliArgumentResultInternal? GetResult(CliArgument argument) => SymbolResultTree.GetResultInternal(argument);
 
         /* Not used
         /// <summary>
@@ -86,7 +86,7 @@ public IEnumerable<ParseError> Errors
         /// </summary>
         /// <param name="option">The option for which to find a result.</param>
         /// <returns>An option result if the option was matched by the parser or has a default value; otherwise, <c>null</c>.</returns>
-        internal CliOptionResultInternal? GetResult(CliOption option) => SymbolResultTree.GetResult(option);
+        internal CliOptionResultInternal? GetResult(CliOption option) => SymbolResultTree.GetResultInternal(option);
 
 // TODO: directives
 /*

src/System.CommandLine/Parsing/SymbolLookupByName.cs

@@ -109,7 +109,7 @@ private bool TryGetSymbolAndParentInternal(string name,
         {
             if (commandCache.SymbolsByName.TryGetValue(name, out symbol))
             {
-                if (symbol is not null && (!valuesOnly || (symbol is CliArgument or CliOption)))
+                if (symbol is not null && (!valuesOnly || (symbol is CliValueSymbol)))
                 {
                     parent = commandCache.Command;
                     errorMessage = null;

src/System.CommandLine/Parsing/SymbolResultTree.cs

@@ -37,13 +37,13 @@ internal SymbolResultTree(
 
         internal int ErrorCount => Errors?.Count ?? 0;
 
-        internal CliArgumentResultInternal? GetResult(CliArgument argument)
+        internal CliArgumentResultInternal? GetResultInternal(CliArgument argument)
             => TryGetValue(argument, out CliSymbolResultInternal? result) ? (CliArgumentResultInternal)result : default;
 
-        internal CliCommandResultInternal? GetResult(CliCommand command)
+        internal CliCommandResultInternal? GetResultInternal(CliCommand command)
             => TryGetValue(command, out var result) ? (CliCommandResultInternal)result : default;
 
-        internal CliOptionResultInternal? GetResult(CliOption option)
+        internal CliOptionResultInternal? GetResultInternal(CliOption option)
             => TryGetValue(option, out CliSymbolResultInternal? result) ? (CliOptionResultInternal)result : default;
 
         // TODO: Determine how this is used. It appears to be O^n in the size of the tree and so if it is called multiple times, we should reconsider to avoid O^(N*M)