Update method names of new line after close brace

Kapil Borle · Kapil Borle · commit c26a08b7c94e · 2017-02-16T23:22:24.000-08:00
diff --git a/Rules/PlaceCloseBrace.cs b/Rules/PlaceCloseBrace.cs
@@ -135,7 +135,7 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
                         if (NewLineAfter)
                         {
                             AddToDiagnosticRecords(
-                                GetViolationForNewLineShouldFollowBrace(tokens, k, openBracePos, fileName),
+                                GetViolationForBraceShouldHaveNewLineAfter(tokens, k, openBracePos, fileName),
                                 ref diagnosticRecords);
                         }
                     }
@@ -261,7 +261,11 @@ private List<CorrectionExtent> GetCorrectionsForBraceShouldNotFollowEmptyLine(
             return corrections;
         }
 
-        private List<CorrectionExtent> GetCorrectionsForNewLineShouldFollowBrace(Token[] tokens, int closeBracePos, int openBracePos, string fileName)
+        private List<CorrectionExtent> GetCorrectionsForBraceShouldHaveNewLineAfter(
+            Token[] tokens,
+            int closeBracePos,
+            int openBracePos,
+            string fileName)
         {
             var corrections = new List<CorrectionExtent>();
             var nextToken = tokens[closeBracePos + 1];
@@ -300,7 +304,11 @@ private string GetIndentation(Token[] tokens, int closeBracePos, int openBracePo
             return new String(' ', firstTokenOnOpenBraceLine.Extent.StartColumnNumber - 1);
         }
 
-        private DiagnosticRecord GetViolationForNewLineShouldFollowBrace(Token[] tokens, int closeBracePos, int openBracePos, string fileName)
+        private DiagnosticRecord GetViolationForBraceShouldHaveNewLineAfter(
+            Token[] tokens,
+            int closeBracePos,
+            int openBracePos,
+            string fileName)
         {
             var expectedNewLinePos = closeBracePos + 1;
             if (tokens.Length > 1 && tokens.Length > expectedNewLinePos)
@@ -318,14 +326,18 @@ private DiagnosticRecord GetViolationForNewLineShouldFollowBrace(Token[] tokens,
                         GetDiagnosticSeverity(),
                         fileName,
                         null,
-                        GetCorrectionsForNewLineShouldFollowBrace(tokens, closeBracePos, openBracePos, fileName));
+                        GetCorrectionsForBraceShouldHaveNewLineAfter(tokens, closeBracePos, openBracePos, fileName));
                     }
             }
 
             return null;
         }
 
-        private DiagnosticRecord GetViolationForBraceShouldBeOnNewLine(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)
             {

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file`
`135`	`135`	`if (NewLineAfter)`
`136`	`136`	`{`
`137`	`137`	`AddToDiagnosticRecords(`
`138`		`- GetViolationForNewLineShouldFollowBrace(tokens, k, openBracePos, fileName),`
	`138`	`+ GetViolationForBraceShouldHaveNewLineAfter(tokens, k, openBracePos, fileName),`
`139`	`139`	`ref diagnosticRecords);`
`140`	`140`	`}`
`141`	`141`	`}`
`@@ -261,7 +261,11 @@ private List<CorrectionExtent> GetCorrectionsForBraceShouldNotFollowEmptyLine(`
`261`	`261`	`return corrections;`
`262`	`262`	`}`
`263`	`263`
`264`		`- private List<CorrectionExtent> GetCorrectionsForNewLineShouldFollowBrace(Token[] tokens, int closeBracePos, int openBracePos, string fileName)`
	`264`	`+ private List<CorrectionExtent> GetCorrectionsForBraceShouldHaveNewLineAfter(`
	`265`	`+ Token[] tokens,`
	`266`	`+ int closeBracePos,`
	`267`	`+ int openBracePos,`
	`268`	`+ string fileName)`
`265`	`269`	`{`
`266`	`270`	`var corrections = new List<CorrectionExtent>();`
`267`	`271`	`var nextToken = tokens[closeBracePos + 1];`
`@@ -300,7 +304,11 @@ private string GetIndentation(Token[] tokens, int closeBracePos, int openBracePo`
`300`	`304`	`return new String(' ', firstTokenOnOpenBraceLine.Extent.StartColumnNumber - 1);`
`301`	`305`	`}`
`302`	`306`
`303`		`- private DiagnosticRecord GetViolationForNewLineShouldFollowBrace(Token[] tokens, int closeBracePos, int openBracePos, string fileName)`
	`307`	`+ private DiagnosticRecord GetViolationForBraceShouldHaveNewLineAfter(`
	`308`	`+ Token[] tokens,`
	`309`	`+ int closeBracePos,`
	`310`	`+ int openBracePos,`
	`311`	`+ string fileName)`
`304`	`312`	`{`
`305`	`313`	`var expectedNewLinePos = closeBracePos + 1;`
`306`	`314`	`if (tokens.Length > 1 && tokens.Length > expectedNewLinePos)`
`@@ -318,14 +326,18 @@ private DiagnosticRecord GetViolationForNewLineShouldFollowBrace(Token[] tokens,`
`318`	`326`	`GetDiagnosticSeverity(),`
`319`	`327`	`fileName,`
`320`	`328`	`null,`
`321`		`- GetCorrectionsForNewLineShouldFollowBrace(tokens, closeBracePos, openBracePos, fileName));`
	`329`	`+ GetCorrectionsForBraceShouldHaveNewLineAfter(tokens, closeBracePos, openBracePos, fileName));`
`322`	`330`	`}`
`323`	`331`	`}`
`324`	`332`
`325`	`333`	`return null;`
`326`	`334`	`}`
`327`	`335`
`328`		`- private DiagnosticRecord GetViolationForBraceShouldBeOnNewLine(Token[] tokens, int closeBracePos, int openBracePos, string fileName)`
	`336`	`+ private DiagnosticRecord GetViolationForBraceShouldBeOnNewLine(`
	`337`	`+ Token[] tokens,`
	`338`	`+ int closeBracePos,`
	`339`	`+ int openBracePos,`
	`340`	`+ string fileName)`
`329`	`341`	`{`
`330`	`342`	`if (tokens.Length > 1 && tokens.Length > closeBracePos)`
`331`	`343`	`{`