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

chore: update var to const and let in dart block generators (#5654)

Browse Source
This commit is contained in:
Rachel Fenichel
2021-10-29 12:35:15 -07:00
committed by GitHub
parent 6c49d6c7e9
commit f4e7249b1a
9 changed files with 350 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
generators/dart/procedures.js
View File

@@ -16,9 +16,9 @@ goog.require('Blockly.Dart');
Blockly.Dart['procedures_defreturn'] = function(block) {
// Define a procedure with a return value.
var funcName = Blockly.Dart.nameDB_.getName(block.getFieldValue('NAME'),
const funcName = Blockly.Dart.nameDB_.getName(block.getFieldValue('NAME'),
Blockly.PROCEDURE_CATEGORY_NAME);
var xfix1 = '';
let xfix1 = '';
if (Blockly.Dart.STATEMENT_PREFIX) {
xfix1 += Blockly.Dart.injectId(Blockly.Dart.STATEMENT_PREFIX, block);
}
@@ -28,16 +28,16 @@ Blockly.Dart['procedures_defreturn'] = function(block) {
if (xfix1) {
xfix1 = Blockly.Dart.prefixLines(xfix1, Blockly.Dart.INDENT);
}
var loopTrap = '';
let loopTrap = '';
if (Blockly.Dart.INFINITE_LOOP_TRAP) {
loopTrap = Blockly.Dart.prefixLines(
Blockly.Dart.injectId(Blockly.Dart.INFINITE_LOOP_TRAP, block),
Blockly.Dart.INDENT);
}
var branch = Blockly.Dart.statementToCode(block, 'STACK');
var returnValue = Blockly.Dart.valueToCode(block, 'RETURN',
const branch = Blockly.Dart.statementToCode(block, 'STACK');
let returnValue = Blockly.Dart.valueToCode(block, 'RETURN',
Blockly.Dart.ORDER_NONE) || '';
var xfix2 = '';
let xfix2 = '';
if (branch && returnValue) {
// After executing the function body, revisit this block for the return.
xfix2 = xfix1;
@@ -45,14 +45,14 @@ Blockly.Dart['procedures_defreturn'] = function(block) {
if (returnValue) {
returnValue = Blockly.Dart.INDENT + 'return ' + returnValue + ';\n';
}
var returnType = returnValue ? 'dynamic' : 'void';
var args = [];
var variables = block.getVars();
for (var i = 0; i < variables.length; i++) {
const returnType = returnValue ? 'dynamic' : 'void';
const args = [];
const variables = block.getVars();
for (let i = 0; i < variables.length; i++) {
args[i] = Blockly.Dart.nameDB_.getName(variables[i],
Blockly.VARIABLE_CATEGORY_NAME);
}
var code = returnType + ' ' + funcName + '(' + args.join(', ') + ') {\n' +
let code = returnType + ' ' + funcName + '(' + args.join(', ') + ') {\n' +
xfix1 + loopTrap + branch + xfix2 + returnValue + '}';
code = Blockly.Dart.scrub_(block, code);
// Add % so as not to collide with helper functions in definitions list.
@@ -66,15 +66,15 @@ Blockly.Dart['procedures_defnoreturn'] = Blockly.Dart['procedures_defreturn'];
Blockly.Dart['procedures_callreturn'] = function(block) {
// Call a procedure with a return value.
var funcName = Blockly.Dart.nameDB_.getName(block.getFieldValue('NAME'),
const funcName = Blockly.Dart.nameDB_.getName(block.getFieldValue('NAME'),
Blockly.PROCEDURE_CATEGORY_NAME);
var args = [];
var variables = block.getVars();
for (var i = 0; i < variables.length; i++) {
const args = [];
const variables = block.getVars();
for (let i = 0; i < variables.length; i++) {
args[i] = Blockly.Dart.valueToCode(block, 'ARG' + i,
Blockly.Dart.ORDER_NONE) || 'null';
}
var code = funcName + '(' + args.join(', ') + ')';
let code = funcName + '(' + args.join(', ') + ')';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
};
@@ -82,15 +82,15 @@ Blockly.Dart['procedures_callnoreturn'] = function(block) {
// Call a procedure with no return value.
// Generated code is for a function call as a statement is the same as a
// function call as a value, with the addition of line ending.
var tuple = Blockly.Dart['procedures_callreturn'](block);
const tuple = Blockly.Dart['procedures_callreturn'](block);
return tuple[0] + ';\n';
};
Blockly.Dart['procedures_ifreturn'] = function(block) {
// Conditionally return value from a procedure.
var condition = Blockly.Dart.valueToCode(block, 'CONDITION',
const condition = Blockly.Dart.valueToCode(block, 'CONDITION',
Blockly.Dart.ORDER_NONE) || 'false';
var code = 'if (' + condition + ') {\n';
let code = 'if (' + condition + ') {\n';
if (Blockly.Dart.STATEMENT_SUFFIX) {
// Inject any statement suffix here since the regular one at the end
// will not get executed if the return is triggered.
@@ -99,7 +99,7 @@ Blockly.Dart['procedures_ifreturn'] = function(block) {
Blockly.Dart.INDENT);
}
if (block.hasReturnValue_) {
var value = Blockly.Dart.valueToCode(block, 'VALUE',
const value = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_NONE) || 'null';
code += Blockly.Dart.INDENT + 'return ' + value + ';\n';
} else {