remove extra expression from enum humanize (#1402)

Humanizr · Feb 17, 2024 · 36e603c · 36e603c
1 parent c693000
commit 36e603c
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/src/Humanizer/EnumHumanizeExtensions.cs b/src/Humanizer/EnumHumanizeExtensions.cs
@@ -19,23 +19,20 @@ public static string Humanize(this Enum input)
             {
                 return Enum.GetValues(type)
                            .Cast<Enum>()
-                           .Where(e => e.CompareTo(Convert.ChangeType(Enum.ToObject(type, 0), type)) != 0)
-                           .Where(input.HasFlag)
-                           .Select(e => e.Humanize())
+                           .Where(_ =>  input.HasFlag(_) &&
+                                        _.CompareTo(Convert.ChangeType(Enum.ToObject(type, 0), type)) != 0)
+                           .Select(_ => _.Humanize())
                            .Humanize();
             }
 
             var caseName = input.ToString();
-            var member = type.GetTypeInfo().GetDeclaredField(caseName);
+            var member = type.GetField(caseName)!;
 
-            if (member != null)
-            {
-                var description = GetCustomDescription(member);
+            var description = GetCustomDescription(member);
 
-                if (description != null)
-                {
-                    return description;
-                }
+            if (description != null)
+            {
+                return description;
             }
 
             return caseName.Humanize();
@@ -48,9 +45,9 @@ public static string Humanize(this Enum input)
         static bool IsBitFieldEnum(Type type) =>
             type.GetCustomAttribute(typeof(FlagsAttribute)) != null;
 
-        static string GetCustomDescription(MemberInfo memberInfo)
+        static string GetCustomDescription(MemberInfo member)
         {
-            var displayAttribute = memberInfo.GetCustomAttribute<DisplayAttribute>();
+            var displayAttribute = member.GetCustomAttribute<DisplayAttribute>();
             if (displayAttribute != null)
             {
                 var description = displayAttribute.GetDescription();
@@ -62,7 +59,7 @@ static string GetCustomDescription(MemberInfo memberInfo)
                 return displayAttribute.GetName();
             }
 
-            foreach (var attr in memberInfo.GetCustomAttributes())
+            foreach (var attr in member.GetCustomAttributes())
             {
                 var attrType = attr.GetType();
                 var descriptionProperty =