Skip to content

UseConsistentWhitespace: Fix CheckParameter bug when using interpolated string #1498

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
merged 1 commit into from
May 18, 2020
Merged

UseConsistentWhitespace: Fix CheckParameter bug when using interpolated string #1498

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
3 changes: 2 additions & 1 deletion Rules/UseConsistentWhitespace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,8 @@ private IEnumerable<DiagnosticRecord> FindParameterViolations(Ast ast)
testAst => testAst is CommandAst, true);
foreach (CommandAst commandAst in commandAsts)
{
List<Ast> commandParameterAstElements = commandAst.FindAll(testAst => true, searchNestedScriptBlocks: false).ToList();
List<Ast> commandParameterAstElements = commandAst.FindAll(
testAst => testAst.Parent == commandAst, searchNestedScriptBlocks: false).ToList();
for (int i = 0; i < commandParameterAstElements.Count - 1; i++)
{
IScriptExtent leftExtent = commandParameterAstElements[i].Extent;
Expand Down
4 changes: 2 additions & 2 deletions Tests/Rules/UseConsistentWhitespace.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,11 +474,11 @@ bar -h i `
}

It "Should fix script to always have 1 space between parameters except when using colon syntax but not by default" {
$def = 'foo -bar $baz -ParameterName: $ParameterValue'
$def = 'foo -bar $baz -ParameterName: $ParameterValue "$PSScriptRoot\module.psd1"'
Invoke-Formatter -ScriptDefinition $def |
Should -BeExactly $def -Because 'CheckParameter configuration is not turned on by default (yet) as the setting is new'
Invoke-Formatter -ScriptDefinition $def -Settings $settings |
Should -BeExactly 'foo -bar $baz -ParameterName: $ParameterValue'
Should -BeExactly 'foo -bar $baz -ParameterName: $ParameterValue "$PSScriptRoot\module.psd1"'
}

It "Should fix script when newlines are involved" {
Expand Down