Including return keyword for block-ending coalesce statements

Author: SteveWilkes

ReadableExpressions.UnitTests/WhenTranslatingBlocks.cs

@@ -339,5 +339,26 @@ public void ShouldIgnoreABlankLabelTargetLine()
 
             Assert.AreEqual(EXPECTED, translated);
         }
+
+        [TestMethod]
+        public void ShouldIncludeAReturnStatementForACoalesce()
+        {
+            var stringVariable1 = Expression.Variable(typeof(string), "myString");
+            var stringVariable2 = Expression.Variable(typeof(string), "yourString");
+            var assignStrings = Expression.Assign(stringVariable1, stringVariable2);
+
+            var stringEmpty = Expression.Field(null, typeof(string), "Empty");
+            var variableOrNull = Expression.Coalesce(stringVariable1, stringEmpty);
+
+            var coalesceBlock = Expression.Block(assignStrings, variableOrNull);
+
+            var translated = coalesceBlock.ToReadableString();
+
+            const string EXPECTED = @"
+var myString = yourString;
+return (myString ?? string.Empty);";
+
+            Assert.AreEqual(EXPECTED.TrimStart(), translated);
+        }
     }
 }

ReadableExpressions/Extensions/InternalExpressionExtensions.cs

@@ -7,8 +7,6 @@
 
     internal static class InternalExpressionExtensions
     {
-        
-
         public static bool IsReturnable(this Expression expression)
         {
             if (expression.Type == typeof(void))
@@ -27,6 +25,7 @@ public static bool IsReturnable(this Expression expression)
                 case ExpressionType.Add:
                 case ExpressionType.AddChecked:
                 case ExpressionType.Call:
+                case ExpressionType.Coalesce:
                 case ExpressionType.Conditional:
                 case ExpressionType.Convert:
                 case ExpressionType.ConvertChecked:

ReadableExpressions/Translators/BlockExpressionTranslator.cs

@@ -198,7 +198,8 @@ private static bool LeaveBlankLineBefore(string line, string previousLine = null
                 return false;
             }
 
-            return line.StartsWith("if (") || line.StartsWith("switch ");
+            return line.StartsWith("if (", StringComparison.Ordinal) ||
+                line.StartsWith("switch ", StringComparison.Ordinal);
         }
 
         private static bool LeaveBlankLineAfter(string line, string nextLine)