Skip to content

Do not always collapse space between parameter and value for native args #17708

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 1 commit into from
Jul 19, 2022
Merged

Do not always collapse space between parameter and value for native args #17708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion src/System.Management.Automation/engine/NativeCommandParameterBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,17 @@ internal void AddToArgumentList(CommandParameterInternal parameter, string argum
{
if (argument != parameter.ParameterText)
{
_argumentList.Add(parameter.ParameterText + argument);
// Only combine the text and argument if there was no space after the parameter,
// otherwise, add the parameter and arguments as separate elements.
if (parameter.SpaceAfterParameter)
{
_argumentList.Add(parameter.ParameterText);
_argumentList.Add(argument);
}
else
{
_argumentList.Add(parameter.ParameterText + argument);
}
}
}
else
Expand Down
8 changes: 8 additions & 0 deletions test/powershell/Language/Scripting/NativeExecution/NativeCommandArguments.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,14 @@ foreach ( $argumentListValue in "Standard","Legacy","Windows" ) {
$lines[1] | Should -BeExactly "Arg 1 is <com:port=\\devbox\pipe\debug,pipe,resets=0,reconnect>"
}

It "Should handle when the ':' is the parameter value" {
$lines = testexe -echoargs awk -F: '{print $1}'
$lines.Count | Should -Be 3
$lines[0] | Should -BeExactly 'Arg 0 is <awk>'
$lines[1] | Should -BeExactly 'Arg 1 is <-F:>'
$lines[2] | Should -BeExactly 'Arg 2 is <{print $1}>'
}

It "Should handle DOS style arguments" {
$lines = testexe -echoargs /arg1 /c:"a string"
$lines.Count | Should -Be 2
Expand Down