Merge pull request #2659 from morsiu/#2527

SA1137: Each switch case with a block is checked separately

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1137UnitTests.cs

@@ -1460,18 +1460,37 @@ void MethodName()
 
                 break;
 
-       case 1:
-case 2:
-     label2:
+        case 1:
+       {
+    label2:
+           if (true)
+           {
+           }
+
+               break;
+       }
+       case 2:
+case 3:
+     label3:
            while (true)
             {
             }
 
            break;
 
+      case 4:
+case 5:
+        {
+        label4:
+          while (true)
+            {
+            }
+
+          break;
+        }
 default:
-label3a:
- label3b:
+label5a:
+ label5b:
 break;
         }
     }
@@ -1493,17 +1512,36 @@ void MethodName()
             break;
 
         case 1:
+       {
+    label2:
+           if (true)
+           {
+           }
+
+           break;
+       }
         case 2:
-      label2:
+        case 3:
+      label3:
             while (true)
             {
             }
 
             break;
 
+        case 4:
+        case 5:
+       {
+        label4:
+          while (true)
+            {
+            }
+
+          break;
+        }
         default:
-      label3a:
-      label3b:
+      label5a:
+      label5b:
             break;
         }
     }
@@ -1513,15 +1551,19 @@ void MethodName()
             DiagnosticResult[] expected =
             {
                 this.CSharpDiagnostic().WithLocation(14, 1),
-                this.CSharpDiagnostic().WithLocation(16, 1),
-                this.CSharpDiagnostic().WithLocation(17, 1),
-                this.CSharpDiagnostic().WithLocation(18, 1),
-                this.CSharpDiagnostic().WithLocation(19, 1),
                 this.CSharpDiagnostic().WithLocation(23, 1),
                 this.CSharpDiagnostic().WithLocation(25, 1),
                 this.CSharpDiagnostic().WithLocation(26, 1),
                 this.CSharpDiagnostic().WithLocation(27, 1),
                 this.CSharpDiagnostic().WithLocation(28, 1),
+                this.CSharpDiagnostic().WithLocation(32, 1),
+                this.CSharpDiagnostic().WithLocation(34, 1),
+                this.CSharpDiagnostic().WithLocation(35, 1),
+                this.CSharpDiagnostic().WithLocation(36, 1),
+                this.CSharpDiagnostic().WithLocation(44, 1),
+                this.CSharpDiagnostic().WithLocation(45, 1),
+                this.CSharpDiagnostic().WithLocation(46, 1),
+                this.CSharpDiagnostic().WithLocation(47, 1),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1137ElementsShouldHaveTheSameIndentation.cs

@@ -217,9 +217,16 @@ private static void HandleSwitchStatement(SyntaxNodeAnalysisContext context)
             var labels = ImmutableList.CreateBuilder<SwitchLabelSyntax>();
             var statements = ImmutableList.CreateBuilder<StatementSyntax>();
             var labeledStatements = ImmutableList.CreateBuilder<StatementSyntax>();
+            var blockStatements = ImmutableList.CreateBuilder<StatementSyntax>();
             foreach (SwitchSectionSyntax switchSection in switchStatement.Sections)
             {
                 labels.AddRange(switchSection.Labels);
+                if (switchSection.Statements.Count == 1 && switchSection.Statements[0].IsKind(SyntaxKind.Block))
+                {
+                    blockStatements.Add(switchSection.Statements[0]);
+                    continue;
+                }
+
                 foreach (var statement in switchSection.Statements)
                 {
                     StatementSyntax statementToAlign = statement;
@@ -236,6 +243,7 @@ private static void HandleSwitchStatement(SyntaxNodeAnalysisContext context)
             CheckElements(context, labels.ToImmutable());
             CheckElements(context, statements.ToImmutable());
             CheckElements(context, labeledStatements.ToImmutable());
+            CheckElements(context, blockStatements.ToImmutable());
         }
 
         private static void HandleInitializerExpression(SyntaxNodeAnalysisContext context)