Skip to content
This repository was archived by the owner on Jan 27, 2026. It is now read-only.

Code generation fix for unknown blocks #152

Merged
joshlory merged 1 commit into from
Nov 15, 2018
Merged

Code generation fix for unknown blocks #152

Show file tree
Hide file tree
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
10 changes: 6 additions & 4 deletions core/code_generation/generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,13 @@ Blockly.CodeGenerator.prototype.blockToCode = function(block, opt_showHidden) {
return this.blockToCode(nextBlock, opt_showHidden);
}

var func = this[block.type];
if (!func) {
return Blockly.Generator.prefixLines('Unknown block: ' + block.type + '\n', '// ');
var generatorFunc = this[block.type];
var code;
if (!generatorFunc) {
code = Blockly.Generator.prefixLines('Unknown block: ' + block.type + '\n', '// ');
} else {
code = generatorFunc.call(block);
}
var code = func.call(block);

if (code instanceof Array) {
// Value blocks return tuples of code and operator order.
Expand Down
52 changes: 52 additions & 0 deletions tests/generator_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,45 @@
*/
'use strict';

var UNKNOWN_BLOCK = `<xml>
<block type="variables_set">
<title name="VAR">i</title>
<value name="VALUE">
<block type="text">
<title name="TEXT"></title>
</block>
</value>
<next>
<block type="NOT_VALID_TYPE">
<value name="VALUE">
<block type="text">
<title name="TEXT"></title>
</block>
</value>
<next>
<block type="variables_set">
<title name="VAR">i</title>
<value name="VALUE">
<block type="text">
<title name="TEXT"></title>
</block>
</value>
</block>
</next>
</block>
</next>
</block>
</xml>`;

var UNKNOWN_BLOCK_AS_CODE =
`var i;


i = '';
// Unknown block: NOT_VALID_TYPE
i = '';
`

function test_get() {
var language1 = Blockly.Generator.get('INTERCAL');
var language2 = Blockly.Generator.get('INTERCAL');
Expand All @@ -31,3 +70,16 @@ function test_prefix() {
assertEquals('Prefix one line.', '12Hello\n', Blockly.Generator.prefixLines('Hello\n', '12'));
assertEquals('Prefix two lines.', '***Hello\n***World\n', Blockly.Generator.prefixLines('Hello\nWorld\n', '***'));
}

function test_unknownBlock() {
var container = Blockly.Test.initializeBlockSpaceEditor();
var blockSpace = Blockly.mainBlockSpace;

Blockly.Xml.domToBlockSpace(blockSpace, Blockly.Xml.textToDom(UNKNOWN_BLOCK));

var generatedCode = Blockly.Generator.blockSpaceToCode('JavaScript');

assertEquals(generatedCode, UNKNOWN_BLOCK_AS_CODE);

goog.dom.removeNode(container);
}