Fixing double-indenting of multi-line if statement tests

Author: SteveWilkes

ReadableExpressions.UnitTests/WhenFormattingCode.cs

@@ -5,8 +5,8 @@
     using System.IO;
     using System.Linq;
     using System.Linq.Expressions;
-    using System.Reflection;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using NetStandardPolyfills;
 
     [TestClass]
     public class WhenFormattingCode
@@ -37,7 +37,7 @@ public void ShouldSplitLongConstructorArgumentListsOntoMultipleLines()
         public void ShouldSplitMultipleArgumentListsOntoMultipleLines()
         {
             var intsMethod = typeof(HelperClass)
-                .GetMethod("GiveMeFourInts", BindingFlags.Public | BindingFlags.Instance);
+                .GetPublicInstanceMethod("GiveMeFourInts");
 
             var helperVariable = Expression.Variable(typeof(HelperClass), "helper");
             var intVariable = Expression.Variable(typeof(int), "intVariable");
@@ -66,7 +66,7 @@ public void ShouldSplitMultipleArgumentListsOntoMultipleLines()
         public void ShouldSplitLongArgumentListsOntoMultipleLines()
         {
             var intsMethod = typeof(HelperClass)
-                .GetMethod("GiveMeSomeInts", BindingFlags.Public | BindingFlags.Instance);
+                .GetPublicInstanceMethod("GiveMeSomeInts");
 
             var helperVariable = Expression.Variable(typeof(HelperClass), "helper");
             var longVariable = Expression.Variable(typeof(int), "thisVariableReallyHasAVeryLongNameIndeed");
@@ -480,6 +480,34 @@ public void ShouldNotIndentParamsArrayArguments()
             Assert.AreEqual(EXPECTED.TrimStart(), translated);
         }
 
+        [TestMethod]
+        public void ShouldIndentParamsArrayArgumentsInAnIfTest()
+        {
+            Expression<Func<bool>> stringTest = () =>
+                string.Join(",", "[", "i", "]", "[", "j", "]", "[", "k", "]") != string.Empty;
+
+            var doNothing = Expression.Default(typeof(void));
+            var ifTestDoNothing = Expression.IfThen(stringTest.Body, doNothing);
+
+            const string EXPECTED = @"
+if (string.Join(
+    "","",
+    ""["",
+    ""i"",
+    ""]"",
+    ""["",
+    ""j"",
+    ""]"",
+    ""["",
+    ""k"",
+    ""]"") != string.Empty)
+{
+}";
+            var translated = ifTestDoNothing.ToReadableString();
+
+            Assert.AreEqual(EXPECTED.TrimStart(), translated);
+        }
+
         [TestMethod]
         public void ShouldTranslateAnExtensionExpressionType()
         {

ReadableExpressions.UnitTests/WhenTranslatingConditionals.cs

@@ -3,6 +3,7 @@
     using System;
     using System.Linq.Expressions;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using NetStandardPolyfills;
 
     [TestClass]
     public class WhenTranslatingConditionals
@@ -276,7 +277,7 @@ public void ShouldNotWrapSingleExpressionTernaryConditionsInParentheses()
         [TestMethod]
         public void ShouldNotWrapMethodCallTernaryConditionsInParentheses()
         {
-            var method = typeof(MethodCallHelper).GetMethod("MultipleParameterMethod");
+            var method = typeof(MethodCallHelper).GetPublicInstanceMethod("MultipleParameterMethod");
 
             var methodCall = Expression.Call(
                 Expression.Variable(typeof(MethodCallHelper), "helper"),

ReadableExpressions/Translators/ConditionalExpressionTranslator.cs

@@ -42,9 +42,7 @@ public override string Translate(Expression expression, TranslationContext conte
         }
 
         private static string GetTest(ConditionalExpression conditional, TranslationContext context)
-        {
-            return new FormattedCondition(conditional.Test, context);
-        }
+            => new FormattedCondition(conditional.Test, context);
 
         private static bool HasNoElseCondition(ConditionalExpression conditional)
         {

ReadableExpressions/Translators/Formatting/FormattedCondition.cs

@@ -20,7 +20,12 @@ public FormattedCondition(
 
             if (test.IsMultiLine())
             {
-                test = test.Indented().TrimStart();
+                if (test.StartsWith(Environment.NewLine + '{'))
+                {
+                    test = test.Indented();
+                }
+
+                test = test.TrimStart();
             }
 
             _singleLineTest = test.WithSurroundingParentheses(CheckExistingParentheses());