feat: ✨ Relation suggestor also detects if your cursor is insideYaml …

…or not
SkepticMystic · Jan 29, 2022 · 4d62eef · 4d62eef
1 parent 957ebe4
commit 4d62eef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/main.js b/main.js
@@ -10006,7 +10006,7 @@ function isInsideYaml(app) {
         return false;
     const { start, end } = frontmatter.position;
     const currOff = editor.posToOffset(editor.getCursor());
-    if (currOff >= start.offset + 4 && currOff <= end.offset - 4)
+    if (currOff >= start.offset && currOff <= end.offset)
         return true;
     else
         return false;
@@ -33518,11 +33518,11 @@ class RelationSuggestor extends obsidian.EditorSuggest {
         });
     }
     selectSuggestion(suggestion) {
-        const { context } = this;
+        const { context, plugin } = this;
         if (context) {
-            const trig = this.plugin.settings.relSuggestorTrigger;
+            const trig = plugin.settings.relSuggestorTrigger;
             const { start, end, editor } = context;
-            editor.replaceRange(suggestion + ":", { ch: start.ch + 1 - trig.length, line: start.line }, end);
+            editor.replaceRange(suggestion + (isInsideYaml(plugin.app) ? ": " : ":: "), { ch: start.ch + 1 - trig.length, line: start.line }, end);
         }
     }
 }

diff --git a/src/RelationSuggestor.ts b/src/RelationSuggestor.ts
@@ -6,6 +6,7 @@ import {
   EditorSuggestTriggerInfo,
   TFile,
 } from "obsidian";
+import { isInsideYaml } from "./Utils/ObsidianUtils";
 import type BCPlugin from "./main";
 import { escapeRegex } from "./Utils/generalUtils";
 import { getFields } from "./Utils/HierUtils";
@@ -54,12 +55,13 @@ export class RelationSuggestor extends EditorSuggest<string> {
   }
 
   selectSuggestion(suggestion: string): void {
-    const { context } = this;
+    const { context, plugin } = this;
     if (context) {
-      const trig = this.plugin.settings.relSuggestorTrigger;
+      const trig = plugin.settings.relSuggestorTrigger;
       const { start, end, editor } = context;
+
       editor.replaceRange(
-        suggestion + ":",
+        suggestion + (isInsideYaml(plugin.app) ? ": " : ":: "),
         { ch: start.ch + 1 - trig.length, line: start.line },
         end
       );

diff --git a/src/Utils/ObsidianUtils.ts b/src/Utils/ObsidianUtils.ts
@@ -167,6 +167,6 @@ export function isInsideYaml(app: App): boolean | null {
 
   const { start, end } = frontmatter.position;
   const currOff = editor.posToOffset(editor.getCursor());
-  if (currOff >= start.offset + 4 && currOff <= end.offset - 4) return true;
+  if (currOff >= start.offset && currOff <= end.offset) return true;
   else return false;
 }