Fix SA1132 assumption that files match default end-of-line settings

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1132CodeFixProvider.cs

@@ -17,6 +17,8 @@ namespace StyleCop.Analyzers.ReadabilityRules
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Microsoft.CodeAnalysis.Editing;
+    using Microsoft.CodeAnalysis.Options;
+    using Microsoft.CodeAnalysis.Text;
     using StyleCop.Analyzers.Helpers;
 
     /// <summary>
@@ -58,8 +60,10 @@ 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 sourceText = await document.GetTextAsync(cancellationToken).ConfigureAwait(false);
+            var options = document.Project.Solution.Workspace.Options;
             var baseFieldDeclaration = (BaseFieldDeclarationSyntax)syntaxRoot.FindNode(diagnostic.Location.SourceSpan);
-            List<BaseFieldDeclarationSyntax> newFieldDeclarations = SplitDeclaration(document, baseFieldDeclaration);
+            List<BaseFieldDeclarationSyntax> newFieldDeclarations = SplitDeclaration(sourceText, options, baseFieldDeclaration);
 
             if (newFieldDeclarations != null)
             {
@@ -72,12 +76,13 @@ private static async Task<Document> GetTransformedDocumentAsync(Document documen
             return document;
         }
 
-        private static List<BaseFieldDeclarationSyntax> SplitDeclaration(Document document, BaseFieldDeclarationSyntax baseFieldDeclaration)
+        private static List<BaseFieldDeclarationSyntax> SplitDeclaration(SourceText sourceText, OptionSet options, BaseFieldDeclarationSyntax baseFieldDeclaration)
         {
             if (baseFieldDeclaration is FieldDeclarationSyntax fieldDeclaration)
             {
                 return DeclarationSplitter(
-                    document,
+                    sourceText,
+                    options,
                     fieldDeclaration.Declaration,
                     fieldDeclaration.WithDeclaration,
                     fieldDeclaration.SemicolonToken.TrailingTrivia);
@@ -86,7 +91,8 @@ private static List<BaseFieldDeclarationSyntax> SplitDeclaration(Document docume
             if (baseFieldDeclaration is EventFieldDeclarationSyntax eventFieldDeclaration)
             {
                 return DeclarationSplitter(
-                    document,
+                    sourceText,
+                    options,
                     eventFieldDeclaration.Declaration,
                     eventFieldDeclaration.WithDeclaration,
                     eventFieldDeclaration.SemicolonToken.TrailingTrivia);
@@ -96,7 +102,8 @@ private static List<BaseFieldDeclarationSyntax> SplitDeclaration(Document docume
         }
 
         private static List<BaseFieldDeclarationSyntax> DeclarationSplitter(
-            Document document,
+            SourceText sourceText,
+            OptionSet options,
             VariableDeclarationSyntax declaration,
             Func<VariableDeclarationSyntax, BaseFieldDeclarationSyntax> declarationFactory,
             SyntaxTriviaList declarationTrailingTrivia)
@@ -145,17 +152,18 @@ private static List<BaseFieldDeclarationSyntax> DeclarationSplitter(
                 else
                 {
                     SyntaxToken commaToken = nodeOrToken.AsToken();
+                    SyntaxTrivia endOfLineTrivia = FormattingHelper.GetEndOfLineForCodeFix(commaToken, sourceText, options);
                     SyntaxTriviaList trailingTrivia = commaToken.TrailingTrivia;
                     if (trailingTrivia.Any())
                     {
                         if (!trailingTrivia.Last().IsKind(SyntaxKind.EndOfLineTrivia))
                         {
-                            trailingTrivia = trailingTrivia.WithoutTrailingWhitespace().Add(FormattingHelper.GetNewLineTrivia(document));
+                            trailingTrivia = trailingTrivia.WithoutTrailingWhitespace().Add(endOfLineTrivia);
                         }
                     }
                     else
                     {
-                        trailingTrivia = SyntaxTriviaList.Create(FormattingHelper.GetNewLineTrivia(document));
+                        trailingTrivia = SyntaxTriviaList.Create(endOfLineTrivia);
                     }
 
                     newFieldDeclarations.Add(previous.WithTrailingTrivia(trailingTrivia));

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1132UnitTests.cs

@@ -1,13 +1,12 @@
 // Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-#nullable disable
-
 namespace StyleCop.Analyzers.Test.ReadabilityRules
 {
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
+    using StyleCop.Analyzers.Test.Helpers;
     using Xunit;
     using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
         StyleCop.Analyzers.ReadabilityRules.SA1132DoNotCombineFields,
@@ -29,16 +28,18 @@ class Foo
             await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
-        [Fact]
-        public async Task TestInvalidDeclarationAsync()
+        [Theory]
+        [InlineData("\n")]
+        [InlineData("\r\n")]
+        public async Task TestInvalidDeclarationAsync(string lineEnding)
         {
-            const string testCode = @"
+            string testCode = @"
 class Foo
 {
-    private int a, b,/*foo*/c,d;
-    public event System.Action aa, bb;
-}";
-            const string fixedCode = @"
+    {|#0:private int a, b,/*foo*/c,d;|}
+    {|#1:public event System.Action aa, bb;|}
+}".ReplaceLineEndings(lineEnding);
+            string fixedCode = @"
 class Foo
 {
     private int a;
@@ -47,12 +48,12 @@ class Foo
     private int d;
     public event System.Action aa;
     public event System.Action bb;
-}";
+}".ReplaceLineEndings(lineEnding);
 
             DiagnosticResult[] expected =
             {
-                Diagnostic().WithLocation(4, 5),
-                Diagnostic().WithLocation(5, 5),
+                Diagnostic().WithLocation(0),
+                Diagnostic().WithLocation(1),
             };
 
             await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);