UseConsistentWhitespace: Ignore empty hashtable for CheckInnerBrace c…

…onfiguration (PowerShell#1349) * UseConsistentWhitespace: Ignore empty hashtable for CheckInnerBrace configuration * tweak test
lamawithonel · Oct 7, 2019 · e461f10 · e461f10
1 parent 2260653
commit e461f10
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/Rules/UseConsistentWhitespace.cs b/Rules/UseConsistentWhitespace.cs
@@ -243,6 +243,7 @@ private IEnumerable<DiagnosticRecord> FindInnerBraceViolations(TokenOperations t
                     || !IsPreviousTokenOnSameLine(lCurly)
                     || lCurly.Next.Value.Kind == TokenKind.NewLine
                     || lCurly.Next.Value.Kind == TokenKind.LineContinuation
+                    || lCurly.Next.Value.Kind == TokenKind.RCurly
                     )
                 {
                     continue;
@@ -268,6 +269,7 @@ private IEnumerable<DiagnosticRecord> FindInnerBraceViolations(TokenOperations t
                     || rCurly.Previous.Value.Kind == TokenKind.LCurly
                     || rCurly.Previous.Value.Kind == TokenKind.NewLine
                     || rCurly.Previous.Value.Kind == TokenKind.LineContinuation
+                    || rCurly.Previous.Value.Kind == TokenKind.AtCurly
                     )
                 {
                     continue;

diff --git a/Tests/Rules/UseConsistentWhitespace.tests.ps1 b/Tests/Rules/UseConsistentWhitespace.tests.ps1
@@ -327,9 +327,15 @@ foo
             $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings
             Test-CorrectionExtentFromContent $def $violations 1 '' ' '
         }
-
-        It "Should find a violation if there is more than 1 space inside empty curly braces" {
-            $def = 'if($true) {  }'
+
+        It "Should find a violation if there is more than 1 space after opening brace" {
+            $def = 'if($true) {  Get-Item }'
+            $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings
+            Test-CorrectionExtentFromContent $def $violations 1 '  ' ' '
+        }
+
+        It "Should find a violation if there is more than 1 space before closing brace" {
+            $def = 'if($true) { Get-Item  }'
             $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings
             Test-CorrectionExtentFromContent $def $violations 1 '  ' ' '
         }
@@ -344,6 +350,11 @@ foo
             Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings | Should -Be $null
         }
 
+        It "Should not find a violation for an empty hashtable" {
+            $def = '$hashtable = @{}'
+            Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings | Should -Be $null
+        }
+
         It "Should not find a violation if a new-line is after the opening brace" {
             $def = @'
 if ($true) {