reorganize extension methods (#742)

jonsequitur · web-flow · commit 08c6d9b76525 · 2020-01-17T08:25:27.000-08:00
* clean up invocation extensions, move Command.Invoke* to System.CommandLine namespace

* move methods from InvocationExtensions into other namespaces

* fix E2E test
diff --git a/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_TypoCorrection.cs b/src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_TypoCorrection.cs
@@ -57,6 +57,6 @@ public IEnumerable<BdnParam<ParseResult>> GenerateTestParseResults()
         [Benchmark]
         [ArgumentsSource(nameof(GenerateTestParseResults))]
         public async Task TypoCorrection(BdnParam<ParseResult> parseResult)
-            => await _testParser.InvokeAsync(parseResult.Value, _nullConsole);
+            => await parseResult.Value.InvokeAsync(_nullConsole);
     }
 }
diff --git a/src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs b/src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs
@@ -4,6 +4,7 @@
 using System.CommandLine.Builder;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
+using System.CommandLine.Parsing;
 using System.CommandLine.Tests;
 using System.Threading.Tasks;
 using FluentAssertions;
diff --git a/src/System.CommandLine.Suggest.Tests/DotnetSuggestEndToEndTests.cs b/src/System.CommandLine.Suggest.Tests/DotnetSuggestEndToEndTests.cs
@@ -155,7 +155,7 @@ await Process.ExecuteAsync(
 
             stdOut.ToString()
                 .Should()
-                .Be($"--apple{NewLine}--banana{NewLine}--cherry{NewLine}--durian{NewLine}");
+                .Be($"--apple{NewLine}--banana{NewLine}--cherry{NewLine}--durian{NewLine}--version{NewLine}");
         }
     }
 }
diff --git a/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/Program.cs b/src/System.CommandLine.Suggest.Tests/EndToEndTestApp/Program.cs
@@ -2,6 +2,7 @@
 using System.CommandLine;
 using System.CommandLine.Builder;
 using System.CommandLine.Invocation;
+using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 
 namespace EndToEndTestApp
@@ -33,10 +34,7 @@ static async Task Main(string[] args)
             rootCommand.Handler = CommandHandler.Create(typeof(Program).GetMethod(nameof(Run)));
 
             var commandLine = new CommandLineBuilder(rootCommand)
-                .UseHelp()
-                .UseSuggestDirective()
-                .UseExceptionHandler()
-                .RegisterWithDotnetSuggest()
+                .UseDefaults()
                 .Build();
 
             await commandLine.InvokeAsync(args);
diff --git a/src/System.CommandLine.Tests/Help/HelpBuilderTests.cs b/src/System.CommandLine.Tests/Help/HelpBuilderTests.cs
@@ -4,8 +4,8 @@
 using System.Collections.Generic;
 using System.CommandLine.Builder;
 using System.CommandLine.Help;
-using System.CommandLine.Invocation;
 using System.CommandLine.IO;
+using System.CommandLine.Parsing;
 using System.IO;
 using FluentAssertions;
 using System.Linq;
diff --git a/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs b/src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs
@@ -3,6 +3,7 @@
 
 using System.CommandLine.Builder;
 using System.CommandLine.Invocation;
+using System.CommandLine.Parsing;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Threading;
diff --git a/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs b/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs
@@ -25,7 +25,7 @@ public async Task When_option_is_mistyped_it_is_suggested()
 
             var result = parser.Parse("niof");
 
-            await parser.InvokeAsync(result, _console);
+            await result.InvokeAsync(_console);
 
             _console.Out.ToString().Should().Contain("'niof' was not matched. Did you mean 'info'?");
         }
@@ -43,7 +43,7 @@ public async Task When_there_are_no_matches_then_nothing_is_suggested()
 
             var result = parser.Parse("zzzzzzz");
 
-            await parser.InvokeAsync(result, _console);
+            await result.InvokeAsync(_console);
 
             _console.Out.ToString().Should().NotContain("was not matched");
         }
