Fixing double blank line between object inits and if statements

Author: SteveWilkes

ReadableExpressions.UnitTests/WhenFormattingCode.cs

@@ -776,6 +776,47 @@ public void ShouldNotLeaveDoubleBlankLinesBetweenIfStatements()
 {
 }
 
+if (i == 1)
+{
+}";
+
+            var translated = block.ToReadableString();
+
+            Assert.AreEqual(EXPECTED.TrimStart(), translated);
+        }
+
+        [TestMethod]
+        public void ShouldNotLeaveDoubleBlankLinesBetweenInitAndIfStatements()
+        {
+            Expression<Action> writeWat = () => Console.WriteLine("Wat");
+            Expression<Func<long>> read = () => Console.Read();
+
+            var newMemoryStream = Expression.New(typeof(MemoryStream));
+            var positionProperty = newMemoryStream.Type.GetProperty("Position");
+            var valueBlock = Expression.Block(writeWat.Body, read.Body);
+            // ReSharper disable once AssignNullToNotNullAttribute
+            var positionInit = Expression.Bind(positionProperty, valueBlock);
+            var memoryStreamInit = Expression.MemberInit(newMemoryStream, positionInit);
+
+            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(memoryStreamInit, ifIntEqualsOneDoNothing);
+
+            const string EXPECTED = @"
+new MemoryStream
+{
+    Position = 
+    {
+        Console.WriteLine(""Wat"");
+
+        return ((long)Console.Read());
+    }
+};
+
 if (i == 1)
 {
 }";

ReadableExpressions/Translators/BlockExpressionTranslator.cs

@@ -169,6 +169,7 @@ private static bool StatementIsTerminated(string translation, Expression express
                     return true;
 
                 case ExpressionType.Assign:
+                case ExpressionType.MemberInit:
                     return false;
             }
 
@@ -200,13 +201,13 @@ private static bool UseFullTypeName(BinaryExpression assignment)
 
         private static bool LeaveBlankLineBefore(string line, string previousLine = null)
         {
-            if ((previousLine != null) && LeaveBlankLineBefore(previousLine))
+            if ((previousLine != null) && LeaveBlankLineAfter(previousLine, line))
             {
                 return false;
             }
 
             return line.StartsWith("if (", StringComparison.Ordinal) ||
-                line.StartsWith("switch ", StringComparison.Ordinal);
+                   line.StartsWith("switch ", StringComparison.Ordinal);
         }
 
         private static bool LeaveBlankLineAfter(string line, string nextLine)