cleanup: run code formatters and cleanups

Author: natemcmaster

src/CommandLineUtils/Abstractions/IValueParser{T}.cs

@@ -8,7 +8,7 @@ namespace McMaster.Extensions.CommandLineUtils.Abstractions
     /// <summary>
     /// A parser that can convert string into <typeparamref name="T" />.
     /// </summary>
-    public interface IValueParser<T> : IValueParser
+    public interface IValueParser<out T> : IValueParser
     {
         /// <summary>
         /// Parses the raw string value.

src/CommandLineUtils/Abstractions/ValueParserProvider.cs

@@ -75,17 +75,12 @@ public IValueParser GetParser(Type type)
         public IValueParser<T>? GetParser<T>()
         {
             var parser = GetParserImpl<T>();
-            if (parser == null)
+            return parser switch
             {
-                return null;
-            }
-
-            if (parser is IValueParser<T> retVal)
-            {
-                return retVal;
-            }
-
-            return new GenericParserAdapter<T>(parser);
+                null => null,
+                IValueParser<T> retVal => retVal,
+                _ => new GenericParserAdapter<T>(parser)
+            };
         }
 
         internal IValueParser? GetParserImpl<T>()
@@ -191,7 +186,7 @@ private void SafeAdd(IValueParser parser, bool andReplace = false)
                 throw new ArgumentNullException(nameof(parser));
             }
 
-            Type targetType = parser.TargetType;
+            var targetType = parser.TargetType;
 
             if (targetType == null)
             {

src/CommandLineUtils/Attributes/AllowedValuesAttribute.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 
 namespace McMaster.Extensions.CommandLineUtils
 {
@@ -29,7 +30,7 @@ public AllowedValuesAttribute(params string[] allowedValues)
         {
         }
 
-        internal ReadOnlyCollection<string> AllowedValues => Array.AsReadOnly(this._allowedValues);
+        internal ReadOnlyCollection<string> AllowedValues => Array.AsReadOnly(_allowedValues);
 
         /// <summary>
         /// Initializes an instance of <see cref="AllowedValuesAttribute"/>.
@@ -73,15 +74,9 @@ public bool IgnoreCase
         /// <inheritdoc />
         protected override ValidationResult IsValid(object value, ValidationContext validationContext)
         {
-            if (value is string str)
+            if (value is string str && _allowedValues.Any(t => str.Equals(t, Comparer)))
             {
-                for (var i = 0; i < _allowedValues.Length; i++)
-                {
-                    if (str.Equals(_allowedValues[i], Comparer))
-                    {
-                        return ValidationResult.Success;
-                    }
-                }
+                return ValidationResult.Success;
             }
 
             return new ValidationResult(FormatErrorMessage(value as string));

src/CommandLineUtils/Attributes/FilePathExistsAttributeBase.cs

@@ -55,17 +55,12 @@ protected override ValidationResult IsValid(object value, ValidationContext vali
 
         private static string GetDefaultErrorMessage(FilePathType filePathType)
         {
-            if (filePathType == FilePathType.File)
+            return filePathType switch
             {
-                return "The file '{0}' does not exist.";
-            }
-
-            if (filePathType == FilePathType.Directory)
-            {
-                return "The directory '{0}' does not exist.";
-            }
-
-            return "The file path '{0}' does not exist.";
+                FilePathType.File => "The file '{0}' does not exist.",
+                FilePathType.Directory => "The directory '{0}' does not exist.",
+                _ => "The file path '{0}' does not exist."
+            };
         }
     }
 }

src/CommandLineUtils/Attributes/FilePathNotExistsAttributeBase.cs

@@ -60,17 +60,12 @@ protected override ValidationResult IsValid(object value, ValidationContext vali
 
         private static string GetDefaultErrorMessage(FilePathType filePathType)
         {
-            if (filePathType == FilePathType.File)
+            return filePathType switch
             {
-                return "The file '{0}' already exists.";
-            }
-
-            if (filePathType == FilePathType.Directory)
-            {
-                return "The directory '{0}' already exists.";
-            }
-
-            return "The file path '{0}' already exists.";
+                FilePathType.File => "The file '{0}' already exists.",
+                FilePathType.Directory => "The directory '{0}' already exists.",
+                _ => "The file path '{0}' already exists."
+            };
         }
     }
 }

