Massive refactoring to get rid of the deprecated global app instance

src/components/ModalInFile.svelte

@@ -18,8 +18,8 @@
   import ResultItemInFile from './ResultItemInFile.svelte'
   import { Query } from 'src/search/query'
   import { openNote } from 'src/tools/notes'
-  import { searchEngine } from 'src/search/omnisearch'
   import { stringsToRegex } from 'src/tools/text-processing'
+  import { Omnisearch } from 'src/search/omnisearch'
 
   export let modal: OmnisearchInFileModal
   export let parent: OmnisearchVaultModal | null = null
@@ -54,7 +54,7 @@
       query = new Query(searchQuery)
       note =
         (
-          await searchEngine.getSuggestions(query, {
+          await Omnisearch.getInstance().getSuggestions(query, {
             singleFilePath,
           })
         )[0] ?? null

src/components/ModalVault.svelte

@@ -24,12 +24,12 @@
   } from 'src/components/modals'
   import ResultItemVault from './ResultItemVault.svelte'
   import { Query } from 'src/search/query'
-  import { settings } from '../settings'
   import * as NotesIndex from '../notes-index'
   import { cacheManager } from '../cache-manager'
-  import { searchEngine } from 'src/search/omnisearch'
   import { cancelable, CancelablePromise } from 'cancelable-promise'
   import { debounce } from 'lodash-es'
+  import { Omnisearch } from 'src/search/omnisearch'
+  import { getSettings } from 'src/settings'
 
   export let modal: OmnisearchVaultModal
   export let previousQuery: string | undefined
@@ -51,7 +51,7 @@
 
   $: selectedNote = resultNotes[selectedIndex]
   $: searchQuery = searchQuery ?? previousQuery
-  $: if (settings.openInNewPane) {
+  $: if (getSettings().openInNewPane) {
     openInNewPaneKey = '↵'
     openInCurrentPaneKey = getCtrlKeyLabel() + ' ↵'
     createInNewPaneKey = 'shift ↵'
@@ -141,7 +141,7 @@
     query = new Query(searchQuery)
     cancelableQuery = cancelable(
       new Promise(resolve => {
-        resolve(searchEngine.getSuggestions(query))
+        resolve(Omnisearch.getInstance().getSuggestions(query))
       })
     )
     resultNotes = await cancelableQuery
@@ -299,7 +299,7 @@
   on:input="{e => (searchQuery = e.detail)}"
   placeholder="Omnisearch - Vault">
   <div class="omnisearch-input-container__buttons">
-    {#if settings.showCreateButton}
+    {#if getSettings().showCreateButton}
       <button on:click="{onClickCreateNote}">Create note</button>
     {/if}
     {#if Platform.isMobile}
@@ -329,7 +329,7 @@
   <div style="text-align: center;">
     {#if !resultNotes.length && searchQuery && !searching}
       We found 0 result for your search here.
-      {#if settings.simpleSearch && searchQuery
+      {#if getSettings().simpleSearch && searchQuery
           .split(SPACE_OR_PUNCTUATION)
           .some(w => w.length < 3)}
         <br />

src/components/modals.ts

@@ -3,12 +3,13 @@ import type { Modifier } from 'obsidian'
 import ModalVault from './ModalVault.svelte'
 import ModalInFile from './ModalInFile.svelte'
 import { Action, eventBus, EventNames, isInputComposition } from '../globals'
-import { settings } from '../settings'
 import { cacheManager } from 'src/cache-manager'
+import { getSettings } from 'src/settings'
 
 abstract class OmnisearchModal extends Modal {
   protected constructor(app: App) {
     super(app)
+    const settings = getSettings()
 
     // Remove all the default modal's children
     // so that we can more easily customize it
@@ -165,7 +166,9 @@ export class OmnisearchVaultModal extends OmnisearchModal {
 
     cacheManager.getSearchHistory().then(history => {
       // Previously searched query (if enabled in settings)
-      const previous = settings.showPreviousQueryResults ? history[0] : null
+      const previous = getSettings().showPreviousQueryResults
+        ? history[0]
+        : null
 
       // Instantiate and display the Svelte component
       const cmp = new ModalVault({