Localize error messages in PlaceCloseBrace rule

Author: Kapil Borle

Rules/PlaceCloseBrace.cs

@@ -82,13 +82,13 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
                         }
 
                         AddToDiagnosticRecords(
-                            GetViolationForBraceOnSameLine(tokens, k, openBracePos, fileName),
+                            GetViolationForBraceShouldBeOnNewLine(tokens, k, openBracePos, fileName),
                             ref diagnosticRecords);
 
                         if (NoEmptyLineBefore)
                         {
                             AddToDiagnosticRecords(
-                                GetViolationForEmptyLineBeforeBrace(tokens, k, openBracePos, fileName),
+                                GetViolationForBraceShouldNotFollowEmptyLine(tokens, k, openBracePos, fileName),
                                 ref diagnosticRecords);
                         }
                     }
@@ -102,7 +102,11 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
             return diagnosticRecords;
         }
 
-        private DiagnosticRecord GetViolationForEmptyLineBeforeBrace(Token[] tokens, int closeBracePos, int openBracePos, string fileName)
+        private DiagnosticRecord GetViolationForBraceShouldNotFollowEmptyLine(
+            Token[] tokens,
+            int closeBracePos,
+            int openBracePos,
+            string fileName)
         {
             if (tokens.Length > 2 && tokens.Length > closeBracePos)
             {
@@ -113,20 +117,28 @@ private DiagnosticRecord GetViolationForEmptyLineBeforeBrace(Token[] tokens, int
                     && extraNewLineToken.Kind == TokenKind.NewLine)
                 {
                     return new DiagnosticRecord(
-                        "Extra new line before close brace",
+                        GetError(Strings.PlaceCloseBraceErrorShouldNotFollowEmptyLine),
                         closeBraceToken.Extent,
                         GetName(),
                         GetDiagnosticSeverity(),
                         fileName,
                         null,
-                        GetSuggestedCorrectionsForEmptyLineBeforeBrace(tokens, closeBracePos, openBracePos, fileName));
+                        GetCorrectionsForBraceShouldNotFollowEmptyLine(
+                            tokens,
+                            closeBracePos,
+                            openBracePos,
+                            fileName));
                 }
             }
 
             return null;
         }
 
-        private List<CorrectionExtent> GetSuggestedCorrectionsForEmptyLineBeforeBrace(Token[] tokens, int closeBracePos, int openBracePos, string fileName)
+        private List<CorrectionExtent> GetCorrectionsForBraceShouldNotFollowEmptyLine(
+            Token[] tokens,
+            int closeBracePos,
+            int openBracePos,
+            string fileName)
         {
             var corrections = new List<CorrectionExtent>();
             var newLineToken = tokens[closeBracePos - 2];
@@ -168,28 +180,28 @@ private string GetIndentation(Token[] tokens, int closeBracePos, int openBracePo
             return new String(' ', firstTokenOnOpenBraceLine.Extent.StartColumnNumber - 1);
         }
 
-        private DiagnosticRecord GetViolationForBraceOnSameLine(Token[] tokens, int closeBracePos, int openBracePos, string fileName)
+        private DiagnosticRecord GetViolationForBraceShouldBeOnNewLine(Token[] tokens, int closeBracePos, int openBracePos, string fileName)
         {
             if (tokens.Length > 1 && tokens.Length > closeBracePos)
             {
                 var closeBraceToken = tokens[closeBracePos];
                 if (tokens[closeBracePos - 1].Kind != TokenKind.NewLine)
                 {
                     return new DiagnosticRecord(
-                        GetError(),
+                        GetError(Strings.PlaceCloseBraceErrorShouldBeOnNewLine),
                         closeBraceToken.Extent,
                         GetName(),
                         GetDiagnosticSeverity(),
                         fileName,
                         null,
-                        GetSuggestedCorrectionsForBraceOnSameLine(tokens, closeBracePos, openBracePos, fileName));
+                        GetCorrectionsForBraceShouldBeOnNewLine(tokens, closeBracePos, openBracePos, fileName));
                 }
             }
 
             return null;
         }
 
-        private List<CorrectionExtent> GetSuggestedCorrectionsForBraceOnSameLine(
+        private List<CorrectionExtent> GetCorrectionsForBraceShouldBeOnNewLine(
             Token[] tokens,
             int closeBracePos,
             int openBracePos,
@@ -249,9 +261,9 @@ private List<Token> GetTokens(Ast ast, List<Token> tokens, ref Dictionary<Ast, L
         /// <summary>
         /// Retrieves the error message of this rule
         /// </summary>
-        private string GetError()
+        private string GetError(string errorString)
         {
-            return string.Format(CultureInfo.CurrentCulture, Strings.PlaceCloseBraceError);
+            return string.Format(CultureInfo.CurrentCulture, errorString);
         }
 
         /// <summary>

Rules/Strings.resx

@@ -883,10 +883,10 @@
     <value>Open brace not on same line as preceding keyword. It should be on the same line.</value>
   </data>
   <data name="PlaceOpenBraceErrorShouldNotBeOnSameLine" xml:space="preserve">
-    <value>Open brace is on same line as preceding keyword. It should be on a new line.</value>
+    <value>Open brace is not on a new line.</value>
   </data>
   <data name="PlaceOpenBraceErrorNoNewLineAfterBrace" xml:space="preserve">
-    <value>No new line after open brace. A new line should follown an open brace.</value>
+    <value>There is no new line after open brace.</value>
   </data>
   <data name="PlaceCloseBraceName" xml:space="preserve">
     <value>PlaceCloseBrace</value>
@@ -897,8 +897,11 @@
   <data name="PlaceCloseBraceDescription" xml:space="preserve">
     <value>Place close brace show be on a new line by itself.</value>
   </data>
-  <data name="PlaceCloseBraceError" xml:space="preserve">
-    <value>Close brace not on a new line</value>
+  <data name="PlaceCloseBraceErrorShouldBeOnNewLine" xml:space="preserve">
+    <value>Close brace is not on a new line.</value>
+  </data>
+  <data name="PlaceCloseBraceErrorShouldNotFollowEmptyLine" xml:space="preserve">
+    <value>Close brace does not follow a non-empty line.</value>
   </data>
   <data name="UseConsistentIndentationName" xml:space="preserve">
     <value>UseConsistentIndentation</value>