Fixing dynamic parameterised method call translation

Author: SteveWilkes

ReadableExpressions/Translators/BclMethodInfoWrapper.cs

@@ -27,19 +27,16 @@ public BclMethodInfoWrapper(MethodInfo method, Type[] genericArguments = null)
 
         public MethodInfo GetGenericMethodDefinition() => _method.GetGenericMethodDefinition();
 
-        public IEnumerable<Type> GetGenericArguments() => GetGenericArgumentsArray();
-
-        private Type[] GetGenericArgumentsArray() =>
+        public IEnumerable<Type> GetGenericArguments() =>
             (_genericArguments ?? (_genericArguments = _method.GetGenericArguments()));
 
         public IEnumerable<ParameterInfo> GetParameters() => _method.GetParameters();
 
         public Type GetGenericArgumentFor(Type parameterType)
         {
-            var genericArguments = GetGenericArgumentsArray();
-            var parameterIndex = Array.IndexOf(genericArguments, parameterType, 0);
+            var parameterIndex = Array.IndexOf(_method.GetGenericArguments(), parameterType, 0);
 
-            return genericArguments[parameterIndex];
+            return _genericArguments[parameterIndex];
         }
     }
 }

ReadableExpressions/Translators/Formatting/ParameterSet.cs

@@ -138,7 +138,8 @@ private static bool IsNotFuncType(ParameterInfo parameter, IMethodInfo method)
                 parameterType = method.GetGenericArgumentFor(parameter.ParameterType);
             }
 
-            return !(parameterType.FullName.StartsWith("System.Action", StringComparison.Ordinal) ||
+            return 
+              !(parameterType.FullName.StartsWith("System.Action", StringComparison.Ordinal) ||
                 parameterType.FullName.StartsWith("System.Func", StringComparison.Ordinal)) ||
                 // ReSharper disable once PossibleUnintendedReferenceComparison
                 (parameter.ParameterType.GetAssembly() != typeof(Action).GetAssembly());