rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Respect match index in regex scripts replacement

Browse Source
This commit is contained in:
Cohee
2024-01-03 12:28:56 +02:00
parent 223325e8bb
commit 04d3dcf39f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/scripts/extensions/regex/engine.js
View File

@ -62,7 +62,13 @@ function getRegexedString(rawString, placement, { characterOverride, isMarkdown,
return finalString; return finalString;
} }
// Runs the provided regex script on the given string /**
* Runs the provided regex script on the given string
* @param {object} regexScript The regex script to run
* @param {string} rawString The string to run the regex script on
* @param {object} params The parameters to use for the regex script
* @returns {string} The new string
*/
function runRegexScript(regexScript, rawString, { characterOverride } = {}) { function runRegexScript(regexScript, rawString, { characterOverride } = {}) {
let newString = rawString; let newString = rawString;
if (!regexScript || !!(regexScript.disabled) || !regexScript?.findRegex || !rawString) { if (!regexScript || !!(regexScript.disabled) || !regexScript?.findRegex || !rawString) {
@ -102,9 +108,9 @@ function runRegexScript(regexScript, rawString, { characterOverride } = {}) {
}, },
); );
if (!newString) { if (!newString) {
newString = rawString.replace(fencedMatch, subReplaceString); newString = rawString.slice(0, match.index) + rawString.slice(match.index).replace(fencedMatch, subReplaceString);
} else { } else {
newString = newString.replace(fencedMatch, subReplaceString); newString = newString.slice(0, match.index) + newString.slice(match.index).replace(fencedMatch, subReplaceString);
} }
// If the regex isn't global, break out of the loop // If the regex isn't global, break out of the loop