enabled setting custom blocks labels to (nested) lists of label parts

jmoenig · Aug 12, 2024 · 25c73cf · 25c73cf
1 parent be87c43
commit 25c73cf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,11 @@
 # Snap! (BYOB) History
 
 ## in development:
+* **Notable Changes:**
+    * enabled setting custom blocks labels to (nested) lists of label parts, not just in DEFINE but also in SET
+
+### 2024-08-12
+* threads: enabled setting custom blocks labels to (nested) lists of label parts
 
 ## 10.0.2:
 * **Notable Fixes:**

diff --git a/snap.html b/snap.html
@@ -17,7 +17,7 @@
         <script src="src/symbols.js?version=2024-01-24"></script>
         <script src="src/widgets.js?version=2024-07-24"></script>
         <script src="src/blocks.js?version=2024-06-10"></script>
-        <script src="src/threads.js?version=2024-08-05"></script>
+        <script src="src/threads.js?version=2024-08-12"></script>
         <script src="src/objects.js?version=2024-08-07"></script>
         <script src="src/scenes.js?version=2024-05-28"></script>
         <script src="src/gui.js?version=2024-08-09"></script>

diff --git a/src/threads.js b/src/threads.js
@@ -65,7 +65,7 @@ StagePickerMorph, CustomBlockDefinition, CommentMorph*/
 
 /*jshint esversion: 11, bitwise: false, evil: true*/
 
-modules.threads = '2024-August-05';
+modules.threads = '2024-August-12';
 
 var ThreadManager;
 var Process;
@@ -8404,8 +8404,16 @@ Process.prototype.doSetBlockAttribute = function (attribute, block, val) {
             (oldType == 'command' && rep.includes(type));
     }
 
+    function labelFromList(list) {
+        return list.map(each => each instanceof List ? each.asWords()
+            : each).asTXT().replaceAll('\n', ' $nl ');
+    }
+
     switch (choice) {
     case 'label':
+        if (val instanceof List) {
+            val = labelFromList(val);
+        }
         def.setBlockLabel(val);
         break;
     case 'comment':