remove Option.ArgumentDescription and rename Option.ArgumentName to ArgumentHelpName

Author: jonsequitur

src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs

@@ -42,27 +42,23 @@ public void Help_describes_default_values_for_complex_root_command_scenario()
                 ),
                 new Option<string>(aliases: new string[] {"--the-root-option-no-default-arg", "-tronda"}) {
                     Description = "the-root-option-no-default-description",
-                    ArgumentName = "the-root-option-arg-no-default-arg",
-                    ArgumentDescription = "the-root-option-arg-no-default-description",
+                    ArgumentHelpName = "the-root-option-arg-no-default-arg",
                     IsRequired = true
                 },
                 new Option<string>(aliases: new string[] {"--the-root-option-default-arg", "-troda"}, () => "the-root-option-arg-value") 
                 {
                     Description = "the-root-option-default-arg-description",
-                    ArgumentName = "the-root-option-arg",
-                    ArgumentDescription = "the-root-option-arg-description"
+                    ArgumentHelpName = "the-root-option-arg",
                 },
                 new Option<FileAccess>(aliases: new string[] {"--the-root-option-enum-arg", "-troea"}, () => FileAccess.Read) 
                 {
                     Description = "the-root-option-description",
-                    ArgumentName = "the-root-option-arg",
-                    ArgumentDescription = "the-root-option-arg-description"
+                    ArgumentHelpName = "the-root-option-arg",
                 },
                 new Option<FileAccess>(aliases: new string[] {"--the-root-option-required-enum-arg", "-trorea"}, () => FileAccess.Read) 
                 {
                     Description = "the-root-option-description",
-                    ArgumentName = "the-root-option-arg",
-                    ArgumentDescription = "the-root-option-arg-description",
+                    ArgumentHelpName = "the-root-option-arg",
                     IsRequired = true
                 },
                 new Option(aliases: new string[] {"--the-root-option-multi-line-description", "-tromld"}) {
@@ -74,6 +70,5 @@ public void Help_describes_default_values_for_complex_root_command_scenario()
             GetHelpBuilder(LargeMaxWidth).Write(command);
             Approvals.Verify(_console.Out.ToString());
         }
-
     }
 }

src/System.CommandLine.Tests/Help/HelpBuilderTests.cs

@@ -514,7 +514,7 @@ public void Arguments_section_is_not_included_if_there_are_only_options_with_arg
             {
                 new Option("-v", "Sets the verbosity.", arity: ArgumentArity.ExactlyOne)
                 {
-                    ArgumentName = "argument for options"
+                    ArgumentHelpName = "argument for options"
                 }
             };
 
@@ -530,7 +530,7 @@ public void Arguments_section_includes_configured_argument_aliases()
             {
                 new Option(new[] { "-v", "--verbosity" }, arity: ArgumentArity.ExactlyOne)
                 {
-                    ArgumentName = "LEVEL",
+                    ArgumentHelpName = "LEVEL",
                     Description = "Sets the verbosity."
                 }
             };
@@ -1188,7 +1188,7 @@ public void Required_options_are_indicated_when_argument_is_named()
                 new Option<string>(new[] {"-r", "--required" })
                 {
                     IsRequired = true,
-                    ArgumentName = "ARG"
+                    ArgumentHelpName = "ARG"
                 }
             };
 
@@ -1292,7 +1292,7 @@ public void Help_describes_default_value_for_option_with_argument_having_default
             {
                 new Option(new[] { "-arg"}, getDefaultValue: () => "the-arg-value")
                 {
-                    ArgumentName = "the-arg"
+                    ArgumentHelpName = "the-arg"
                 }
             };
 

src/System.CommandLine.Tests/OptionTests.cs

@@ -235,18 +235,18 @@ public void Argument_takes_option_alias_as_its_name_when_it_is_not_provided()
         {
             var command = new Option("--alias", arity: ArgumentArity.ZeroOrOne);
 
-            command.ArgumentName.Should().Be("alias");
+            command.ArgumentHelpName.Should().Be("alias");
         }
 
         [Fact]
         public void Argument_retains_name_when_it_is_provided()
         {
             var option = new Option("-alias", arity: ArgumentArity.ZeroOrOne)
             {
-                ArgumentName = "arg"
+                ArgumentHelpName = "arg"
             };
 
-            option.ArgumentName.Should().Be("arg");
+            option.ArgumentHelpName.Should().Be("arg");
         }
 
         [Fact]

src/System.CommandLine/Option.cs

@@ -88,30 +88,16 @@ getDefaultValue is null &&
         internal virtual Argument Argument
         {
             get => Arguments.FirstOrDefault() ?? Argument.None;
-            set
-            {
-                for (var i = 0; i < Children.Arguments.Count; i++)
-                {
-                    Children.Remove(Children.Arguments[i]);
-                }
-
-                AddArgumentInner(value);
-            }
+            set => AddArgumentInner(value); // FIX: delete?
         }
 
         //TODO: Guard against Argument.None?
-        public string ArgumentName
+        public string ArgumentHelpName
         {
             get => Argument.Name;
             set => Argument.Name = value;
         }
 
-        public string? ArgumentDescription
-        {
-            get => Argument.Description;
-            set => Argument.Description = value;
-        }
-
         private IEnumerable<Argument> Arguments => Children.OfType<Argument>();
 
         internal bool DisallowBinding { get; set; }