Improve analyzer AddEmptyLineAfterClosingBrace (RCS1153).

Author: josefpihrt

src/Analyzers/CSharp/Analysis/AddEmptyLineAfterClosingBraceAnalyzer.cs

@@ -30,7 +30,8 @@ public override void Initialize(AnalysisContext context)
             context.RegisterSyntaxNodeAction(AnalyzeBlock, SyntaxKind.Block);
             context.RegisterSyntaxNodeAction(AnalyzeWhileStatement, SyntaxKind.WhileStatement);
             context.RegisterSyntaxNodeAction(AnalyzeForStatement, SyntaxKind.ForStatement);
-            context.RegisterSyntaxNodeAction(AnalyzeForEachStatement, SyntaxKind.ForEachStatement);
+            context.RegisterSyntaxNodeAction(AnalyzeCommonForEachStatement, SyntaxKind.ForEachStatement);
+            context.RegisterSyntaxNodeAction(AnalyzeCommonForEachStatement, SyntaxKind.ForEachVariableStatement);
             context.RegisterSyntaxNodeAction(AnalyzeUsingStatement, SyntaxKind.UsingStatement);
             context.RegisterSyntaxNodeAction(AnalyzeFixedStatement, SyntaxKind.FixedStatement);
             context.RegisterSyntaxNodeAction(AnalyzeCheckedStatement, SyntaxKind.CheckedStatement);
@@ -40,6 +41,7 @@ public override void Initialize(AnalysisContext context)
             context.RegisterSyntaxNodeAction(AnalyzeIfStatement, SyntaxKind.IfStatement);
             context.RegisterSyntaxNodeAction(AnalyzeSwitchStatement, SyntaxKind.SwitchStatement);
             context.RegisterSyntaxNodeAction(AnalyzeTryStatement, SyntaxKind.TryStatement);
+            context.RegisterSyntaxNodeAction(AnalyzeElseClause, SyntaxKind.ElseClause);
         }
 
         private static void AnalyzeBlock(SyntaxNodeAnalysisContext context)
@@ -76,9 +78,9 @@ private static void AnalyzeForStatement(SyntaxNodeAnalysisContext context)
             }
         }
 
-        private static void AnalyzeForEachStatement(SyntaxNodeAnalysisContext context)
+        private static void AnalyzeCommonForEachStatement(SyntaxNodeAnalysisContext context)
         {
-            var forEachStatement = (ForEachStatementSyntax)context.Node;
+            var forEachStatement = (CommonForEachStatementSyntax)context.Node;
 
             if (forEachStatement.IsParentKind(SyntaxKind.Block))
             {
@@ -187,6 +189,21 @@ private static void AnalyzeTryStatement(SyntaxNodeAnalysisContext context)
             }
         }
 
+        private static void AnalyzeElseClause(SyntaxNodeAnalysisContext context)
+        {
+            var elseClause = (ElseClauseSyntax)context.Node;
+
+            if (elseClause.Statement?.Kind() == SyntaxKind.Block)
+            {
+                IfStatementSyntax ifStatement = elseClause.GetTopmostIf();
+
+                if (ifStatement.IsParentKind(SyntaxKind.Block))
+                {
+                    AnalyzeStatement(context, ifStatement, (BlockSyntax)elseClause.Statement);
+                }
+            }
+        }
+
         private static void AnalyzeStatement(SyntaxNodeAnalysisContext context, StatementSyntax statement, BlockSyntax block)
         {
             if (block?.IsMissing == false)

src/Tests/Analyzers.Tests/RCS1153AddEmptyLineAfterClosingBraceTests.cs

@@ -0,0 +1,59 @@
+// Copyright (c) Josef Pihrt. All rights reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Roslynator.CSharp.CodeFixes;
+using Xunit;
+
+namespace Roslynator.CSharp.Analysis.Tests
+{
+    public class RCS1153AddEmptyLineAfterClosingBraceTests : AbstractCSharpFixVerifier
+    {
+        public override DiagnosticDescriptor Descriptor { get; } = DiagnosticDescriptors.AddEmptyLineAfterClosingBrace;
+
+        public override DiagnosticAnalyzer Analyzer { get; } = new AddEmptyLineAfterClosingBraceAnalyzer();
+
+        public override CodeFixProvider FixProvider { get; } = new AddEmptyLineAfterClosingBraceCodeFixProvider();
+
+        [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddEmptyLineAfterClosingBrace)]
+        public async Task Test_ElseClause()
+        {
+            await VerifyDiagnosticAndFixAsync(@"
+class C
+{
+    void M()
+    {
+        bool x = false;
+
+        if (x)
+        {
+        }
+        else
+        {
+        }[|
+|]        M();
+    }
+}
+", @"
+class C
+{
+    void M()
+    {
+        bool x = false;
+
+        if (x)
+        {
+        }
+        else
+        {
+        }
+
+        M();
+    }
+}
+");
+        }
+    }
+}