ReTry to find inherited property by BindingFlags.DeclaredOnly (#581)

Author: mpreyskurantov

net/DevExtreme.AspNet.Data.Tests/ExpressionCompilerTests.cs

@@ -33,6 +33,14 @@ public StructWithRef(object any) {
             }
         }
 
+        class TargetClassEx1 : TargetClass {
+            public int Prop { get; set; }
+        }
+
+        class TargetClassEx2 : TargetClassEx1 {
+            public new string Prop { get; set; }
+        }
+
         string CompileAccessor(bool guardNulls, string selector, Action<List<Expression>> customizeProgression = null) {
             return new SampleCompiler(guardNulls)
                 .CompileAccessorExpression(Expression.Parameter(typeof(TargetClass), "t"), selector, customizeProgression)
@@ -118,6 +126,10 @@ public void Issue142() {
             );
         }
 
+        [Fact]
+        public void Issue580() {
+            Assert.Equal(typeof(String), ExpressionCompiler.GetPropertyOrField(Expression.Parameter(typeof(TargetClassEx2)), "Prop").Type);
+        }
     }
 
 }

net/DevExtreme.AspNet.Data/ExpressionCompiler.cs

@@ -44,7 +44,7 @@ protected internal Expression CompileAccessorExpression(Expression target, strin
                 else if(DynamicBindingHelper.ShouldUseDynamicBinding(currentTarget.Type))
                     currentTarget = DynamicBindingHelper.CompileGetMember(currentTarget, clientExprItem);
                 else
-                    currentTarget = FixReflectedType(Expression.PropertyOrField(currentTarget, clientExprItem));
+                    currentTarget = FixReflectedType(GetPropertyOrField(currentTarget, clientExprItem));
 
                 progression.Add(currentTarget);
             }
@@ -113,6 +113,23 @@ static Expression ReadExpando(Expression expando, string member) {
             );
         }
 
+        internal static MemberExpression GetPropertyOrField(Expression expression, string propertyOrFieldName) {
+            MemberExpression memberExpr;
+            try {
+                memberExpr = Expression.PropertyOrField(expression, propertyOrFieldName);
+            } catch(AmbiguousMatchException) {
+                memberExpr = GetDeclaredOnlyProperty(expression, propertyOrFieldName);
+            }
+            return memberExpr;
+        }
+
+        static MemberExpression GetDeclaredOnlyProperty(Expression expression, string propertyOrFieldName) {
+            PropertyInfo pi = expression.Type.GetProperty(propertyOrFieldName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.IgnoreCase | BindingFlags.DeclaredOnly);
+            if(pi != null)
+                return Expression.Property(expression, pi);
+            throw new ArgumentException($"'{propertyOrFieldName}' is not a member of type '{expression.Type}'", nameof(propertyOrFieldName));
+        }
+
         static MemberExpression FixReflectedType(MemberExpression expr) {
             var member = expr.Member;
             var declaringType = member.DeclaringType;