Refactor to use parameterized package identity argument methods per review feedback

Co-authored-by: baronfel <[email protected]>

Author: 2 people

src/Cli/dotnet/Commands/Tool/Install/ToolInstallCommandParser.cs

@@ -10,7 +10,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Install;
 
 internal static class ToolInstallCommandParser
 {
-    public static readonly Argument<PackageIdentityWithRange> PackageIdentityArgument = CommonArguments.RequiredToolPackageIdentityArgument();
+    public static readonly Argument<PackageIdentityWithRange> PackageIdentityArgument = CommonArguments.RequiredPackageIdentityArgument(CliStrings.ToolPackageIdentityArgumentDescription);
 
     public static readonly Option<string> VersionOption = new("--version")
     {

src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommandParser.cs

@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Update;
 
 internal static class ToolUpdateCommandParser
 {
-    public static readonly Argument<PackageIdentityWithRange?> PackageIdentityArgument = CommonArguments.OptionalPackageIdentityArgument();
+    public static readonly Argument<PackageIdentityWithRange?> PackageIdentityArgument = CommonArguments.OptionalPackageIdentityArgument(CliStrings.ToolPackageIdentityArgumentDescription);
 
     public static readonly Option<bool> UpdateAllOption = ToolAppliedOption.UpdateAllOption;
 

src/Cli/dotnet/CommonArguments.cs

@@ -12,25 +12,23 @@ namespace Microsoft.DotNet.Cli
     internal class CommonArguments
     {
         public static DynamicArgument<PackageIdentityWithRange?> OptionalPackageIdentityArgument() =>
+            OptionalPackageIdentityArgument(CliStrings.PackageIdentityArgumentDescription);
+
+        public static DynamicArgument<PackageIdentityWithRange?> OptionalPackageIdentityArgument(string description) =>
             new("packageId")
             {
-                Description = CliStrings.PackageIdentityArgumentDescription,
+                Description = description,
                 CustomParser = (ArgumentResult argumentResult) => ParsePackageIdentityWithVersionSeparator(argumentResult.Tokens[0]?.Value),
                 Arity = ArgumentArity.ZeroOrOne,
             };
 
         public static DynamicArgument<PackageIdentityWithRange> RequiredPackageIdentityArgument() =>
-            new("packageId")
-            {
-                Description = CliStrings.PackageIdentityArgumentDescription,
-                CustomParser = (ArgumentResult argumentResult) => ParsePackageIdentityWithVersionSeparator(argumentResult.Tokens[0]?.Value)!.Value,
-                Arity = ArgumentArity.ExactlyOne,
-            };
+            RequiredPackageIdentityArgument(CliStrings.PackageIdentityArgumentDescription);
 
-        public static DynamicArgument<PackageIdentityWithRange> RequiredToolPackageIdentityArgument() =>
+        public static DynamicArgument<PackageIdentityWithRange> RequiredPackageIdentityArgument(string description) =>
             new("packageId")
             {
-                Description = CliStrings.ToolPackageIdentityArgumentDescription,
+                Description = description,
                 CustomParser = (ArgumentResult argumentResult) => ParsePackageIdentityWithVersionSeparator(argumentResult.Tokens[0]?.Value)!.Value,
                 Arity = ArgumentArity.ExactlyOne,
             };