tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-04-16 17:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve CommandApp error message rendering

Browse Source 
* Move line break to end of error message
* Move line break to start of each help section

Closes #392
This commit is contained in:
Sean Fausett 2021-05-10 19:17:20 +12:00 committed by GitHub
parent ea5b7338ad
commit 2ba06577ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Spectre.Console/Cli/CommandApp.cs
View File

@ -131,9 +131,10 @@ namespace Spectre.Console.Cli
var converted = new List<IRenderable?> var converted = new List<IRenderable?>
{ {
new Composer() new Composer()
.LineBreak()
.Text("[red]Error:[/]") .Text("[red]Error:[/]")
.Space().Text(ex.Message.EscapeMarkup()), .Space()
.Text(ex.Message.EscapeMarkup())
.LineBreak(),
}; };
// Got a renderable inner exception? // Got a renderable inner exception?

10
src/Spectre.Console/Cli/Internal/HelpWriter.cs
View File

@ -155,7 +155,7 @@ namespace Spectre.Console.Cli
} }
composer.Join(" ", parameters); composer.Join(" ", parameters);
composer.LineBreaks(2); composer.LineBreak();
return new[] return new[]
{ {
@ -204,6 +204,7 @@ namespace Spectre.Console.Cli
if (examples.Count > 0) if (examples.Count > 0)
{ {
var composer = new Composer(); var composer = new Composer();
composer.LineBreak();
composer.Style("yellow", "EXAMPLES:").LineBreak(); composer.Style("yellow", "EXAMPLES:").LineBreak();
for (var index = 0; index < Math.Min(maxExamples, examples.Count); index++) for (var index = 0; index < Math.Min(maxExamples, examples.Count); index++)
@ -213,7 +214,6 @@ namespace Spectre.Console.Cli
composer.LineBreak(); composer.LineBreak();
} }
composer.LineBreak();
return new[] { composer }; return new[] { composer };
} }
@ -230,6 +230,7 @@ namespace Spectre.Console.Cli
var result = new List<IRenderable> var result = new List<IRenderable>
{ {
new Markup("\n"),
new Markup("[yellow]ARGUMENTS:[/]"), new Markup("[yellow]ARGUMENTS:[/]"),
new Markup("\n"), new Markup("\n"),
}; };
@ -252,7 +253,6 @@ namespace Spectre.Console.Cli
argument.Description?.TrimEnd('.') ?? " "); argument.Description?.TrimEnd('.') ?? " ");
} }
grid.AddEmptyRow();
result.Add(grid); result.Add(grid);
return result; return result;
@ -269,6 +269,7 @@ namespace Spectre.Console.Cli
var result = new List<IRenderable> var result = new List<IRenderable>
{ {
new Markup("\n"),
new Markup("[yellow]OPTIONS:[/]"), new Markup("[yellow]OPTIONS:[/]"),
new Markup("\n"), new Markup("\n"),
}; };
@ -325,7 +326,6 @@ namespace Spectre.Console.Cli
option.Description?.TrimEnd('.') ?? " "); option.Description?.TrimEnd('.') ?? " ");
} }
grid.AddEmptyRow();
result.Add(grid); result.Add(grid);
return result; return result;
@ -346,6 +346,7 @@ namespace Spectre.Console.Cli
var result = new List<IRenderable> var result = new List<IRenderable>
{ {
new Markup("\n"),
new Markup("[yellow]COMMANDS:[/]"), new Markup("[yellow]COMMANDS:[/]"),
new Markup("\n"), new Markup("\n"),
}; };
@ -371,7 +372,6 @@ namespace Spectre.Console.Cli
child.Description?.TrimEnd('.') ?? " "); child.Description?.TrimEnd('.') ?? " ");
} }
grid.AddEmptyRow();
result.Add(grid); result.Add(grid);
return result; return result;