Improve nullable type display

Resolves #11
jacobjmarks · May 4, 2024 · 5a289be · 5a289be
1 parent c0affc3
commit 5a289be
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 8 deletions.
diff --git a/Client/Pages/Home.razor b/Client/Pages/Home.razor
@@ -36,9 +36,14 @@
             </TitleContent>
             <ChildContent>
                 <MudStack>
-                    <MudSwitch @bind-Value="@includeNullableTypes" Color="Color.Primary">
-                        Include nullable types
-                    </MudSwitch>
+                    <MudSelect Label="Show nullable types" @bind-Value="showNullableTypes" Variant="Variant.Outlined">
+                        <MudSelectItem Value="@("Always")" />
+                        <MudSelectItem Value="@("When Discrepant")" />
+                        <MudSelectItem Value="@("Never")" />
+                    </MudSelect>
+
+                    <MudDivider />
+
                     <MudSwitch @bind-Value="@showErroneous" Color="Color.Primary">
                         Show erroneous bindings
                         <MudText Typo="Typo.caption" Class="d-block mud-text-secondary">

diff --git a/Client/Pages/Home.razor.cs b/Client/Pages/Home.razor.cs
@@ -30,7 +30,7 @@ public sealed partial class Home : IDisposable
 
     private IEnumerable<BindingResults> bindingResults = [];
 
-    private bool includeNullableTypes = false;
+    private string showNullableTypes = "When Discrepant";
     private bool showErroneous = false;
     private bool showDetailedErrorMessages = false;
 
@@ -99,13 +99,23 @@ private async Task GetBindingResultsAsync(string inputValue)
         bindingResults = results.OrderBy(r => r.AllErroneous);
     }
 
-    private bool ResultTableFilter(BindingResults r)
+    private bool ResultTableFilter(BindingResults results)
     {
-        if (!includeNullableTypes && r.Type.EndsWith('?'))
+        if (!showErroneous && results.AllErroneous)
             return false;
 
-        if (!showErroneous && r.AllErroneous)
-            return false;
+        if (results.Type.EndsWith('?') && showNullableTypes != "Always")
+        {
+            if (showNullableTypes == "Never")
+                return false;
+
+            if (showNullableTypes == "When Discrepant")
+            {
+                var nonNullableResults = bindingResults.First(r => r.Type == results.Type[..^1]);
+                if (nonNullableResults.AreEquivalentTo(results))
+                    return false;
+            }
+        }
 
         return true;
     }

diff --git a/Shared/BindingResults.cs b/Shared/BindingResults.cs
@@ -14,4 +14,15 @@ public record BindingResults(
 
     [JsonIgnore]
     public bool AllErroneous { get => Results.All(r => r.Value.IsErroneous); }
+
+    public bool AreEquivalentTo(BindingResults other)
+    {
+        if (Results.Count != other.Results.Count) return false;
+        foreach (var entry in Results)
+        {
+            if (!other.Results.TryGetValue(entry.Key, out var otherValue) || otherValue != entry.Value)
+                return false;
+        }
+        return true;
+    }
 };