Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Src/Enums.NET.Test/EnumsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,11 @@ public void AsString_ReturnsValidResult_WhenUsingValidEnumFormat()
AssertTryFormat(DisplayAttributeEnum.Left, "Izquierda", EnumFormat.DisplayName);
AssertTryFormat(DisplayAttributeEnum.Right, "Derecho", EnumFormat.DisplayName);

AssertTryFormat(CardinalDirection.North, "N", EnumFormat.DisplayDescription);
AssertTryFormat(CardinalDirection.South, "S", EnumFormat.DisplayDescription);
AssertTryFormat(CardinalDirection.East, "E", EnumFormat.DisplayDescription);
AssertTryFormat(CardinalDirection.West, "W", EnumFormat.DisplayDescription);

AssertTryFormat(ToObject<CharEnum>('a'), "a", EnumFormat.UnderlyingValue);
AssertTryFormat(ToObject<CharEnum>('a'), ((ushort)'a').ToString(), EnumFormat.DecimalValue);
AssertTryFormat(ToObject<CharEnum>('a'), ((ushort)'a').ToString("X4"), EnumFormat.HexadecimalValue);
Expand Down
15 changes: 15 additions & 0 deletions Src/Enums.NET.TestEnums/CardinalDirection.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using System.ComponentModel.DataAnnotations;

namespace EnumsNET.Tests.TestEnums;

public enum CardinalDirection
{
[Display(Description = "N")]
North,
[Display(Description = "S")]
South,
[Display(Description = "E")]
East,
[Display(Description = "W")]
West
}
5 changes: 5 additions & 0 deletions Src/Enums.NET/EnumCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,7 @@ public string AsString(TUnderlying value)
EnumFormat.Description => GetMember(value)?.Attributes.Get<DescriptionAttribute>()?.Description,
EnumFormat.EnumMemberValue => GetMember(value)?.Attributes.Get<EnumMemberAttribute>()?.Value,
EnumFormat.DisplayName => GetMember(value)?.Attributes.Get<DisplayAttribute>()?.GetName(),
EnumFormat.DisplayDescription => GetMember(value)?.Attributes.Get<DisplayAttribute>()?.GetDescription(),
_ => Enums.CustomEnumMemberFormat(GetMember(value)?.EnumMember, format.Validate(nameof(format)))
};

Expand Down Expand Up @@ -762,6 +763,7 @@ internal string AsStringInternal(TUnderlying value, EnumMemberInternal<TUnderlyi
EnumFormat.Description => TryInitializeMember(value, ref isInitialized, ref member)?.Attributes.Get<DescriptionAttribute>()?.Description,
EnumFormat.EnumMemberValue => TryInitializeMember(value, ref isInitialized, ref member)?.Attributes.Get<EnumMemberAttribute>()?.Value,
EnumFormat.DisplayName => TryInitializeMember(value, ref isInitialized, ref member)?.Attributes.Get<DisplayAttribute>()?.GetName(),
EnumFormat.DisplayDescription => TryInitializeMember(value, ref isInitialized, ref member)?.Attributes.Get<DisplayAttribute>()?.GetDescription(),
_ => Enums.CustomEnumMemberFormat(TryInitializeMember(value, ref isInitialized, ref member)?.EnumMember, format.Validate(nameof(format)))
};

Expand Down Expand Up @@ -868,6 +870,9 @@ internal bool TryFormatInternal(TUnderlying value, EnumMemberInternal<TUnderlyin
case EnumFormat.DisplayName:
var displayName = TryInitializeMember(value, ref isInitialized, ref member)?.Attributes.Get<DisplayAttribute>()?.GetName();
return TryWriteStringToSpan(displayName, destination, out charsWritten);
case EnumFormat.DisplayDescription:
var displayDescription = TryInitializeMember(value, ref isInitialized, ref member)?.Attributes.Get<DisplayAttribute>()?.GetDescription();
return TryWriteStringToSpan(displayDescription, destination, out charsWritten);
default:
var v = Enums.CustomEnumMemberFormat(TryInitializeMember(value, ref isInitialized, ref member)?.EnumMember, format.Validate(nameof(format)));
return TryWriteStringToSpan(v, destination, out charsWritten);
Expand Down
6 changes: 5 additions & 1 deletion Src/Enums.NET/EnumFormat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ public enum EnumFormat
/// <summary>
/// Enum is represented by its <see cref="DisplayAttribute.Name"/>.
/// </summary>
DisplayName = 6
DisplayName = 6,
/// <summary>
/// Enum is represented by its <see cref="DisplayAttribute.Description"/>.
/// </summary>
DisplayDescription = 7
}

[AttributeUsage(AttributeTargets.Enum)]
Expand Down
2 changes: 1 addition & 1 deletion Src/Enums.NET/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ internal static ValueCollection<EnumFormat> NameFormat
}

#region Custom EnumFormat
private const int s_startingCustomEnumFormatValue = (int)EnumFormat.DisplayName + 1;
private const int s_startingCustomEnumFormatValue = (int)EnumFormat.DisplayDescription + 1;

private static Func<EnumMember, string?>[] s_customEnumMemberFormatters = [];

Expand Down