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

escaping

Browse Source
This commit is contained in:
LenAnderson
2024-04-12 17:29:12 -04:00
parent ca6b9c5d63
commit 271b73b7e4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ export class SlashCommandParser {
} }
testClosure() { testClosure() {
return this.ahead.length > 0 && this.char == '{' && this.ahead[0] == ':'; return this.ahead.length > 0 && this.char == '{' && this.ahead[0] == ':' && this.behind.slice(-1) != '\\';
} }
testClosureEnd() { testClosureEnd() {
if (this.ahead.length < 1) throw new SlashCommandParserError(`Unclosed closure at position ${this.index - 2}`, this.text, this.index); if (this.ahead.length < 1) throw new SlashCommandParserError(`Unclosed closure at position ${this.index - 2}`, this.text, this.index);
@ -395,7 +395,7 @@ export class SlashCommandParser {
let value = ''; let value = '';
while (!this.testQuotedValueEnd()) value += this.take(); // take all chars until closing quote while (!this.testQuotedValueEnd()) value += this.take(); // take all chars until closing quote
this.take(); // discard closing quote this.take(); // discard closing quote
return value; return value.replace(/\\(")/g, '$1');
} }
testListValue() { testListValue() {
@ -409,19 +409,19 @@ export class SlashCommandParser {
let value = ''; let value = '';
while (!this.testListValueEnd()) value += this.take(); // take all chars until closing bracket while (!this.testListValueEnd()) value += this.take(); // take all chars until closing bracket
value += this.take(); // take closing bracket value += this.take(); // take closing bracket
return value; return value.replace(/\\([[\]])/g, '$1');
} }
testValue() { testValue() {
return !/\s/.test(this.char); return !/\s/.test(this.char);
} }
testValueEnd() { testValueEnd() {
if (/\s/.test(this.char)) return true; if (/\s/.test(this.char) && this.behind.slice(-1) != '\\') return true;
return this.testCommandEnd(); return this.testCommandEnd();
} }
parseValue() { parseValue() {
let value = ''; let value = '';
while (!this.testValueEnd()) value += this.take(); // take all chars until value end while (!this.testValueEnd()) value += this.take(); // take all chars until value end
return value; return value.replace(/\\([\s{:])/g, '$1');
} }
} }