Backups/UnityExplorer_Fix
1
0
Fork 0
mirror of https://github.com/GrahamKracker/UnityExplorer.git synced 2025-07-03 12:02:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix methods with multiple generic constraints

Browse Source
This commit is contained in:
sinaioutlander
2020-09-19 01:27:33 +10:00
parent c39e097378
commit ad5fc04a3b
3 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/CachedObjects/Other/CacheMethod.cs
View File

@ -14,7 +14,7 @@ namespace Explorer
public override bool HasParameters => base.HasParameters || GenericArgs.Length > 0;
public Type[] GenericArgs { get; private set; }
public Type[] GenericConstraints { get; private set; }
public Type[][] GenericConstraints { get; private set; }
public string[] GenericArgInput = new string[0];
@ -23,8 +23,7 @@ namespace Explorer
var mi = (MemInfo as MethodInfo);
GenericArgs = mi.GetGenericArguments();
GenericConstraints = GenericArgs.Select(x => x.GetGenericParameterConstraints()
.FirstOrDefault())
GenericConstraints = GenericArgs.Select(x => x.GetGenericParameterConstraints())
.ToArray();
GenericArgInput = new string[GenericArgs.Length];
@ -86,21 +85,22 @@ namespace Explorer
var input = GenericArgInput[i];
if (ReflectionHelpers.GetTypeByName(input) is Type t)
{
if (GenericConstraints[i] == null)
if (GenericConstraints[i].Length == 0)
{
list.Add(t);
}
else
{
if (GenericConstraints[i].IsAssignableFrom(t))
foreach (var constraint in GenericConstraints[i].Where(x => x != null))
{
list.Add(t);
}
else
{
MelonLogger.LogWarning($"Generic argument #{i} '{input}', is not assignable from the generic constraint!");
return null;
if (!constraint.IsAssignableFrom(t))
{
MelonLogger.LogWarning($"Generic argument #{i}, '{input}' is not assignable from the constraint '{constraint}'!");
return null;
}
}
list.Add(t);
}
}
else