tTag === "sup" || currentTag === "sub") { @@ -374,38 +408,84 @@ var SupSubPlugin = class extends import_obsidian.Plugin { } editor.focus(); setTimeout(() => { - const selection = editor.getSelection(); - if (selection) { - const regex = new RegExp(`<${tag}>(.*?)`, "s"); - const matches = regex.exec(selection); - if (matches) { - const debracketedSelection = matches[1]; - editor.replaceSelection(debracketedSelection); - new import_obsidian.Notice(`${tag} tags removed`); - } else { - const wrappedSelection = `<${tag}>${selection}`; - editor.replaceSelection(wrappedSelection); - new import_obsidian.Notice(`${tag} tags added`); - } - this.hideSupSubButtons(); - if (this.settings.hideTags) { - const cursor = editor.getCursor(); - const lineContent = editor.getLine(cursor.line); - const optimizedLine = this.optimizeTags(lineContent, tag); - editor.setLine(cursor.line, optimizedLine); + try { + const selection = editor.getSelection(); + if (selection) { + const cursorFrom = editor.getCursor("from"); + const cursorTo = editor.getCursor("to"); + let handled = false; + if (cursorFrom.line === cursorTo.line) { + const line = editor.getLine(cursorFrom.line); + const tagRegex = /<(sup|sub)>([\s\S]*?)<\/\1>/g; + let tagMatch; + while ((tagMatch = tagRegex.exec(line)) !== null) { + const mStart = tagMatch.index; + const mEnd = tagMatch.index + tagMatch[0].length; + if (cursorFrom.ch < mEnd && cursorTo.ch > mStart) { + editor.setSelection( + { line: cursorFrom.line, ch: mStart }, + { line: cursorFrom.line, ch: mEnd } + ); + editor.replaceSelection(tagMatch[2]); + new import_obsidian.Notice(`${tagMatch[1]} tags removed`); + this.hideSupSubButtons(); + if (this.settings.hideTags) { + const cursor = editor.getCursor(); + const lineContent = editor.getLine(cursor.line); + const optimizedLine = this.optimizeTags(lineContent, tagMatch[1]); + if (optimizedLine !== lineContent) { + editor.setLine(cursor.line, optimizedLine); + } + } + this.selectionStart = null; + this.selectionEnd = null; + const endPos = editor.getCursor("to"); + requestAnimationFrame(() => { + editor.setCursor(endPos); + }); + handled = true; + break; + } + } + } + if (!handled) { + if (/<\/?(sup|sub)>/i.test(selection)) { + new import_obsidian.Notice("Selection already contains tags"); + this.hideSupSubButtons(); + this.selectionStart = null; + this.selectionEnd = null; + return; + } + const wrappedSelection = `<${tag}>${selection}`; + editor.replaceSelection(wrappedSelection); + new import_obsidian.Notice(`${tag} tags added`); + this.hideSupSubButtons(); + if (this.settings.hideTags) { + const cursor = editor.getCursor(); + const lineContent = editor.getLine(cursor.line); + const optimizedLine = this.optimizeTags(lineContent, tag); + if (optimizedLine !== lineContent) { + editor.setLine(cursor.line, optimizedLine); + } + } + this.selectionStart = null; + this.selectionEnd = null; + const endPos = editor.getCursor("to"); +