Merge pull request #227 from /issues/217

fixed could not convert extension ruby code to block if never enabled…

Author: takaokouji

src/lib/ruby-to-blocks-converter/index.js

@@ -27,6 +27,32 @@ import GdxForConverter from './gdx_for';
 /* eslint-disable no-invalid-this */
 const ColorRegexp = /^#[0-9a-fA-F]{6}$/;
 
+// from scratch-vm/src/serialization/sb3.js
+const CORE_EXTENSIONS = [
+    'argument',
+    'colour',
+    'control',
+    'data',
+    'event',
+    'looks',
+    'math',
+    'motion',
+    'operator',
+    'procedures',
+    'sensing',
+    'sound'
+];
+
+// from scratch-vm/src/serialization/sb3.js
+const getExtensionIdForOpcode = function (opcode) {
+    const index = opcode.indexOf('_');
+    const prefix = opcode.substring(0, index);
+    if (CORE_EXTENSIONS.indexOf(prefix) === -1) {
+        if (prefix !== '') return prefix;
+    }
+    return null;
+};
+
 /**
  * Class for a block converter that translates ruby code into the blocks.
  */
@@ -80,6 +106,7 @@ class RubyToBlocksConverter {
             errors: [],
             argumentBlocks: {},
             procedureCallBlocks: {},
+            extensionIDs: new Set(),
 
             blocks: {},
             blockTypes: {},
@@ -127,6 +154,11 @@ class RubyToBlocksConverter {
                         `could not convert ${block.opcode}: ${this._getSource(block.node)}`
                     );
                 }
+
+                const extensionID = getExtensionIdForOpcode(block.opcode);
+                if (extensionID) {
+                    this._context.extensionIDs.add(extensionID);
+                }
             });
             return true;
         } catch (e) {
@@ -182,11 +214,21 @@ class RubyToBlocksConverter {
         Object.keys(target.blocks._blocks).forEach(blockId => {
             target.blocks.deleteBlock(blockId);
         });
-        Object.keys(this._context.blocks).forEach(blockId => {
-            target.blocks.createBlock(this._context.blocks[blockId]);
+
+        const extensionPromises = [];
+        this._context.extensionIDs.forEach(extensionID => {
+            if (!this.vm.extensionManager.isExtensionLoaded(extensionID)) {
+                extensionPromises.push(this.vm.extensionManager.loadExtensionURL(extensionID));
+            }
         });
 
-        this.vm.emitWorkspaceUpdate();
+        Promise.all(extensionPromises).then(() => {
+            Object.keys(this._context.blocks).forEach(blockId => {
+                target.blocks.createBlock(this._context.blocks[blockId]);
+            });
+
+            this.vm.emitWorkspaceUpdate();
+        });
     }
 
     _callConvertersHandler (handlerName) {