make Argument (non-generic) abstract

jonsequitur · jonsequitur · commit 21cefe59ffcd · 2022-03-15T15:10:40.000-07:00
diff --git a/src/System.CommandLine.Tests/ArgumentTests.cs b/src/System.CommandLine.Tests/ArgumentTests.cs
@@ -17,15 +17,15 @@ public class ArgumentTests : SymbolTests
         [Fact]
         public void By_default_there_is_no_default_value()
         {
-            var argument = new Argument();
+            var argument = new Argument<string>();
 
             argument.HasDefaultValue.Should().BeFalse();
         }
 
         [Fact]
         public void When_default_value_is_set_to_null_then_HasDefaultValue_is_true()
         {
-            var argument = new Argument();
+            var argument = new Argument<string>();
 
             argument.SetDefaultValue(null);
 
@@ -35,7 +35,7 @@ public void When_default_value_is_set_to_null_then_HasDefaultValue_is_true()
         [Fact]
         public void When_default_value_factory_is_set_then_HasDefaultValue_is_true()
         {
-            var argument = new Argument();
+            var argument = new Argument<string[]>();
 
             argument.SetDefaultValueFactory(() => null);
 
@@ -699,7 +699,7 @@ public void OnlyTake_can_pass_on_all_tokens()
 
         protected override Symbol CreateSymbol(string name)
         {
-            return new Argument(name);
+            return new Argument<string>(name);
         }
     }
 }
