Allow blockquotes with encoded tags (#4662) * Allow blockquotes with encoded tags Fixes #4634 * Cache canUseNegativeLookbehind result * Optimize regex allocation

d08f3a2eef34959307270b485c6c4d92e725ab43

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

Signed

public/script.js+4 -1 Viewed

     importFromExternalUrl,
     shiftUpByOne,
     shiftDownByOne,
 +    canUseNegativeLookbehind,
 } from './scripts/utils.js';
 import { debounce_timeout, GENERATION_TYPE_TRIGGERS, IGNORE_SYMBOL, inject_ids } from './scripts/constants.js';

@@ -1598,7 +1599,9 @@ export function messageFormatting(mes, ch_name, isSystem, isUser, messageId, san
1598	1599	}
1599	1600
1600	1601	if (!isSystem && power_user.encode_tags) {
1601		- mes = mes.replaceAll('<', '<').replaceAll('>', '>');
	1602	+ mes = canUseNegativeLookbehind()
	1603	+ ? mes.replaceAll('<', '<').replace(new RegExp('(?<!^\|\\n\\s*)>', 'g'), '>')
	1604	+ : mes.replaceAll('<', '<').replaceAll('>', '>');
1602	1605	}
1603	1606
1604	1607	// Make sure reasoning strings are always shown, even if they include "<" or ">"

public/scripts/slash-commands.js+1 -10 Viewed

 import { Fuse, DOMPurify } from '../lib.js';
 import { canUseNegativeLookbehind, copyText, flashHighlight } from './utils.js';
 import {
     Generate,

  * @returns {Promise<AutoComplete>}
  */
 export async function setSlashCommandAutoComplete(textarea, isFloating = false) {
 -    function canUseNegativeLookbehind() {
 -        try {
 -            new RegExp('(?<!_)');
 -            return true;
 -        } catch (e) {
 -            return false;
 -        }
 -    }
+-
     if (!canUseNegativeLookbehind()) {
         console.warn('Cannot use negative lookbehind in this browser');
         return;

public/scripts/utils.js+18 -0 Viewed

 };
 /**
 + * Checks if the current environment supports negative lookbehind in regular expressions.
 + * @returns {boolean} True if negative lookbehind is supported, false otherwise.
 + */
 +export function canUseNegativeLookbehind() {
 +    let result = canUseNegativeLookbehind['result'];
 +    if (typeof result !== 'boolean') {
 +        try {
 +            new RegExp('(?<!_)');
 +            result = true;
 +        } catch (e) {
 +            result = false;
 +        }
 +        canUseNegativeLookbehind['result'] = result;
 +    }
 +    return result;
 +}
++
 +/**
  * Renders a dropdown for selecting page size in pagination.
  * @param {number} pageSize Page size
  * @param {number[]} sizeChangerOptions Array of page size options