Merge pull request #7 from rca-umb/tab

Tab

Author: rca-umb

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.1] - 2025-3-4
+
+### Fixed
+
+- If a suggestion is selected, the suggestion window will disappear until the next editor change.
+- Separator warning will appear until clicked or the problematic characters are removed, and only instance of this warning will appear at a time.
+
 ## [1.2.0] - 2025-2-25
 
 ### Added

main.ts

@@ -1,4 +1,4 @@
-import { App, Editor, EditorPosition, EditorSuggest, EditorSuggestTriggerInfo, Notice, Plugin, PluginSettingTab, Setting, debounce } from 'obsidian';
+import { App, Editor, EditorPosition, EditorSuggest, EditorSuggestTriggerInfo, Notice, Plugin, PluginSettingTab, Setting} from 'obsidian';
 
 interface AnchorDisplaySuggestion {
 	displayText: string;
@@ -40,12 +40,14 @@ export default class AnchorDisplayText extends Plugin {
 				const cursor = editor.getCursor();
 				const currentLine = editor.getLine(cursor.line);
 
-				const lastChar = currentLine[cursor.ch - 1];
-				if (lastChar !== ']') return;
+				const lastChars = currentLine.slice(cursor.ch - 2, cursor.ch);
+				if (lastChars !== ']]') {
+					return
+				}
 
 				// match anchor links WITHOUT an already defined display text
 				const headerLinkPattern = /\[\[([^\]]+#[^|\n\r\]]+)\]\]/;
-				const match = currentLine.slice(0, cursor.ch).match(headerLinkPattern);
+				const match = currentLine.slice(0, cursor.ch + 2).match(headerLinkPattern);
 				if (match) {
 					// handle multiple subheadings
 					const headings = match[1].split('#')
@@ -98,6 +100,7 @@ export default class AnchorDisplayText extends Plugin {
 
 class AnchorDisplaySuggest extends EditorSuggest<AnchorDisplaySuggestion> {
 	private plugin: AnchorDisplayText;
+	private suggestionSelected: EditorPosition | null = null;
 
 	constructor(plugin: AnchorDisplayText) {
 		super(plugin.app);
@@ -107,17 +110,23 @@ class AnchorDisplaySuggest extends EditorSuggest<AnchorDisplaySuggestion> {
 	onTrigger(cursor: EditorPosition, editor: Editor): EditorSuggestTriggerInfo | null {
 		// turns off suggestions if the setting is disabled but the app hasn't been reloaded
 		if (!this.plugin.settings.suggest) return null;
+		if (this.suggestionSelected) {
+			if (this.suggestionSelected.ch === cursor.ch 
+				&& this.suggestionSelected.line === cursor.line) return null;
+			this.suggestionSelected = null;
+			return null;
+		}
 
 		const currentLine = editor.getLine(cursor.line);
-		const lastChar = currentLine[cursor.ch - 1];
-		if (lastChar !== ']') return null;
+		const lastChars = currentLine.slice(cursor.ch - 2, cursor.ch);
+		if (lastChars !== ']]') return null;
 
 		// match anchor links, even if they already have a display text
 		const headerLinkPattern = /(\[\[([^\]]+#[^\n\r\]]+)\]\])$/;
 		// only when cursor is immediately after the link
 		const match = currentLine.slice(0, cursor.ch).match(headerLinkPattern);
 
-		if(!match) return null;
+		if (!match) return null;
 
 		return {
 			start: {
@@ -191,17 +200,13 @@ class AnchorDisplaySuggest extends EditorSuggest<AnchorDisplaySuggestion> {
 			this.context!.start.ch = this.context!.start.ch - match[0].length;
 		}
 		editor.replaceRange(`|${value.displayText}`, this.context!.start, this.context!.end, 'headerDisplayText');
+		this.suggestionSelected = this.context!.end;
 	};
 }
 
 class AnchorDisplayTextSettingTab extends PluginSettingTab {
 	plugin: AnchorDisplayText;
-
-	private showSepNotice = debounce(
-		() => new Notice(`Separators cannot contain any of the following characters: []#^|`), 
-		1000,
-		true
-	);
+	private sepWarning: Notice | null = null;
 
 	constructor(app: App, plugin: AnchorDisplayText) {
 		super(app, plugin);
@@ -210,13 +215,21 @@ class AnchorDisplayTextSettingTab extends PluginSettingTab {
 
 	validateSep(value: string): string {
 		let validValue: string = value;
+
 		for (const c of value) {
 			if ('[]#^|'.includes(c)) {
 				validValue = validValue.replace(c, '');
 			}
 		}
 		if (validValue != value) {
-			this.showSepNotice();
+			if (!this.sepWarning) {
+				this.sepWarning = new Notice(`Separators cannot contain any of the following characters: []#^|`, 0);
+			}
+		} else {
+			if (this.sepWarning) {
+				this.sepWarning!.hide();
+				this.sepWarning = null;
+			}
 		}
 		return validValue;
 	}

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "anchor-display-text",
 	"name": "Anchor Link Display Text",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"minAppVersion": "0.15.0",
 	"description": "Automatically uses the linked heading as the display text for the anchor links.",
 	"author": "Robert C Arsenault",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "anchor-display-text-plugin",
-	"version": "1.2.0",
+	"version": "1.2.1",
 	"description": "Plugin for Obsidian (https://obsidian.md) that sets the display text of anchor links to the name of the heading.",
 	"main": "main.js",
 	"scripts": {