diff --git a/src/System.CommandLine.Tests/CommandTests.cs b/src/System.CommandLine.Tests/CommandTests.cs
@@ -96,18 +96,12 @@ public void Commands_at_multiple_levels_can_have_their_own_arguments()
         {
             var outer = new Command("outer")
             {
-                new Argument
-                {
-                    Arity = ArgumentArity.ExactlyOne
-                }
+                new Argument<string>()
             };
             outer.AddCommand(
                 new Command("inner")
                 {
-                    new Argument
-                    {
-                        Arity = ArgumentArity.ZeroOrMore
-                    }
+                    new Argument<string[]>()
                 });
 
             var parser = new Parser(outer);
@@ -254,9 +248,9 @@ public void It_retains_argument_name_when_it_is_provided()
         {
             var command = new Command("-alias")
             {
-                new Argument
+                new Argument<bool>
                 {
-                    Name = "arg", Arity = ArgumentArity.ZeroOrOne
+                    Name = "arg"
                 }
             };
 
diff --git a/src/System.CommandLine.Tests/CompletionContextTests.cs b/src/System.CommandLine.Tests/CompletionContextTests.cs
@@ -204,10 +204,7 @@ public void When_position_is_specified_in_string_command_line_then_it_returns_ar
             var command =
                 new Command("the-command")
                 {
-                    new Argument
-                    {
-                        Arity = ArgumentArity.ZeroOrMore
-                    }
+                    new Argument<string[]>()
                 };
 
             var position = commandLine.IndexOf("$", StringComparison.Ordinal);
diff --git a/src/System.CommandLine.Tests/CompletionTests.cs b/src/System.CommandLine.Tests/CompletionTests.cs
@@ -119,7 +119,7 @@ public void Command_GetCompletions_returns_available_subcommands_and_option_alia
             {
                 new Command("subcommand", "subcommand"),
                 new Option<bool>("--option", "option"),
-                new Argument
+                new Argument<string[]>
                 {
                     Arity = ArgumentArity.OneOrMore,
                     Completions = { "command-argument" }
@@ -156,7 +156,7 @@ public void Command_GetCompletions_does_not_return_argument_names()
         {
             var command = new Command("command")
             {
-                new Argument("the-argument")
+                new Argument<string>("the-argument")
             };
 
             var completions = command.GetCompletions();
@@ -467,10 +467,7 @@ public void Subcommand_names_are_available_as_suggestions()
             {
                 new Command("one", "Command one"),
                 new Command("two", "Command two"),
-                new Argument
-                {
-                    Arity = ArgumentArity.ExactlyOne
-                }
+                new Argument<string>()
             };
 
             var commandLine = "test";
@@ -488,10 +485,7 @@ public void Both_subcommands_and_options_are_available_as_suggestions()
             {
                 new Command("one"),
                 new Option<string>("--one"),
-                new Argument
-                {
-                    Arity = ArgumentArity.ExactlyOne
-                }
+                new Argument<string>()
             };
 
             var commandLine = "test";
diff --git a/src/System.CommandLine.Tests/Help/HelpBuilderTests.cs b/src/System.CommandLine.Tests/Help/HelpBuilderTests.cs
@@ -127,7 +127,7 @@ public void Usage_section_shows_arguments_if_there_are_arguments_for_command_whe
             int maxArity,
             string expectedArgsUsage)
         {
-            var argument = new Argument
+            var argument = new Argument<string>
             {
                 Name = "the-args",
                 Arity = new ArgumentArity(minArity, maxArity)
@@ -167,14 +167,14 @@ public void Usage_section_shows_arguments_if_there_are_arguments_for_command_whe
             int maxArityForArg2,
             string expectedArgsUsage)
         {
-            var arg1 = new Argument
+            var arg1 = new Argument<string>
             {
                 Name = "arg1",
                 Arity = new ArgumentArity(
                     minArityForArg1,
                     maxArityForArg1)
             };
-            var arg2 = new Argument
+            var arg2 = new Argument<string>
             {
                 Name = "arg2",
                 Arity = new ArgumentArity(
@@ -418,7 +418,7 @@ public void Arguments_section_is_included_if_there_are_commands_with_arguments_c
         {
             var command = new Command("the-command", "command help")
             {
-                new Argument
+                new Argument<string>
                 {
                     Name = "arg command name",
                     Description = "test"
@@ -822,7 +822,7 @@ public void Option_argument_first_column_indicates_enums_values(bool nullable)
         [Fact]
         public void Help_describes_default_value_for_argument()
         {
-            var argument = new Argument
+            var argument = new Argument<string>
             {
                 Name = "the-arg",
                 Description = "Help text from HelpDetail",
@@ -1529,11 +1529,11 @@ public void Subcommand_help_does_not_contain_hidden_argument()
         [Fact]
         public void Help_describes_default_value_for_subcommand_with_arguments_and_only_defaultable_is_shown()
         {
-            var argument = new Argument
+            var argument = new Argument<string>
             {
                 Name = "the-arg",
             };
-            var otherArgumentHidden = new Argument
+            var otherArgumentHidden = new Argument<string>
             {
                 Name = "the-other-hidden-arg",
                 IsHidden = true
@@ -1570,11 +1570,11 @@ public void Help_describes_default_value_for_subcommand_with_arguments_and_only_
         [Fact]
         public void Help_describes_default_values_for_subcommand_with_multiple_defaultable_arguments()
         {
-            var argument = new Argument
+            var argument = new Argument<string>
             {
                 Name = "the-arg",
             };
-            var otherArgument = new Argument
+            var otherArgument = new Argument<string>
             {
                 Name = "the-other-arg"
             };
diff --git a/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs b/src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs
@@ -124,7 +124,7 @@ public async Task Hidden_commands_are_not_suggested()
         [Fact]
         public async Task Arguments_are_not_suggested()
         {
-            var argument = new Argument("the-argument");
+            var argument = new Argument<string>("the-argument");
             var command = new Command("been");
 
             var parser =
diff --git a/src/System.CommandLine.Tests/ParseResultTests.cs b/src/System.CommandLine.Tests/ParseResultTests.cs
@@ -59,14 +59,14 @@ public void Command_will_not_accept_a_command_if_a_sibling_command_has_already_b
             {
                 new Command("inner-one")
                 {
-                    new Argument
+                    new Argument<bool>
                     {
                         Arity = ArgumentArity.Zero
                     }
                 },
                 new Command("inner-two")
                 {
-                    new Argument
+                    new Argument<bool>
                     {
                         Arity = ArgumentArity.Zero
                     }
diff --git a/src/System.CommandLine.Tests/ParserTests.MultipleArguments.cs b/src/System.CommandLine.Tests/ParserTests.MultipleArguments.cs
@@ -123,14 +123,8 @@ public void When_multiple_arguments_are_present_then_their_order_relative_to_sib
             [Fact]
             public void Multiple_arguments_of_unspecified_type_are_parsed_correctly()
             {
-                var sourceArg = new Argument("source")
-                {
-                    Arity = ArgumentArity.ExactlyOne
-                };
-                var destinationArg = new Argument("destination")
-                {
-                    Arity = ArgumentArity.ExactlyOne
-                };
+                var sourceArg = new Argument<string>("source");
+                var destinationArg = new Argument<string>("destination");
                 var root = new RootCommand
                 {
                     sourceArg,
diff --git a/src/System.CommandLine.Tests/ParserTests.cs b/src/System.CommandLine.Tests/ParserTests.cs
@@ -185,10 +185,7 @@ public void Options_do_not_get_unbundled_unless_all_resulting_options_would_be_v
             outer.AddOption(new Option<bool>("-a"));
             var inner = new Command("inner")
             {
-                new Argument
-                {
-                    Arity = ArgumentArity.ZeroOrMore
-                }
+                new Argument<string[]>()
             };
             inner.AddOption(new Option<bool>("-b"));
             inner.AddOption(new Option<bool>("-c"));
@@ -390,10 +387,8 @@ public void When_an_option_is_not_respecified_but_limit_is_reached_then_the_foll
                 {
                     animalsOption,
                     vegetablesOption,
-                    new Argument
-                    {
-                        Arity = ArgumentArity.ZeroOrMore
-                    }});
+                    new Argument<string[]>()
+                });
 
             var result = parser.Parse("the-command -a cat some-arg -v carrot");
 
@@ -541,16 +536,10 @@ public void When_nested_commands_all_accept_arguments_then_the_nearest_captures_
             var command = new Command(
                 "outer")
             {
-                new Argument
-                {
-                    Arity = ArgumentArity.ZeroOrMore
-                },
+                new Argument<string[]>(),
                 new Command("inner")
                 {
-                    new Argument
-                    {
-                        Arity = ArgumentArity.ZeroOrMore
-                    }
+                    new Argument<string[]>()
                 }
             };
 
@@ -848,10 +837,7 @@ public void Absolute_unix_style_paths_are_lexed_correctly()
 
             var parser = new Parser(new Command("rm")
             {
-                new Argument
-                {
-                    Arity = ArgumentArity.ZeroOrMore
-                }
+                new Argument<string[]>()
             });
 
             var result = parser.Parse(command);
@@ -871,10 +857,7 @@ public void Absolute_Windows_style_paths_are_lexed_correctly()
 
             var parser = new Parser(new Command("rm")
             {
-                new Argument
-                {
-                    Arity = ArgumentArity.ZeroOrMore
-                }
+                new Argument<string[]>()
             });
 
             ParseResult result = parser.Parse(command);
@@ -1021,10 +1004,7 @@ public void The_default_behavior_of_unmatched_tokens_resulting_in_errors_can_be_
         {
             var command = new Command("the-command")
             {
-                new Argument
-                {
-                    Arity = ArgumentArity.ExactlyOne
-                }
+                new Argument<string>()
             };
             command.TreatUnmatchedTokensAsErrors = false;
 
@@ -1410,7 +1390,7 @@ public void Parse_can_be_called_with_null_args()
         [Fact]
         public void Command_argument_arity_can_be_a_fixed_value_greater_than_1()
         {
-            var argument = new Argument
+            var argument = new Argument<string[]>
             {
                 Arity = new ArgumentArity(3, 3)
             };
@@ -1432,7 +1412,7 @@ public void Command_argument_arity_can_be_a_fixed_value_greater_than_1()
         [Fact]
         public void Command_argument_arity_can_be_a_range_with_a_lower_bound_greater_than_1()
         {
-            var argument = new Argument
+            var argument = new Argument<string[]>
             {
                 Arity = new ArgumentArity(3, 5)
             };
@@ -1466,7 +1446,7 @@ public void When_command_arguments_are_fewer_than_minimum_arity_then_an_error_is
         {
             var command = new Command("the-command")
             {
-                new Argument
+                new Argument<string[]>
                 {
                     Arity = new ArgumentArity(2, 3)
                 }
@@ -1485,7 +1465,7 @@ public void When_command_arguments_are_greater_than_maximum_arity_then_an_error_
         {
             var command = new Command("the-command")
             {
-                new Argument
+                new Argument<string[]>
                 {
                     Arity = new ArgumentArity(2, 3)
                 }
@@ -1605,15 +1585,9 @@ public void A_subcommand_wont_overflow_when_checking_maximum_argument_capcity()
         {
             // Tests bug identified in https://github.com/dotnet/command-line-api/issues/997
 
-            var argument1 = new Argument("arg1")
-            {
-                Arity = ArgumentArity.ExactlyOne
-            };
+            var argument1 = new Argument<string>("arg1");
 
-            var argument2 = new Argument<string[]>("arg2")
-            {
-                Arity = ArgumentArity.OneOrMore
-            };
+            var argument2 = new Argument<string[]>("arg2");
 
             var command = new Command("subcommand")
             {
diff --git a/src/System.CommandLine.Tests/ResourceLocalizationTests.cs b/src/System.CommandLine.Tests/ResourceLocalizationTests.cs
@@ -19,10 +19,7 @@ public void Default_validation_messages_can_be_replaced_in_order_to_add_localiza
 
             var command = new Command("the-command")
             {
-                new Argument
-                {
-                    Arity = ArgumentArity.ExactlyOne
-                }
+                new Argument<string>()
             };
             var parser = new Parser(new CommandLineConfiguration(command, resources: messages));
             var result = parser.Parse("the-command");
@@ -40,10 +37,7 @@ public void Default_validation_messages_can_be_replaced_using_CommandLineBuilder
 
             var parser = new CommandLineBuilder(new Command("the-command")
                          {
-                             new Argument
-                             {
-                                 Arity = ArgumentArity.ExactlyOne
-                             }
+                             new Argument<string>()
                          })
                          .UseLocalizationResources(messages)
                          .Build();
diff --git a/src/System.CommandLine/Argument.cs b/src/System.CommandLine/Argument.cs

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,15 @@ public class ArgumentTests : SymbolTests`
`17`	`17`	`[Fact]`
`18`	`18`	`public void By_default_there_is_no_default_value()`
`19`	`19`	`{`
`20`		`- var argument = new Argument();`
	`20`	`+ var argument = new Argument<string>();`
`21`	`21`
`22`	`22`	`argument.HasDefaultValue.Should().BeFalse();`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`[Fact]`
`26`	`26`	`public void When_default_value_is_set_to_null_then_HasDefaultValue_is_true()`
`27`	`27`	`{`
`28`		`- var argument = new Argument();`
	`28`	`+ var argument = new Argument<string>();`
`29`	`29`
`30`	`30`	`argument.SetDefaultValue(null);`
`31`	`31`
`@@ -35,7 +35,7 @@ public void When_default_value_is_set_to_null_then_HasDefaultValue_is_true()`
`35`	`35`	`[Fact]`
`36`	`36`	`public void When_default_value_factory_is_set_then_HasDefaultValue_is_true()`
`37`	`37`	`{`
`38`		`- var argument = new Argument();`
	`38`	`+ var argument = new Argument<string[]>();`
`39`	`39`
`40`	`40`	`argument.SetDefaultValueFactory(() => null);`
`41`	`41`
`@@ -699,7 +699,7 @@ public void OnlyTake_can_pass_on_all_tokens()`
`699`	`699`
`700`	`700`	`protected override Symbol CreateSymbol(string name)`
`701`	`701`	`{`
`702`		`- return new Argument(name);`
	`702`	`+ return new Argument<string>(name);`
`703`	`703`	`}`
`704`	`704`	`}`
`705`	`705`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,18 +96,12 @@ public void Commands_at_multiple_levels_can_have_their_own_arguments()`
`96`	`96`	`{`
`97`	`97`	`var outer = new Command("outer")`
`98`	`98`	`{`
`99`		`- new Argument`
`100`		`- {`
`101`		`- Arity = ArgumentArity.ExactlyOne`
`102`		`- }`
	`99`	`+ new Argument<string>()`
`103`	`100`	`};`
`104`	`101`	`outer.AddCommand(`
`105`	`102`	`new Command("inner")`
`106`	`103`	`{`
`107`		`- new Argument`
`108`		`- {`
`109`		`- Arity = ArgumentArity.ZeroOrMore`
`110`		`- }`
	`104`	`+ new Argument<string[]>()`
`111`	`105`	`});`
`112`	`106`
`113`	`107`	`var parser = new Parser(outer);`
`@@ -254,9 +248,9 @@ public void It_retains_argument_name_when_it_is_provided()`
`254`	`248`	`{`
`255`	`249`	`var command = new Command("-alias")`
`256`	`250`	`{`
`257`		`- new Argument`
	`251`	`+ new Argument<bool>`
`258`	`252`	`{`
`259`		`- Name = "arg", Arity = ArgumentArity.ZeroOrOne`
	`253`	`+ Name = "arg"`
`260`	`254`	`}`
`261`	`255`	`};`
`262`	`256`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public void Usage_section_shows_arguments_if_there_are_arguments_for_command_whe`
`127`	`127`	`int maxArity,`
`128`	`128`	`string expectedArgsUsage)`
`129`	`129`	`{`
`130`		`- var argument = new Argument`
	`130`	`+ var argument = new Argument<string>`
`131`	`131`	`{`
`132`	`132`	`Name = "the-args",`
`133`	`133`	`Arity = new ArgumentArity(minArity, maxArity)`
`@@ -167,14 +167,14 @@ public void Usage_section_shows_arguments_if_there_are_arguments_for_command_whe`
`167`	`167`	`int maxArityForArg2,`
`168`	`168`	`string expectedArgsUsage)`
`169`	`169`	`{`
`170`		`- var arg1 = new Argument`
	`170`	`+ var arg1 = new Argument<string>`
`171`	`171`	`{`
`172`	`172`	`Name = "arg1",`
`173`	`173`	`Arity = new ArgumentArity(`
`174`	`174`	`minArityForArg1,`
`175`	`175`	`maxArityForArg1)`
`176`	`176`	`};`
`177`		`- var arg2 = new Argument`
	`177`	`+ var arg2 = new Argument<string>`
`178`	`178`	`{`
`179`	`179`	`Name = "arg2",`
`180`	`180`	`Arity = new ArgumentArity(`
`@@ -418,7 +418,7 @@ public void Arguments_section_is_included_if_there_are_commands_with_arguments_c`
`418`	`418`	`{`
`419`	`419`	`var command = new Command("the-command", "command help")`
`420`	`420`	`{`
`421`		`- new Argument`
	`421`	`+ new Argument<string>`
`422`	`422`	`{`
`423`	`423`	`Name = "arg command name",`
`424`	`424`	`Description = "test"`
`@@ -822,7 +822,7 @@ public void Option_argument_first_column_indicates_enums_values(bool nullable)`
`822`	`822`	`[Fact]`
`823`	`823`	`public void Help_describes_default_value_for_argument()`
`824`	`824`	`{`
`825`		`- var argument = new Argument`
	`825`	`+ var argument = new Argument<string>`
`826`	`826`	`{`
`827`	`827`	`Name = "the-arg",`
`828`	`828`	`Description = "Help text from HelpDetail",`
`@@ -1529,11 +1529,11 @@ public void Subcommand_help_does_not_contain_hidden_argument()`
`1529`	`1529`	`[Fact]`
`1530`	`1530`	`public void Help_describes_default_value_for_subcommand_with_arguments_and_only_defaultable_is_shown()`
`1531`	`1531`	`{`
`1532`		`- var argument = new Argument`
	`1532`	`+ var argument = new Argument<string>`
`1533`	`1533`	`{`
`1534`	`1534`	`Name = "the-arg",`
`1535`	`1535`	`};`
`1536`		`- var otherArgumentHidden = new Argument`
	`1536`	`+ var otherArgumentHidden = new Argument<string>`
`1537`	`1537`	`{`
`1538`	`1538`	`Name = "the-other-hidden-arg",`
`1539`	`1539`	`IsHidden = true`
`@@ -1570,11 +1570,11 @@ public void Help_describes_default_value_for_subcommand_with_arguments_and_only_`
`1570`	`1570`	`[Fact]`
`1571`	`1571`	`public void Help_describes_default_values_for_subcommand_with_multiple_defaultable_arguments()`
`1572`	`1572`	`{`
`1573`		`- var argument = new Argument`
	`1573`	`+ var argument = new Argument<string>`
`1574`	`1574`	`{`
`1575`	`1575`	`Name = "the-arg",`
`1576`	`1576`	`};`
`1577`		`- var otherArgument = new Argument`
	`1577`	`+ var otherArgument = new Argument<string>`
`1578`	`1578`	`{`
`1579`	`1579`	`Name = "the-other-arg"`
`1580`	`1580`	`};`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public async Task Hidden_commands_are_not_suggested()`
`124`	`124`	`[Fact]`
`125`	`125`	`public async Task Arguments_are_not_suggested()`
`126`	`126`	`{`
`127`		`- var argument = new Argument("the-argument");`
	`127`	`+ var argument = new Argument<string>("the-argument");`
`128`	`128`	`var command = new Command("been");`
`129`	`129`
`130`	`130`	`var parser =`
Original file line number	Diff line number	Diff line change
`@@ -59,14 +59,14 @@ public void Command_will_not_accept_a_command_if_a_sibling_command_has_already_b`
`59`	`59`	`{`
`60`	`60`	`new Command("inner-one")`
`61`	`61`	`{`
`62`		`- new Argument`
	`62`	`+ new Argument<bool>`
`63`	`63`	`{`
`64`	`64`	`Arity = ArgumentArity.Zero`
`65`	`65`	`}`
`66`	`66`	`},`
`67`	`67`	`new Command("inner-two")`
`68`	`68`	`{`
`69`		`- new Argument`
	`69`	`+ new Argument<bool>`
`70`	`70`	`{`
`71`	`71`	`Arity = ArgumentArity.Zero`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,10 +185,7 @@ public void Options_do_not_get_unbundled_unless_all_resulting_options_would_be_v`
`185`	`185`	`outer.AddOption(new Option<bool>("-a"));`
`186`	`186`	`var inner = new Command("inner")`
`187`	`187`	`{`
`188`		`- new Argument`
`189`		`- {`
`190`		`- Arity = ArgumentArity.ZeroOrMore`
`191`		`- }`
	`188`	`+ new Argument<string[]>()`
`192`	`189`	`};`
`193`	`190`	`inner.AddOption(new Option<bool>("-b"));`
`194`	`191`	`inner.AddOption(new Option<bool>("-c"));`
`@@ -390,10 +387,8 @@ public void When_an_option_is_not_respecified_but_limit_is_reached_then_the_foll`
`390`	`387`	`{`
`391`	`388`	`animalsOption,`
`392`	`389`	`vegetablesOption,`
`393`		`- new Argument`
`394`		`- {`
`395`		`- Arity = ArgumentArity.ZeroOrMore`
`396`		`- }});`
	`390`	`+ new Argument<string[]>()`
	`391`	`+ });`
`397`	`392`
`398`	`393`	`var result = parser.Parse("the-command -a cat some-arg -v carrot");`
`399`	`394`
`@@ -541,16 +536,10 @@ public void When_nested_commands_all_accept_arguments_then_the_nearest_captures_`
`541`	`536`	`var command = new Command(`
`542`	`537`	`"outer")`
`543`	`538`	`{`
`544`		`- new Argument`
`545`		`- {`
`546`		`- Arity = ArgumentArity.ZeroOrMore`
`547`		`- },`
	`539`	`+ new Argument<string[]>(),`
`548`	`540`	`new Command("inner")`
`549`	`541`	`{`
`550`		`- new Argument`
`551`		`- {`
`552`		`- Arity = ArgumentArity.ZeroOrMore`
`553`		`- }`
	`542`	`+ new Argument<string[]>()`
`554`	`543`	`}`
`555`	`544`	`};`
`556`	`545`
`@@ -848,10 +837,7 @@ public void Absolute_unix_style_paths_are_lexed_correctly()`
`848`	`837`
`849`	`838`	`var parser = new Parser(new Command("rm")`
`850`	`839`	`{`
`851`		`- new Argument`
`852`		`- {`
`853`		`- Arity = ArgumentArity.ZeroOrMore`
`854`		`- }`
	`840`	`+ new Argument<string[]>()`
`855`	`841`	`});`
`856`	`842`
`857`	`843`	`var result = parser.Parse(command);`
`@@ -871,10 +857,7 @@ public void Absolute_Windows_style_paths_are_lexed_correctly()`
`871`	`857`
`872`	`858`	`var parser = new Parser(new Command("rm")`
`873`	`859`	`{`
`874`		`- new Argument`
`875`		`- {`
`876`		`- Arity = ArgumentArity.ZeroOrMore`
`877`		`- }`
	`860`	`+ new Argument<string[]>()`
`878`	`861`	`});`
`879`	`862`
`880`	`863`	`ParseResult result = parser.Parse(command);`
`@@ -1021,10 +1004,7 @@ public void The_default_behavior_of_unmatched_tokens_resulting_in_errors_can_be_`
`1021`	`1004`	`{`
`1022`	`1005`	`var command = new Command("the-command")`
`1023`	`1006`	`{`
`1024`		`- new Argument`
`1025`		`- {`
`1026`		`- Arity = ArgumentArity.ExactlyOne`
`1027`		`- }`
	`1007`	`+ new Argument<string>()`
`1028`	`1008`	`};`
`1029`	`1009`	`command.TreatUnmatchedTokensAsErrors = false;`
`1030`	`1010`
`@@ -1410,7 +1390,7 @@ public void Parse_can_be_called_with_null_args()`
`1410`	`1390`	`[Fact]`
`1411`	`1391`	`public void Command_argument_arity_can_be_a_fixed_value_greater_than_1()`
`1412`	`1392`	`{`
`1413`		`- var argument = new Argument`
	`1393`	`+ var argument = new Argument<string[]>`
`1414`	`1394`	`{`
`1415`	`1395`	`Arity = new ArgumentArity(3, 3)`
`1416`	`1396`	`};`
`@@ -1432,7 +1412,7 @@ public void Command_argument_arity_can_be_a_fixed_value_greater_than_1()`
`1432`	`1412`	`[Fact]`
`1433`	`1413`	`public void Command_argument_arity_can_be_a_range_with_a_lower_bound_greater_than_1()`
`1434`	`1414`	`{`
`1435`		`- var argument = new Argument`
	`1415`	`+ var argument = new Argument<string[]>`
`1436`	`1416`	`{`
`1437`	`1417`	`Arity = new ArgumentArity(3, 5)`
`1438`	`1418`	`};`
`@@ -1466,7 +1446,7 @@ public void When_command_arguments_are_fewer_than_minimum_arity_then_an_error_is`
`1466`	`1446`	`{`
`1467`	`1447`	`var command = new Command("the-command")`
`1468`	`1448`	`{`
`1469`		`- new Argument`
	`1449`	`+ new Argument<string[]>`
`1470`	`1450`	`{`
`1471`	`1451`	`Arity = new ArgumentArity(2, 3)`
`1472`	`1452`	`}`
`@@ -1485,7 +1465,7 @@ public void When_command_arguments_are_greater_than_maximum_arity_then_an_error_`
`1485`	`1465`	`{`
`1486`	`1466`	`var command = new Command("the-command")`
`1487`	`1467`	`{`
`1488`		`- new Argument`
	`1468`	`+ new Argument<string[]>`
`1489`	`1469`	`{`
`1490`	`1470`	`Arity = new ArgumentArity(2, 3)`
`1491`	`1471`	`}`
`@@ -1605,15 +1585,9 @@ public void A_subcommand_wont_overflow_when_checking_maximum_argument_capcity()`
`1605`	`1585`	`{`
`1606`	`1586`	`// Tests bug identified in https://github.com/dotnet/command-line-api/issues/997`
`1607`	`1587`
`1608`		`- var argument1 = new Argument("arg1")`
`1609`		`- {`
`1610`		`- Arity = ArgumentArity.ExactlyOne`
`1611`		`- };`
	`1588`	`+ var argument1 = new Argument<string>("arg1");`
`1612`	`1589`
`1613`		`- var argument2 = new Argument<string[]>("arg2")`
`1614`		`- {`
`1615`		`- Arity = ArgumentArity.OneOrMore`
`1616`		`- };`
	`1590`	`+ var argument2 = new Argument<string[]>("arg2");`
`1617`	`1591`
`1618`	`1592`	`var command = new Command("subcommand")`
`1619`	`1593`	`{`