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

Set generator’s isInitialized to false in finish

Browse Source 
Previously isInitialized would remain true after first generation.
Also move common init/finish code to parent class.
This commit is contained in:
Neil Fraser
2021-05-21 10:17:26 -07:00
committed by Neil Fraser
parent 5d2c48e1ab
commit b50cb5779f
5 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
generators/dart.js
View File

@@ -83,15 +83,11 @@ Blockly.Dart.isInitialized = false;
* @param {!Blockly.Workspace} workspace Workspace to generate code from.
*/
Blockly.Dart.init = function(workspace) {
// Create a dictionary of definitions to be printed before the code.
Blockly.Dart.definitions_ = Object.create(null);
// Create a dictionary mapping desired function names in definitions_
// to actual function names (to avoid collisions with user functions).
Blockly.Dart.functionNames_ = Object.create(null);
// Call Blockly.Generator's init.
Object.getPrototypeOf(this).init.call(this);
if (!Blockly.Dart.nameDB_) {
Blockly.Dart.nameDB_ =
new Blockly.Names(Blockly.Dart.RESERVED_WORDS_);
Blockly.Dart.nameDB_ = new Blockly.Names(Blockly.Dart.RESERVED_WORDS_);
} else {
Blockly.Dart.nameDB_.reset();
}
@@ -144,9 +140,10 @@ Blockly.Dart.finish = function(code) {
definitions.push(def);
}
}
// Clean up temporary data.
delete Blockly.Dart.definitions_;
delete Blockly.Dart.functionNames_;
// Call Blockly.Generator's finish.
code = Object.getPrototypeOf(this).finish.call(this, code);
this.isInitialized = false;
Blockly.Dart.nameDB_.reset();
var allDefs = imports.join('\n') + '\n\n' + definitions.join('\n\n');
return allDefs.replace(/\n\n+/g, '\n\n').replace(/\n*$/, '\n\n\n') + code;