Check while token of do statement with a non-block body

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1138UnitTests.cs

@@ -614,13 +614,13 @@ void MethodName()
 
         do
             return;
-while (true);
+        while (true);
 
         do
             do
                 return;
-while (true);
-while (true);
+            while (true);
+        while (true);
     }
 }
 ";
@@ -635,9 +635,12 @@ void MethodName()
                 this.CSharpDiagnostic(SA1137ElementsShouldHaveTheSameIndentation.SA1138DiagnosticId).WithLocation(10, 1),
                 this.CSharpDiagnostic(SA1137ElementsShouldHaveTheSameIndentation.SA1138DiagnosticId).WithLocation(12, 1),
                 this.CSharpDiagnostic(SA1137ElementsShouldHaveTheSameIndentation.SA1138DiagnosticId).WithLocation(13, 1),
+                this.CSharpDiagnostic(SA1137ElementsShouldHaveTheSameIndentation.SA1138DiagnosticId).WithLocation(14, 1),
                 this.CSharpDiagnostic(SA1137ElementsShouldHaveTheSameIndentation.SA1138DiagnosticId).WithLocation(16, 1),
                 this.CSharpDiagnostic(SA1137ElementsShouldHaveTheSameIndentation.SA1138DiagnosticId).WithLocation(17, 1),
                 this.CSharpDiagnostic(SA1137ElementsShouldHaveTheSameIndentation.SA1138DiagnosticId).WithLocation(18, 1),
+                this.CSharpDiagnostic(SA1137ElementsShouldHaveTheSameIndentation.SA1138DiagnosticId).WithLocation(19, 1),
+                this.CSharpDiagnostic(SA1137ElementsShouldHaveTheSameIndentation.SA1138DiagnosticId).WithLocation(20, 1),
             };
 
         protected string FixedStatementTestCode => @"

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

@@ -1012,16 +1012,21 @@ private void AnalyzeCheckedStatement(CheckedStatementSyntax node)
 
             private void AnalyzeDoStatement(DoStatementSyntax node)
             {
+                ImmutableArray<SyntaxToken> tokens;
+
                 if (node.Statement.IsKind(SyntaxKind.Block))
                 {
                     BlockSyntax block = (BlockSyntax)node.Statement;
-                    var tokens = ImmutableArray.Create(GetFirstTokenForAnalysis(node), block.OpenBraceToken, block.CloseBraceToken, node.WhileKeyword);
-                    CheckTokens(this.context, this.compilation, this.settings, this.IndentationLevel - 1, tokens);
+                    tokens = ImmutableArray.Create(GetFirstTokenForAnalysis(node), block.OpenBraceToken, block.CloseBraceToken, node.WhileKeyword);
                 }
                 else
                 {
+                    tokens = ImmutableArray.Create(GetFirstTokenForAnalysis(node), node.WhileKeyword);
+
                     CheckElements(this.context, this.compilation, this.settings, this.IndentationLevel, ImmutableList.Create(node.Statement));
                 }
+
+                CheckTokens(this.context, this.compilation, this.settings, this.IndentationLevel - 1, tokens);
             }
 
             private void AnalyzeFixedStatement(FixedStatementSyntax node)