CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-08 01:20:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

In Code demo, give warning if a generator function is missing. (#1585)

Browse Source 
Refactored renderContent() to use new attemptCodeGeneration()
function, reducing code duplication.
attemptCodeGeneration() now calls checkAllGeneratorFunctionsDefined()
before running the generator.
This commit is contained in:
Andrew n marshall
2018-02-08 13:01:33 -08:00
committed by GitHub
parent e58c8a32d4
commit cf1c69686d
1 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
demos/code/code.js
View File

@@ -304,48 +304,63 @@ Code.renderContent = function() {
xmlTextarea.value = xmlText;
xmlTextarea.focus();
} else if (content.id == 'content_javascript') {
var code = Blockly.JavaScript.workspaceToCode(Code.workspace);
content.textContent = code;
if (typeof PR.prettyPrintOne == 'function') {
code = content.textContent;
code = PR.prettyPrintOne(code, 'js');
content.innerHTML = code;
}
Code.attemptCodeGeneration(Blockly.JavaScript, 'js');
} else if (content.id == 'content_python') {
code = Blockly.Python.workspaceToCode(Code.workspace);
content.textContent = code;
if (typeof PR.prettyPrintOne == 'function') {
code = content.textContent;
code = PR.prettyPrintOne(code, 'py');
content.innerHTML = code;
}
Code.attemptCodeGeneration(Blockly.Python, 'py');
} else if (content.id == 'content_php') {
code = Blockly.PHP.workspaceToCode(Code.workspace);
content.textContent = code;
if (typeof PR.prettyPrintOne == 'function') {
code = content.textContent;
code = PR.prettyPrintOne(code, 'php');
content.innerHTML = code;
}
Code.attemptCodeGeneration(Blockly.PHP, 'php');
} else if (content.id == 'content_dart') {
code = Blockly.Dart.workspaceToCode(Code.workspace);
content.textContent = code;
if (typeof PR.prettyPrintOne == 'function') {
code = content.textContent;
code = PR.prettyPrintOne(code, 'dart');
content.innerHTML = code;
}
Code.attemptCodeGeneration(Blockly.Dart, 'dart');
} else if (content.id == 'content_lua') {
code = Blockly.Lua.workspaceToCode(Code.workspace);
Code.attemptCodeGeneration(Blockly.Lua, 'lua');
}
};
/**
* Attempt to generate the code and display it in the UI, pretty printed.
* @param generator {!Blockly.Generator} The generator to use.
* @param prettyPrintType {string} The file type key for the pretty printer.
*/
Code.attemptCodeGeneration = function(generator, prettyPrintType) {
var content = document.getElementById('content_' + Code.selected);
content.textContent = '';
if (Code.checkAllGeneratorFunctionsDefined(generator)) {
var code = generator.workspaceToCode(Code.workspace);
content.textContent = code;
if (typeof PR.prettyPrintOne == 'function') {
code = content.textContent;
code = PR.prettyPrintOne(code, 'lua');
code = PR.prettyPrintOne(code, prettyPrintType);
content.innerHTML = code;
}
}
};
/**
* Check whether all blocks in use have generator functions.
* @param generator {!Blockly.Generator} The generator to use.
*/
Code.checkAllGeneratorFunctionsDefined = function(generator) {
var blocks = Code.workspace.getAllBlocks();
var missingBlockGenerators = [];
for (var i = 0; i < blocks.length; i++) {
var blockType = blocks[i].type;
if (!generator[blockType]) {
if (missingBlockGenerators.indexOf(blockType) === -1) {
missingBlockGenerators.push(blockType);
}
}
}
var valid = missingBlockGenerators.length == 0;
if (!valid) {
var msg = 'The generator code for the following blocks not specified for '
+ generator.name_ + ':\n - ' + missingBlockGenerators.join('\n - ');
Blockly.alert(msg); // Assuming synchronous. No callback.
}
return valid;
};
/**
* Initialize Blockly. Called on page load.
*/