Minor internal refactoring.

Author: gsscoder

src/libcmdline/Extensions/StringExtensions.cs

@@ -78,10 +78,5 @@ public static bool IsLongOption(this string value)
         {
             return value[0] == '-' && value[1] == '-';
         }
-
-        public static StringComparison GetStringComparison(this IParserSettings settings)
-        {
-            return settings.CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
-        }
     }
 }

src/libcmdline/Parser.cs

@@ -21,21 +21,23 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 #endregion
-#region Using Directives
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-using System.Linq;
-using CommandLine.Extensions;
-using CommandLine.Helpers;
-using CommandLine.Infrastructure;
+#region Using Directives
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using CommandLine.Extensions;
+using CommandLine.Helpers;
+using CommandLine.Infrastructure;
 using CommandLine.Text;
 #endregion
 
 namespace CommandLine
-{
+{
+    using System.IO;
+
     /// <summary>
     /// Provides methods to parse command line arguments. Default implementation for <see cref="CommandLine.IParser"/>.
     /// </summary>
@@ -288,6 +290,11 @@ private static void SetParserStateIfNeeded(object options, IEnumerable<ParsingEr
             {
                 parserState.Errors.Add(error);
             }
+        }
+
+        private static StringComparison GetStringComparison(IParserSettings settings)
+        {
+            return settings.CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
         }
 
         private bool DoParseArguments(string[] args, object options)
@@ -442,11 +449,11 @@ private bool TryParseHelpVerb(string[] args, object options, Pair<MethodInfo, He
         {
             var helpWriter = Settings.HelpWriter;
             if (helpInfo != null && helpWriter != null)
-            {
-                if (string.Compare(args[0], helpInfo.Right.LongName, Settings.GetStringComparison()) == 0)
+            {
+                if (string.Compare(args[0], helpInfo.Right.LongName, GetStringComparison(Settings)) == 0)
                 {
-                    // User explicitly requested help
-                    var verb = args.Length > 1 ? args[1] : null;
+                    // User explicitly requested help
+                    var verb = args.FirstOrDefault();
                     if (verb != null)
                     {
                         var verbOption = optionMap[verb];
@@ -496,10 +503,11 @@ private void InvokeAutoBuildIfNeeded(object options)
             }
 
             // We print help text for the user
-            Settings.HelpWriter.Write(HelpText.AutoBuild(
-                options,
-                current => HelpText.DefaultParsingErrorsHandler(options, current),
-                options.HasVerbs()));
+            Settings.HelpWriter.Write(
+                HelpText.AutoBuild(
+                    options,
+                    current => HelpText.DefaultParsingErrorsHandler(options, current),
+                    options.HasVerbs()));
         }
 
         private void Dispose(bool disposing)