@@ -61,7 +61,7 @@ public async Task When_command_is_mistyped_it_is_suggested()
 
             var result = parser.Parse("sertor");
 
-            await parser.InvokeAsync(result, _console);
+            await result.InvokeAsync(_console);
 
             _console.Out.ToString().Should().Contain("'sertor' was not matched. Did you mean 'restore'?");
         }
@@ -80,7 +80,7 @@ public async Task When_there_are_multiple_matches_it_picks_the_best_matches()
 
             var result = parser.Parse("een");
 
-            await parser.InvokeAsync(result, _console);
+            await result.InvokeAsync(_console);
 
             _console.Out.ToString().Should().Contain("'een' was not matched. Did you mean 'seen', or 'been'?");
         }
@@ -98,7 +98,7 @@ public async Task Hidden_commands_are_not_suggested()
 
             var result = parser.Parse("een");
 
-            await parser.InvokeAsync(result, _console);
+            await result.InvokeAsync(_console);
 
             _console.Out.ToString().Should().Contain("'een' was not matched. Did you mean 'been'?");
         }
@@ -115,7 +115,7 @@ public async Task Arguments_are_not_suggested()
 
             var result = parser.Parse("een");
 
-            await parser.InvokeAsync(result, _console);
+            await result.InvokeAsync(_console);
 
             _console.Out.ToString().Should().Contain("'een' was not matched. Did you mean 'been'?");
         }
@@ -132,7 +132,7 @@ public async Task Hidden_options_are_not_suggested()
                     .Build();
             var result = parser.Parse("een");
 
-            await parser.InvokeAsync(result, _console);
+            await result.InvokeAsync(_console);
 
             _console.Out.ToString().Should().Contain("'een' was not matched. Did you mean 'been'?");
         }
@@ -148,7 +148,7 @@ public async Task Suggestions_favor_matches_with_prefix()
                     .Build();
             var result = parser.Parse("-all");
 
-            await parser.InvokeAsync(result, _console);
+            await result.InvokeAsync(_console);
 
             _console.Out.ToString().Should().Contain("'-all' was not matched. Did you mean '-call'?");
         }
diff --git a/src/System.CommandLine.Tests/ParseDirectiveTests.cs b/src/System.CommandLine.Tests/ParseDirectiveTests.cs
@@ -43,7 +43,7 @@ public async Task Parse_directive_writes_parse_diagram()
 
             var console = new TestConsole();
 
-            await parser.InvokeAsync(result, console);
+            await result.InvokeAsync(console);
 
             console.Out
                    .ToString()
diff --git a/src/System.CommandLine.Tests/SuggestDirectiveTests.cs b/src/System.CommandLine.Tests/SuggestDirectiveTests.cs
@@ -56,7 +56,7 @@ public async Task It_writes_suggestions_for_option_arguments_when_under_subcomma
 
             var console = new TestConsole();
 
-            await parser.InvokeAsync(result, console);
+            await result.InvokeAsync(console);
 
             console.Out
                    .ToString()
@@ -81,7 +81,7 @@ public async Task It_writes_suggestions_for_option_arguments_when_under_root_com
 
             var console = new TestConsole();
 
-            await parser.InvokeAsync(result, console);
+            await result.InvokeAsync(console);
 
             console.Out
                    .ToString()
