MethodHasPriority: improve resolution (#210)

MethodHasPriority: use promoted parameters when the method's argument type is an inferred generic type. Fixes #203
dynamicexpresso · Dec 13, 2021 · 6e7ef1e · 6e7ef1e
1 parent dcc633f
commit 6e7ef1e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/DynamicExpresso.Core/Parsing/Parser.cs b/src/DynamicExpresso.Core/Parsing/Parser.cs
@@ -2363,11 +2363,11 @@ private static bool MethodHasPriority(Expression[] args, MethodData method, Meth
 				var methodParamType = GetParameterType(methodParam);
 				var otherMethodParamType = GetParameterType(otherMethodParam);
 
-				if (arg is InterpreterExpression)
-				{
+				if (methodParamType.ContainsGenericParameters)
 					methodParamType = method.PromotedParameters[i].Type;
+
+				if (otherMethodParamType.ContainsGenericParameters)
 					otherMethodParamType = otherMethod.PromotedParameters[i].Type;
-				}
 
 				var c = CompareConversions(arg.Type, methodParamType, otherMethodParamType);
 				if (c < 0)

diff --git a/test/DynamicExpresso.UnitTest/GithubIssues.cs b/test/DynamicExpresso.UnitTest/GithubIssues.cs
@@ -399,6 +399,18 @@ public void GitHub_Issue_191()
 		}
 
 		[Test]
+		public void GitHub_Issue_203()
+		{
+			var target = new Interpreter();
+			target.Reference(typeof(Utils));
+
+			var list = new[] { 1, 2, 3 };
+
+			var listInt = target.Eval<List<int>>("Utils.Array(list)", new Parameter("list", list));
+			Assert.AreEqual(Utils.Array(list), listInt);
+		}
+
+    [Test]
 		public void GitHub_Issue_205_Property_on_nullable()
 		{
 			var interpreter = new Interpreter();