Fix SA1104/SA1105 hard-coding of CRLF

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1104SA1105CodeFixProvider.cs

@@ -13,7 +13,6 @@ namespace StyleCop.Analyzers.ReadabilityRules
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CodeActions;
     using Microsoft.CodeAnalysis.CodeFixes;
-    using Microsoft.CodeAnalysis.CSharp;
     using StyleCop.Analyzers.Helpers;
 
     /// <summary>
@@ -54,14 +53,17 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
         private static async Task<Document> GetTransformedDocumentAsync(Document document, Diagnostic diagnostic, CancellationToken cancellationToken)
         {
             var syntaxRoot = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var text = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
             var token = syntaxRoot.FindToken(diagnostic.Location.SourceSpan.Start);
 
             var settings = SettingsHelper.GetStyleCopSettingsInCodeFix(document.Project.AnalyzerOptions, syntaxRoot.SyntaxTree, cancellationToken);
             var indentationTrivia = QueryIndentationHelpers.GetQueryIndentationTrivia(settings.Indentation, token);
 
             var precedingToken = token.GetPreviousToken();
+            var options = document.Project.Solution.Workspace.Options;
+            var endOfLineTrivia = FormattingHelper.GetEndOfLineForCodeFix(token, text, options);
             var triviaList = precedingToken.TrailingTrivia.AddRange(token.LeadingTrivia);
-            var processedTriviaList = triviaList.WithoutTrailingWhitespace().Add(SyntaxFactory.CarriageReturnLineFeed);
+            var processedTriviaList = triviaList.WithoutTrailingWhitespace().Add(endOfLineTrivia);
 
             var replaceMap = new Dictionary<SyntaxToken, SyntaxToken>()
             {

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1104UnitTests.cs

@@ -9,6 +9,7 @@ namespace StyleCop.Analyzers.Test.ReadabilityRules
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.ReadabilityRules;
+    using StyleCop.Analyzers.Test.Helpers;
     using Xunit;
     using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
         StyleCop.Analyzers.ReadabilityRules.SA110xQueryClauses,
@@ -22,9 +23,12 @@ public class SA1104UnitTests
         /// <summary>
         /// Verifies that a select query expression produces the expected results.
         /// </summary>
+        /// <param name="lineEnding">The line ending to use in the test code.</param>
         /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
-        [Fact]
-        public async Task TestSelectQueryExpressionAsync()
+        [Theory]
+        [InlineData("\n")]
+        [InlineData("\r\n")]
+        public async Task TestSelectQueryExpressionAsync(string lineEnding)
         {
             var testCode = @"namespace TestNamespace
 {
@@ -43,11 +47,11 @@ public void TestMethod2()
                 from element in TestMethod1
                 (
                     12
-                ) select element;
+                ) {|#0:select|} element;
         }
     }
 }
-";
+".ReplaceLineEndings(lineEnding);
 
             var fixedTestCode = @"namespace TestNamespace
 {
@@ -71,11 +75,11 @@ from element in TestMethod1
         }
     }
 }
-";
+".ReplaceLineEndings(lineEnding);
 
             DiagnosticResult[] expectedDiagnostics =
             {
-                Diagnostic(SA110xQueryClauses.SA1104Descriptor).WithLocation(18, 19),
+                Diagnostic(SA110xQueryClauses.SA1104Descriptor).WithLocation(0),
             };
 
             await VerifyCSharpFixAsync(testCode, expectedDiagnostics, fixedTestCode, CancellationToken.None).ConfigureAwait(false);

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1105UnitTests.cs

@@ -9,6 +9,7 @@ namespace StyleCop.Analyzers.Test.ReadabilityRules
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.ReadabilityRules;
+    using StyleCop.Analyzers.Test.Helpers;
     using Xunit;
     using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
         StyleCop.Analyzers.ReadabilityRules.SA110xQueryClauses,
@@ -22,9 +23,12 @@ public class SA1105UnitTests
         /// <summary>
         /// Verifies that a select query expression produces the expected results.
         /// </summary>
+        /// <param name="lineEnding">The line ending to use in the test code.</param>
         /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
-        [Fact]
-        public async Task TestSelectQueryExpressionAsync()
+        [Theory]
+        [InlineData("\n")]
+        [InlineData("\r\n")]
+        public async Task TestSelectQueryExpressionAsync(string lineEnding)
         {
             var testCode = @"namespace TestNamespace
 {
@@ -40,14 +44,14 @@ public int[] TestMethod1(int x)
         public void TestMethod2()
         {
             var x =
-                from element in new[] { 1, 2, 3 } select TestMethod1
+                from element in new[] { 1, 2, 3 } {|#0:select|} TestMethod1
                 (
                     element
                 );
         }
     }
 }
-";
+".ReplaceLineEndings(lineEnding);
 
             var fixedTestCode = @"namespace TestNamespace
 {
@@ -71,11 +75,11 @@ select TestMethod1
         }
     }
 }
-";
+".ReplaceLineEndings(lineEnding);
 
             DiagnosticResult[] expectedDiagnostics =
             {
-                Diagnostic(SA110xQueryClauses.SA1105Descriptor).WithLocation(15, 51),
+                Diagnostic(SA110xQueryClauses.SA1105Descriptor).WithLocation(0),
             };
 
             await VerifyCSharpFixAsync(testCode, expectedDiagnostics, fixedTestCode, CancellationToken.None).ConfigureAwait(false);