Fix indentation of 'else if'

DotNetAnalyzers · Jan 11, 2016 · 929a9d1 · 929a9d1
1 parent 8a9a731
commit 929a9d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1138UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1138UnitTests.cs
@@ -888,22 +888,22 @@ void MethodName()
         }
         else if (2 == 3)
         {
-                int y = 3 + 2;
+            int y = 3 + 2;
         }
         else
         {
-                int y = 3 + 2;
+            int y = 3 + 2;
         }
 
         if (1 == 2)
             return;
         else if (2 == 3)
         {
-                int y = 3 + 2;
+            int y = 3 + 2;
         }
         else
         {
-                int y = 3 + 2;
+            int y = 3 + 2;
         }
 
         if (1 == 2)
@@ -914,7 +914,7 @@ void MethodName()
             return;
         else
         {
-                int y = 3 + 2;
+            int y = 3 + 2;
         }
 
         if (1 == 2)
@@ -923,7 +923,7 @@ void MethodName()
         }
         else if (2 == 3)
         {
-                int y = 3 + 2;
+            int y = 3 + 2;
         }
         else
             return;

diff --git a/...alyzers/StyleCop.Analyzers/ReadabilityRules/SA1137ElementsShouldHaveTheSameIndentation.cs b/...alyzers/StyleCop.Analyzers/ReadabilityRules/SA1137ElementsShouldHaveTheSameIndentation.cs
@@ -778,7 +778,8 @@ public override void VisitForStatement(ForStatementSyntax node)
 
             public override void VisitIfStatement(IfStatementSyntax node)
             {
-                using (this.AdjustIndentation(1))
+                int adjustment = node.Parent.IsKind(SyntaxKind.ElseClause) ? 0 : 1;
+                using (this.AdjustIndentation(adjustment))
                 {
                     this.AnalyzeIfStatement(node);
                     base.VisitIfStatement(node);