rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-01-19 04:50:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

#2268 Fix while command

Browse Source
This commit is contained in:
Cohee 2024-05-19 12:19:08 +03:00
parent 581e5f1f04
commit 48c075fb42
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/scripts/variables.js
View File

@ -337,11 +337,12 @@ async function whileCallback(args, command) {
commandResult = await command.execute(); commandResult = await command.execute();
} else { } else {
commandResult = await executeSubCommands(command, args._scope, args._parserFlags, args._abortController); commandResult = await executeSubCommands(command, args._scope, args._parserFlags, args._abortController);
if (commandResult.isAborted) {
args._abortController.abort(commandResult.abortReason, true);
}
} }
break;
if (commandResult.isAborted) {
args._abortController.abort(commandResult.abortReason, true);
break;
}
} else { } else {
break; break;
} }
@ -558,20 +559,20 @@ function evalBoolean(rule, a, b) {
* @param {string} command Command to execute. May contain escaped macro and batch separators. * @param {string} command Command to execute. May contain escaped macro and batch separators.
* @param {SlashCommandScope} [scope] The scope to use. * @param {SlashCommandScope} [scope] The scope to use.
* @param {PARSER_FLAG[]} [parserFlags] The parser flags to use. * @param {PARSER_FLAG[]} [parserFlags] The parser flags to use.
* @param {SlashCommandAbortController} [abortController] The abort controller to use.
* @returns {Promise<SlashCommandClosureResult>} Closure execution result * @returns {Promise<SlashCommandClosureResult>} Closure execution result
*/ */
async function executeSubCommands(command, scope = null, parserFlags = null) { async function executeSubCommands(command, scope = null, parserFlags = null, abortController = null) {
if (command.startsWith('"') && command.endsWith('"')) { if (command.startsWith('"') && command.endsWith('"')) {
command = command.slice(1, -1); command = command.slice(1, -1);
} }
const abortController = new SlashCommandAbortController();
const result = await executeSlashCommandsWithOptions(command, { const result = await executeSlashCommandsWithOptions(command, {
handleExecutionErrors: false, handleExecutionErrors: false,
handleParserErrors: false, handleParserErrors: false,
parserFlags, parserFlags,
scope, scope,
abortController, abortController: abortController ?? new SlashCommandAbortController(),
}); });
return result; return result;
@ -1644,7 +1645,7 @@ export function registerVariableCommands() {
returns: 'length of the provided value', returns: 'length of the provided value',
unnamedArgumentList: [ unnamedArgumentList: [
new SlashCommandArgument( new SlashCommandArgument(
'value', [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], true 'value', [ARGUMENT_TYPE.STRING, ARGUMENT_TYPE.VARIABLE_NAME], true,
), ),
], ],
helpString: ` helpString: `