Fixed Enum display names were not being used (#239)

shibayan · Nov 11, 2022 · 169631f · 169631f
1 parent 46d2ffc
commit 169631f
Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Sharprompt/Internal/EnumHelper.cs b/Sharprompt/Internal/EnumHelper.cs
@@ -31,11 +31,11 @@ private static EnumMetadata GetEnumMetadata(TEnum value)
         };
     }
 
-    public static string? GetDisplayName(TEnum value) => s_metadataCache[value].DisplayName ?? value.ToString();
+    public static string GetDisplayName(TEnum value) => s_metadataCache[value].DisplayName ?? value.ToString()!;
 
     public static IEnumerable<TEnum> GetValues() => s_metadataCache.OrderBy(x => x.Value.Order)
-                                                               .Select(x => x.Key)
-                                                               .ToArray();
+                                                                   .Select(x => x.Key)
+                                                                   .ToArray();
 
     private class EnumMetadata
     {

diff --git a/Sharprompt/MultiSelectOptions.cs b/Sharprompt/MultiSelectOptions.cs
@@ -14,6 +14,7 @@ public MultiSelectOptions()
         if (typeof(T).IsAssignableTo(typeof(Enum)))
         {
             Items = EnumHelper<T>.GetValues();
+            TextSelector = EnumHelper<T>.GetDisplayName;
         }
     }
 

diff --git a/Sharprompt/Prompt.Basic.cs b/Sharprompt/Prompt.Basic.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 
 using Sharprompt.Forms;
 using Sharprompt.Internal;
@@ -155,7 +154,11 @@ public static IEnumerable<T> MultiSelect<T>(string message, IEnumerable<T>? item
                 options.Items = items;
             }
 
-            options.DefaultValues = defaultValues ?? Enumerable.Empty<T>();
+            if (defaultValues is not null)
+            {
+                options.DefaultValues = defaultValues;
+            }
+
             options.PageSize = pageSize;
             options.Minimum = minimum;
             options.Maximum = maximum;

diff --git a/Sharprompt/SelectOptions.cs b/Sharprompt/SelectOptions.cs
@@ -13,6 +13,7 @@ public SelectOptions()
         if (typeof(T).IsAssignableTo(typeof(Enum)))
         {
             Items = EnumHelper<T>.GetValues();
+            TextSelector = EnumHelper<T>.GetDisplayName;
         }
     }