Skip to content

Commit 3c63f70

Browse files
committed
WIP
1 parent b3d9d99 commit 3c63f70

5 files changed

Lines changed: 17 additions & 16 deletions

File tree

src/Spectre.Console.Cli/Help/HelpProvider.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class HelpProvider : IHelpProvider
3232
/// <remarks>
3333
/// Useful for unit testing different styling of the same help text.
3434
/// </remarks>
35-
protected virtual bool RenderMarkupInline { get; }
35+
protected virtual bool RenderMarkupInline { get; } = false;
3636

3737
private sealed class HelpArgument
3838
{
@@ -115,8 +115,7 @@ public HelpProvider(ICommandAppSettings settings)
115115
this.ShowOptionDefaultValues = settings.ShowOptionDefaultValues;
116116
this.MaximumIndirectExamples = settings.MaximumIndirectExamples;
117117
this.TrimTrailingPeriod = settings.TrimTrailingPeriod;
118-
this.RenderMarkupInline = settings.RenderMarkupInline;
119-
this.helpStyles = settings.HelpProviderStyles;
118+
this.helpStyles = settings.HelpProviderStyles ?? HelpProviderStyle.Default;
120119

121120
resources = new HelpProviderResources(settings.Culture);
122121
}

src/Spectre.Console.Cli/ICommandAppSettings.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,10 @@ public interface ICommandAppSettings
4141
/// </summary>
4242
bool TrimTrailingPeriod { get; set; }
4343

44-
/// <summary>
45-
/// Gets or sets a value indicating whether to emit the markup styles, inline, when rendering the help text.
46-
/// </summary>
47-
/// <remarks>
48-
/// Useful for unit testing different styling of the same help text.
49-
/// </remarks>
50-
bool RenderMarkupInline { get; set; }
51-
5244
/// <summary>
5345
/// Gets or sets the styles to used when rendering the help text.
5446
/// </summary>
55-
HelpProviderStyle HelpProviderStyles { get; set; }
47+
HelpProviderStyle? HelpProviderStyles { get; set; }
5648

5749
/// <summary>
5850
/// Gets or sets the <see cref="IAnsiConsole"/>.

src/Spectre.Console.Cli/Internal/Configuration/CommandAppSettings.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ internal sealed class CommandAppSettings : ICommandAppSettings
1515
public bool PropagateExceptions { get; set; }
1616
public bool ValidateExamples { get; set; }
1717
public bool TrimTrailingPeriod { get; set; }
18-
public bool RenderMarkupInline { get; set; }
19-
public HelpProviderStyle HelpProviderStyles { get; set; }
18+
public HelpProviderStyle? HelpProviderStyles { get; set; }
2019
public bool StrictParsing { get; set; }
2120
public bool ConvertFlagsToRemainingArguments { get; set; }
2221

@@ -32,7 +31,6 @@ public CommandAppSettings(ITypeRegistrar registrar)
3231
ShowOptionDefaultValues = true;
3332
MaximumIndirectExamples = 5;
3433
TrimTrailingPeriod = true;
35-
RenderMarkupInline = false;
3634
HelpProviderStyles = HelpProviderStyle.Default;
3735
ConvertFlagsToRemainingArguments = false;
3836
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
namespace Spectre.Console.Cli.Tests.Data.Help;
2+
3+
internal class NoStylesHelpProvider : HelpProvider
4+
{
5+
protected override bool RenderMarkupInline { get; } = true;
6+
7+
public NoStylesHelpProvider(ICommandAppSettings settings)
8+
: base(settings)
9+
{
10+
}
11+
}

test/Spectre.Console.Cli.Tests/Unit/CommandAppTests.Help.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,9 @@ public Task Should_Output_Default_Command_And_Additional_Commands_When_Default_C
277277
fixture.SetDefaultCommand<LionCommand>();
278278
fixture.Configure(configurator =>
279279
{
280+
configurator.Settings.PropagateExceptions = true;
280281
configurator.AddExample("20", "--alive");
281-
configurator.Settings.RenderMarkupInline = true;
282+
configurator.SetHelpProvider<NoStylesHelpProvider>();
282283
configurator.Settings.HelpProviderStyles = helpProviderStyle switch
283284
{
284285
"Default" => HelpProviderStyle.Default,

0 commit comments

Comments
 (0)