Add rule 'NoNewLineBeforeEndBrace'

Author: Lakshmi Priya Sekar

src/Microsoft.DotNet.CodeFormatting/Microsoft.DotNet.CodeFormatting.csproj

@@ -80,6 +80,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Rules\HasCopyrightHeaderFormattingRule.cs" />
     <Compile Include="Rules\HasNoNewLineAfterOpenBraceFormattingRule.cs" />
+    <Compile Include="Rules\HasNoNewLineBeforeEndBraceFormattingRule.cs" />
     <Compile Include="Rules\HasNoXmlBasedCopyrightHeaderFormattingRule.cs" />
     <Compile Include="Rules\HasUsingsOutsideOfNamespaceFormattingRule.cs" />
     <Compile Include="Rules\IsFormattedFormattingRule.cs" />

src/Microsoft.DotNet.CodeFormatting/Rules/HasNoNewLineAfterOpenBraceFormattingRule.cs

@@ -26,8 +26,12 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca
             {
                 var triviaItem = token.LeadingTrivia.First();
                 int elementsToRemove = 1;
-                while (triviaItem == token.LeadingTrivia.ElementAt(elementsToRemove))
-                    elementsToRemove++;
+                if (token.LeadingTrivia.Count > 1)
+                {
+                    while (triviaItem == token.LeadingTrivia.ElementAt(elementsToRemove))
+                        elementsToRemove++;
+                }
+
                 var newToken = token.WithLeadingTrivia(token.LeadingTrivia.Skip(elementsToRemove));
                 return newToken;
             };

src/Microsoft.DotNet.CodeFormatting/Rules/HasNoNewLineBeforeEndBraceFormattingRule.cs

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under MIT. See LICENSE in the project root for license information.
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.DotNet.CodeFormatting.Rules
+{
+    [Export(typeof(IFormattingRule))]
+    internal sealed class HasNoNewLineBeforeEndBraceFormattingRule : IFormattingRule
+    {
+        public async Task<Document> ProcessAsync(Document document, CancellationToken cancellationToken)
+        {
+            var syntaxRoot = await document.GetSyntaxRootAsync(cancellationToken) as CSharpSyntaxNode;
+            if (syntaxRoot == null)
+                return document;
+
+            var closeBraceTokens = syntaxRoot.DescendantTokens().Where((token) => token.CSharpKind() == SyntaxKind.CloseBraceToken);
+            Func<SyntaxToken, SyntaxToken, SyntaxToken> replacementForTokens = (token, dummy) =>
+            {
+                var triviaItem = token.LeadingTrivia.First();
+                int elementsToRemove = 1;
+                if (token.LeadingTrivia.Count > 1)
+                {
+                    while (triviaItem == token.LeadingTrivia.ElementAt(elementsToRemove))
+                        elementsToRemove++;
+                }
+
+                var newToken = token.WithLeadingTrivia(token.LeadingTrivia.Skip(elementsToRemove));
+                return newToken;
+            };
+
+            var tokensToReplace = closeBraceTokens.Where((token) => token.HasLeadingTrivia && token.LeadingTrivia.First().CSharpKind() == SyntaxKind.EndOfLineTrivia);
+
+            return document.WithSyntaxRoot(syntaxRoot.ReplaceTokens(tokensToReplace, replacementForTokens));
+        }
+    }
+}

src/Microsoft.DotNet.CodeFormatting/Rules/IsFormattedFormattingRule.cs

@@ -23,6 +23,7 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca
             var oldTrivia = syntaxRoot.DescendantTrivia().Where(trivia => trivia.CSharpKind() == SyntaxKind.DisabledTextTrivia);
             Func<SyntaxTrivia, SyntaxTrivia, SyntaxTrivia> replacementTrivia = (trivia, dummy) =>
             {
+                var levelToIndent = trivia.Token.Parent.Ancestors().Count();
                 var compilation = SyntaxFactory.ParseCompilationUnit(trivia.ToString());
                 var formattedTrivia = Formatter.Format(compilation.SyntaxTree.GetRoot(), document.Project.Solution.Workspace).GetText().ToString();
                 return SyntaxFactory.DisabledText(formattedTrivia);