CSHARP-5628: Requested changes.

Author: rstam

src/MongoDB.Driver/Linq/Linq3Implementation/Misc/PartialEvaluator.cs

@@ -76,7 +76,7 @@ public override Expression Visit(Expression expression)
             protected override Expression VisitBinary(BinaryExpression node)
             {
                 var leftExpression = node.Left;
-                var rightExpression =  node.Right;
+                var rightExpression = node.Right;
 
                 if (leftExpression.Type == typeof(bool) && rightExpression.Type == typeof(bool))
                 {
@@ -138,7 +138,7 @@ protected override Expression VisitConditional(ConditionalExpression node)
                 }
 
                 var ifTrue = Visit(node.IfTrue);
-                var ifFalse =  Visit(node.IfFalse);
+                var ifFalse = Visit(node.IfFalse);
 
                 if (BothAreConstant<bool>(ifTrue, ifFalse, out var ifTrueValue, out var ifFalseValue))
                 {
@@ -155,16 +155,16 @@ protected override Expression VisitConditional(ConditionalExpression node)
                     // T ? true : Q => T || Q
                     // T ? false : Q => !T && Q
                     return ifTrueValue
-                        ? Visit(Expression.Or(test, ifFalse))
-                        : Visit(Expression.And(Expression.Not(test), ifFalse));
+                        ? Visit(Expression.OrElse(test, ifFalse))
+                        : Visit(Expression.AndAlso(Expression.Not(test), ifFalse));
                 }
                 else if (IsConstant<bool>(ifFalse, out ifFalseValue))
                 {
                     // T ? P : true => !T || P
                     // T ? P : false => T && P
                     return ifFalseValue
-                        ? Visit(Expression.Or(Expression.Not(test), ifTrue))
-                        : Visit(Expression.And(test, ifTrue));
+                        ? Visit(Expression.OrElse(Expression.Not(test), ifTrue))
+                        : Visit(Expression.AndAlso(test, ifTrue));
                 }
 
                 return node.Update(test, ifTrue, ifFalse);

tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp5628Tests.cs

@@ -129,7 +129,7 @@ public void Where_simplifications_should_work(int testCase, string expectedStage
         var collection = Fixture.Collection;
 
         // see: https://codeql.github.com/codeql-query-help/csharp/cs-simplifiable-boolean-expression/#recommendation
-        // not all simplifciations listed there are safe for a database (because of possibly missing fields or tri-valued logic)
+        // not all simplifications listed there are safe for a database (because of possibly missing fields or tri-valued logic)
         var queryable = testCase switch
         {
             1 => collection.AsQueryable().Where(x => x.P == true), // not safe