Improved initializer handling of SA1513

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1513UnitTests.cs

@@ -739,6 +739,63 @@ public void TestMethod()
             await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Verifies that having an initializer as last parameter / argument will not raise any diagnostics.
+        /// This is a regression for #1713
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task VerifyThatInitializerAsLastParameterWillNotProduceDiagnosticAsync()
+        {
+            var testCode = @"
+using System;
+
+public class Program
+{
+    private class Foo : IDisposable
+    {
+        public int Bar { get; set; }
+
+        public void Dispose()
+        {
+        }
+    }
+
+    public static void Main(string[] args)
+    {
+        foreach (
+            var x in
+            new[]
+            {
+                1,
+                2,
+                3
+            })
+        {
+        }
+
+        using (
+            new Foo
+            {
+                Bar = 1
+            })
+        {
+        }
+
+        Console.WriteLine(
+            new[]
+            {
+                1,
+                2,
+                3
+            });
+    }
+}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
         /// <inheritdoc/>
         protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers()
         {

StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine.cs

@@ -237,9 +237,8 @@ private void AnalyzeCloseBrace(SyntaxToken token)
                         return;
                     }
 
-                    if (nextToken.IsKind(SyntaxKind.CommaToken) &&
-                        (IsPartOf<InitializerExpressionSyntax>(token) ||
-                         IsPartOf<AnonymousObjectCreationExpressionSyntax>(token)))
+                    if ((nextToken.IsKind(SyntaxKind.CommaToken) || nextToken.IsKind(SyntaxKind.CloseParenToken)) &&
+                        (IsPartOf<InitializerExpressionSyntax>(token) || IsPartOf<AnonymousObjectCreationExpressionSyntax>(token)))
                     {
                         // the close brace is part of an initializer statement.
                         return;