src/CommandLineUtils/Attributes/OptionAttribute.cs

@@ -11,7 +11,7 @@ namespace McMaster.Extensions.CommandLineUtils
     /// Represents one or many command line option that is identified by flag proceeded by '-' or '--'.
     /// Options are not positional. Compare to <see cref="ArgumentAttribute"/>.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
+    [AttributeUsage(AttributeTargets.Property)]
     public sealed class OptionAttribute : OptionAttributeBase
     {
         /// <summary>
@@ -88,10 +88,7 @@ internal CommandOption Configure(CommandLineApplication app, PropertyInfo prop)
 
             Configure(option);
 
-            if (option.Description == null)
-            {
-                option.Description = prop.Name;
-            }
+            option.Description ??= prop.Name;
 
             app.Options.Add(option);
             return option;

src/CommandLineUtils/Attributes/SubcommandAttribute.cs

@@ -11,7 +11,7 @@ namespace McMaster.Extensions.CommandLineUtils
     /// <summary>
     /// Represents a subcommand.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
     public sealed class SubcommandAttribute : Attribute
     {
         /// <summary>

src/CommandLineUtils/Attributes/SuppressDefaultHelpOptionAttribute.cs

@@ -9,7 +9,7 @@ namespace McMaster.Extensions.CommandLineUtils
     /// <summary>
     /// Suppress <see cref="DefaultHelpOptionConvention"/>.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Assembly, Inherited = true)]
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Assembly)]
     public sealed class SuppressDefaultHelpOptionAttribute : Attribute
     {
     }

src/CommandLineUtils/CommandArgument{T}.cs

@@ -44,9 +44,9 @@ public CommandArgument(IValueParser<T> valueParser)
         void IInternalCommandParamOfT.Parse(CultureInfo culture)
         {
             _parsedValues.Clear();
-            for (int i = 0; i < Values.Count; i++)
+            foreach (var t in Values)
             {
-                _parsedValues.Add(_valueParser.Parse(Name, Values[i], culture));
+                _parsedValues.Add(_valueParser.Parse(Name, t, culture));
             }
         }
     }

src/CommandLineUtils/CommandLineApplication.cs

@@ -51,7 +51,7 @@ static CommandLineApplication()
         private readonly HashSet<string> _names = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         private string? _primaryCommandName;
         internal CommandLineContext _context;
-        private ParserConfig _parserConfig;
+        private readonly ParserConfig _parserConfig;
         private IHelpTextGenerator _helpTextGenerator;
         private CommandOption? _optionHelp;
         private readonly Lazy<IServiceProvider> _services;
@@ -224,11 +224,9 @@ public CommandOption? OptionHelp
                 {
                     return _optionHelp;
                 }
-                if (Parent?.OptionHelp?.Inherited == true)
-                {
-                    return Parent.OptionHelp;
-                }
-                return null;
+                return Parent?.OptionHelp?.Inherited == true
+                    ? Parent.OptionHelp
+                    : null;
             }
             internal set => _optionHelp = value;
         }
@@ -245,7 +243,7 @@ public CommandOption? OptionHelp
         public List<CommandArgument> Arguments { get; private set; }
 
         /// <summary>
-        /// When initialized when <see cref="UnrecognizedArgumentHandling"/> is <see cref="UnrecognizedArgumentHandling.StopParsingAndCollect" />,
+        /// When initialized when <see cref="UnrecognizedArgumentHandling"/> is <see cref="McMaster.Extensions.CommandLineUtils.UnrecognizedArgumentHandling.StopParsingAndCollect" />,
         /// this will contain any unrecognized arguments.
         /// </summary>
         public List<string> RemainingArguments { get; private set; }
@@ -290,7 +288,7 @@ public UnrecognizedArgumentHandling UnrecognizedArgumentHandling
         /// A response file contains additional arguments that will be treated as if they were passed in on the command line.
         /// </para>
         /// <para>
-        /// Defaults to <see cref="ResponseFileHandling.Disabled" />.
+        /// Defaults to <see cref="McMaster.Extensions.CommandLineUtils.ResponseFileHandling.Disabled" />.
         /// </para>
         /// <para>
         /// Nested response false are not supported.
