Skip to content

Remove Argument.AllowedValues, use Validator to implement the logic #1959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamsitnik merged 6 commits into from
Dec 15, 2022
Merged

Remove Argument.AllowedValues, use Validator to implement the logic #1959

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2411731
delay List<Validators> allocation
adamsitnik Nov 10, 2022
29940bb
delegate Option.AcceptOnlyFromAmong to Argument.AcceptOnlyFromAmong
adamsitnik Nov 10, 2022
d2b0206
use Validator to implement AllowedValues
adamsitnik Nov 10, 2022
36b179c
Merge remote-tracking branch 'upstream/main' into removeAllowedValues
adamsitnik Dec 15, 2022
f517c35
remove redundant line
adamsitnik Dec 15, 2022
1cb1e9a
add a missing failing test and a fix for it
adamsitnik Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
delay List<Validators> allocation
  • Loading branch information
@adamsitnik
adamsitnik committed Nov 10, 2022
commit 2411731afc3166cc00276cec38434f364c22eaaf
5 changes: 3 additions & 2 deletions src/System.CommandLine/Argument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,15 @@ private protected override string DefaultName
}
}

internal List<Action<ArgumentResult>> Validators => _validators ??= new ();
internal IReadOnlyList<Action<ArgumentResult>> Validators
=> _validators is null ? Array.Empty<Action<ArgumentResult>>() : _validators;

/// <summary>
/// Adds a custom validator to the argument. Validators can be used
/// to provide custom errors based on user input.
/// </summary>
/// <param name="validate">The action to validate the parsed argument.</param>
public void AddValidator(Action<ArgumentResult> validate) => Validators.Add(validate);
public void AddValidator(Action<ArgumentResult> validate) => (_validators ??= new()).Add(validate);
Copy link
Member

@jozkee jozkee Nov 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are other places that call Validator.Add, which would now add the Action to the Array.Empty<Action>.

command-line-api/src/System.CommandLine/Argument{T}.cs

Line 215 in 350a618

Validators.Add(validate);

command-line-api/src/System.CommandLine/OptionValidation.cs

Line 21 in 350a618

option.Argument.Validators.Add(Validate.FileExists);

Copy link
Member

@jozkee jozkee Nov 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that #1966 is merged, this shoud go on Argument<T>.


/// <summary>
/// Gets the default value for the argument.
Expand Down