fix: avoid race conditions in search loop

jillro · Dec 28, 2024 · 8d3ba8a · 8d3ba8a
1 parent 5ef21ba
commit 8d3ba8a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/components/store.ts b/src/components/store.ts
@@ -88,8 +88,6 @@ async function updateSearchResults() {
   let batch: Map<TFile, boolean> = new Map();
   let lastBatch = { date: new Date(), index: 0 };
   for (let i = 0; i < $sortedFiles.length; i++) {
-    if ($searchQuery !== get(searchQuery)) return;
-
     const file = $sortedFiles[i];
     const cachedResult = get(searchResultCache).get(cacheKey($sortedFiles[i]));
     if (cachedResult !== undefined) {
@@ -111,10 +109,14 @@ async function updateSearchResults() {
         frontmatter,
         caseSensitive: $searchCaseSensitive,
       });
+
+      if ($searchQuery !== get(searchQuery)) return;
       batch.set(file, match);
       searchResultCache.update((cache) => cache.set(cacheKey(file), match));
     }
 
+    if ($searchQuery !== get(searchQuery)) return;
+
     if (i % 10 === 0) {
       searchResultLoadingState.set(i / $sortedFiles.length);
     }