fix: active file is undefined in binary files

refs: #1210
SilentVoid13 · Oct 2, 2023 · 27af7a3 · 27af7a3
1 parent 516d2bf
commit 27af7a3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/core/Templater.ts b/src/core/Templater.ts
@@ -10,6 +10,7 @@ import {
 import {
     delay,
     generate_dynamic_command_regex,
+    get_active_file,
     resolve_tfile,
 } from "utils/Utils";
 import TemplaterPlugin from "main";
@@ -60,7 +61,7 @@ export class Templater {
         target_file: TFile,
         run_mode: RunMode
     ): RunningConfig {
-        const active_file = app.workspace.activeEditor?.file;
+        const active_file = get_active_file(app);
 
         return {
             template_file: template_file,
@@ -104,7 +105,7 @@ export class Templater {
             const new_file_location = app.vault.getConfig("newFileLocation");
             switch (new_file_location) {
                 case "current": {
-                    const active_file = app.workspace.activeEditor?.file;
+                    const active_file = get_active_file(app);
                     if (active_file) {
                         folder = active_file.parent;
                     }

diff --git a/src/editor/Editor.ts b/src/editor/Editor.ts
@@ -4,6 +4,7 @@ import TemplaterPlugin from "main";
 import { TemplaterError } from "utils/Error";
 import { CursorJumper } from "editor/CursorJumper";
 import { log_error } from "utils/Log";
+import { get_active_file } from "utils/Utils";
 import { Autocomplete } from "editor/Autocomplete";
 
 import "editor/mode/javascript";
@@ -58,7 +59,7 @@ export class Editor {
         if (auto_jump && !this.plugin.settings.auto_jump_to_cursor) {
             return;
         }
-        if (file && app.workspace.activeEditor?.file !== file) {
+        if (file && get_active_file(app) !== file) {
             return;
         }
         await this.cursor_jumper.jump_to_next_cursor_location();

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
@@ -1,5 +1,12 @@
 import { TemplaterError } from "./Error";
-import { normalizePath, TAbstractFile, TFile, TFolder, Vault } from "obsidian";
+import {
+    App,
+    normalizePath,
+    TAbstractFile,
+    TFile,
+    TFolder,
+    Vault,
+} from "obsidian";
 
 export function delay(ms: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, ms));
@@ -74,3 +81,7 @@ export function arraymove<T>(
     arr[fromIndex] = arr[toIndex];
     arr[toIndex] = element;
 }
+
+export function get_active_file(app: App) {
+    return app.workspace.activeEditor?.file ?? app.workspace.getActiveFile();
+}