Rearrange the order that commands are listed in the USAGE block and l…

…ist all the commands on the line (#224)
natemcmaster · Apr 9, 2019 · daf989b · daf989b
1 parent 84e9baf
commit daf989b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/CommandLineUtils/HelpText/DefaultHelpTextGenerator.cs b/src/CommandLineUtils/HelpText/DefaultHelpTextGenerator.cs
@@ -113,14 +113,16 @@ protected virtual void GenerateUsage(
                 output.Write(stack.Pop());
             }
 
-            if (visibleArguments.Any())
+            if (visibleOptions.Any())
             {
-                output.Write(" [arguments]");
+                output.Write(" [options]");
             }
 
-            if (visibleOptions.Any())
+            foreach (var argument in visibleArguments)
             {
-                output.Write(" [options]");
+                output.Write(" <");
+                output.Write(argument.Name);
+                output.Write(">");
             }
 
             if (visibleCommands.Any())

diff --git a/test/CommandLineUtils.Tests/CommandLineApplicationTests.cs b/test/CommandLineUtils.Tests/CommandLineApplicationTests.cs
@@ -732,7 +732,7 @@ public void HelpOptionIsInherited(string helpOptionString)
                 var outData = outWriter.ToString();
 
                 Assert.True(helpOption.HasValue());
-                Assert.Contains("Usage: lvl1 lvl2 [arguments] [options]", outData);
+                Assert.Contains("Usage: lvl1 lvl2 [options] <lvl-arg>", outData);
 
                 inputs = new[] { helpOptionString };
                 app.Execute(inputs);

diff --git a/test/CommandLineUtils.Tests/HelpOptionAttributeTests.cs b/test/CommandLineUtils.Tests/HelpOptionAttributeTests.cs
@@ -174,7 +174,7 @@ public void HelpOptionIsInherited()
             var outData = sb.ToString();
 
             Assert.True(app.OptionHelp.HasValue());
-            Assert.Contains("Usage: lvl1 lvl2 [arguments] [options]", outData);
+            Assert.Contains("Usage: lvl1 lvl2 [options] <lvl-arg>", outData);
         }
 
         [Theory]