Add support for generic methods, improved non-generic dictionary output

This commit is contained in:
sinaioutlander
2020-09-18 18:03:17 +10:00
parent db91968519
commit b154cbf39d
6 changed files with 149 additions and 25 deletions

View File

@ -13,18 +13,34 @@ namespace Explorer
{
private CacheObjectBase m_cachedReturnValue;
public override bool HasParameters => base.HasParameters || GenericArgs.Length > 0;
public Type[] GenericArgs { get; private set; }
public Type[] GenericConstraints { get; private set; }
public string[] GenericArgInput = new string[0];
public static bool CanEvaluate(MethodInfo mi)
{
// TODO generic args
if (mi.GetGenericArguments().Length > 0)
{
return false;
}
// primitive and string args supported
return CanProcessArgs(mi.GetParameters());
}
public override void Init()
{
var mi = (MemInfo as MethodInfo);
GenericArgs = mi.GetGenericArguments();
GenericConstraints = GenericArgs.Select(x => x.GetGenericParameterConstraints()
.FirstOrDefault())
.ToArray();
GenericArgInput = new string[GenericArgs.Length];
ValueType = mi.ReturnType;
ValueTypeName = ValueType.FullName;
}
public override void UpdateValue()
{
//base.UpdateValue();
@ -37,6 +53,45 @@ namespace Explorer
var mi = MemInfo as MethodInfo;
object ret = null;
// Parse generic arguments
if (GenericArgs.Length > 0)
{
var list = new List<Type>();
for (int i = 0; i < GenericArgs.Length; i++)
{
var input = GenericArgInput[i];
if (ReflectionHelpers.GetTypeByName(input) is Type t)
{
if (GenericConstraints[i] == null)
{
list.Add(t);
}
else
{
if (GenericConstraints[i].IsAssignableFrom(t))
{
list.Add(t);
}
else
{
MelonLogger.Log($"Generic argument #{i} '{input}', is not assignable from the generic constraint!");
return;
}
}
}
else
{
MelonLogger.Log($"Generic argument #{i}, could not get any type by the name of '{input}'!" +
$" Make sure you use the full name, including the NameSpace.");
return;
}
}
// make into a generic with type list
mi = mi.MakeGenericMethod(list.ToArray());
}
// Parse arguments
if (!HasParameters)
{
ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, new object[0]);