From d4ef232d8e93f8c9ef4f24887fac09f9dfc36eb6 Mon Sep 17 00:00:00 2001
From: Simon Cambier <simon.cambier@protonmail.com>
Date: Thu, 28 Apr 2022 22:57:29 +0200
Subject: [PATCH] Small fixes / cleaner code

---
 src/components/ModalVault.svelte | 21 +++++++++++++--------
 src/utils.ts                     |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/ModalVault.svelte b/src/components/ModalVault.svelte
index a22c65c..6aaa947 100644
--- a/src/components/ModalVault.svelte
+++ b/src/components/ModalVault.svelte
@@ -20,14 +20,11 @@ let searchQuery: string
 let resultNotes: ResultNote[] = []
 $: selectedNote = resultNotes[selectedIndex]
 
-$: (async() => {
-  if (searchQuery) {
-    resultNotes = await getSuggestions(searchQuery)
-    lastSearch = searchQuery
-  }
-  selectedIndex = 0
-  scrollIntoView()
-})()
+$: if (searchQuery) {
+  updateResults()
+} else {
+  resultNotes = []
+}
 
 onMount(() => {
   searchQuery = lastSearch
@@ -39,6 +36,14 @@ onMount(() => {
   eventBus.on("vault", "arrow-down", () => moveIndex(1))
 })
 
+async function updateResults() {
+  resultNotes = await getSuggestions(searchQuery)
+  lastSearch = searchQuery
+  selectedIndex = 0
+  scrollIntoView()
+  if (resultNotes.length) console.log(resultNotes[0])
+}
+
 function onClick() {
   if (!selectedNote) return
   openNote(selectedNote)
diff --git a/src/utils.ts b/src/utils.ts
index ed655c3..ee7284c 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -89,7 +89,7 @@ export function makeExcerpt(content: string, offset: number): string {
   const pos = offset ?? -1
   if (pos > -1) {
     const from = Math.max(0, pos - excerptBefore)
-    const to = Math.min(content.length - 1, pos + excerptAfter)
+    const to = Math.min(content.length, pos + excerptAfter)
     content =
       (from > 0 ? '…' : '') +
       content.slice(from, to).trim() +