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

Fix indentation for function blocks with return statements (#1362)

Browse Source 
* fix indentation for the return statement in function blocks that return a value

* Fix hard-coded autoindent, and swap it for Blockly.PHP.INDENT

* Fix hard-coded 2 spaces indent and use language-appropriate global indent
This commit is contained in:
Nicole Parrot
2017-10-17 18:20:11 -04:00
committed by Rachel Fenichel
parent 5c00256e96
commit 97ce5b3e4f
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
generators/dart/procedures.js
View File

@@ -47,7 +47,7 @@ Blockly.Dart['procedures_defreturn'] = function(block) {
var returnValue = Blockly.Dart.valueToCode(block, 'RETURN',
Blockly.Dart.ORDER_NONE) || '';
if (returnValue) {
returnValue = ' return ' + returnValue + ';\n';
returnValue = Blockly.Dart.INDENT + 'return ' + returnValue + ';\n';
}
var returnType = returnValue ? 'dynamic' : 'void';
var args = [];
@@ -101,9 +101,9 @@ Blockly.Dart['procedures_ifreturn'] = function(block) {
if (block.hasReturnValue_) {
var value = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_NONE) || 'null';
code += ' return ' + value + ';\n';
code += Blockly.Dart.INDENT + 'return ' + value + ';\n';
} else {
code += ' return;\n';
code += Blockly.Dart.INDENT + 'return;\n';
}
code += '}\n';
return code;

6
generators/javascript/procedures.js
View File

@@ -47,7 +47,7 @@ Blockly.JavaScript['procedures_defreturn'] = function(block) {
var returnValue = Blockly.JavaScript.valueToCode(block, 'RETURN',
Blockly.JavaScript.ORDER_NONE) || '';
if (returnValue) {
returnValue = ' return ' + returnValue + ';\n';
returnValue = Blockly.JavaScript.INDENT + 'return ' + returnValue + ';\n';
}
var args = [];
for (var i = 0; i < block.arguments_.length; i++) {
@@ -101,9 +101,9 @@ Blockly.JavaScript['procedures_ifreturn'] = function(block) {
if (block.hasReturnValue_) {
var value = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_NONE) || 'null';
code += ' return ' + value + ';\n';
code += Blockly.JavaScript.INDENT + 'return ' + value + ';\n';
} else {
code += ' return;\n';
code += Blockly.JavaScript.INDENT + 'return;\n';
}
code += '}\n';
return code;

6
generators/lua/procedures.js
View File

@@ -47,7 +47,7 @@ Blockly.Lua['procedures_defreturn'] = function(block) {
var returnValue = Blockly.Lua.valueToCode(block, 'RETURN',
Blockly.Lua.ORDER_NONE) || '';
if (returnValue) {
returnValue = ' return ' + returnValue + '\n';
returnValue = Blockly.Lua.INDENT + 'return ' + returnValue + '\n';
} else if (!branch) {
branch = '';
}
@@ -103,9 +103,9 @@ Blockly.Lua['procedures_ifreturn'] = function(block) {
if (block.hasReturnValue_) {
var value = Blockly.Lua.valueToCode(block, 'VALUE',
Blockly.Lua.ORDER_NONE) || 'nil';
code += ' return ' + value + '\n';
code += Blockly.Lua.INDENT + 'return ' + value + '\n';
} else {
code += ' return\n';
code += Blockly.Lua.INDENT + 'return\n';
}
code += 'end\n';
return code;

8
generators/php/procedures.js
View File

@@ -43,7 +43,7 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
Blockly.Variables.NAME_TYPE));
}
}
globals = globals.length ? ' global ' + globals.join(', ') + ';\n' : '';
globals = globals.length ? Blockly.PHP.INDENT + 'global ' + globals.join(', ') + ';\n' : '';
var funcName = Blockly.PHP.variableDB_.getName(
block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
@@ -61,7 +61,7 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
var returnValue = Blockly.PHP.valueToCode(block, 'RETURN',
Blockly.PHP.ORDER_NONE) || '';
if (returnValue) {
returnValue = ' return ' + returnValue + ';\n';
returnValue = Blockly.PHP.INDENT + 'return ' + returnValue + ';\n';
}
var args = [];
for (var i = 0; i < block.arguments_.length; i++) {
@@ -115,9 +115,9 @@ Blockly.PHP['procedures_ifreturn'] = function(block) {
if (block.hasReturnValue_) {
var value = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'null';
code += ' return ' + value + ';\n';
code += Blockly.PHP.INDENT + 'return ' + value + ';\n';
} else {
code += ' return;\n';
code += Blockly.PHP.INDENT + 'return;\n';
}
code += '}\n';
return code;

6
generators/python/procedures.js
View File

@@ -61,7 +61,7 @@ Blockly.Python['procedures_defreturn'] = function(block) {
var returnValue = Blockly.Python.valueToCode(block, 'RETURN',
Blockly.Python.ORDER_NONE) || '';
if (returnValue) {
returnValue = ' return ' + returnValue + '\n';
returnValue = Blockly.Python.INDENT + 'return ' + returnValue + '\n';
} else if (!branch) {
branch = Blockly.Python.PASS;
}
@@ -117,9 +117,9 @@ Blockly.Python['procedures_ifreturn'] = function(block) {
if (block.hasReturnValue_) {
var value = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_NONE) || 'None';
code += ' return ' + value + '\n';
code += Blockly.Python.INDENT + 'return ' + value + '\n';
} else {
code += ' return\n';
code += Blockly.Python.INDENT + 'return\n';
}
return code;
};