Fix bug in HasNoNewLineBeforeEndBraceFormattingRule

Lakshmi Priya Sekar · Lakshmi Priya Sekar · commit 1e193b6960d0 · 2014-11-24T10:55:39.000-08:00
diff --git a/src/Microsoft.DotNet.CodeFormatting/Rules/HasNoNewLineBeforeEndBraceFormattingRule.cs b/src/Microsoft.DotNet.CodeFormatting/Rules/HasNoNewLineBeforeEndBraceFormattingRule.cs
@@ -31,7 +31,8 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca
 
             var tokensToReplace = closeBraceTokens.Where((token) => token.HasLeadingTrivia && (
                                     token.LeadingTrivia.First().CSharpKind() == SyntaxKind.EndOfLineTrivia ||
-                                    token.LeadingTrivia.Last().CSharpKind() == SyntaxKind.EndOfLineTrivia));
+                                    token.LeadingTrivia.Last().CSharpKind() == SyntaxKind.EndOfLineTrivia ||
+                                    token.LeadingTrivia.Last().CSharpKind() == SyntaxKind.WhitespaceTrivia));
             
             return document.WithSyntaxRoot(syntaxRoot.ReplaceTokens(tokensToReplace, replaceTriviaInTokens));
         }
@@ -62,7 +63,7 @@ private static IEnumerable<SyntaxTrivia> RemoveNewLinesFromBotton(IEnumerable<Sy
                 trivia = trivia.Take(trivia.Count() - 1);
             }
 
-            if (trivia.Last().CSharpKind() == SyntaxKind.EndOfLineTrivia) 
+            if (trivia.Any() && trivia.Last().CSharpKind() == SyntaxKind.EndOfLineTrivia) 
             {
                 if (trivia.Count() > 1)
                 {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca`
`31`	`31`
`32`	`32`	`var tokensToReplace = closeBraceTokens.Where((token) => token.HasLeadingTrivia && (`
`33`	`33`	`token.LeadingTrivia.First().CSharpKind() == SyntaxKind.EndOfLineTrivia \|\|`
`34`		`- token.LeadingTrivia.Last().CSharpKind() == SyntaxKind.EndOfLineTrivia));`
	`34`	`+ token.LeadingTrivia.Last().CSharpKind() == SyntaxKind.EndOfLineTrivia \|\|`
	`35`	`+ token.LeadingTrivia.Last().CSharpKind() == SyntaxKind.WhitespaceTrivia));`
`35`	`36`
`36`	`37`	`return document.WithSyntaxRoot(syntaxRoot.ReplaceTokens(tokensToReplace, replaceTriviaInTokens));`
`37`	`38`	`}`
`@@ -62,7 +63,7 @@ private static IEnumerable<SyntaxTrivia> RemoveNewLinesFromBotton(IEnumerable<Sy`
`62`	`63`	`trivia = trivia.Take(trivia.Count() - 1);`
`63`	`64`	`}`
`64`	`65`
`65`		`- if (trivia.Last().CSharpKind() == SyntaxKind.EndOfLineTrivia)`
	`66`	`+ if (trivia.Any() && trivia.Last().CSharpKind() == SyntaxKind.EndOfLineTrivia)`
`66`	`67`	`{`
`67`	`68`	`if (trivia.Count() > 1)`
`68`	`69`	`{`