using same order for usage and argument descriptions

Author: Artur Stolear

src/GitReleaseNotes/Logging/ConsoleHelpFormatter.cs

@@ -15,15 +15,13 @@ public class ConsoleHelpFormatter : IHelpFormatter
     public ConsoleHelpFormatter()
         : this(Console.BufferWidth, 1, 5)
     {
-
     }
 
     public ConsoleHelpFormatter(int bufferWidth, int commandSamplePadding, int argumentDescriptionPadding)
     {
         BufferWidth = bufferWidth;
         CommandSamplePadding = commandSamplePadding;
         ArgumentDescriptionPadding = argumentDescriptionPadding;
-
     }
 
     public virtual void WriteHelp(ModelHelp modelHelp, TextWriter writer)
@@ -44,10 +42,10 @@ public virtual void WriteHelp(ModelHelp modelHelp, TextWriter writer)
 
     private void WriteArgumentDescriptions(ModelHelp modelHelp)
     {
-        var items = modelHelp.Members
+        var helpMembers = GetHelpMembers(modelHelp);
+
+        var items = helpMembers
             .Where(m => string.IsNullOrEmpty(m.HelpText) == false)
-            .OrderByDescending(m => m.OrdinalIndex.HasValue)
-            .ThenBy(m => m.OrdinalIndex)
             .ToDictionary(ks => ks.OrdinalIndex.HasValue ? ks.Name : GetFullSwitchString(modelHelp.SwitchDelimiter, ks.Switches), es => es.HelpText);
 
         WriteJustifiedOutput(items, ArgumentDescriptionPadding);
@@ -132,14 +130,8 @@ protected virtual void WriteJustifiedItem(string leftColumnText, string rightCol
 
     protected virtual void WriteUsage(ModelHelp modelHelp, TextWriter writer)
     {
-        var values = modelHelp.Members.Where(m => m.OrdinalIndex.HasValue)
-            .OrderBy(m => m.OrdinalIndex.Value)
-            .Select(m => m.Name)
-            .Concat(modelHelp.Members
-                .Where(m => m.OrdinalIndex.HasValue == false)
-                .OrderBy(m => m.Name)
-                .Select(m => string.Format("[{0}]", string.Join("|", m.Switches.Select(s => modelHelp.SwitchDelimiter + s).ToArray()))));
-
+        var helpMembers = GetHelpMembers(modelHelp);
+        var values = helpMembers.Select(m => m.OrdinalIndex.HasValue ? m.Name : GetFullSwitchString(modelHelp.SwitchDelimiter, m.Switches));
 
         //TODO: Figure out actual command name?
         var dictionary = new Dictionary<string, string>
@@ -149,4 +141,18 @@ protected virtual void WriteUsage(ModelHelp modelHelp, TextWriter writer)
 
         WriteJustifiedOutput(dictionary, CommandSamplePadding);
     }
+
+    private static IEnumerable<MemberHelp> GetHelpMembers(ModelHelp modelHelp)
+    {
+        var ordinals = modelHelp.Members
+            .Where(m => m.OrdinalIndex.HasValue)
+            .OrderBy(m => m.OrdinalIndex.Value);
+
+        var switches = modelHelp.Members
+            .Where(m => m.OrdinalIndex.HasValue == false)
+            .OrderBy(m => m.Name);
+
+        var memberHelps = ordinals.Concat(switches);
+        return memberHelps;
+    }
 }