Skip to content

Fix parameter name in the Get-Variable cmdlet error message. #7384

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
iSazonov merged 4 commits into from
Jul 31, 2018
Merged

Fix parameter name in the Get-Variable cmdlet error message. #7384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6c8426
Fix parameter name in the Get-Variable cmdlet error message.
sethvs Jul 27, 2018
0aa4ab7
Add const.
sethvs Jul 30, 2018
8e46a2b
Address CodeFactor issues.
sethvs Jul 30, 2018
16a5b66
Remove line break.
sethvs Jul 30, 2018
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
13 changes: 9 additions & 4 deletions src/System.Management.Automation/engine/SessionStateScopeAPIs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ internal sealed partial class SessionStateInternal
/// </summary>
private SessionStateScope _currentScope;

/// <summary>
/// Cmdlet parameter name to return in the error message instead of "scopeID".
/// </summary>
internal const string ScopeParameterName = "Scope";

/// <summary>
/// Given a scope identifier, returns the proper session state scope.
/// </summary>
Expand Down Expand Up @@ -92,18 +97,18 @@ internal SessionStateScope GetScopeByID(string scopeID)

if (scopeNumericID < 0)
{
throw PSTraceSource.NewArgumentOutOfRangeException("scopeID", scopeID);
throw PSTraceSource.NewArgumentOutOfRangeException(ScopeParameterName, scopeID);
}

result = GetScopeByID(scopeNumericID) ?? _currentScope;
}
catch (FormatException)
{
throw PSTraceSource.NewArgumentException("scopeID", AutomationExceptions.InvalidScopeIdArgument, "scopeID");
throw PSTraceSource.NewArgumentException(ScopeParameterName, AutomationExceptions.InvalidScopeIdArgument, ScopeParameterName);
}
catch (OverflowException)
{
throw PSTraceSource.NewArgumentOutOfRangeException("scopeID", scopeID);
throw PSTraceSource.NewArgumentOutOfRangeException(ScopeParameterName, scopeID);
}
}
}
Expand Down Expand Up @@ -144,7 +149,7 @@ internal SessionStateScope GetScopeByID(int scopeID)
{
ArgumentOutOfRangeException outOfRange =
PSTraceSource.NewArgumentOutOfRangeException(
"scopeID",
ScopeParameterName,
originalID,
SessionStateStrings.ScopeIDExceedsAvailableScopes,
originalID);
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/resources/AutomationExceptions.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<value>Cannot process argument because the value of argument "{0}" is not valid. Change the value of the "{0}" argument and run the operation again.</value>
</data>
<data name="InvalidScopeIdArgument" xml:space="preserve">
<value>Cannot process argument because the value of argument "{0}" is not valid. Valid values are "Global", "Local", or "Script", or a number relative to the current scope (0 through the number of scopes where 0 is the current scope and 1 is its parent). Change the value of the "{0}" argument and run the operation again.</value>
<value>Cannot process argument because the value of parameter "{0}" is not valid. Valid values are "Global", "Local", or "Script", or a number relative to the current scope (0 through the number of scopes where 0 is the current scope and 1 is its parent). Change the value of the "{0}" parameter and run the operation again.</value>
</data>
<data name="ArgumentNull" xml:space="preserve">
<value>Cannot process argument because the value of argument "{0}" is null. Change the value of argument "{0}" to a non-null value.</value>
Expand Down