Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2020
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 45 additions & 3 deletions src/lib/ruby-to-blocks-converter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -80,6 +106,7 @@ class RubyToBlocksConverter {
errors: [],
argumentBlocks: {},
procedureCallBlocks: {},
extensionIDs: new Set(),

blocks: {},
blockTypes: {},
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down