More newline fixes

Author: jaredpar

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

@@ -123,7 +123,7 @@ private static SyntaxToken FixCloseBraceLeadingTrivia(SyntaxToken token)
                 else
                 {
                     // new line and we are done. 
-                    triviaList = SyntaxFactory.TriviaList(SyntaxFactory.CarriageReturnLineFeed);
+                    triviaList = SyntaxFactory.TriviaList(SyntaxUtil.GetBestNewLineTrivia(token));
                 }
             }
             else
@@ -148,7 +148,7 @@ private static SyntaxTriviaList RemoveNewLinesFromTop(SyntaxTriviaList triviaLis
             }
 
             var list = new List<SyntaxTrivia>(triviaList.Count);
-            list.Add(SyntaxFactory.CarriageReturnLineFeed);
+            list.Add(SyntaxUtil.GetBestNewLineTrivia(triviaList));
 
             var index = MovePastSimpleNewLines(triviaList, 0);
             while (index < triviaList.Count)
@@ -200,7 +200,7 @@ private static SyntaxTriviaList RemoveNewLinesFromBottom(SyntaxTriviaList trivia
             // A directive has an implicit new line after it.
             if (!list[index].IsDirective)
             {
-                list.Add(SyntaxFactory.CarriageReturnLineFeed);
+                list.Add(SyntaxUtil.GetBestNewLineTrivia(triviaList));
             }
 
             if (triviaList.Last().IsKind(SyntaxKind.WhitespaceTrivia))

src/Microsoft.DotNet.CodeFormatting/SyntaxUtil.cs

@@ -27,6 +27,18 @@ internal static SyntaxTrivia GetBestNewLineTrivia(SyntaxNode node, SyntaxTrivia?
             return defaultNewLineTrivia ?? SyntaxFactory.CarriageReturnLineFeed;
         }
 
+        internal static SyntaxTrivia GetBestNewLineTrivia(SyntaxToken token, SyntaxTrivia? defaultNewLineTrivia = null)
+        {
+            SyntaxTrivia trivia;
+            if (TryGetExistingNewLine(token.LeadingTrivia, out trivia) ||
+                TryGetExistingNewLine(token.TrailingTrivia, out trivia))
+            {
+                return trivia;
+            }
+
+            return defaultNewLineTrivia ?? SyntaxFactory.CarriageReturnLineFeed;
+        }
+
         internal static SyntaxTrivia GetBestNewLineTrivia(SyntaxTriviaList list, SyntaxTrivia? defaultNewLineTrivia = null)
         {
             SyntaxTrivia trivia;