Merge pull request #2405 from KathleenDollard/make-old-result-internal

Make ArgumentResult, OptionResult and CommandResult `internal`

Author: KathleenDollard

src/System.CommandLine.Subsystems/Directives/DiagramSubsystem.cs

@@ -35,7 +35,8 @@ internal static StringBuilder Diagram(ParseResult parseResult)
         var builder = new StringBuilder(100);
 
 
-        Diagram(builder, parseResult.RootCommandResult, parseResult);
+        // TODO: Reinstate this when ready to implement
+        //Diagram(builder, parseResult.RootCommandResult, parseResult);
 
         // TODO: Unmatched tokens
         /*

src/System.CommandLine/CliArgument{T}.cs

@@ -34,7 +34,7 @@ public CliArgument(string name) : base(name)
         /// the delegate is also invoked when an input was provided.
         /// </remarks>
         */
-        public Func<ArgumentResult, T>? DefaultValueFactory { get; set; }
+        internal Func<ArgumentResult, T>? DefaultValueFactory { get; set; }
 
 // TODO: custom parsers
 /*

src/System.CommandLine/CliOption{T}.cs

@@ -30,7 +30,7 @@ private protected CliOption(string name, string[] aliases, CliArgument<T> argume
         }
 
         /// <inheritdoc cref="CliArgument{T}.DefaultValueFactory" />
-        public Func<ArgumentResult, T>? DefaultValueFactory
+        internal Func<ArgumentResult, T>? DefaultValueFactory
         {
             get => _argument.DefaultValueFactory;
             set => _argument.DefaultValueFactory = value;

src/System.CommandLine/ParseResult.cs

@@ -87,7 +87,7 @@ internal ParseResult(
         /// <summary>
         /// A result indicating the command specified in the command line input.
         /// </summary>
-        public CommandResult CommandResult { get; }
+        internal CommandResult CommandResult { get; }
 
         /// <summary>
         /// The configuration used to produce the parse result.
@@ -97,7 +97,7 @@ internal ParseResult(
         /// <summary>
         /// Gets the root command result.
         /// </summary>
-        public CommandResult RootCommandResult => _rootCommandResult;
+        internal CommandResult RootCommandResult => _rootCommandResult;
 
         /// <summary>
         /// Gets the parse errors found while parsing command line input.
@@ -180,23 +180,23 @@ CommandLineText is null
         /// </summary>
         /// <param name="argument">The argument for which to find a result.</param>
         /// <returns>A result for the specified argument, or <see langword="null"/> if it was not provided and no default was configured.</returns>
-        public ArgumentResult? GetResult(CliArgument argument) =>
+        internal ArgumentResult? GetResult(CliArgument argument) =>
             _rootCommandResult.GetResult(argument);
 
         /// <summary>
         /// Gets the result, if any, for the specified command.
         /// </summary>
         /// <param name="command">The command for which to find a result.</param>
         /// <returns>A result for the specified command, or <see langword="null"/> if it was not provided.</returns>
-        public CommandResult? GetResult(CliCommand command) =>
+        internal CommandResult? GetResult(CliCommand command) =>
             _rootCommandResult.GetResult(command);
 
         /// <summary>
         /// Gets the result, if any, for the specified option.
         /// </summary>
         /// <param name="option">The option for which to find a result.</param>
         /// <returns>A result for the specified option, or <see langword="null"/> if it was not provided and no default was configured.</returns>
-        public OptionResult? GetResult(CliOption option) =>
+        internal OptionResult? GetResult(CliOption option) =>
             _rootCommandResult.GetResult(option);
 
 // TODO: Directives

src/System.CommandLine/Parsing/ArgumentResult.cs

@@ -9,7 +9,7 @@ namespace System.CommandLine.Parsing
     /// <summary>
     /// A result produced when parsing an <see cref="Argument"/>.
     /// </summary>
-    public sealed class ArgumentResult : SymbolResult
+    internal sealed class ArgumentResult : SymbolResult
     {
         private ArgumentConversionResult? _conversionResult;
         private bool _onlyTakeHasBeenCalled;

src/System.CommandLine/Parsing/CommandResult.cs

@@ -9,7 +9,7 @@ namespace System.CommandLine.Parsing
     /// <summary>
     /// A result produced when parsing a <see cref="Command" />.
     /// </summary>
-    public sealed class CommandResult : SymbolResult
+    internal sealed class CommandResult : SymbolResult
     {
         internal CommandResult(
             CliCommand command,

src/System.CommandLine/Parsing/OptionResult.cs

@@ -10,7 +10,7 @@ namespace System.CommandLine.Parsing
     /// <summary>
     /// A result produced when parsing an <see cref="Option" />.
     /// </summary>
-    public sealed class OptionResult : SymbolResult
+    internal sealed class OptionResult : SymbolResult
     {
         private ArgumentConversionResult? _argumentConversionResult;
 

src/System.CommandLine/Parsing/SymbolResult.cs

@@ -70,21 +70,21 @@ 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>
-        public ArgumentResult? GetResult(CliArgument argument) => SymbolResultTree.GetResult(argument);
+        internal ArgumentResult? GetResult(CliArgument argument) => SymbolResultTree.GetResult(argument);
 
         /// <summary>
         /// Finds a result for the specific command anywhere in the parse tree, including parent and child symbol results.
         /// </summary>
         /// <param name="command">The command for which to find a result.</param>
         /// <returns>An command result if the command was matched by the parser; otherwise, <c>null</c>.</returns>
-        public CommandResult? GetResult(CliCommand command) => SymbolResultTree.GetResult(command);
+        internal CommandResult? GetResult(CliCommand command) => SymbolResultTree.GetResult(command);
 
         /// <summary>
         /// Finds a result for the specific option anywhere in the parse tree, including parent and child symbol results.
         /// </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>
-        public OptionResult? GetResult(CliOption option) => SymbolResultTree.GetResult(option);
+        internal OptionResult? GetResult(CliOption option) => SymbolResultTree.GetResult(option);
 
 // TODO: directives
 /*