Ensuring only single blank lines are left between if or switch blocks

Author: SteveWilkes

ReadableExpressions.UnitTests/WhenFormattingCode.cs

@@ -735,6 +735,36 @@ public void ShouldLeaveABlankLineBeforeAnIfStatement()
             Assert.AreEqual(EXPECTED.TrimStart(), translated);
         }
 
+        [TestMethod]
+        public void ShouldNotLeaveDoubleBlankLinesBetweenIfStatements()
+        {
+            var intVariable = Expression.Variable(typeof(int), "i");
+            var one = Expression.Constant(1);
+            var intVariableEqualsOne = Expression.Equal(intVariable, one);
+            var doNothing = Expression.Default(typeof(void));
+            var ifIntEqualsOneDoNothing = Expression.IfThen(intVariableEqualsOne, doNothing);
+
+            var block = Expression.Block(
+                new[] { intVariable },
+                ifIntEqualsOneDoNothing,
+                ifIntEqualsOneDoNothing);
+
+            const string EXPECTED = @"
+int i;
+
+if (i == 1)
+{
+}
+
+if (i == 1)
+{
+}";
+
+            var translated = block.ToReadableString();
+
+            Assert.AreEqual(EXPECTED.TrimStart(), translated);
+        }
+
         [TestMethod]
         public void ShouldTranslateMultilineBlockSingleMethodArguments()
         {

ReadableExpressions/Translators/BlockExpressionTranslator.cs

@@ -69,7 +69,7 @@ private static IEnumerable<string> GetBlockStatements(
             {
                 var line = lines[i];
 
-                if ((i > 0) && LeaveBlankLineBefore(line))
+                if ((i > 0) && LeaveBlankLineBefore(line, lines[i - 1]))
                 {
                     yield return string.Empty;
                 }
@@ -191,8 +191,13 @@ private static bool UseFullTypeName(BinaryExpression assignment)
             return conditional.IfTrue.Type != conditional.IfFalse.Type;
         }
 
-        private static bool LeaveBlankLineBefore(string line)
+        private static bool LeaveBlankLineBefore(string line, string previousLine = null)
         {
+            if ((previousLine != null) && LeaveBlankLineBefore(previousLine))
+            {
+                return false;
+            }
+
             return line.StartsWith("if (") || line.StartsWith("switch ");
         }