From 257020299068b87b3146eea1e7f47e52b43b6b80 Mon Sep 17 00:00:00 2001 From: Patrik Svensson Date: Sun, 25 May 2025 00:56:19 +0200 Subject: [PATCH] Fix build errors --- src/Spectre.Console.Cli/Help/HelpProvider.cs | 18 ++++++++++++------ ...uired_Options.Output.DotNet9_0.verified.txt | 6 ------ ...xt => Required_Options.Output.verified.txt} | 0 ...o_Description.Output.DotNet9_0.verified.txt | 6 ------ ...Options_No_Description.Output.verified.txt} | 0 5 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options.Output.DotNet9_0.verified.txt rename src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/{Required_Options.Output.DotNet8_0.verified.txt => Required_Options.Output.verified.txt} (100%) delete mode 100644 src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options_No_Description.Output.DotNet9_0.verified.txt rename src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/{Required_Options_No_Description.Output.DotNet8_0.verified.txt => Required_Options_No_Description.Output.verified.txt} (100%) diff --git a/src/Spectre.Console.Cli/Help/HelpProvider.cs b/src/Spectre.Console.Cli/Help/HelpProvider.cs index 096c02d..58db0aa 100644 --- a/src/Spectre.Console.Cli/Help/HelpProvider.cs +++ b/src/Spectre.Console.Cli/Help/HelpProvider.cs @@ -222,7 +222,8 @@ public class HelpProvider : IHelpProvider { if (isCurrent) { - parameters.Add(NewComposer().Style(helpStyles?.Usage?.CurrentCommand ?? Style.Plain, + parameters.Add(NewComposer().Style( + helpStyles?.Usage?.CurrentCommand ?? Style.Plain, $"{current.Name}")); } else @@ -238,7 +239,8 @@ public class HelpProvider : IHelpProvider foreach (var argument in current.Parameters.OfType() .Where(a => a.IsRequired).OrderBy(a => a.Position).ToArray()) { - parameters.Add(NewComposer().Style(helpStyles?.Usage?.RequiredArgument ?? Style.Plain, + parameters.Add(NewComposer().Style( + helpStyles?.Usage?.RequiredArgument ?? Style.Plain, $"<{argument.Value}>")); } } @@ -249,7 +251,8 @@ public class HelpProvider : IHelpProvider { foreach (var optionalArgument in optionalArguments) { - parameters.Add(NewComposer().Style(helpStyles?.Usage?.OptionalArgument ?? Style.Plain, + parameters.Add(NewComposer().Style( + helpStyles?.Usage?.OptionalArgument ?? Style.Plain, $"[{optionalArgument.Value}]")); } } @@ -591,11 +594,14 @@ public class HelpProvider : IHelpProvider null => NewComposer().Text(" "), "" => NewComposer().Text(" "), Array { Length: 0 } => NewComposer().Text(" "), - Array array => NewComposer().Join(", ", + Array array => NewComposer().Join( + ", ", array.Cast().Select(o => - NewComposer().Style(helpStyles?.Options?.DefaultValue ?? Style.Plain, + NewComposer().Style( + helpStyles?.Options?.DefaultValue ?? Style.Plain, o.ToString() ?? string.Empty))), - _ => NewComposer().Style(helpStyles?.Options?.DefaultValue ?? Style.Plain, + _ => NewComposer().Style( + helpStyles?.Options?.DefaultValue ?? Style.Plain, defaultValue?.ToString() ?? string.Empty), }; } diff --git a/src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options.Output.DotNet9_0.verified.txt b/src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options.Output.DotNet9_0.verified.txt deleted file mode 100644 index 0ac93ae..0000000 --- a/src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options.Output.DotNet9_0.verified.txt +++ /dev/null @@ -1,6 +0,0 @@ -USAGE: - myapp [OPTIONS] - -OPTIONS: - -h, --help Prints help information - --foo Foos the bars. Required \ No newline at end of file diff --git a/src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options.Output.DotNet8_0.verified.txt b/src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options.Output.verified.txt similarity index 100% rename from src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options.Output.DotNet8_0.verified.txt rename to src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options.Output.verified.txt diff --git a/src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options_No_Description.Output.DotNet9_0.verified.txt b/src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options_No_Description.Output.DotNet9_0.verified.txt deleted file mode 100644 index 4f7fe31..0000000 --- a/src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options_No_Description.Output.DotNet9_0.verified.txt +++ /dev/null @@ -1,6 +0,0 @@ -USAGE: - myapp [OPTIONS] - -OPTIONS: - -h, --help Prints help information - --foo Required \ No newline at end of file diff --git a/src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options_No_Description.Output.DotNet8_0.verified.txt b/src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options_No_Description.Output.verified.txt similarity index 100% rename from src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options_No_Description.Output.DotNet8_0.verified.txt rename to src/Tests/Spectre.Console.Cli.Tests/Expectations/Help/Required_Options_No_Description.Output.verified.txt