Make changes based on code review feedback

Lakshmi Priya Sekar · Lakshmi Priya Sekar · commit da3919f3c8c3 · 2014-11-11T14:25:56.000-08:00
diff --git a/src/Microsoft.DotNet.CodeFormatting/Rules/HasNewLineBeforeFirstNamespaceFormattingRule.cs b/src/Microsoft.DotNet.CodeFormatting/Rules/HasNewLineBeforeFirstNamespaceFormattingRule.cs
@@ -36,7 +36,7 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca
                     int index = trivia.Count - 2;
                     while (index >= 0)
                     {
-                        if (trivia.ElementAt(index).CSharpKind() != SyntaxKind.EndOfLineTrivia)
+                        if (SyntaxKind.EndOfLineTrivia != trivia.ElementAt(index).CSharpKind())
                             break;
                         index--;
                     }
@@ -49,7 +49,7 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca
                 }
             }
 
-            newTrivia = newTrivia.Concat(new[] { SyntaxFactory.EndOfLine("\n"), SyntaxFactory.EndOfLine("\n") });
+            newTrivia = newTrivia.Concat(new[] { SyntaxFactory.CarriageReturnLineFeed, SyntaxFactory.CarriageReturnLineFeed });
 
             return document.WithSyntaxRoot(syntaxRoot.ReplaceNode(firstNamespace, firstNamespace.WithLeadingTrivia(newTrivia)));
         }
diff --git a/src/Microsoft.DotNet.CodeFormatting/Rules/HasNewLineBeforeFirstUsingFormattingRule.cs b/src/Microsoft.DotNet.CodeFormatting/Rules/HasNewLineBeforeFirstUsingFormattingRule.cs
@@ -39,7 +39,7 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca
                     int index = trivia.Count - 2;
                     while (index >= 0)
                     {
-                        if (trivia.ElementAt(index).CSharpKind() != SyntaxKind.EndOfLineTrivia)
+                        if (SyntaxKind.EndOfLineTrivia != trivia.ElementAt(index).CSharpKind())
                             break;
                         index--;
                     }
@@ -52,7 +52,7 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca
                 }                
             }
 
-            newTrivia = newTrivia.Concat(new[] { SyntaxFactory.EndOfLine("\n"), SyntaxFactory.EndOfLine("\n") });
+            newTrivia = newTrivia.Concat(new[] { SyntaxFactory.CarriageReturnLineFeed, SyntaxFactory.CarriageReturnLineFeed });
 
             return document.WithSyntaxRoot(syntaxRoot.ReplaceNode(firstUsing, firstUsing.WithLeadingTrivia(newTrivia)));
         }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca`
`36`	`36`	`int index = trivia.Count - 2;`
`37`	`37`	`while (index >= 0)`
`38`	`38`	`{`
`39`		`- if (trivia.ElementAt(index).CSharpKind() != SyntaxKind.EndOfLineTrivia)`
	`39`	`+ if (SyntaxKind.EndOfLineTrivia != trivia.ElementAt(index).CSharpKind())`
`40`	`40`	`break;`
`41`	`41`	`index--;`
`42`	`42`	`}`
`@@ -49,7 +49,7 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`- newTrivia = newTrivia.Concat(new[] { SyntaxFactory.EndOfLine("\n"), SyntaxFactory.EndOfLine("\n") });`
	`52`	`+ newTrivia = newTrivia.Concat(new[] { SyntaxFactory.CarriageReturnLineFeed, SyntaxFactory.CarriageReturnLineFeed });`
`53`	`53`
`54`	`54`	`return document.WithSyntaxRoot(syntaxRoot.ReplaceNode(firstNamespace, firstNamespace.WithLeadingTrivia(newTrivia)));`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca`
`39`	`39`	`int index = trivia.Count - 2;`
`40`	`40`	`while (index >= 0)`
`41`	`41`	`{`
`42`		`- if (trivia.ElementAt(index).CSharpKind() != SyntaxKind.EndOfLineTrivia)`
	`42`	`+ if (SyntaxKind.EndOfLineTrivia != trivia.ElementAt(index).CSharpKind())`
`43`	`43`	`break;`
`44`	`44`	`index--;`
`45`	`45`	`}`
`@@ -52,7 +52,7 @@ public async Task<Document> ProcessAsync(Document document, CancellationToken ca`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- newTrivia = newTrivia.Concat(new[] { SyntaxFactory.EndOfLine("\n"), SyntaxFactory.EndOfLine("\n") });`
	`55`	`+ newTrivia = newTrivia.Concat(new[] { SyntaxFactory.CarriageReturnLineFeed, SyntaxFactory.CarriageReturnLineFeed });`
`56`	`56`
`57`	`57`	`return document.WithSyntaxRoot(syntaxRoot.ReplaceNode(firstUsing, firstUsing.WithLeadingTrivia(newTrivia)));`
`58`	`58`	`}`