Do no automatically apply non-markdown for context separators (#4003)

817474c60dd976827c18556c0d7936229cd35b62

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: c218c1baeaa58025ce38f1abc0dec742b0156097

public/scripts/showdown-exclusion.js+24 -25 Viewed

 import { power_user } from './power-user.js';
 +import { substituteParams } from '../script.js';
 -// Showdown extension to make chat separators (dinkuses) ignore markdown formatting
 +/**
 + * Showdown extension to make chat separators (dinkuses) ignore markdown formatting
 + * @returns {import('showdown').ShowdownExtension[]} An array of Showdown extensions
 + */
 export const markdownExclusionExt = () => {
     if (!power_user) {
         console.log('Showdown-dinkus extension: power_user wasn\'t found! Returning.');
         return [];
+    }
 -    let combinedExcludeString = '';
 +    // The extension will only be applied if the user has non-empty "Non-markdown strings"
 -    if (power_user.context.chat_start) {
 +    // Changing the string in the UI reloads the processor, so we don't need to worry about it
 -        combinedExcludeString += `${power_user.context.chat_start},`;
 +    if (!power_user.markdown_escape_strings) {
 -    }
+-
 -    if (power_user.context.example_separator) {
 -        combinedExcludeString += `${power_user.context.example_separator},`;
 -    }
+-
 -    if (power_user.markdown_escape_strings) {
 -        combinedExcludeString += power_user.markdown_escape_strings;
 -    }
+-
 -    const escapedExclusions = combinedExcludeString
 -        .split(',')
 -        .filter((element) => element.length > 0)
 -        .map((element) => `(${element.split('').map((char) => `\\${char}`).join('')})`);
+-
+-
 -    // No exclusions? No extension!
 -    if (!combinedExcludeString || combinedExcludeString.length === 0 || escapedExclusions.length === 0) {
         return [];
+    }
 -    const replaceRegex = new RegExp(`^(${escapedExclusions.join('|')})\n`, 'gm');
 +    // Escape the strings to be excluded from markdown parsing
 +    // Function is evaluated every time, so we don't care about stale macros in the strings
     return [{
         type: 'lang',
 -        regex: replaceRegex,
 +        filter: (text) => {
 -        replace: ((match) => match.replace(replaceRegex, `\u0000${match} \n`)),
 +            const escapedExclusions = substituteParams(power_user.markdown_escape_strings)
 +                .split(',')
 +                .filter((element) => element.length > 0)
 +                .map((element) => `(${element.split('').map((char) => `\\${char}`).join('')})`);
++
 +            // No exclusions? No extension!
 +            if (escapedExclusions.length === 0) {
 +                return text;
 +            }
++
 +            const replaceRegex = new RegExp(`^(${escapedExclusions.join('|')})\n`, 'gm');
 +            return text.replace(replaceRegex, ((match) => match.replace(replaceRegex, `\u0000${match} \n`)));
 +        },
     }];
 };