Skip to content

Replace Requires.NotNullOrEmpty(string) with ArgumentException.ThrowIfNullOrEmpty #19197

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
daxian-dbw merged 2 commits into from
Feb 24, 2023
Merged

Replace Requires.NotNullOrEmpty(string) with ArgumentException.ThrowIfNullOrEmpty #19197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c99171
Replace `Requires.NotNullOrEmpty` with `ArgumentException.ThrowIfNull…
xtqqczze Feb 22, 2023
f16cb79
Update with changes from 79b4b5c33f6048ef9cb8b6b24400a564d57c4227
xtqqczze Feb 23, 2023
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
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/Subsystem/FeedbackSubsystem/IFeedbackProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public FeedbackItem(string header, List<string>? actions, FeedbackDisplayLayout
/// <param name="layout">The layout for displaying the actions.</param>
public FeedbackItem(string header, List<string>? actions, string? footer, FeedbackDisplayLayout layout)
{
Requires.NotNullOrEmpty(header, nameof(header));
ArgumentException.ThrowIfNullOrEmpty(header);

Header = header;
RecommendedActions = actions;
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/Subsystem/PredictionSubsystem/CommandPrediction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ static Action<ICommandPredictor> GetCallBack(PredictionClient client, uint sessi
/// <param name="suggestionText">The accepted suggestion text.</param>
public static void OnSuggestionAccepted(PredictionClient client, Guid predictorId, uint session, string suggestionText)
{
Requires.NotNullOrEmpty(suggestionText, nameof(suggestionText));
ArgumentException.ThrowIfNullOrEmpty(suggestionText);

var predictors = SubsystemManager.GetSubsystems<ICommandPredictor>();
if (predictors.Count == 0)
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/Subsystem/PredictionSubsystem/ICommandPredictor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public PredictionContext(Ast inputAst, Token[] inputTokens)
/// <returns>A <see cref="PredictionContext"/> object.</returns>
public static PredictionContext Create(string input)
{
Requires.NotNullOrEmpty(input, nameof(input));
ArgumentException.ThrowIfNullOrEmpty(input);

Ast ast = Parser.ParseInput(input, out Token[] tokens, out _);
return new PredictionContext(ast, tokens);
Expand Down Expand Up @@ -239,7 +239,7 @@ public PredictiveSuggestion(string suggestion)
/// <param name="toolTip">The tooltip of the suggestion.</param>
public PredictiveSuggestion(string suggestion, string? toolTip)
{
Requires.NotNullOrEmpty(suggestion, nameof(suggestion));
ArgumentException.ThrowIfNullOrEmpty(suggestion);

SuggestionText = suggestion;
ToolTip = toolTip;
Expand Down
8 changes: 0 additions & 8 deletions src/System.Management.Automation/engine/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1733,14 +1733,6 @@ internal ReadOnlyBag(HashSet<T> hashset)
/// </summary>
internal static class Requires
{
internal static void NotNullOrEmpty(string value, string paramName)
{
if (string.IsNullOrEmpty(value))
{
throw new ArgumentNullException(paramName);
}
}

internal static void NotNullOrEmpty(ICollection value, string paramName)
{
if (value is null || value.Count == 0)
Expand Down