Merge pull request #2386 from KathleenDollard/parseresult-remove-tokens

Removed tokens from ParseResult

Author: KathleenDollard

src/System.CommandLine.Tests/ParserTests.cs

@@ -497,6 +497,8 @@ public void Relative_order_of_arguments_and_options_within_a_command_does_not_ma
                             .Excluding(y => y.WhichGetterHas(CSharpAccessModifier.PrivateProtected)));
         }
 
+        // TODO: Tests tokens which is no longer exposed, and should be replaced by tests of location or removed
+        /*
         [Theory]
         [InlineData("--one 1 --many 1 --many 2")]
         [InlineData("--one 1 --many 1 --many 2 arg1 arg2")]
@@ -520,6 +522,7 @@ public void Original_order_of_tokens_is_preserved_in_ParseResult_Tokens(string c
 
             result.Tokens.Select(t => t.Value).Should().Equal(rawSplit);
         }
+        */
 
         /*
         [Fact]
@@ -1114,6 +1117,8 @@ public void When_an_option_argument_is_enclosed_in_double_quotes_its_value_retai
                 .BeEquivalentTo(new[] { arg2 });
         }
 
+        // TODO: Tests tokens which is no longer exposed, and should be replaced by tests of location or removed
+        /*
         [Fact] // https://github.com/dotnet/command-line-api/issues/1445
         public void Trailing_option_delimiters_are_ignored()
         {
@@ -1136,6 +1141,7 @@ public void Trailing_option_delimiters_are_ignored()
                 .Should()
                 .BeEquivalentSequenceTo(new[] { "subcommand", "--directory", @"c:\" });
         }
+        */
 
         [Theory]
         [InlineData("-x -y")]
@@ -1620,6 +1626,8 @@ public void When_option_arguments_are_greater_than_maximum_arity_then_an_error_i
                 .Contain(LocalizationResources.UnrecognizedCommandOrArgument("4"));
         }
 
+        // TODO: Tests tokens which is no longer exposed, and should be replaced with equivalent test using ParseResult
+        /*
         [Fact]
         public void Tokens_are_not_split_if_the_part_before_the_delimiter_is_not_an_option()
         {
@@ -1633,6 +1641,7 @@ public void Tokens_are_not_split_if_the_part_before_the_delimiter_is_not_an_opti
                 .BeEquivalentTo("url",
                                 "jdbc:sqlserver://10.0.0.2;databaseName=main");
         }
+        */
         /*
         [Fact]
         public void A_subcommand_wont_overflow_when_checking_maximum_argument_capacity()

src/System.CommandLine/ParseResult.cs

@@ -31,7 +31,9 @@ internal ParseResult(
             CommandResult rootCommandResult,
             CommandResult commandResult,
             Dictionary<CliSymbol, ValueResult> valueResults,
+            /*
             List<CliToken> tokens,
+            */
 // TODO: unmatched tokens
 //          List<CliToken>? unmatchedTokens,
             List<ParseError>? errors,
@@ -53,7 +55,7 @@ internal ParseResult(
             _action = action;
             _preActions = preActions;
 */
-
+            /*
             // skip the root command when populating Tokens property
             if (tokens.Count > 1)
             {
@@ -67,6 +69,7 @@ internal ParseResult(
             {
                 Tokens = Array.Empty<CliToken>();
             }
+            */
 
             CommandLineText = commandLineText;
 
@@ -101,12 +104,14 @@ internal ParseResult(
         /// </summary>
         public IReadOnlyList<ParseError> Errors { get; }
 
+        /*
         // TODO: don't expose tokens
         // TODO: This appears to be set, but only read during testing. Consider removing.
         /// <summary>
         /// Gets the tokens identified while parsing command line input.
         /// </summary>
         internal IReadOnlyList<CliToken> Tokens { get; }
+        */
 
         // TODO: This appears to be set, but never used. Consider removing.
         /// <summary>

src/System.CommandLine/Parsing/ParseOperation.cs

@@ -86,7 +86,9 @@ internal ParseResult Parse()
                 _rootCommandResult,
                 _innermostCommandResult,
                 _rootCommandResult.SymbolResultTree.GetValueResultDictionary(),
+                /*
                 _tokens,
+                */
 // TODO: unmatched tokens
 //                _symbolResultTree.UnmatchedTokens,
                 _symbolResultTree.Errors,