Updated after feedback.

Added additional test case to improve coverage
Removed unreachable code
Fixed copy/paste typo

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1500/SA1500UnitTests.Properties.cs

@@ -415,5 +415,51 @@ public bool Property11
             await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
+
+        /// <summary>
+        /// Verifies that a single line accessor with an embedded block will be handled correctly.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        public async Task TestSingleLineAccessorWithEmbeddedBlockAsync()
+        {
+            var testCode = @"
+public class TestClass
+{
+    public int[] TestProperty
+    {
+        get {
+            {
+                return new[] { 1, 2, 3 }; } }
+    }
+}
+";
+
+            var fixedTestCode = @"
+public class TestClass
+{
+    public int[] TestProperty
+    {
+        get
+        {
+            {
+                return new[] { 1, 2, 3 };
+            }
+        }
+    }
+}
+";
+
+            DiagnosticResult[] expected =
+            {
+                this.CSharpDiagnostic().WithLocation(6, 13),
+                this.CSharpDiagnostic().WithLocation(8, 43),
+                this.CSharpDiagnostic().WithLocation(8, 45)
+            };
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1500CodeFixProvider.cs

@@ -26,7 +26,7 @@ namespace StyleCop.Analyzers.LayoutRules
     internal class SA1500CodeFixProvider : CodeFixProvider
     {
         /// <inheritdoc/>
-        public override ImmutableArray<string> FixableDiagnosticIds { get; } = 
+        public override ImmutableArray<string> FixableDiagnosticIds { get; } =
             ImmutableArray.Create(SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine.DiagnosticId);
 
         /// <inheritdoc/>
@@ -74,14 +74,11 @@ private static Dictionary<SyntaxToken, SyntaxToken> GenerateBraceFixes(Document
 
                 if (IsAccessorWithSingleLineBlock(previousToken, braceToken))
                 {
-                    if (!braceTokens.Contains(previousToken))
-                    {
-                        var newTrailingTrivia = previousToken.TrailingTrivia
-                            .WithoutTrailingWhitespace()
-                            .Add(SyntaxFactory.Space);
+                    var newTrailingTrivia = previousToken.TrailingTrivia
+                        .WithoutTrailingWhitespace()
+                        .Add(SyntaxFactory.Space);
 
-                        AddReplacement(tokenReplacements, previousToken, previousToken.WithTrailingTrivia(newTrailingTrivia));
-                    }
+                    AddReplacement(tokenReplacements, previousToken, previousToken.WithTrailingTrivia(newTrailingTrivia));
 
                     braceReplacementToken = braceReplacementToken.WithLeadingTrivia(braceToken.LeadingTrivia.WithoutLeadingWhitespace());
                 }
@@ -254,7 +251,7 @@ private class FixAll : DocumentBasedFixAllProvider
                 new FixAll();
 
             protected override string CodeActionTitle =>
-                LayoutResources.SA1503CodeFix;
+                LayoutResources.SA1500CodeFix;
 
             protected override async Task<SyntaxNode> FixAllInDocumentAsync(FixAllContext fixAllContext, Document document)
             {
@@ -268,9 +265,10 @@ protected override async Task<SyntaxNode> FixAllInDocumentAsync(FixAllContext fi
 
                 var tokens = diagnostics
                     .Select(diagnostic => syntaxRoot.FindToken(diagnostic.Location.SourceSpan.Start))
-                    .OrderBy(token => token.SpanStart);
+                    .OrderBy(token => token.SpanStart)
+                    .ToImmutableArray();
 
-                var tokenReplacements = GenerateBraceFixes(document, tokens.ToImmutableArray());
+                var tokenReplacements = GenerateBraceFixes(document, tokens);
 
                 return syntaxRoot.ReplaceTokens(tokenReplacements.Keys, (originalToken, rewrittenToken) => tokenReplacements[originalToken]);
             }