From 05f3a5d8a1a65d3372575290ad051edec5c68b88 Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Thu, 31 Aug 2023 14:39:31 +0300 Subject: [PATCH] #1041 Auto-fix displayed markdown for unbalanced quotes/asterisks --- public/script.js | 4 ++-- public/scripts/power-user.js | 26 ++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/public/script.js b/public/script.js index cfc24f8a4..1e800c5de 100644 --- a/public/script.js +++ b/public/script.js @@ -1236,7 +1236,7 @@ function messageFormatting(mes, ch_name, isSystem, isUser) { } if (power_user.auto_fix_generated_markdown) { - mes = fixMarkdown(mes); + mes = fixMarkdown(mes, true); } if (!isSystem && power_user.encode_tags) { @@ -3862,7 +3862,7 @@ function cleanUpMessage(getMessage, isImpersonate, isContinue, displayIncomplete } } if (power_user.auto_fix_generated_markdown) { - getMessage = fixMarkdown(getMessage); + getMessage = fixMarkdown(getMessage, false); } return getMessage; } diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js index a3f36e7bf..cc2c3660f 100644 --- a/public/scripts/power-user.js +++ b/public/scripts/power-user.js @@ -30,7 +30,7 @@ import { import { registerSlashCommand } from "./slash-commands.js"; import { tokenizers } from "./tokenizers.js"; -import { delay, resetScrollHeight } from "./utils.js"; +import { countOccurrences, delay, isOdd, resetScrollHeight } from "./utils.js"; export { loadPowerUserSettings, @@ -283,6 +283,7 @@ function collapseNewlines(x) { /** * Fix formatting problems in markdown. * @param {string} text Text to be processed. + * @param {boolean} forDisplay Whether the text is being processed for display. * @returns {string} Processed text. * @example * "^example * text*\n" // "^example *text*\n" @@ -296,7 +297,7 @@ function collapseNewlines(x) { * // and you HAVE to handle the cases where multiple pairs of asterisks exist in the same line * "^example * text* * harder problem *\n" // "^example *text* *harder problem*\n" */ -function fixMarkdown(text) { +function fixMarkdown(text, forDisplay) { // Find pairs of formatting characters and capture the text in between them const format = /([\*_]{1,2})([\s\S]*?)\1/gm; let matches = []; @@ -313,6 +314,27 @@ function fixMarkdown(text) { newText = newText.slice(0, matches[i].index) + replacementText + newText.slice(matches[i].index + matchText.length); } + // Don't auto-fix asterisks if this is a message clean-up procedure. + // It botches the continue function. Apply this to display only. + if (!forDisplay) { + return newText; + } + + const splitText = newText.split('\n'); + + // Fix asterisks, and quotes that are not paired + for (let index = 0; index < splitText.length; index++) { + const line = splitText[index]; + const charsToCheck = ['*', '"']; + for (const char of charsToCheck) { + if (line.includes(char) && isOdd(countOccurrences(line, char))) { + splitText[index] = line.trimEnd() + char; + } + } + } + + newText = splitText.join('\n'); + return newText; }