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

Merge pull request #1161 from MartinZikmund/dev/mazi/stringcomparer-confirmation

Browse Source
This commit is contained in:
Patrik Svensson 2023-03-16 09:57:15 +01:00 committed by GitHub
commit 70da3f40ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Spectre.Console/Prompts/ConfirmationPrompt.cs
View File

@ -40,10 +40,13 @@ public sealed class ConfirmationPrompt : IPrompt<bool>
public bool ShowDefaultValue { get; set; } = true;
/// <summary>
/// Gets or sets a value indicating whether the confirmation
/// should use case insensitive matching.
/// Gets or sets the string comparer to use when comparing user input
/// against Yes/No choices.
/// </summary>
public bool CaseInsensitive { get; set; } = true;
/// <remarks>
/// Defaults to <see cref="StringComparer.CurrentCultureIgnoreCase"/>.
/// </remarks>
public StringComparer Comparer { get; set; } = StringComparer.CurrentCultureIgnoreCase;
/// <summary>
/// Initializes a new instance of the <see cref="ConfirmationPrompt"/> class.
@ -63,7 +66,8 @@ public sealed class ConfirmationPrompt : IPrompt<bool>
/// <inheritdoc/>
public async Task<bool> ShowAsync(IAnsiConsole console, CancellationToken cancellationToken)
{
var comparer = CaseInsensitive ? StringComparer.CurrentCultureIgnoreCase : StringComparer.CurrentCulture;
var comparer = Comparer ?? StringComparer.CurrentCultureIgnoreCase;
var prompt = new TextPrompt<char>(_prompt, comparer)
.InvalidChoiceMessage(InvalidChoiceMessage)
.ValidationErrorMessage(InvalidChoiceMessage)
@ -75,6 +79,6 @@ public sealed class ConfirmationPrompt : IPrompt<bool>
var result = await prompt.ShowAsync(console, cancellationToken).ConfigureAwait(false);
return Yes.ToString().Equals(result.ToString(), CaseInsensitive ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture);
return comparer.Compare(Yes.ToString(), result.ToString()) == 0;
}
}