Skip to content

Fix NullReferenceException when analysing partial script with InnerBrace option of UseConsistentWhitespace #1834

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 4 commits into from
Aug 30, 2022
Merged

Fix NullReferenceException when analysing partial script with InnerBrace option of UseConsistentWhitespace #1834

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
7380bb3
Fix NullReferenceException when analysing partial script with InnerBr…
bergmeister Aug 30, 2022
f6ab625
tweak test name
bergmeister Aug 30, 2022
4b84450
formatting
bergmeister Aug 30, 2022
c2161fc
Merge branch 'master' of https://github.com/PowerShell/PSScriptAnalyz…
bergmeister Aug 30, 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
4 changes: 2 additions & 2 deletions Rules/UseConsistentWhitespace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ private IEnumerable<DiagnosticRecord> FindInnerBraceViolations(TokenOperations t
foreach (var lCurly in tokenOperations.GetTokenNodes(TokenKind.LCurly))
{
if (lCurly.Next == null
|| !IsPreviousTokenOnSameLine(lCurly)
|| !(lCurly.Previous == null || IsPreviousTokenOnSameLine(lCurly))
|| lCurly.Next.Value.Kind == TokenKind.NewLine
|| lCurly.Next.Value.Kind == TokenKind.LineContinuation
|| lCurly.Next.Value.Kind == TokenKind.RCurly
Expand Down Expand Up @@ -616,7 +616,7 @@ private List<CorrectionExtent> GetCorrections(
}


private bool IsPreviousTokenOnSameLine(LinkedListNode<Token> lparen)
private static bool IsPreviousTokenOnSameLine(LinkedListNode<Token> lparen)
{
return lparen.Previous.Value.Extent.EndLineNumber == lparen.Value.Extent.StartLineNumber;
}
Expand Down
4 changes: 4 additions & 0 deletions Tests/Rules/UseConsistentWhitespace.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,10 @@ if ($true) { Get-Item `
'@
Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings | Should -Be $null
}

It 'Should not throw when analysing a line starting with a scriptblock' {
{ Invoke-ScriptAnalyzer -ScriptDefinition '{ }' -Settings $settings -ErrorAction Stop } | Should -Not -Throw
}
}


Expand Down