Maintaining surrounding parentheses in multiple-clause conditional statement tests

Author: SteveWilkes

ReadableExpressions.UnitTests/WhenTranslatingConditionals.cs

@@ -95,6 +95,27 @@ public void ShouldTranslateAMultipleLineIfStatement()
             Assert.AreEqual(EXPECTED.TrimStart(), translated);
         }
 
+        [TestMethod]
+        public void ShouldTranslateAMultipleClauseIfStatement()
+        {
+            var intVariable = Expression.Variable(typeof(int), "i");
+            var one = Expression.Constant(1);
+            var intVariableLessThanOne = Expression.LessThan(intVariable, one);
+            var intVariableMoreThanOne = Expression.GreaterThan(intVariable, one);
+            var intVariableInRange = Expression.AndAlso(intVariableLessThanOne, intVariableMoreThanOne);
+            Expression<Action> writeHello = () => Console.WriteLine("Hello");
+            var ifLessThanOneThenWrite = Expression.IfThen(intVariableInRange, writeHello.Body);
+
+            var translated = ifLessThanOneThenWrite.ToReadableString();
+
+            const string EXPECTED = @"
+if ((i < 1) && (i > 1))
+{
+    Console.WriteLine(""Hello"");
+}";
+            Assert.AreEqual(EXPECTED.TrimStart(), translated);
+        }
+
         [TestMethod]
         public void ShouldTranslateAMultipleLineIfStatementTest()
         {

ReadableExpressions/Translators/Formatting/FormattedCondition.cs

@@ -23,11 +23,17 @@ public FormattedCondition(
                 test = test.Indented().TrimStart();
             }
 
-            _singleLineTest = test.WithSurroundingParentheses(checkExisting: true);
+            _singleLineTest = test.WithSurroundingParentheses(CheckExistingParentheses());
 
             MultipleLineTranslationFactory = GetMultipleLineTranslation;
         }
 
+        private bool CheckExistingParentheses()
+        {
+            // ReSharper disable once UnusedVariable
+            return IsNotRelevantBinary(_condition, out BinaryExpression binary);
+        }
+
         protected override Func<string> SingleLineTranslationFactory => () => _singleLineTest;
 
         protected override Func<string> MultipleLineTranslationFactory { get; }