Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
11 changes: 10 additions & 1 deletion Engine/TokenOperations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public IEnumerable<Token> GetCloseBracesInCommandElements()
public IEnumerable<Tuple<Token, Token>> GetBracePairs()
{
var openBraceStack = new Stack<Token>();
var hashtableAsts = ast.FindAll(oneAst => oneAst is HashtableAst, searchNestedScriptBlocks: true);
foreach (var token in tokens)
{
if (token.Kind == TokenKind.LCurly)
Expand All @@ -84,7 +85,15 @@ public IEnumerable<Tuple<Token, Token>> GetBracePairs()
if (token.Kind == TokenKind.RCurly
&& openBraceStack.Count > 0)
{
yield return new Tuple<Token, Token>(openBraceStack.Pop(), token);
var closeBraceBelongsToHashTable = hashtableAsts.Any(hashtableAst =>
{
return hashtableAst.Extent.EndLineNumber == token.Extent.EndLineNumber
&& hashtableAst.Extent.EndColumnNumber == token.Extent.EndColumnNumber;
});
if (!closeBraceBelongsToHashTable)
{
yield return new Tuple<Token, Token>(openBraceStack.Pop(), token);
}
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions Tests/Rules/PlaceCloseBrace.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,18 @@ $hashtable = @{a = 1; b = 2}
}
}

Context "When there is a one line hashtable inside a one line statement" {
BeforeAll {
$scriptDefinition = 'if ($true) { $test = @{ } }'
$ruleConfiguration.'IgnoreOneLineBlock' = $true
}

It "Should not find a violation" {
$violations = Invoke-ScriptAnalyzer -ScriptDefinition $scriptDefinition -Settings $settings
$violations.Count | Should -Be 0
}
}

Context "When there is a multi-line hashtable" {
BeforeAll {

Expand Down