Merge pull request #7 from oeN/fix/autocomplete-trigger

Fix autocomplete trigger

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "liquid-templates",
 	"name": "Liquid Templates",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"minAppVersion": "0.13.10",
 	"description": "Empower your template with LiquidJS tags",
 	"author": "diomedet",

src/main.ts

@@ -27,7 +27,6 @@ export default class LiquidTemplates extends Plugin {
 
   async saveSettings(): Promise<void> {
     // the templates folder can change
-    // this.setupAutosuggest();
     await this.saveData(this.settings);
   }
 

src/suggest/codemirror-suggest.ts

@@ -1,129 +0,0 @@
-import { App, ISuggestOwner, Scope } from "obsidian";
-
-import Suggest from "./suggest";
-
-function checkForInputPhrase(
-  cmEditor: CodeMirror.Editor,
-  pos: CodeMirror.Position,
-  phrase: string
-): boolean {
-  const from = {
-    line: pos.line,
-    ch: pos.ch - phrase.length,
-  };
-  return cmEditor.getRange(from, pos) === phrase;
-}
-
-function isCursorBeforePos(
-  pos: CodeMirror.Position,
-  cursor: CodeMirror.Position
-): boolean {
-  if (pos.line === cursor.line) {
-    return cursor.ch < pos.ch;
-  }
-  return cursor.line < pos.line;
-}
-
-export default abstract class CodeMirrorSuggest<T> implements ISuggestOwner<T> {
-  protected app: App;
-  protected cmEditor: CodeMirror.Editor;
-  private scope: Scope;
-
-  private suggestEl: HTMLElement;
-  private instructionsEl: HTMLElement;
-  private suggest: Suggest<T>;
-
-  private startPos: CodeMirror.Position;
-  private triggerPhrase: string;
-
-  constructor(app: App, triggerPhrase: string) {
-    this.triggerPhrase = triggerPhrase;
-    this.app = app;
-    this.scope = new Scope();
-
-    this.suggestEl = createDiv("suggestion-container");
-    const suggestion = this.suggestEl.createDiv("suggestion");
-    this.instructionsEl = this.suggestEl.createDiv("prompt-instructions");
-    this.suggest = new Suggest(this, suggestion, this.scope);
-
-    this.scope.register([], "Escape", this.close.bind(this));
-  }
-
-  public setInstructions(
-    createInstructionsFn: (containerEl: HTMLElement) => void
-  ): void {
-    this.instructionsEl.empty();
-    createInstructionsFn(this.instructionsEl);
-  }
-
-  public update(
-    cmEditor: CodeMirror.Editor,
-    changeObj: CodeMirror.EditorChange
-  ): boolean {
-    if (this.cmEditor !== cmEditor) {
-      this.suggestEl?.detach();
-    }
-    this.cmEditor = cmEditor;
-    const cursorPos = cmEditor.getCursor();
-
-    // autosuggest is open
-    if (this.suggestEl.parentNode) {
-      if (isCursorBeforePos(this.startPos, cursorPos)) {
-        this.close();
-        return false;
-      }
-      this.attachAtCursor();
-    } else {
-      if (
-        changeObj.text.length === 1 && // ignore multi-cursors
-        checkForInputPhrase(this.cmEditor, cursorPos, this.triggerPhrase) &&
-        !document.querySelector(".suggestion-container") // don't trigger multiple autosuggests
-      ) {
-        this.startPos = cursorPos;
-        this.open();
-        this.attachAtCursor();
-      }
-    }
-
-    return false;
-  }
-
-  protected getStartPos(): CodeMirror.Position {
-    return {
-      line: this.startPos.line,
-      ch: this.startPos.ch - this.triggerPhrase.length,
-    };
-  }
-
-  protected getInputStr(): string {
-    // return string from / to cursor
-    const cursor = this.cmEditor.getCursor();
-    const line = this.cmEditor.getLine(cursor.line);
-    return line.substring(this.startPos.ch, cursor.ch);
-  }
-
-  private attachAtCursor() {
-    const inputStr = this.getInputStr();
-    const suggestions = this.getSuggestions(inputStr);
-    this.suggest.setSuggestions(suggestions);
-
-    this.cmEditor.addWidget(this.cmEditor.getCursor(), this.suggestEl, true);
-  }
-
-  open(): void {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (<any>this.app).keymap.pushScope(this.scope);
-  }
-
-  close(): void {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (<any>this.app).keymap.popScope(this.scope);
-    this.startPos = null;
-    this.suggest.setSuggestions([]);
-    this.suggestEl.detach();
-  }
-
-  abstract getSuggestions(inputStr: string): T[];
-  abstract renderSuggestion(item: T, el: HTMLElement): void;
-  abstract selectSuggestion(item: T, evt: MouseEvent | KeyboardEvent): void;
-}

src/suggest/template-suggest.ts

@@ -124,7 +124,7 @@ export default class TemplateSuggest extends EditorSuggest<ITemplateCompletion>
 
     const match = lineContents
       .substring(0, cursor.ch)
-      .match(new RegExp(`(?:^|\s|\W)(${this.triggerPhrase}[^${this.triggerPhrase}]*$)`));
+      .match(new RegExp(`${this.triggerPhrase}(.*)`));
 
     if (match === null) return null;
 
@@ -141,16 +141,9 @@ export default class TemplateSuggest extends EditorSuggest<ITemplateCompletion>
     cursor: EditorPosition
   ): EditorSuggestTriggerInfo {
     return {
-      start: this.getStartPos(match, cursor.line),
+      start: { line: cursor.line, ch: match.index },
       end: cursor,
-      query: match[1].substring(this.triggerPhrase.length),
-    };
-  }
-
-  protected getStartPos(match: RegExpMatchArray, line: number): EditorPosition {
-    return {
-      line: line,
-      ch: match.index + match[0].length - match[1].length,
+      query: match[1],
     };
   }
 }