make opening to existing tab default behavior

Author: chhoumann

src/engine/CaptureChoiceEngine.ts

@@ -90,10 +90,7 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
 			}
 
 			if (this.choice.openFile && file) {
-				let openExistingTab = false;
-				if (this.choice.focusExistingFileTab) {
-					openExistingTab = await openExistingFileTab(this.app, file);
-				}
+				const openExistingTab = await openExistingFileTab(this.app, file);
 
 				if (!openExistingTab) {
 					await openFile(this.app, file, {

src/engine/TemplateChoiceEngine.ts

@@ -147,10 +147,10 @@ export class TemplateChoiceEngine extends TemplateEngine {
 			}
 
 			if (this.choice.openFile && createdFile) {
-				let openExistingTab = false;
-				if (this.choice.focusExistingFileTab) {
-					openExistingTab = await openExistingFileTab(this.app, createdFile);
-				}
+				const openExistingTab = await openExistingFileTab(
+					this.app,
+					createdFile,
+				);
 
 				if (!openExistingTab) {
 					await openFile(this.app, createdFile, {

src/gui/ChoiceBuilder/captureChoiceBuilder.ts

@@ -58,11 +58,7 @@ export class CaptureChoiceBuilder extends ChoiceBuilder {
 			this.addOpenFileSetting();
 
 			if (this.choice.openFile) {
-				this.addFocusExistingTabSetting();
-
-				if (!this.choice.focusExistingFileTab) {
-					this.addOpenFileInNewTabSetting();
-				}
+				this.addOpenFileInNewTabSetting();
 			}
 		}
 
@@ -435,20 +431,6 @@ export class CaptureChoiceBuilder extends ChoiceBuilder {
 			});
 	}
 
-	private addFocusExistingTabSetting(): void {
-		const existingTabSetting = new Setting(this.contentEl);
-		existingTabSetting
-			.setName("Focus Existing Tab")
-			.setDesc("Focus the tab that have already opened the file.")
-			.addToggle((toggle) => {
-				toggle.setValue(this.choice?.focusExistingFileTab);
-				toggle.onChange((value) => {
-					this.choice.focusExistingFileTab = value;
-					this.reload();
-				});
-			});
-	}
-
 	private addOpenFileInNewTabSetting(): void {
 		const newTabSetting = new Setting(this.contentEl);
 		newTabSetting

src/gui/ChoiceBuilder/templateChoiceBuilder.ts

@@ -51,11 +51,7 @@ export class TemplateChoiceBuilder extends ChoiceBuilder {
 		this.addOpenFileSetting();
 
 		if (this.choice.openFile) {
-			this.addFocusExistingTabSetting();
-
-			if (!this.choice.focusExistingFileTab) {
-				this.addOpenFileInNewTabSetting();
-			}
+			this.addOpenFileInNewTabSetting();
 		}
 	}
 
@@ -339,20 +335,6 @@ export class TemplateChoiceBuilder extends ChoiceBuilder {
 			});
 	}
 
-	private addFocusExistingTabSetting(): void {
-		const existingTabSetting = new Setting(this.contentEl);
-		existingTabSetting
-			.setName("Focus Existing Tab")
-			.setDesc("Focus the tab that have already opened the file.")
-			.addToggle((toggle) => {
-				toggle.setValue(this.choice?.focusExistingFileTab);
-				toggle.onChange((value) => {
-					this.choice.focusExistingFileTab = value;
-					this.reload();
-				});
-			});
-	}
-
 	private addOpenFileInNewTabSetting(): void {
 		const newTabSetting = new Setting(this.contentEl);
 		newTabSetting

src/types/choices/CaptureChoice.ts

@@ -23,7 +23,6 @@ export class CaptureChoice extends Choice implements ICaptureChoice {
 	};
 	prepend: boolean;
 	task: boolean;
-	focusExistingFileTab: boolean;
 	openFileInNewTab: {
 		enabled: boolean;
 		direction: NewTabDirection;
@@ -61,7 +60,6 @@ export class CaptureChoice extends Choice implements ICaptureChoice {
 		};
 		this.openFile = false;
 		this.openFileInMode = "default";
-		this.focusExistingFileTab = true;
 	}
 
 	public static Load(choice: ICaptureChoice): CaptureChoice {

src/types/choices/ICaptureChoice.ts

@@ -23,7 +23,6 @@ export default interface ICaptureChoice extends IChoice {
 		createIfNotFound: boolean;
 		createIfNotFoundLocation: string;
 	};
-	focusExistingFileTab: boolean;
 	openFileInNewTab: {
 		enabled: boolean;
 		direction: NewTabDirection;

src/types/choices/ITemplateChoice.ts

@@ -15,7 +15,6 @@ export default interface ITemplateChoice extends IChoice {
 	fileNameFormat: { enabled: boolean; format: string };
 	appendLink: boolean;
 	openFile: boolean;
-	focusExistingFileTab: boolean;
 	openFileInNewTab: {
 		enabled: boolean;
 		direction: NewTabDirection;

src/types/choices/TemplateChoice.ts

@@ -14,7 +14,6 @@ export class TemplateChoice extends Choice implements ITemplateChoice {
 		createInSameFolderAsActiveFile: boolean;
 		chooseFromSubfolders: boolean;
 	};
-	focusExistingFileTab: boolean;
 	openFileInNewTab: {
 		enabled: boolean;
 		direction: NewTabDirection;
@@ -48,7 +47,6 @@ export class TemplateChoice extends Choice implements ITemplateChoice {
 		this.openFileInMode = "default";
 		this.fileExistsMode = "Increment the file name";
 		this.setFileExistsBehavior = false;
-		this.focusExistingFileTab = true;
 	}
 
 	public static Load(choice: ITemplateChoice): TemplateChoice {

src/utilityObsidian.ts

@@ -14,7 +14,6 @@ import type { CaptureChoice } from "./types/choices/CaptureChoice";
 import type { MacroChoice } from "./types/choices/MacroChoice";
 import type IChoice from "./types/choices/IChoice";
 import { log } from "./logger/logManager";
-import { resolve } from "path";
 
 export function getTemplater(app: App) {
 	return app.plugins.plugins["templater-obsidian"];
@@ -177,10 +176,7 @@ export async function openExistingFileTab(
 		const view = m_leaf.view;
 		if (view instanceof FileView) {
 			if (view.file) {
-				const normalizedOpeningPath = resolve(file.path);
-				const normalizedCurrentPath = resolve(view.file.path);
-
-				if (normalizedOpeningPath === normalizedCurrentPath) {
+				if (file.path === view.file.path) {
 					leaf = m_leaf;
 					return;
 				}