diff --git a/generators/dart/procedures.js b/generators/dart/procedures.js index ad2550cc7..fad15c211 100644 --- a/generators/dart/procedures.js +++ b/generators/dart/procedures.js @@ -35,9 +35,10 @@ Blockly.Dart['procedures_defreturn'] = function(block) { Blockly.Procedures.NAME_TYPE); var branch = Blockly.Dart.statementToCode(block, 'STACK'); if (Blockly.Dart.STATEMENT_PREFIX) { + var id = block.id.replace(/\$/g, '$$$$'); // Issue 251. branch = Blockly.Dart.prefixLines( Blockly.Dart.STATEMENT_PREFIX.replace(/%1/g, - '\'' + block.id + '\''), Blockly.Dart.INDENT) + branch; + '\'' + id + '\''), Blockly.Dart.INDENT) + branch; } if (Blockly.Dart.INFINITE_LOOP_TRAP) { branch = Blockly.Dart.INFINITE_LOOP_TRAP.replace(/%1/g, diff --git a/generators/javascript/procedures.js b/generators/javascript/procedures.js index 04845f9bd..aaab94350 100644 --- a/generators/javascript/procedures.js +++ b/generators/javascript/procedures.js @@ -35,9 +35,10 @@ Blockly.JavaScript['procedures_defreturn'] = function(block) { block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE); var branch = Blockly.JavaScript.statementToCode(block, 'STACK'); if (Blockly.JavaScript.STATEMENT_PREFIX) { + var id = block.id.replace(/\$/g, '$$$$'); // Issue 251. branch = Blockly.JavaScript.prefixLines( Blockly.JavaScript.STATEMENT_PREFIX.replace(/%1/g, - '\'' + block.id + '\''), Blockly.JavaScript.INDENT) + branch; + '\'' + id + '\''), Blockly.JavaScript.INDENT) + branch; } if (Blockly.JavaScript.INFINITE_LOOP_TRAP) { branch = Blockly.JavaScript.INFINITE_LOOP_TRAP.replace(/%1/g, diff --git a/generators/lua/procedures.js b/generators/lua/procedures.js index b6d6cdda1..92e7b4da2 100644 --- a/generators/lua/procedures.js +++ b/generators/lua/procedures.js @@ -35,9 +35,10 @@ Blockly.Lua['procedures_defreturn'] = function(block) { block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE); var branch = Blockly.Lua.statementToCode(block, 'STACK'); if (Blockly.Lua.STATEMENT_PREFIX) { + var id = block.id.replace(/\$/g, '$$$$'); // Issue 251. branch = Blockly.Lua.prefixLines( Blockly.Lua.STATEMENT_PREFIX.replace(/%1/g, - '\'' + block.id + '\''), Blockly.Lua.INDENT) + branch; + '\'' + id + '\''), Blockly.Lua.INDENT) + branch; } if (Blockly.Lua.INFINITE_LOOP_TRAP) { branch = Blockly.Lua.INFINITE_LOOP_TRAP.replace(/%1/g, diff --git a/generators/php/procedures.js b/generators/php/procedures.js index ac4f0244e..10569268d 100644 --- a/generators/php/procedures.js +++ b/generators/php/procedures.js @@ -49,9 +49,10 @@ Blockly.PHP['procedures_defreturn'] = function(block) { block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE); var branch = Blockly.PHP.statementToCode(block, 'STACK'); if (Blockly.PHP.STATEMENT_PREFIX) { + var id = block.id.replace(/\$/g, '$$$$'); // Issue 251. branch = Blockly.PHP.prefixLines( Blockly.PHP.STATEMENT_PREFIX.replace(/%1/g, - '\'' + block.id + '\''), Blockly.PHP.INDENT) + branch; + '\'' + id + '\''), Blockly.PHP.INDENT) + branch; } if (Blockly.PHP.INFINITE_LOOP_TRAP) { branch = Blockly.PHP.INFINITE_LOOP_TRAP.replace(/%1/g, diff --git a/generators/python/procedures.js b/generators/python/procedures.js index 10d279a90..506482d17 100644 --- a/generators/python/procedures.js +++ b/generators/python/procedures.js @@ -49,9 +49,10 @@ Blockly.Python['procedures_defreturn'] = function(block) { Blockly.Procedures.NAME_TYPE); var branch = Blockly.Python.statementToCode(block, 'STACK'); if (Blockly.Python.STATEMENT_PREFIX) { + var id = block.id.replace(/\$/g, '$$$$'); // Issue 251. branch = Blockly.Python.prefixLines( Blockly.Python.STATEMENT_PREFIX.replace(/%1/g, - '\'' + block.id + '\''), Blockly.Python.INDENT) + branch; + '\'' + id + '\''), Blockly.Python.INDENT) + branch; } if (Blockly.Python.INFINITE_LOOP_TRAP) { branch = Blockly.Python.INFINITE_LOOP_TRAP.replace(/%1/g,