yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slight optimisation in ExtensionMethodFinder. Previous commits fixed #30346

Browse Source
This commit is contained in:
agrath@gmail.com
2011-07-21 11:42:34 -12:00
parent 1a0c9c3e9f
commit 6dcf1fcd8e
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
umbraco.MacroEngines.Juno/RazorDynamicNode/ExtensionMethodFinder.cs
View File

@@ -125,26 +125,30 @@ namespace umbraco.MacroEngines
return null;
}
MethodInfo methodToExecute = null;
//Given the args, lets get the types and compare the type sequence to try and find the correct overload
var argTypes = args.ToList().ConvertAll(o =>
if (methods.Count > 1)
{
Expression oe = (o as Expression);
if (oe != null)
//Given the args, lets get the types and compare the type sequence to try and find the correct overload
var argTypes = args.ToList().ConvertAll(o =>
{
return oe.Type.FullName;
Expression oe = (o as Expression);
if (oe != null)
{
return oe.Type.FullName;
}
return o.GetType().FullName;
});
var methodsWithArgTypes = methods.ConvertAll(method => new { method = method, types = method.GetParameters().ToList().ConvertAll(pi => pi.ParameterType.FullName) });
var firstMatchingOverload = methodsWithArgTypes.FirstOrDefault(m =>
{
return m.types.SequenceEqual(argTypes);
});
if (firstMatchingOverload != null)
{
methodToExecute = firstMatchingOverload.method;
}
return o.GetType().FullName;
});
var methodsWithArgTypes = methods.ConvertAll(method => new { method = method, types = method.GetParameters().ToList().ConvertAll(pi => pi.ParameterType.FullName) });
var firstMatchingOverload = methodsWithArgTypes.FirstOrDefault(m =>
{
return m.types.SequenceEqual(argTypes);
});
if (firstMatchingOverload != null)
{
methodToExecute = firstMatchingOverload.method;
}
else
if (methodToExecute == null)
{
MethodInfo firstMethod = methods.FirstOrDefault();
// NH: this is to ensure that it's always the correct one being chosen when using the LINQ extension methods