Merge pull request #748 from PowerShell/kapilmb/fix-close-brace-rule

Fix PlaceCloseBrace rule behavior for IgnoreOneLineBlock switch

Author: Kapil Borle

Rules/PlaceCloseBrace.cs

@@ -315,7 +315,8 @@ private DiagnosticRecord GetViolationForBraceShouldHaveNewLineAfter(
             {
                 var closeBraceToken = tokens[closeBracePos];
                 if ((tokens[expectedNewLinePos].Kind == TokenKind.Else
-                    || tokens[expectedNewLinePos].Kind == TokenKind.ElseIf))
+                    || tokens[expectedNewLinePos].Kind == TokenKind.ElseIf)
+                    && !tokensToIgnore.Contains(closeBraceToken))
                     {
                     return new DiagnosticRecord(
                         GetError(Strings.PlaceCloseBraceErrorShouldFollowNewLine),

Tests/Rules/PlaceCloseBrace.tests.ps1

@@ -118,6 +118,16 @@ $x = if ($true) { "blah" } else { "blah blah" }
             $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings
             $violations.Count | Should Be 0
         }
+
+        It "Should ignore violations for one line if statement even if NewLineAfter is true" {
+            $def = @'
+$x = if ($true) { "blah" } else { "blah blah" }
+'@
+            $ruleConfiguration.'IgnoreOneLineBlock' = $true
+            $ruleConfiguration.'NewLineAfter' = $true
+            $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings
+            $violations.Count | Should Be 0
+        }
     }
 
     Context "When a close brace should be follow a new line" {