Create violation for close brace in branch statements

Whenever `NewLineAfter = $false`, the rule creates a violation if a branching statement is on a new line after the preceding close brace. We consider the following braching statements:
- else
- elseif
- catch
- finally

Author: Kapil Borle

Rules/PlaceCloseBrace.cs

@@ -138,6 +138,12 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
                                 GetViolationForBraceShouldHaveNewLineAfter(tokens, k, openBracePos, fileName),
                                 ref diagnosticRecords);
                         }
+                        else
+                        {
+                            AddToDiagnosticRecords(
+                                GetViolationsForUncuddledBranches(tokens, k, openBracePos, fileName),
+                                ref diagnosticRecords);
+                        }
                     }
                     else
                     {
@@ -326,12 +332,41 @@ private DiagnosticRecord GetViolationForBraceShouldHaveNewLineAfter(
                         fileName,
                         null,
                         GetCorrectionsForBraceShouldHaveNewLineAfter(tokens, closeBracePos, openBracePos, fileName));
-                    }
+                }
             }
 
             return null;
         }
 
+        private DiagnosticRecord GetViolationsForUncuddledBranches(
+            Token[] tokens,
+            int closeBracePos,
+            int openBracePos,
+            string fileName)
+        {
+            var expectedNewLinePos = closeBracePos + 1;
+
+            if (tokens.Length > 1 && tokens.Length > expectedNewLinePos)
+            {
+                var closeBraceToken = tokens[closeBracePos];
+                if (tokens[closeBracePos + 1].Kind == TokenKind.NewLine &&
+                    IsBranchingStatementToken(tokens[closeBracePos + 2]))
+                {
+                    return new DiagnosticRecord(
+                         GetError(Strings.PlaceCloseBraceErrorShouldCuddleBranchStatement),
+                         closeBraceToken.Extent,
+                         GetName(),
+                         GetDiagnosticSeverity(),
+                         fileName,
+                         null,
+                         GetCorrectionsForBraceShouldHaveNewLineAfter(tokens, closeBracePos, openBracePos, fileName));
+                }
+            }
+
+            return null;
+        }
+
+
         private DiagnosticRecord GetViolationForBraceShouldBeOnNewLine(
             Token[] tokens,
             int closeBracePos,
@@ -376,6 +411,20 @@ private List<CorrectionExtent> GetCorrectionsForBraceShouldBeOnNewLine(
             return corrections;
         }
 
+        private bool IsBranchingStatementToken(Token token)
+        {
+            switch (token.Kind)
+            {
+                case TokenKind.Else:
+                case TokenKind.ElseIf:
+                case TokenKind.Catch:
+                case TokenKind.Finally:
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
         private void AddToDiagnosticRecords(
             DiagnosticRecord diagnosticRecord,
             ref List<DiagnosticRecord> diagnosticRecords)

Rules/Strings.resx

@@ -906,6 +906,9 @@
   <data name="PlaceCloseBraceErrorShouldFollowNewLine" xml:space="preserve">
     <value>Close brace does not follow a new line.</value>
   </data>
+  <data name="PlaceCloseBraceErrorShouldCuddleBranchStatement" xml:space="preserve">
+    <value>Close brace follows a new line.</value>
+  </data>
   <data name="UseConsistentIndentationName" xml:space="preserve">
     <value>UseConsistentIndentation</value>
   </data>