Merge branch 'develop' into loadCostume

.npmignore

@@ -6,7 +6,7 @@
 /.github
 /.travis.yml
 /.tx
--/test
+/test
 
 # Build created files
 /playground

src/blocks/scratch3_data.js

@@ -23,6 +23,7 @@ class Scratch3DataBlocks {
             data_listcontents: this.getListContents,
             data_addtolist: this.addToList,
             data_deleteoflist: this.deleteOfList,
+            data_deletealloflist: this.deleteAllOfList,
             data_insertatlist: this.insertAtList,
             data_replaceitemoflist: this.replaceItemOfList,
             data_itemoflist: this.getItemOfList,
@@ -136,6 +137,13 @@ class Scratch3DataBlocks {
         list._monitorUpToDate = false;
     }
 
+    deleteAllOfList (args, util) {
+        const list = util.target.lookupOrCreateList(
+            args.LIST.id, args.LIST.name);
+        list.value = [];
+        return;
+    }
+
     insertAtList (args, util) {
         const item = args.ITEM;
         const list = util.target.lookupOrCreateList(

src/engine/runtime.js

@@ -58,6 +58,10 @@ const ArgumentTypeMap = (() => {
     map[ArgumentType.BOOLEAN] = {
         check: 'Boolean'
     };
+    map[ArgumentType.MATRIX] = {
+        shadowType: 'matrix',
+        fieldType: 'MATRIX'
+    };
     return map;
 })();
 

src/extension-support/argument-type.js

@@ -26,7 +26,12 @@ const ArgumentType = {
     /**
      * String value with text field
      */
-    STRING: 'string'
+    STRING: 'string',
+
+    /**
+     * String value with matirx field
+     */
+    MATRIX: 'matrix'
 };
 
 module.exports = ArgumentType;

src/extension-support/extension-manager.js

@@ -144,18 +144,21 @@ class ExtensionManager {
     }
 
     /**
-    * regenerate blockinfo for any loaded extensions
+     * Regenerate blockinfo for any loaded extensions
-    */
+     * @returns {Promise} resolved once all the extensions have been reinitialized
+     */
     refreshBlocks () {
-        this._loadedExtensions.forEach(serviceName => {
+        const allPromises = Array.from(this._loadedExtensions.values()).map(serviceName =>
             dispatch.call(serviceName, 'getInfo')
                 .then(info => {
+                    info = this._prepareExtensionInfo(serviceName, info);
                     dispatch.call('runtime', '_refreshExtensionPrimitives', info);
                 })
                 .catch(e => {
                     log.error(`Failed to refresh buildtin extension primitives: ${JSON.stringify(e)}`);
-                });
+                })
-        });
+        );
+        return Promise.all(allPromises);
     }
 
     allocateWorker () {

src/io/bleSession.js

@@ -51,8 +51,8 @@ class BLESession extends JSONRPCWebSocket {
         this.sendRemoteRequest('connect', {peripheralId: id})
             .then(() => {
                 log.info('should have connected');
-                this._runtime.emit(this._runtime.constructor.PERIPHERAL_CONNECTED);
                 this._connected = true;
+                this._runtime.emit(this._runtime.constructor.PERIPHERAL_CONNECTED);
                 this._connectCallback();
             })
             .catch(e => {

src/io/btSession.js

@@ -53,8 +53,8 @@ class BTSession extends JSONRPCWebSocket {
         this.sendRemoteRequest('connect', {peripheralId: id})
             .then(() => {
                 log.info('should have connected');
-                this._runtime.emit(this._runtime.constructor.PERIPHERAL_CONNECTED);
                 this._connected = true;
+                this._runtime.emit(this._runtime.constructor.PERIPHERAL_CONNECTED);
                 this._connectCallback();
             })
             .catch(e => {

src/virtual-machine.js

@@ -916,12 +916,15 @@ class VirtualMachine extends EventEmitter {
      * set the current locale and builtin messages for the VM
      * @param {[type]} locale       current locale
      * @param {[type]} messages     builtin messages map for current locale
+     * @returns {Promise} Promise that resolves when all the blocks have been
+     *     updated for a new locale (or empty if locale hasn't changed.)
      */
     setLocale (locale, messages) {
-        if (locale !== formatMessage.setup().locale) {
+        if (locale === formatMessage.setup().locale) {
-            formatMessage.setup({locale: locale, translations: {[locale]: messages}});
+            return Promise.resolve();
-            this.extensionManager.refreshBlocks();
         }
+        formatMessage.setup({locale: locale, translations: {[locale]: messages}});
+        return this.extensionManager.refreshBlocks();
     }
 
     /**