From 82400456419500d91311a090e881a7ff9f676dcc Mon Sep 17 00:00:00 2001
From: Daniel Bauer <daniel.bauer@senckenberg.de>
Date: Tue, 17 Dec 2024 19:36:20 +0100
Subject: [PATCH] fix: index not building on plugin enabling

---
 src/main.ts | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 2b3a8ed..9f6b85c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 import { App, Plugin, PluginSettingTab, Setting, TFile } from "obsidian";
 import { DataviewSuggester } from "./DataviewSuggester";
-import { getAPI } from "obsidian-dataview";
+import { getAPI, isPluginEnabled } from "obsidian-dataview";
 import { SettingsTab } from "./SettingsTab";
 
 interface DataviewAutocompleteSettings {
@@ -15,18 +15,19 @@ const DEFAULT_SETTINGS: DataviewAutocompleteSettings = {
 
 export default class DataviewAutocompletePlugin extends Plugin {
     settings: DataviewAutocompleteSettings;
-    suggester: DataviewSuggester | undefined;
+    suggester: DataviewSuggester;
 
     async onload() {
         await this.loadSettings();
         this.addSettingTab(new SettingsTab(this.app, this));
 
+        this.suggester = new DataviewSuggester(this, 10, true, true);
+        this.registerEditorSuggest(this.suggester);
+
         this.registerEvent(
             // @ts-ignore
             this.app.metadataCache.on("dataview:index-ready", () => {
-                if (this.suggester !== undefined) {
-                    this.suggester.onDataviewIndexReady();
-                }
+                this.suggester.onDataviewIndexReady();
             }),
         );
 
@@ -35,24 +36,14 @@ export default class DataviewAutocompletePlugin extends Plugin {
                 // @ts-ignore
                 "dataview:metadata-change",
                 (type: string, file: TFile, oldPath?: string) => {
-                    if (this.suggester !== undefined) {
-                        this.suggester.onDataviewMetadataChange(type, file, oldPath);
-                    }
+                    this.suggester.onDataviewMetadataChange(type, file, oldPath);
                 },
             ),
         );
 
-        this.app.workspace.onLayoutReady(() => {
-            // @ts-ignore
-            if (!Object.keys(this.app.plugins.plugins).includes("dataview")) {
-                console.warn("Dataview plugin not installed. Dataview Autocompletion plugin will not work.");
-            } else {
-                // register suggester, requires dataview to be loaded first.
-                console.log("Registering dataview autocompletion suggester");
-                this.suggester = new DataviewSuggester(this, 10, true, true);
-                this.registerEditorSuggest(this.suggester);
-            }
-        });
+        if (isPluginEnabled(this.app) && getAPI(this.app)?.index.initialized) {
+            this.suggester.onDataviewIndexReady();
+        }
     }
 
     onunload() {}