From ebee93a2aa98ae9ecea4f34049e410d842ebd21d Mon Sep 17 00:00:00 2001
From: Simon Cambier <simon.cambier@protonmail.com>
Date: Thu, 19 Jan 2023 08:37:43 +0100
Subject: [PATCH] Registering events sooner

---
 src/main.ts | 71 ++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 7469075..559f8c5 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -64,45 +64,44 @@ export default class OmnisearchPlugin extends Plugin {
       },
     })
 
-    app.workspace.onLayoutReady(async () => {
-      // Listeners to keep the search index up-to-date
-      this.registerEvent(
-        this.app.vault.on('create', async file => {
-          if (isFileIndexable(file.path)) {
-            await cacheManager.addToLiveCache(file.path)
-            searchEngine.addFromPaths([file.path])
-          }
-        })
-      )
-      this.registerEvent(
-        this.app.vault.on('delete', file => {
-          cacheManager.removeFromLiveCache(file.path)
-          searchEngine.removeFromPaths([file.path])
-        })
-      )
-      this.registerEvent(
-        this.app.vault.on('modify', async file => {
-          if (isFileIndexable(file.path)) {
-            await cacheManager.addToLiveCache(file.path)
-            NotesIndex.markNoteForReindex(file)
-          }
-        })
-      )
-      this.registerEvent(
-        this.app.vault.on('rename', async (file, oldPath) => {
-          if (isFileIndexable(file.path)) {
-            cacheManager.removeFromLiveCache(oldPath)
-            cacheManager.addToLiveCache(file.path)
-            searchEngine.removeFromPaths([oldPath])
-            await searchEngine.addFromPaths([file.path])
-          }
-        })
-      )
+    // Listeners to keep the search index up-to-date
+    this.registerEvent(
+      this.app.vault.on('create', async file => {
+        if (isFileIndexable(file.path)) {
+          await cacheManager.addToLiveCache(file.path)
+          searchEngine.addFromPaths([file.path])
+        }
+      })
+    )
+    this.registerEvent(
+      this.app.vault.on('delete', file => {
+        cacheManager.removeFromLiveCache(file.path)
+        searchEngine.removeFromPaths([file.path])
+      })
+    )
+    this.registerEvent(
+      this.app.vault.on('modify', async file => {
+        if (isFileIndexable(file.path)) {
+          await cacheManager.addToLiveCache(file.path)
+          NotesIndex.markNoteForReindex(file)
+        }
+      })
+    )
+    this.registerEvent(
+      this.app.vault.on('rename', async (file, oldPath) => {
+        if (isFileIndexable(file.path)) {
+          cacheManager.removeFromLiveCache(oldPath)
+          cacheManager.addToLiveCache(file.path)
+          searchEngine.removeFromPaths([oldPath])
+          await searchEngine.addFromPaths([file.path])
+        }
+      })
+    )
 
+    app.workspace.onLayoutReady(async () => {
+      this.executeFirstLaunchTasks()
       await this.populateIndex()
     })
-
-    this.executeFirstLaunchTasks()
   }
 
   executeFirstLaunchTasks(): void {