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 double pipe a pipe breaker

Browse Source
This commit is contained in:
LenAnderson
2024-04-09 20:11:30 -04:00
parent 66c5fc554d
commit 18b851f77f
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
public/scripts/slash-commands/SlashCommandParser.js
View File

@ -213,6 +213,7 @@ export class SlashCommandParser {
return this.char == ':' && this.ahead[0] == '}' && this.behind.slice(-1) != '\\';
}
parseClosure() {
let injectPipe = true;
this.take(2); // discard opening {:
let closure = new SlashCommandClosure(this.scope);
this.scope = closure.scope;
@ -224,11 +225,23 @@ export class SlashCommandParser {
}
while (!this.testClosureEnd()) {
if (this.testCommand()) {
closure.executorList.push(this.parseCommand());
const cmd = this.parseCommand();
cmd.injectPipe = injectPipe;
closure.executorList.push(cmd);
injectPipe = true;
} else {
while (!this.testCommandEnd()) this.take(1); // discard plain text and comments
while (!this.testCommandEnd()) this.take(); // discard plain text and comments
}
while (/\s|\|/.test(this.char)) this.take(); // discard whitespace and pipe (command separator)
this.discardWhitespace();
// first pipe marks end of command
if (this.char == '|') {
this.take(); // discard first pipe
// second pipe indicates no pipe injection for the next command
if (this.char == '|') {
injectPipe = false;
}
}
while (/\s|\|/.test(this.char)) this.take(); // discard whitespace and further pipes (command separator)
}
this.take(2); // discard closing :}
if (this.char == '(' && this.ahead[0] == ')') {