feat: improve bool editor

rdavisau · Apr 25, 2019 · c762dc7 · c762dc7
1 parent c73332b
commit c762dc7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/DumpEditable/EditableDumpContainer.cs b/src/DumpEditable/EditableDumpContainer.cs
@@ -139,6 +139,7 @@ public partial class EditableDumpContainer<T>
             new List<EditorRule>
             {
                 EditorRule.ForEnums(),
+                EditorRule.ForBool(),
                 EditorRule.ForTypeWithStringBasedEditor<int>(int.TryParse),
                 EditorRule.ForTypeWithStringBasedEditor<uint>(uint.TryParse),
                 EditorRule.ForTypeWithStringBasedEditor<short>(short.TryParse),
@@ -155,7 +156,6 @@ public partial class EditableDumpContainer<T>
                     output = input;
                     return true;
                 }),
-                EditorRule.ForTypeWithStringBasedEditor<bool>(bool.TryParse),
                 EditorRule.ForTypeWithStringBasedEditor<byte>(byte.TryParse),
                 EditorRule.ForTypeWithStringBasedEditor<sbyte>(sbyte.TryParse),
                 EditorRule.ForTypeWithStringBasedEditor<char>(char.TryParse),

diff --git a/src/DumpEditable/EditorRule.cs b/src/DumpEditable/EditorRule.cs
@@ -45,6 +45,19 @@ public static EditorRule ForType<T>(Func<object, PropertyInfo, Action, object> g
                             .Concat(new [] { "]" }))
                         );
 
+        public static EditorRule ForBool() =>
+            EditorRule.For(
+                (_, p) => p.PropertyType == typeof(bool) || p.PropertyType == typeof(bool?),
+                (o, p, c) =>
+                    Util.HorizontalRun(true,
+                        Enumerable.Concat(
+                                new object[] { p.GetValue(o) ?? NullString, "[" },
+                                new bool?[] { true, false, null }
+                                    .Where(b => p.PropertyType == typeof(bool?) || b != null)
+                                    .Select(v => new Hyperlinq(() => { SetValue(o, p, v); c(); }, $"{(object)v ?? NullString }")))
+                            .Concat(new[] { "]" }))
+            );
+
         public static EditorRule ForTypeWithStringBasedEditor<T>(ParseFunc<string, T, bool> parseFunc, bool supportNullable = true, bool supportEnumerable = true)
             => new EditorRule
             {
@@ -67,7 +80,7 @@ public static EditorRule ForTypeWithStringBasedEditor<T>(ParseFunc<string, T, bo
                 isEnumerable = false;
 
             var desc = currVal == null 
-                    ? "null"
+                    ? NullString
                     : (isEnumerable ? JsonConvert.SerializeObject(currVal) : $"{currVal}");
 
             var change = new Hyperlinq(() =>
@@ -88,7 +101,7 @@ public static EditorRule ForTypeWithStringBasedEditor<T>(ParseFunc<string, T, bo
                         return; // can't deserialise
                     }
                 }
-                if (canConvert)
+                else if (canConvert)
                 {
                     SetValue(o,p,output);
                 }
@@ -115,5 +128,7 @@ public static void SetValue(object o, PropertyInfo p, object v)
         }
 
         public delegate V ParseFunc<T, U, V>(T input, out U output);
+
+        private const string NullString = "(null)";
     }
 }