@@ -107,7 +107,7 @@ public async Task It_writes_suggestions_for_option_aliases_under_subcommand(stri
 
             var console = new TestConsole();
 
-            await parser.InvokeAsync(result, console);
+            await result.InvokeAsync(console);
 
             console.Out
                    .ToString()
@@ -136,7 +136,7 @@ public async Task It_writes_suggestions_for_option_aliases_under_root_command(st
 
             var console = new TestConsole();
 
-            await parser.InvokeAsync(result, console);
+            await result.InvokeAsync(console);
 
             console.Out
                    .ToString()
@@ -160,7 +160,7 @@ public async Task It_writes_suggestions_for_subcommand_aliases_under_root_comman
 
             var console = new TestConsole();
 
-            await parser.InvokeAsync(result, console);
+            await result.InvokeAsync(console);
 
             console.Out
                    .ToString()
@@ -185,7 +185,7 @@ public async Task It_writes_suggestions_for_partial_option_aliases_under_root_co
 
             var console = new TestConsole();
 
-            await parser.InvokeAsync(result, console);
+            await result.InvokeAsync(console);
 
             console.Out
                    .ToString()
@@ -206,7 +206,7 @@ public async Task It_writes_suggestions_for_partial_subcommand_aliases_under_roo
 
             var console = new TestConsole();
 
-            await parser.InvokeAsync(result, console);
+            await result.InvokeAsync(console);
 
             console.Out
                    .ToString()
@@ -227,7 +227,7 @@ public async Task It_writes_suggestions_for_partial_option_and_subcommand_aliase
 
             var console = new TestConsole();
 
-            await parser.InvokeAsync(result, console);
+            await result.InvokeAsync(console);
 
             console.Out
                    .ToString()
diff --git a/src/System.CommandLine.Tests/UseExceptionHandlerTests.cs b/src/System.CommandLine.Tests/UseExceptionHandlerTests.cs
@@ -4,6 +4,7 @@
 using System.CommandLine.Builder;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
+using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;
diff --git a/src/System.CommandLine.Tests/UseHelpTests.cs b/src/System.CommandLine.Tests/UseHelpTests.cs
@@ -30,7 +30,7 @@ public async Task UseHelp_writes_help_for_the_specified_command()
 
             var result = parser.Parse("command subcommand --help");
 
-            await parser.InvokeAsync(result, _console);
+            await result.InvokeAsync(_console);
 
             _console.Out.ToString().Should().Contain($"{RootCommand.ExecutableName} command subcommand");
         }
@@ -116,7 +116,7 @@ public async Task UseHelp_does_not_display_when_option_defined_with_same_alias()
 
             var result = parser.Parse("command -h");
 
-            await parser.InvokeAsync(result, _console);
+            await result.InvokeAsync(_console);
 
             _console.Out.ToString().Should().BeEmpty();
         }
diff --git a/src/System.CommandLine.Tests/VersionOptionTests.cs b/src/System.CommandLine.Tests/VersionOptionTests.cs
@@ -4,6 +4,7 @@
 using System.CommandLine.Builder;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
+using System.CommandLine.Parsing;
 using System.Reflection;
 using System.Threading.Tasks;
 using FluentAssertions;
diff --git a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs
diff --git a/src/System.CommandLine/CommandExtensions.cs b/src/System.CommandLine/CommandExtensions.cs
diff --git a/src/System.CommandLine/Invocation/InvocationExtensions.cs b/src/System.CommandLine/Invocation/InvocationExtensions.cs
diff --git a/src/System.CommandLine/Parsing/ParseResultExtensions.cs b/src/System.CommandLine/Parsing/ParseResultExtensions.cs
diff --git a/src/System.CommandLine/Parsing/ParserExtensions.cs b/src/System.CommandLine/Parsing/ParserExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,6 @@ public IEnumerable<BdnParam<ParseResult>> GenerateTestParseResults()`
`57`	`57`	`[Benchmark]`
`58`	`58`	`[ArgumentsSource(nameof(GenerateTestParseResults))]`
`59`	`59`	`public async Task TypoCorrection(BdnParam<ParseResult> parseResult)`
`60`		`- => await _testParser.InvokeAsync(parseResult.Value, _nullConsole);`
	`60`	`+ => await parseResult.Value.InvokeAsync(_nullConsole);`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ await Process.ExecuteAsync(`
