diff --git a/src/CommandLineUtils/HelpText/DefaultHelpTextGenerator.cs b/src/CommandLineUtils/HelpText/DefaultHelpTextGenerator.cs index 89689e87..5655a4be 100644 --- 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 index cbf8e710..bc05d8d0 100644 --- 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] ", outData); inputs = new[] { helpOptionString }; app.Execute(inputs); diff --git a/test/CommandLineUtils.Tests/HelpOptionAttributeTests.cs b/test/CommandLineUtils.Tests/HelpOptionAttributeTests.cs index 0dd19738..f86b32d7 100644 --- 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] ", outData); } [Theory]