@@ -359,19 +357,16 @@ public char[] OptionNameValueSeparators
             get => _parserConfig.OptionNameValueSeparators ?? Parent?.OptionNameValueSeparators ?? new[] { ' ', ':', '=' };
             set
             {
-                if (value is null)
-                {
-                    throw new ArgumentNullException(nameof(value));
-                }
-                else if (value.Length == 0)
+                if (value.Length == 0)
                 {
                     throw new ArgumentException(Strings.IsEmptyArray, nameof(value));
                 }
+
                 _parserConfig.OptionNameValueSeparators = value;
             }
         }
 
-        internal bool OptionNameAndValueCanBeSpaceSeparated => Array.IndexOf(this.OptionNameValueSeparators, ' ') >= 0;
+        internal bool OptionNameAndValueCanBeSpaceSeparated => Array.IndexOf(OptionNameValueSeparators, ' ') >= 0;
 
         /// <summary>
         /// Gets the default value parser provider.
@@ -920,14 +915,9 @@ public CommandOption VersionOption(string template,
             string? shortFormVersion,
             string? longFormVersion = null)
         {
-            if (longFormVersion == null)
-            {
-                return VersionOption(template, () => shortFormVersion);
-            }
-            else
-            {
-                return VersionOption(template, () => shortFormVersion, () => longFormVersion);
-            }
+            return longFormVersion == null
+                ? VersionOption(template, () => shortFormVersion)
+                : VersionOption(template, () => shortFormVersion, () => longFormVersion);
         }
 
 #pragma warning disable RS0026 // Do not add multiple public overloads with optional parameters
@@ -980,7 +970,7 @@ public virtual void ShowHint()
         /// <param name="usePager">Use a console pager to display help text, if possible.</param>
         public void ShowHelp(bool usePager)
         {
-            CommandLineApplication? cmd = this;
+            var cmd = this;
             while (cmd != null)
             {
                 cmd.IsShowingInformation = true;
@@ -1015,7 +1005,7 @@ public virtual string GetHelpText()
         /// </summary>
         public void ShowVersion()
         {
-            CommandLineApplication? cmd = this;
+            var cmd = this;
             while (cmd != null)
             {
                 cmd.IsShowingInformation = true;
@@ -1077,12 +1067,7 @@ public void ShowRootCommandFullNameAndVersion()
 
         internal bool MatchesName(string name)
         {
-            if (string.Equals(name, Name, StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-
-            return _names.Contains(name);
+            return string.Equals(name, Name, StringComparison.OrdinalIgnoreCase) || _names.Contains(name);
         }
 
         private sealed class Builder : IConventionBuilder
@@ -1113,17 +1098,7 @@ IConventionBuilder IConventionBuilder.AddConvention(IConvention convention)
         /// <summary>
         /// Gets a builder that can be used to apply conventions to
         /// </summary>
-        public IConventionBuilder Conventions
-        {
-            get
-            {
-                if (_builder == null)
-                {
-                    _builder = new Builder(this);
-                }
-                return _builder;
-            }
-        }
+        public IConventionBuilder Conventions => _builder ??= new Builder(this);
 
         private protected virtual ConventionContext CreateConventionContext() => new ConventionContext(this, null);
 
@@ -1192,7 +1167,7 @@ public ServiceProvider(CommandLineApplication parent)
                     return _parent;
                 }
 
-                // prefer this type before AdditionalServces because it is common for service containers to automatically
+                // prefer this type before AdditionalServices because it is common for service containers to automatically
                 // create IEnumerable<T> to allow registration of multiple services
                 if (serviceType == typeof(IEnumerable<CommandOption>))
                 {
@@ -1219,13 +1194,10 @@ public ServiceProvider(CommandLineApplication parent)
                     return accessor.GetModel();
                 }
 
-                if (_parent.AdditionalServices != null)
+                var retVal = _parent.AdditionalServices?.GetService(serviceType);
+                if (retVal != null)
                 {
-                    var retVal = _parent.AdditionalServices.GetService(serviceType);
-                    if (retVal != null)
-                    {
-                        return retVal;
-                    }
+                    return retVal;
                 }
 
                 // Resolve this after AdditionalServices to support overriding IConsole from a custom service container