Merge pull request #2896 from entrylabs/issue/8642

issue 8642
entrylabs · Jan 7, 2025 · a82ce6d · a82ce6d
2 parents a5e27b0 + 8c2436e
commit a82ce6d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git a/extern/util/static.js b/extern/util/static.js
@@ -68,6 +68,7 @@ EntryStatic.getAllBlocks = function () {
                 'repeat_inf',
                 'repeat_while_true',
                 'stop_repeat',
+                'continue_repeat',
                 '_if',
                 'if_else',
                 'wait_until_true',

diff --git a/src/playground/blocks/block_flow.js b/src/playground/blocks/block_flow.js
@@ -326,6 +326,30 @@ module.exports = {
                 },
                 syntax: { js: [], py: ['break'] },
             },
+            continue_repeat: {
+                color: EntryStatic.colorSet.block.default.FLOW,
+                outerLine: EntryStatic.colorSet.block.darken.FLOW,
+                skeleton: 'basic',
+                statements: [],
+                params: [
+                    {
+                        type: 'Indicator',
+                        img: 'block_icon/flow_icon.svg',
+                        size: 11,
+                    },
+                ],
+                events: {},
+                def: {
+                    params: [null],
+                    type: 'continue_repeat',
+                },
+                class: 'repeat',
+                isNotFor: [],
+                func(sprite, script) {
+                    return this.executor.continueLoop();
+                },
+                syntax: { js: [], py: ['continue'] },
+            },
             _if: {
                 color: EntryStatic.colorSet.block.default.FLOW,
                 outerLine: EntryStatic.colorSet.block.darken.FLOW,

diff --git a/src/playground/executors.js b/src/playground/executors.js
@@ -224,6 +224,20 @@ class Executor {
         return Entry.STATIC.PASS;
     }
 
+    continueLoop() {
+        if (this._callStack.length) {
+            this.scope = this._callStack.pop();
+        }
+        while (this._callStack.length) {
+            const schema = Entry.block[this.scope.block.type];
+            if (schema.class === 'repeat') {
+                continue;
+            }
+            this.scope = this._callStack.pop();
+        }
+        return Entry.STATIC.CONTINUE;
+    }
+
     end() {
         Entry.dispatchEvent('blockExecuteEnd', this.scope.block && this.scope.block.view);
         this.scope.block = null;