Leaving blank lines after multiline statements in a block

Author: SteveWilkes

ReadableExpressions.UnitTests/WhenFormattingCode.cs

@@ -218,6 +218,7 @@ public void ShouldNotVarAssignAnOuterBlockDeclaredVariable()
     Console.WriteLine(name);
     Console.WriteLine(name);
 };
+
 name = ""Alice"";
 writeNameTwice.Invoke();";
 
@@ -498,6 +499,35 @@ public void ShouldTranslateNullToNull()
 
             Assert.IsNull(translated);
         }
+
+        [TestMethod]
+        public void ShouldLeaveABlankLineAfterAMultipleLineExpression()
+        {
+            Expression<Func<List<int>, IEnumerable<int>>> longCallChain = list => list
+                .Select(i => i * 2)
+                .Select(i => i * 3)
+                .Select(i => i * 4)
+                .ToArray();
+
+            var longChainblock = Expression.Block(longCallChain.Body, longCallChain.Body);
+
+            const string EXPECTED = @"
+list
+    .Select(i => i * 2)
+    .Select(i => i * 3)
+    .Select(i => i * 4)
+    .ToArray();
+
+return list
+    .Select(i => i * 2)
+    .Select(i => i * 3)
+    .Select(i => i * 4)
+    .ToArray();";
+
+            var translated = longChainblock.ToReadableString();
+
+            Assert.AreEqual(EXPECTED.TrimStart(), translated);
+        }
     }
 
     #region Helper Classes

ReadableExpressions/StringExtensions.cs

@@ -24,9 +24,9 @@ public static string Unterminated(this string codeLine)
 
         private static readonly string[] _newLines = { Environment.NewLine };
 
-        public static string[] SplitToLines(this string line)
+        public static string[] SplitToLines(this string line, StringSplitOptions splitOptions = StringSplitOptions.None)
         {
-            return line.Split(_newLines, StringSplitOptions.None);
+            return line.Split(_newLines, splitOptions);
         }
 
         private const string IndentSpaces = "    ";

ReadableExpressions/Translators/BlockExpressionTranslator.cs

@@ -136,7 +136,20 @@ private static IEnumerable<string> ProcessBlockContents(IList<string> lines, Blo
 
         private static bool LeaveBlankLineAfter(string line, string nextLine)
         {
-            return line.EndsWith('}') && !(string.IsNullOrEmpty(nextLine) || nextLine.StartsWithNewLine());
+            return (line.EndsWith('}') || IsMultiLineStatement(line)) &&
+                !(string.IsNullOrEmpty(nextLine) || nextLine.StartsWithNewLine());
+        }
+
+        private static bool IsMultiLineStatement(string line)
+        {
+            if (!line.Contains(Environment.NewLine))
+            {
+                return false;
+            }
+
+            return line
+                .SplitToLines(StringSplitOptions.RemoveEmptyEntries)
+                .Any(l => !l.IsTerminated());
         }
 
         private static bool IncludeReturnStatement(BlockExpression block, ICollection<string> lines)