Merge pull request #3746 from bjornhellander/feature/sa1513-collectio…

…n-expression Update SA1513 to not require a blank line if the closing brace is at the end of a collection expression
DotNetAnalyzers · Dec 15, 2023 · 2a917ff · 2a917ff
2 parents 9529b98 + bfd1498
commit 2a917ff
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/LayoutRules/SA1513CSharp12UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/LayoutRules/SA1513CSharp12UnitTests.cs
@@ -3,9 +3,34 @@
 
 namespace StyleCop.Analyzers.Test.CSharp12.LayoutRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.CSharp11.LayoutRules;
+    using Xunit;
+
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.LayoutRules.SA1513ClosingBraceMustBeFollowedByBlankLine,
+        StyleCop.Analyzers.LayoutRules.SA1513CodeFixProvider>;
 
     public partial class SA1513CSharp12UnitTests : SA1513CSharp11UnitTests
     {
+        [Fact]
+        [WorkItem(3720, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3720")]
+        public async Task TestObjectInitializerInCollectionExpressionAsync()
+        {
+            var testCode = @"
+public class Foo
+{
+    public Foo[] TestMethod() =>
+    [
+        new Foo
+        {
+        }
+    ];
+}";
+
+            await VerifyCSharpFixAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, testCode, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }
diff --git a/...p.Analyzers/StyleCop.Analyzers/LayoutRules/SA1513ClosingBraceMustBeFollowedByBlankLine.cs b/...p.Analyzers/StyleCop.Analyzers/LayoutRules/SA1513ClosingBraceMustBeFollowedByBlankLine.cs
@@ -272,6 +272,12 @@ private void AnalyzeCloseBrace(SyntaxToken token)
                         return;
                     }
 
+                    if (nextToken.IsKind(SyntaxKind.CloseBracketToken))
+                    {
+                        // the close brace is for example in an object initializer at the end of a collection expression.
+                        return;
+                    }
+
                     if (nextToken.IsKind(SyntaxKind.AddKeyword)
                         || nextToken.IsKind(SyntaxKind.RemoveKeyword)
                         || nextToken.IsKind(SyntaxKind.GetKeyword)