feat: show history and suggestions together

Author: Testudinidae

CmdPalWebSearchShortcut/WebSearchShortcut/History/HistoryService.cs

@@ -39,6 +39,17 @@ public static string[] Get(string shortcutName)
         }
     }
 
+    public static string[] Search(string shortcutName, string searchText)
+    {
+        lock (_lock)
+        {
+            return [
+                .. Get(shortcutName)
+                    .Where(query => query.StartsWith(searchText, StringComparison.OrdinalIgnoreCase))
+            ];
+        }
+    }
+
     public static void Add(string shortcutName, string query)
     {
         lock (_lock)

CmdPalWebSearchShortcut/WebSearchShortcut/Pages/SearchWebPage.cs

@@ -14,6 +14,7 @@ namespace WebSearchShortcut;
 
 internal sealed partial class SearchWebPage : DynamicListPage
 {
+    private const int MaxHistoryDisplayCount = 3;
     private const int MaxDisplayCount = 100;
 
     private readonly WebSearchShortcutDataEntry _shortcut;
@@ -98,12 +99,12 @@ public override async void UpdateSearchText(string oldSearch, string newSearch)
         {
         }
 
+        var historyItems = BuildHistoryItems(newSearch);
+
         if (shouldOpenHomePage)
         {
             UpdateSuggestionItems([], currentEpoch);
 
-            var historyItems = BuildHistoryItems();
-
             RenderItems([_openHomepageListItem, .. historyItems], currentEpoch);
 
             return;
@@ -112,7 +113,7 @@ public override async void UpdateSearchText(string oldSearch, string newSearch)
         var primaryItems = BuildPrimaryItems(newSearch);
         var snapshotSuggestions = Volatile.Read(ref _suggestionItems);
 
-        RenderItems([.. primaryItems, .. snapshotSuggestions], currentEpoch);
+        RenderItems([.. primaryItems, .. historyItems, .. snapshotSuggestions], currentEpoch);
 
         if (!shouldFetchSuggestions)
             return;
@@ -144,7 +145,7 @@ public override async void UpdateSearchText(string oldSearch, string newSearch)
 
         UpdateSuggestionItems(suggestionItems, currentEpoch);
 
-        RenderItems([.. primaryItems, .. suggestionItems], currentEpoch);
+        RenderItems([.. primaryItems, .. historyItems, .. suggestionItems], currentEpoch);
     }
 
     private void RenderItems(IListItem[] items, int currentUpdateSearchTextEpoch)
@@ -197,11 +198,11 @@ private ListItem[] BuildPrimaryItems(string searchText)
         ];
     }
 
-    private ListItem[] BuildHistoryItems()
+    private ListItem[] BuildHistoryItems(string searchText)
     {
         var historyQueries = HistoryService
-            .Get(_shortcut.Name)
-            .Take(MaxDisplayCount - 1);
+            .Search(_shortcut.Name, searchText)
+            .Take(string.IsNullOrEmpty(searchText) ? MaxDisplayCount : MaxHistoryDisplayCount);
 
         return [
             .. historyQueries.Select(historyQuery => new ListItem(