Fix ignore one-line if-else in PlaceCloseBrace rule

Kapil Borle · Kapil Borle · commit 095767f95144 · 2017-04-13T17:41:00.000-07:00
Whenever `IgnoreOneLineBlock` was set true, the rule would fire on the closing brace of `if` statement in a one line `if-else` block. This commit fixes that issue.
diff --git a/Rules/PlaceCloseBrace.cs b/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),

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,8 @@ private DiagnosticRecord GetViolationForBraceShouldHaveNewLineAfter(`
`315`	`315`	`{`
`316`	`316`	`var closeBraceToken = tokens[closeBracePos];`
`317`	`317`	`if ((tokens[expectedNewLinePos].Kind == TokenKind.Else`
`318`		`- \|\| tokens[expectedNewLinePos].Kind == TokenKind.ElseIf))`
	`318`	`+ \|\| tokens[expectedNewLinePos].Kind == TokenKind.ElseIf)`
	`319`	`+ && !tokensToIgnore.Contains(closeBraceToken))`
`319`	`320`	`{`
`320`	`321`	`return new DiagnosticRecord(`
`321`	`322`	`GetError(Strings.PlaceCloseBraceErrorShouldFollowNewLine),`