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

add index support to var macro

Browse Source
This commit is contained in:
LenAnderson
2024-04-18 17:41:39 -04:00
parent c1d31809a1
commit e67443abb2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/scripts/slash-commands/SlashCommandClosure.js
View File

@ -28,12 +28,12 @@ export class SlashCommandClosure {
let isList = false; let isList = false;
let listValues = []; let listValues = [];
scope = scope ?? this.scope; scope = scope ?? this.scope;
const re = /({{pipe}})|(?:{{var::([^\s]+?)}})/; const re = /({{pipe}})|(?:{{var::([^\s]+?)(?:::((?!}}).+))?}})/;
while (re.test(text)) { while (re.test(text)) {
const match = re.exec(text); const match = re.exec(text);
const before = text.slice(0, match.index); const before = text.slice(0, match.index);
const after = text.slice(match.index + match[0].length); const after = text.slice(match.index + match[0].length);
const replacer = match[1] ? scope.pipe : scope.getVariable(match[2]); const replacer = match[1] ? scope.pipe : scope.getVariable(match[2], match[3]);
if (replacer instanceof SlashCommandClosure) { if (replacer instanceof SlashCommandClosure) {
isList = true; isList = true;
if (match.index > 0) { if (match.index > 0) {