fix: 🐛 Fix #8: 'm' flag

SkepticMystic · Oct 24, 2021 · e813997 · e813997
1 parent 5328b64
commit e813997
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 26 deletions.
diff --git a/main.js b/main.js
diff --git a/src/Components/AddQComponent.svelte b/src/Components/AddQComponent.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-  import { Notice } from "obsidian";
+  import { App, Notice } from "obsidian";
   import type { Query } from "src/interfaces";
   import type ACPlugin from "src/main";
   import type { ACSettingTab, AddQModal } from "src/SettingTab";
   import { cmdNextId, cmdRunId } from "src/utils";
   import { onMount } from "svelte";
 
-  // export let app: App;
+  export let app: App;
   export let plugin: ACPlugin;
   export let modal: AddQModal;
   export let settingsTab: ACSettingTab;
@@ -47,8 +47,8 @@
 
       if (i > -1) {
         // Remove old command
-        this.app.commands.removeCommand(cmdRunId(oldQ));
-        this.app.commands.removeCommand(cmdNextId(oldQ));
+        app.commands.removeCommand(cmdRunId(oldQ));
+        app.commands.removeCommand(cmdNextId(oldQ));
 
         // Overwrite old Q
         plugin.settings.savedQueries[i] = newQ;

diff --git a/src/SettingTab.ts b/src/SettingTab.ts
@@ -45,7 +45,6 @@ export class ACSettingTab extends PluginSettingTab {
         },
         (but) => {
           but.addEventListener("click", () => {
-            console.log("editing" + i);
             this.editSavedQ(i);
           });
         }
@@ -142,6 +141,7 @@ export class AddQModal extends Modal {
     new AddQComponent({
       target: contentEl,
       props: {
+        app: this.app,
         plugin: this.plugin,
         modal: this,
         settingsTab: this.settingsTab,

diff --git a/src/main.ts b/src/main.ts
@@ -210,8 +210,8 @@ export default class ACPlugin extends Plugin {
 
       const regex = createRegex(existingQ);
       const matches = [...content.matchAll(regex)];
-      console.log({ matches });
       nextI = matches.find((match) => match.index >= offset)?.index;
+      console.log({ matches, nextI });
 
       // nextI = content.indexOf(existingQ.query, offset);
     } else {
@@ -225,7 +225,11 @@ export default class ACPlugin extends Plugin {
         to: editorSelection.head,
       });
     } else {
-      const loopedI = content.indexOf(toSelect);
+      const regex = createRegex(existingQ);
+      const matches = [...content.matchAll(regex)];
+      const loopedI = matches[0].index;
+      console.log({ matches, loopedI });
+
       if (loopedI > -1) {
         const editorSelection = this.createSelection(editor, loopedI, toSelect);
         this.setSelections(appendQ, editor, editorSelection);