caleb-brown/Alchemy
1
0
Fork 0
mirror of https://github.com/AnnulusGames/Alchemy.git synced 2025-01-22 08:18:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25 from AnnulusGames/fix-multiple-field

Browse Source 
Fix: fields hiding the inherited members of Component are displayed multiple times
This commit is contained in:
Annulus Games 2024-02-17 14:38:36 +09:00 committed by GitHub
commit d56f989028
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Alchemy/Assets/Alchemy/Editor/Internal/InspectorHelper.cs
View File

@ -211,18 +211,21 @@ namespace Alchemy.Editor
break;
case FieldInfo:
case PropertyInfo:
var property = findPropertyFunc?.Invoke(memberInfo.Name);
// Create property field
if (property != null)
if (memberInfo.IsPublic() || memberInfo.HasCustomAttribute<SerializeField>())
{
if (memberInfo is FieldInfo fieldInfo)
var property = findPropertyFunc?.Invoke(memberInfo.Name);
// Create property field
if (property != null)
{
return new AlchemyPropertyField(property, fieldInfo.FieldType, depth);
}
else
{
return new AlchemyPropertyField(property, ((PropertyInfo)memberInfo).PropertyType, depth);
if (memberInfo is FieldInfo fieldInfo)
{
return new AlchemyPropertyField(property, fieldInfo.FieldType, depth);
}
else
{
return new AlchemyPropertyField(property, ((PropertyInfo)memberInfo).PropertyType, depth);
}
}
}

11
Alchemy/Assets/Alchemy/Editor/Internal/MemberInfoExtensions.cs
View File

@ -15,5 +15,16 @@ namespace Alchemy.Editor
result = memberInfo.GetCustomAttribute<T>();
return result != null;
}
public static bool IsPublic(this MemberInfo memberInfo)
{
switch (memberInfo)
{
case MethodInfo methodInfo: return methodInfo.IsPublic;
case FieldInfo fieldInfo: return fieldInfo.IsPublic;
case PropertyInfo propertyInfo: return propertyInfo.GetMethod != null && propertyInfo.GetMethod.IsPublic && propertyInfo.SetMethod != null && propertyInfo.SetMethod.IsPublic;
default: throw new NotSupportedException();
}
}
}
}

68
Alchemy/Assets/Alchemy/Editor/Internal/ReflectionHelper.cs
View File

@ -134,24 +134,9 @@ namespace Alchemy.Editor
}
}
class FieldInfoEqualityComparer : IEqualityComparer<FieldInfo>
{
public static readonly FieldInfoEqualityComparer Instance = new();
public bool Equals(FieldInfo x, FieldInfo y)
{
return x.Name == y.Name && x.DeclaringType == y.DeclaringType;
}
public int GetHashCode(FieldInfo obj)
{
return HashCode.Combine(obj.Name, obj.DeclaringType);
}
}
public static IEnumerable<FieldInfo> GetAllFieldsIncludingBaseNonPublic(Type type, BindingFlags bindingAttr = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
{
return EnumerateTypeHierarchy(type).Reverse().SelectMany(t => t.GetFields(bindingAttr)).Distinct(FieldInfoEqualityComparer.Instance);
return EnumerateTypeHierarchy(type).Reverse().SelectMany(t => t.GetFields(bindingAttr | BindingFlags.DeclaredOnly));
}
public static PropertyInfo GetProperty(Type type, string name, BindingFlags bindingAttr = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static, bool includingBaseNonPublic = false)
@ -171,24 +156,9 @@ namespace Alchemy.Editor
return info;
}
class PropertyInfoEqualityComparer : IEqualityComparer<PropertyInfo>
{
public static readonly PropertyInfoEqualityComparer Instance = new();
public bool Equals(PropertyInfo x, PropertyInfo y)
{
return x.Name == y.Name && x.DeclaringType == y.DeclaringType;
}
public int GetHashCode(PropertyInfo obj)
{
return HashCode.Combine(obj.Name, obj.DeclaringType);
}
}
public static IEnumerable<PropertyInfo> GetAllPropertiesIncludingBaseNonPublic(Type type, BindingFlags bindingAttr = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
{
return EnumerateTypeHierarchy(type).Reverse().SelectMany(t => t.GetProperties(bindingAttr)).Distinct(PropertyInfoEqualityComparer.Instance);
return EnumerateTypeHierarchy(type).Reverse().SelectMany(t => t.GetProperties(bindingAttr | BindingFlags.DeclaredOnly));
}
public static MethodInfo GetMethod(Type type, string name, BindingFlags bindingAttr = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static, bool includingBaseNonPublic = false)
@ -208,24 +178,9 @@ namespace Alchemy.Editor
return info;
}
class MethodInfoEqualityComparer : IEqualityComparer<MethodInfo>
{
public static readonly MethodInfoEqualityComparer Instance = new();
public bool Equals(MethodInfo x, MethodInfo y)
{
return x.Name == y.Name && x.DeclaringType == y.DeclaringType;
}
public int GetHashCode(MethodInfo obj)
{
return HashCode.Combine(obj.Name, obj.DeclaringType);
}
}
public static IEnumerable<MethodInfo> GetAllMethodsIncludingBaseNonPublic(Type type, BindingFlags bindingAttr = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
{
return EnumerateTypeHierarchy(type).Reverse().SelectMany(t => t.GetMethods(bindingAttr)).Distinct(MethodInfoEqualityComparer.Instance);
return EnumerateTypeHierarchy(type).Reverse().SelectMany(t => t.GetMethods(bindingAttr | BindingFlags.DeclaredOnly));
}
public static object GetValue(object target, string name, BindingFlags bindingAttr = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static, bool allowProperty = true, bool allowMethod = true)
@ -298,24 +253,9 @@ namespace Alchemy.Editor
}
}
class MemberInfoEqualityComparer : IEqualityComparer<MemberInfo>
{
public static readonly MemberInfoEqualityComparer Instance = new();
public bool Equals(MemberInfo x, MemberInfo y)
{
return x.Name == y.Name && x.DeclaringType == y.DeclaringType;
}
public int GetHashCode(MemberInfo obj)
{
return HashCode.Combine(obj.Name, obj.DeclaringType);
}
}
public static IEnumerable<MemberInfo> GetMembersIncludingBaseNonPublic(Type type, BindingFlags bindingAttr = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
{
return EnumerateTypeHierarchy(type).Reverse().SelectMany(t => t.GetMembers(bindingAttr)).Distinct(MemberInfoEqualityComparer.Instance);
return EnumerateTypeHierarchy(type).Reverse().SelectMany(t => t.GetMembers(bindingAttr | BindingFlags.DeclaredOnly));
}
public static object Invoke(object target, string name, params object[] parameters)