Fix SA1133 hard-coding of CRLF

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1133CodeFixProvider.cs

@@ -16,6 +16,8 @@ namespace StyleCop.Analyzers.ReadabilityRules
     using Microsoft.CodeAnalysis.CodeFixes;
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
+    using Microsoft.CodeAnalysis.Options;
+    using Microsoft.CodeAnalysis.Text;
     using StyleCop.Analyzers.Helpers;
 
     /// <summary>
@@ -58,22 +60,24 @@ 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 nodeInSourceSpan = syntaxRoot.FindNode(diagnostic.Location.SourceSpan, getInnermostNodeForTie: true);
             AttributeListSyntax attributeList = nodeInSourceSpan.FirstAncestorOrSelf<AttributeListSyntax>();
 
             var settings = SettingsHelper.GetStyleCopSettingsInCodeFix(document.Project.AnalyzerOptions, syntaxRoot.SyntaxTree, cancellationToken);
             var indentationSteps = IndentationHelper.GetIndentationSteps(settings.Indentation, attributeList);
             var indentationTrivia = IndentationHelper.GenerateWhitespaceTrivia(settings.Indentation, indentationSteps);
 
-            List<AttributeListSyntax> newAttributeLists = GetNewAttributeList(attributeList, indentationTrivia);
+            List<AttributeListSyntax> newAttributeLists = GetNewAttributeList(attributeList, indentationTrivia, sourceText, options);
 
             var newSyntaxRoot = syntaxRoot.ReplaceNode(attributeList, newAttributeLists);
             var newDocument = document.WithSyntaxRoot(newSyntaxRoot.WithoutFormatting());
 
             return newDocument;
         }
 
-        private static List<AttributeListSyntax> GetNewAttributeList(AttributeListSyntax attributeList, SyntaxTrivia indentationTrivia)
+        private static List<AttributeListSyntax> GetNewAttributeList(AttributeListSyntax attributeList, SyntaxTrivia indentationTrivia, SourceText sourceText, OptionSet options)
         {
             var newAttributeLists = new List<AttributeListSyntax>();
 
@@ -90,7 +94,7 @@ private static List<AttributeListSyntax> GetNewAttributeList(AttributeListSyntax
 
                 newAttributeList = (i == (attributeList.Attributes.Count - 1))
                     ? newAttributeList.WithTrailingTrivia(attributeList.GetTrailingTrivia())
-                    : newAttributeList.WithTrailingTrivia(SyntaxFactory.CarriageReturnLineFeed);
+                    : newAttributeList.WithTrailingTrivia(FormattingHelper.GetEndOfLineForCodeFix(attributeList.CloseBracketToken, sourceText, options));
 
                 newAttributeLists.Add(newAttributeList);
             }
@@ -114,6 +118,8 @@ protected override async Task<SyntaxNode> FixAllInDocumentAsync(FixAllContext fi
                 }
 
                 var syntaxRoot = await document.GetSyntaxRootAsync(fixAllContext.CancellationToken).ConfigureAwait(false);
+                var sourceText = await document.GetTextAsync(fixAllContext.CancellationToken).ConfigureAwait(false);
+                var options = document.Project.Solution.Workspace.Options;
                 var settings = SettingsHelper.GetStyleCopSettingsInCodeFix(document.Project.AnalyzerOptions, syntaxRoot.SyntaxTree, fixAllContext.CancellationToken);
 
                 // 🐉 Need to eagerly evaluate this with ToList() to ensure nodes are not garbage collected between the
@@ -126,7 +132,7 @@ protected override async Task<SyntaxNode> FixAllInDocumentAsync(FixAllContext fi
                 {
                     var indentationSteps = IndentationHelper.GetIndentationSteps(settings.Indentation, attributeList);
                     var indentationTrivia = IndentationHelper.GenerateWhitespaceTrivia(settings.Indentation, indentationSteps);
-                    newRoot = newRoot.ReplaceNode(newRoot.GetCurrentNode(attributeList), GetNewAttributeList(attributeList, indentationTrivia));
+                    newRoot = newRoot.ReplaceNode(newRoot.GetCurrentNode(attributeList), GetNewAttributeList(attributeList, indentationTrivia, sourceText, options));
                 }
 
                 return newRoot;

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1133UnitTests.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.SA1133DoNotCombineAttributes,
@@ -56,24 +57,27 @@ public class TestClass
         /// <summary>
         /// Verifies that an attribute list will produce the required diagnostics.
         /// </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 VerifyThatAttributeListProducesDiagnosticAsync()
+        [Theory]
+        [InlineData("\n")]
+        [InlineData("\r\n")]
+        public async Task VerifyThatAttributeListProducesDiagnosticAsync(string lineEnding)
         {
             var testCode = @"using System.ComponentModel;
 
-[EditorBrowsable(EditorBrowsableState.Never), DesignOnly(true)]
+[EditorBrowsable(EditorBrowsableState.Never), {|#0:DesignOnly|}(true)]
 public class TestClass
 {
     /// <summary>
     /// Test method.
     /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never), DesignOnly(true), DisplayName(""Test"")] // test comment
+    [EditorBrowsable(EditorBrowsableState.Never), {|#1:DesignOnly|}(true), DisplayName(""Test"")] // test comment
     public void TestMethod()
     {
     }
 }
-";
+".ReplaceLineEndings(lineEnding);
 
             var fixedTestCode = @"using System.ComponentModel;
 
@@ -91,12 +95,12 @@ public void TestMethod()
     {
     }
 }
-";
+".ReplaceLineEndings(lineEnding);
 
             DiagnosticResult[] expected =
             {
-                Diagnostic().WithLocation(3, 47),
-                Diagnostic().WithLocation(9, 51),
+                Diagnostic().WithLocation(0),
+                Diagnostic().WithLocation(1),
             };
 
             await VerifyCSharpFixAsync(testCode, expected, fixedTestCode, CancellationToken.None).ConfigureAwait(false);