Parse in operator before and/or (#524)

Author: igitur

src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs

@@ -283,7 +283,7 @@ Expression ParseAndOperator()
             {
                 Token op = _textParser.CurrentToken;
                 _textParser.NextToken();
-                Expression right = ParseComparisonOperator();
+                Expression right = ParseIn();
                 CheckAndPromoteOperands(typeof(ILogicalSignatures), op.Id, op.Text, ref left, ref right, op.Pos);
                 left = Expression.AndAlso(left, right);
             }

test/System.Linq.Dynamic.Core.Tests/EntitiesTests.In.cs

@@ -0,0 +1,34 @@
+#if EFCORE
+using Microsoft.EntityFrameworkCore;
+#else
+
+using System.Data.Entity;
+
+#endif
+
+using Xunit;
+
+namespace System.Linq.Dynamic.Core.Tests
+{
+    public partial class EntitiesTests : IDisposable
+    {
+        /// <summary>
+        /// Test for https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/524
+        /// </summary>
+        [Fact]
+        public void Entities_Where_In_And()
+        {
+            // Arrange
+            PopulateTestData();
+
+            var expected = _context.Blogs.Include(b => b.Posts).Where(b => new[] { 1, 3, 5 }.Contains(b.BlogId) && new [] { "Blog3", "Blog4" }.Contains(b.Name)).ToArray();
+
+            // Act
+            var test = _context.Blogs.Include(b => b.Posts).Where(@"BlogId in (1, 3, 5) and Name in (""Blog3"", ""Blog4"")").ToArray();
+
+            // Assert
+            Assert.NotEmpty(test);
+            Assert.Equal(expected, test);
+        }
+    }
+}

test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionParserTests.cs

@@ -93,6 +93,20 @@ public void Parse_ParseAndOperator(string expression, string result)
             Check.That(parsedExpression).Equals(result);
         }
 
+        [Fact]
+        public void Parse_ParseMultipleInOperators()
+        {
+            // Arrange
+            ParameterExpression[] parameters = { ParameterExpressionHelper.CreateParameterExpression(typeof(Company), "x") };
+            var sut = new ExpressionParser(parameters, "MainCompanyId in (1, 2) and Name in (\"A\", \"B\")", null, null);
+
+            // Act
+            var parsedExpression = sut.Parse(null).ToString();
+
+            // Assert
+            Check.That(parsedExpression).Equals("(((x.MainCompanyId == 1) OrElse (x.MainCompanyId == 2)) AndAlso ((x.Name == \"A\") OrElse (x.Name == \"B\")))");
+        }
+
         [Theory]
         [InlineData("string(\"\")", "")]
         [InlineData("string(\"a\")", "a")]