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

chore: replace var with const and let in python block generators (#5650)

Browse Source 
* chore: replace var with const and let in python block generators

* chore: update test deps

* chore: update bracket usage in switch statements
This commit is contained in:
Rachel Fenichel
2021-10-29 11:02:58 -07:00
committed by GitHub
parent f0a874ca27
commit db78d9f280
9 changed files with 342 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
generators/python/text.js
View File

@@ -16,14 +16,14 @@ goog.require('Blockly.Python');
Blockly.Python['text'] = function(block) {
// Text value.
var code = Blockly.Python.quote_(block.getFieldValue('TEXT'));
const code = Blockly.Python.quote_(block.getFieldValue('TEXT'));
return [code, Blockly.Python.ORDER_ATOMIC];
};
Blockly.Python['text_multiline'] = function(block) {
// Text value.
var code = Blockly.Python.multiline_quote_(block.getFieldValue('TEXT'));
var order = code.indexOf('+') !== -1 ? Blockly.Python.ORDER_ADDITIVE :
const code = Blockly.Python.multiline_quote_(block.getFieldValue('TEXT'));
const order = code.indexOf('+') !== -1 ? Blockly.Python.ORDER_ADDITIVE :
Blockly.Python.ORDER_ATOMIC;
return [code, order];
};
@@ -54,41 +54,43 @@ Blockly.Python['text_join'] = function(block) {
switch (block.itemCount_) {
case 0:
return ['\'\'', Blockly.Python.ORDER_ATOMIC];
break;
case 1:
var element = Blockly.Python.valueToCode(block, 'ADD0',
case 1: {
const element = Blockly.Python.valueToCode(block, 'ADD0',
Blockly.Python.ORDER_NONE) || '\'\'';
var codeAndOrder = Blockly.Python.text.forceString_(element);
const codeAndOrder = Blockly.Python.text.forceString_(element);
return codeAndOrder;
break;
case 2:
var element0 = Blockly.Python.valueToCode(block, 'ADD0',
Blockly.Python.ORDER_NONE) || '\'\'';
var element1 = Blockly.Python.valueToCode(block, 'ADD1',
Blockly.Python.ORDER_NONE) || '\'\'';
var code = Blockly.Python.text.forceString_(element0)[0] + ' + ' +
}
case 2: {
const element0 = Blockly.Python.valueToCode(
block, 'ADD0', Blockly.Python.ORDER_NONE) ||
'\'\'';
const element1 = Blockly.Python.valueToCode(
block, 'ADD1', Blockly.Python.ORDER_NONE) ||
'\'\'';
const code = Blockly.Python.text.forceString_(element0)[0] + ' + ' +
Blockly.Python.text.forceString_(element1)[0];
return [code, Blockly.Python.ORDER_ADDITIVE];
break;
default:
var elements = [];
for (var i = 0; i < block.itemCount_; i++) {
}
default: {
const elements = [];
for (let i = 0; i < block.itemCount_; i++) {
elements[i] = Blockly.Python.valueToCode(block, 'ADD' + i,
Blockly.Python.ORDER_NONE) || '\'\'';
}
var tempVar = Blockly.Python.nameDB_.getDistinctName('x',
Blockly.VARIABLE_CATEGORY_NAME);
var code = '\'\'.join([str(' + tempVar + ') for ' + tempVar + ' in [' +
const tempVar = Blockly.Python.nameDB_.getDistinctName(
'x', Blockly.VARIABLE_CATEGORY_NAME);
const code = '\'\'.join([str(' + tempVar + ') for ' + tempVar + ' in [' +
elements.join(', ') + ']])';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
}
}
};
Blockly.Python['text_append'] = function(block) {
// Append to a variable in place.
var varName = Blockly.Python.nameDB_.getName(block.getFieldValue('VAR'),
const varName = Blockly.Python.nameDB_.getName(block.getFieldValue('VAR'),
Blockly.VARIABLE_CATEGORY_NAME);
var value = Blockly.Python.valueToCode(block, 'TEXT',
const value = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_NONE) || '\'\'';
return varName + ' = str(' + varName + ') + ' +
Blockly.Python.text.forceString_(value)[0] + '\n';
@@ -96,28 +98,28 @@ Blockly.Python['text_append'] = function(block) {
Blockly.Python['text_length'] = function(block) {
// Is the string null or array empty?
var text = Blockly.Python.valueToCode(block, 'VALUE',
const text = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_NONE) || '\'\'';
return ['len(' + text + ')', Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['text_isEmpty'] = function(block) {
// Is the string null or array empty?
var text = Blockly.Python.valueToCode(block, 'VALUE',
const text = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_NONE) || '\'\'';
var code = 'not len(' + text + ')';
const code = 'not len(' + text + ')';
return [code, Blockly.Python.ORDER_LOGICAL_NOT];
};
Blockly.Python['text_indexOf'] = function(block) {
// Search the text for a substring.
// Should we allow for non-case sensitive???
var operator = block.getFieldValue('END') === 'FIRST' ? 'find' : 'rfind';
var substring = Blockly.Python.valueToCode(block, 'FIND',
const operator = block.getFieldValue('END') === 'FIRST' ? 'find' : 'rfind';
const substring = Blockly.Python.valueToCode(block, 'FIND',
Blockly.Python.ORDER_NONE) || '\'\'';
var text = Blockly.Python.valueToCode(block, 'VALUE',
const text = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_MEMBER) || '\'\'';
var code = text + '.' + operator + '(' + substring + ')';
const code = text + '.' + operator + '(' + substring + ')';
if (block.workspace.options.oneBasedIndex) {
return [code + ' + 1', Blockly.Python.ORDER_ADDITIVE];
}
@@ -127,66 +129,74 @@ Blockly.Python['text_indexOf'] = function(block) {
Blockly.Python['text_charAt'] = function(block) {
// Get letter at index.
// Note: Until January 2013 this block did not have the WHERE input.
var where = block.getFieldValue('WHERE') || 'FROM_START';
var textOrder = (where === 'RANDOM') ? Blockly.Python.ORDER_NONE :
const where = block.getFieldValue('WHERE') || 'FROM_START';
const textOrder = (where === 'RANDOM') ? Blockly.Python.ORDER_NONE :
Blockly.Python.ORDER_MEMBER;
var text = Blockly.Python.valueToCode(block, 'VALUE', textOrder) || '\'\'';
const text = Blockly.Python.valueToCode(block, 'VALUE', textOrder) || '\'\'';
switch (where) {
case 'FIRST':
var code = text + '[0]';
case 'FIRST': {
const code = text + '[0]';
return [code, Blockly.Python.ORDER_MEMBER];
case 'LAST':
var code = text + '[-1]';
}
case 'LAST': {
const code = text + '[-1]';
return [code, Blockly.Python.ORDER_MEMBER];
case 'FROM_START':
var at = Blockly.Python.getAdjustedInt(block, 'AT');
var code = text + '[' + at + ']';
}
case 'FROM_START': {
const at = Blockly.Python.getAdjustedInt(block, 'AT');
const code = text + '[' + at + ']';
return [code, Blockly.Python.ORDER_MEMBER];
case 'FROM_END':
var at = Blockly.Python.getAdjustedInt(block, 'AT', 1, true);
var code = text + '[' + at + ']';
}
case 'FROM_END': {
const at = Blockly.Python.getAdjustedInt(block, 'AT', 1, true);
const code = text + '[' + at + ']';
return [code, Blockly.Python.ORDER_MEMBER];
case 'RANDOM':
}
case 'RANDOM': {
Blockly.Python.definitions_['import_random'] = 'import random';
var functionName = Blockly.Python.provideFunction_(
'text_random_letter',
['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(text):',
' x = int(random.random() * len(text))',
' return text[x];']);
code = functionName + '(' + text + ')';
const functionName =
Blockly.Python.provideFunction_('text_random_letter', [
'def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(text):',
' x = int(random.random() * len(text))', ' return text[x];'
]);
const code = functionName + '(' + text + ')';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
}
}
throw Error('Unhandled option (text_charAt).');
};
Blockly.Python['text_getSubstring'] = function(block) {
// Get substring.
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
var text = Blockly.Python.valueToCode(block, 'STRING',
const where1 = block.getFieldValue('WHERE1');
const where2 = block.getFieldValue('WHERE2');
const text = Blockly.Python.valueToCode(block, 'STRING',
Blockly.Python.ORDER_MEMBER) || '\'\'';
let at1;
switch (where1) {
case 'FROM_START':
var at1 = Blockly.Python.getAdjustedInt(block, 'AT1');
at1 = Blockly.Python.getAdjustedInt(block, 'AT1');
if (at1 === 0) {
at1 = '';
}
break;
case 'FROM_END':
var at1 = Blockly.Python.getAdjustedInt(block, 'AT1', 1, true);
at1 = Blockly.Python.getAdjustedInt(block, 'AT1', 1, true);
break;
case 'FIRST':
var at1 = '';
at1 = '';
break;
default:
throw Error('Unhandled option (text_getSubstring)');
}
let at2;
switch (where2) {
case 'FROM_START':
var at2 = Blockly.Python.getAdjustedInt(block, 'AT2', 1);
at2 = Blockly.Python.getAdjustedInt(block, 'AT2', 1);
break;
case 'FROM_END':
var at2 = Blockly.Python.getAdjustedInt(block, 'AT2', 0, true);
at2 = Blockly.Python.getAdjustedInt(block, 'AT2', 0, true);
// Ensure that if the result calculated is 0 that sub-sequence will
// include all elements as expected.
if (!Blockly.isNumber(String(at2))) {
@@ -197,69 +207,70 @@ Blockly.Python['text_getSubstring'] = function(block) {
}
break;
case 'LAST':
var at2 = '';
at2 = '';
break;
default:
throw Error('Unhandled option (text_getSubstring)');
}
var code = text + '[' + at1 + ' : ' + at2 + ']';
const code = text + '[' + at1 + ' : ' + at2 + ']';
return [code, Blockly.Python.ORDER_MEMBER];
};
Blockly.Python['text_changeCase'] = function(block) {
// Change capitalization.
var OPERATORS = {
const OPERATORS = {
'UPPERCASE': '.upper()',
'LOWERCASE': '.lower()',
'TITLECASE': '.title()'
};
var operator = OPERATORS[block.getFieldValue('CASE')];
var text = Blockly.Python.valueToCode(block, 'TEXT',
const operator = OPERATORS[block.getFieldValue('CASE')];
const text = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_MEMBER) || '\'\'';
var code = text + operator;
const code = text + operator;
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['text_trim'] = function(block) {
// Trim spaces.
var OPERATORS = {
const OPERATORS = {
'LEFT': '.lstrip()',
'RIGHT': '.rstrip()',
'BOTH': '.strip()'
};
var operator = OPERATORS[block.getFieldValue('MODE')];
var text = Blockly.Python.valueToCode(block, 'TEXT',
const operator = OPERATORS[block.getFieldValue('MODE')];
const text = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_MEMBER) || '\'\'';
var code = text + operator;
const code = text + operator;
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['text_print'] = function(block) {
// Print statement.
var msg = Blockly.Python.valueToCode(block, 'TEXT',
const msg = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_NONE) || '\'\'';
return 'print(' + msg + ')\n';
};
Blockly.Python['text_prompt_ext'] = function(block) {
// Prompt function.
var functionName = Blockly.Python.provideFunction_(
const functionName = Blockly.Python.provideFunction_(
'text_prompt',
['def ' + Blockly.Python.FUNCTION_NAME_PLACEHOLDER_ + '(msg):',
' try:',
' return raw_input(msg)',
' except NameError:',
' return input(msg)']);
let msg;
if (block.getField('TEXT')) {
// Internal message.
var msg = Blockly.Python.quote_(block.getFieldValue('TEXT'));
msg = Blockly.Python.quote_(block.getFieldValue('TEXT'));
} else {
// External message.
var msg = Blockly.Python.valueToCode(block, 'TEXT',
msg = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_NONE) || '\'\'';
}
var code = functionName + '(' + msg + ')';
var toNumber = block.getFieldValue('TYPE') === 'NUMBER';
let code = functionName + '(' + msg + ')';
const toNumber = block.getFieldValue('TYPE') === 'NUMBER';
if (toNumber) {
code = 'float(' + code + ')';
}
@@ -269,28 +280,28 @@ Blockly.Python['text_prompt_ext'] = function(block) {
Blockly.Python['text_prompt'] = Blockly.Python['text_prompt_ext'];
Blockly.Python['text_count'] = function(block) {
var text = Blockly.Python.valueToCode(block, 'TEXT',
const text = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_MEMBER) || '\'\'';
var sub = Blockly.Python.valueToCode(block, 'SUB',
const sub = Blockly.Python.valueToCode(block, 'SUB',
Blockly.Python.ORDER_NONE) || '\'\'';
var code = text + '.count(' + sub + ')';
const code = text + '.count(' + sub + ')';
return [code, Blockly.Python.ORDER_FUNCTION_CALL];
};
Blockly.Python['text_replace'] = function(block) {
var text = Blockly.Python.valueToCode(block, 'TEXT',
const text = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_MEMBER) || '\'\'';
var from = Blockly.Python.valueToCode(block, 'FROM',
const from = Blockly.Python.valueToCode(block, 'FROM',
Blockly.Python.ORDER_NONE) || '\'\'';
var to = Blockly.Python.valueToCode(block, 'TO',
const to = Blockly.Python.valueToCode(block, 'TO',
Blockly.Python.ORDER_NONE) || '\'\'';
var code = text + '.replace(' + from + ', ' + to + ')';
const code = text + '.replace(' + from + ', ' + to + ')';
return [code, Blockly.Python.ORDER_MEMBER];
};
Blockly.Python['text_reverse'] = function(block) {
var text = Blockly.Python.valueToCode(block, 'TEXT',
const text = Blockly.Python.valueToCode(block, 'TEXT',
Blockly.Python.ORDER_MEMBER) || '\'\'';
var code = text + '[::-1]';
const code = text + '[::-1]';
return [code, Blockly.Python.ORDER_MEMBER];
};