`155`	`155`
`156`	`156`	`stdOut.ToString()`
`157`	`157`	`.Should()`
`158`		`- .Be($"--apple{NewLine}--banana{NewLine}--cherry{NewLine}--durian{NewLine}");`
	`158`	`+ .Be($"--apple{NewLine}--banana{NewLine}--cherry{NewLine}--durian{NewLine}--version{NewLine}");`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public async Task When_option_is_mistyped_it_is_suggested()`
`25`	`25`
`26`	`26`	`var result = parser.Parse("niof");`
`27`	`27`
`28`		`- await parser.InvokeAsync(result, _console);`
	`28`	`+ await result.InvokeAsync(_console);`
`29`	`29`
`30`	`30`	`_console.Out.ToString().Should().Contain("'niof' was not matched. Did you mean 'info'?");`
`31`	`31`	`}`
`@@ -43,7 +43,7 @@ public async Task When_there_are_no_matches_then_nothing_is_suggested()`
`43`	`43`
`44`	`44`	`var result = parser.Parse("zzzzzzz");`
`45`	`45`
`46`		`- await parser.InvokeAsync(result, _console);`
	`46`	`+ await result.InvokeAsync(_console);`
`47`	`47`
`48`	`48`	`_console.Out.ToString().Should().NotContain("was not matched");`
`49`	`49`	`}`
`@@ -61,7 +61,7 @@ public async Task When_command_is_mistyped_it_is_suggested()`
`61`	`61`
`62`	`62`	`var result = parser.Parse("sertor");`
`63`	`63`
`64`		`- await parser.InvokeAsync(result, _console);`
	`64`	`+ await result.InvokeAsync(_console);`
`65`	`65`
`66`	`66`	`_console.Out.ToString().Should().Contain("'sertor' was not matched. Did you mean 'restore'?");`
`67`	`67`	`}`
`@@ -80,7 +80,7 @@ public async Task When_there_are_multiple_matches_it_picks_the_best_matches()`
`80`	`80`
`81`	`81`	`var result = parser.Parse("een");`
`82`	`82`
`83`		`- await parser.InvokeAsync(result, _console);`
	`83`	`+ await result.InvokeAsync(_console);`
`84`	`84`
`85`	`85`	`_console.Out.ToString().Should().Contain("'een' was not matched. Did you mean 'seen', or 'been'?");`
`86`	`86`	`}`
`@@ -98,7 +98,7 @@ public async Task Hidden_commands_are_not_suggested()`
`98`	`98`
`99`	`99`	`var result = parser.Parse("een");`
`100`	`100`
`101`		`- await parser.InvokeAsync(result, _console);`
	`101`	`+ await result.InvokeAsync(_console);`
`102`	`102`
`103`	`103`	`_console.Out.ToString().Should().Contain("'een' was not matched. Did you mean 'been'?");`
`104`	`104`	`}`
`@@ -115,7 +115,7 @@ public async Task Arguments_are_not_suggested()`
`115`	`115`
`116`	`116`	`var result = parser.Parse("een");`
`117`	`117`
`118`		`- await parser.InvokeAsync(result, _console);`
	`118`	`+ await result.InvokeAsync(_console);`
`119`	`119`
`120`	`120`	`_console.Out.ToString().Should().Contain("'een' was not matched. Did you mean 'been'?");`
`121`	`121`	`}`
`@@ -132,7 +132,7 @@ public async Task Hidden_options_are_not_suggested()`
`132`	`132`	`.Build();`
`133`	`133`	`var result = parser.Parse("een");`
`134`	`134`
`135`		`- await parser.InvokeAsync(result, _console);`
	`135`	`+ await result.InvokeAsync(_console);`
`136`	`136`
`137`	`137`	`_console.Out.ToString().Should().Contain("'een' was not matched. Did you mean 'been'?");`
`138`	`138`	`}`
`@@ -148,7 +148,7 @@ public async Task Suggestions_favor_matches_with_prefix()`
`148`	`148`	`.Build();`
`149`	`149`	`var result = parser.Parse("-all");`
`150`	`150`
`151`		`- await parser.InvokeAsync(result, _console);`
	`151`	`+ await result.InvokeAsync(_console);`
`152`	`152`
`153`	`153`	`_console.Out.ToString().Should().Contain("'-all' was not matched. Did you mean '-call'?");`
`154`	`154`	`}`