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

chore: Use ES6 template strings in CSS and code generators (#5902)

Browse Source 
* Unindent CSS, save 3 kb of code.
* Convert generator functions to template strings. 
This resolves #5761.
This commit is contained in:
Neil Fraser
2022-01-28 17:58:43 -08:00
committed by GitHub
parent a31003fab9
commit 1f6a1bd8d9
39 changed files with 2194 additions and 2062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
generators/lua/text.js
View File

@@ -32,22 +32,22 @@ Lua['text_multiline'] = function(block) {
Lua['text_join'] = function(block) {
// Create a string made up of any number of elements of any type.
if (block.itemCount_ === 0) {
return ['\'\'', Lua.ORDER_ATOMIC];
return ["''", Lua.ORDER_ATOMIC];
} else if (block.itemCount_ === 1) {
const element = Lua.valueToCode(block, 'ADD0', Lua.ORDER_NONE) || '\'\'';
const element = Lua.valueToCode(block, 'ADD0', Lua.ORDER_NONE) || "''";
const code = 'tostring(' + element + ')';
return [code, Lua.ORDER_HIGH];
} else if (block.itemCount_ === 2) {
const element0 =
Lua.valueToCode(block, 'ADD0', Lua.ORDER_CONCATENATION) || '\'\'';
Lua.valueToCode(block, 'ADD0', Lua.ORDER_CONCATENATION) || "''";
const element1 =
Lua.valueToCode(block, 'ADD1', Lua.ORDER_CONCATENATION) || '\'\'';
Lua.valueToCode(block, 'ADD1', Lua.ORDER_CONCATENATION) || "''";
const code = element0 + ' .. ' + element1;
return [code, Lua.ORDER_CONCATENATION];
} else {
const elements = [];
for (let i = 0; i < block.itemCount_; i++) {
elements[i] = Lua.valueToCode(block, 'ADD' + i, Lua.ORDER_NONE) || '\'\'';
elements[i] = Lua.valueToCode(block, 'ADD' + i, Lua.ORDER_NONE) || "''";
}
const code = 'table.concat({' + elements.join(', ') + '})';
return [code, Lua.ORDER_HIGH];
@@ -59,41 +59,47 @@ Lua['text_append'] = function(block) {
const varName =
Lua.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
const value =
Lua.valueToCode(block, 'TEXT', Lua.ORDER_CONCATENATION) || '\'\'';
Lua.valueToCode(block, 'TEXT', Lua.ORDER_CONCATENATION) || "''";
return varName + ' = ' + varName + ' .. ' + value + '\n';
};
Lua['text_length'] = function(block) {
// String or array length.
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_UNARY) || '\'\'';
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_UNARY) || "''";
return ['#' + text, Lua.ORDER_UNARY];
};
Lua['text_isEmpty'] = function(block) {
// Is the string null or array empty?
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_UNARY) || '\'\'';
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_UNARY) || "''";
return ['#' + text + ' == 0', Lua.ORDER_RELATIONAL];
};
Lua['text_indexOf'] = function(block) {
// Search the text for a substring.
const substring = Lua.valueToCode(block, 'FIND', Lua.ORDER_NONE) || '\'\'';
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_NONE) || '\'\'';
const substring = Lua.valueToCode(block, 'FIND', Lua.ORDER_NONE) || "''";
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_NONE) || "''";
let functionName;
if (block.getFieldValue('END') === 'FIRST') {
functionName = Lua.provideFunction_('firstIndexOf', [
'function ' + Lua.FUNCTION_NAME_PLACEHOLDER_ + '(str, substr) ',
' local i = string.find(str, substr, 1, true)', ' if i == nil then',
' return 0', ' else', ' return i', ' end', 'end'
]);
functionName = Lua.provideFunction_('firstIndexOf', `
function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(str, substr)
local i = string.find(str, substr, 1, true)
if i == nil then
return 0
end
return i
end
`);
} else {
functionName = Lua.provideFunction_('lastIndexOf', [
'function ' + Lua.FUNCTION_NAME_PLACEHOLDER_ + '(str, substr)',
' local i = string.find(string.reverse(str), ' +
'string.reverse(substr), 1, true)',
' if i then', ' return #str + 2 - i - #substr', ' end', ' return 0',
'end'
]);
functionName = Lua.provideFunction_('lastIndexOf', `
function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(str, substr)
local i = string.find(string.reverse(str), string.reverse(substr), 1, true)
if i then
return #str + 2 - i - #substr
end
return 0
end
`);
}
const code = functionName + '(' + text + ', ' + substring + ')';
return [code, Lua.ORDER_HIGH];
@@ -105,14 +111,15 @@ Lua['text_charAt'] = function(block) {
const where = block.getFieldValue('WHERE') || 'FROM_START';
const atOrder = (where === 'FROM_END') ? Lua.ORDER_UNARY : Lua.ORDER_NONE;
const at = Lua.valueToCode(block, 'AT', atOrder) || '1';
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_NONE) || '\'\'';
const text = Lua.valueToCode(block, 'VALUE', Lua.ORDER_NONE) || "''";
let code;
if (where === 'RANDOM') {
const functionName = Lua.provideFunction_('text_random_letter', [
'function ' + Lua.FUNCTION_NAME_PLACEHOLDER_ + '(str)',
' local index = math.random(string.len(str))',
' return string.sub(str, index, index)', 'end'
]);
const functionName = Lua.provideFunction_('text_random_letter', `
function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(str)
local index = math.random(string.len(str))
return string.sub(str, index, index)
end
`);
code = functionName + '(' + text + ')';
} else {
let start;
@@ -133,10 +140,11 @@ Lua['text_charAt'] = function(block) {
code = 'string.sub(' + text + ', ' + start + ', ' + start + ')';
} else {
// use function to avoid reevaluation
const functionName = Lua.provideFunction_('text_char_at', [
'function ' + Lua.FUNCTION_NAME_PLACEHOLDER_ + '(str, index)',
' return string.sub(str, index, index)', 'end'
]);
const functionName = Lua.provideFunction_('text_char_at', `
function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(str, index)
return string.sub(str, index, index)
end
`);
code = functionName + '(' + text + ', ' + start + ')';
}
}
@@ -145,7 +153,7 @@ Lua['text_charAt'] = function(block) {
Lua['text_getSubstring'] = function(block) {
// Get substring.
const text = Lua.valueToCode(block, 'STRING', Lua.ORDER_NONE) || '\'\'';
const text = Lua.valueToCode(block, 'STRING', Lua.ORDER_NONE) || "''";
// Get start index.
const where1 = block.getFieldValue('WHERE1');
@@ -183,28 +191,35 @@ Lua['text_getSubstring'] = function(block) {
Lua['text_changeCase'] = function(block) {
// Change capitalization.
const operator = block.getFieldValue('CASE');
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || '\'\'';
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
let functionName;
if (operator === 'UPPERCASE') {
functionName = 'string.upper';
} else if (operator === 'LOWERCASE') {
functionName = 'string.lower';
} else if (operator === 'TITLECASE') {
functionName = Lua.provideFunction_(
'text_titlecase',
// There are shorter versions at
// http://lua-users.org/wiki/SciteTitleCase
// that do not preserve whitespace.
[
'function ' + Lua.FUNCTION_NAME_PLACEHOLDER_ + '(str)',
' local buf = {}', ' local inWord = false', ' for i = 1, #str do',
' local c = string.sub(str, i, i)', ' if inWord then',
' table.insert(buf, string.lower(c))',
' if string.find(c, "%s") then', ' inWord = false',
' end', ' else', ' table.insert(buf, string.upper(c))',
' inWord = true', ' end', ' end',
' return table.concat(buf)', 'end'
]);
// There are shorter versions at
// http://lua-users.org/wiki/SciteTitleCase
// that do not preserve whitespace.
functionName = Lua.provideFunction_('text_titlecase', `
function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(str)
local buf = {}
local inWord = false
for i = 1, #str do
local c = string.sub(str, i, i)
if inWord then
table.insert(buf, string.lower(c))
if string.find(c, "%s") then
inWord = false
end
else
table.insert(buf, string.upper(c))
inWord = true
end
end
return table.concat(buf)
end
`);
}
const code = functionName + '(' + text + ')';
return [code, Lua.ORDER_HIGH];
@@ -214,14 +229,14 @@ Lua['text_trim'] = function(block) {
// Trim spaces.
const OPERATORS = {LEFT: '^%s*(,-)', RIGHT: '(.-)%s*$', BOTH: '^%s*(.-)%s*$'};
const operator = OPERATORS[block.getFieldValue('MODE')];
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || '\'\'';
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
const code = 'string.gsub(' + text + ', "' + operator + '", "%1")';
return [code, Lua.ORDER_HIGH];
};
Lua['text_print'] = function(block) {
// Print statement.
const msg = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || '\'\'';
const msg = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
return 'print(' + msg + ')\n';
};
@@ -233,13 +248,16 @@ Lua['text_prompt_ext'] = function(block) {
msg = Lua.quote_(block.getFieldValue('TEXT'));
} else {
// External message.
msg = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || '\'\'';
msg = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
}
const functionName = Lua.provideFunction_('text_prompt', [
'function ' + Lua.FUNCTION_NAME_PLACEHOLDER_ + '(msg)', ' io.write(msg)',
' io.flush()', ' return io.read()', 'end'
]);
const functionName = Lua.provideFunction_('text_prompt', `
function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(msg)
io.write(msg)
io.flush()
return io.read()
end
`);
let code = functionName + '(' + msg + ')';
const toNumber = block.getFieldValue('TYPE') === 'NUMBER';
@@ -252,59 +270,58 @@ Lua['text_prompt_ext'] = function(block) {
Lua['text_prompt'] = Lua['text_prompt_ext'];
Lua['text_count'] = function(block) {
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || '\'\'';
const sub = Lua.valueToCode(block, 'SUB', Lua.ORDER_NONE) || '\'\'';
const functionName = Lua.provideFunction_('text_count', [
'function ' + Lua.FUNCTION_NAME_PLACEHOLDER_ + '(haystack, needle)',
' if #needle == 0 then',
' return #haystack + 1',
' end',
' local i = 1',
' local count = 0',
' while true do',
' i = string.find(haystack, needle, i, true)',
' if i == nil then',
' break',
' end',
' count = count + 1',
' i = i + #needle',
' end',
' return count',
'end',
]);
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
const sub = Lua.valueToCode(block, 'SUB', Lua.ORDER_NONE) || "''";
const functionName = Lua.provideFunction_('text_count', `
function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(haystack, needle)
if #needle == 0 then
return #haystack + 1
end
local i = 1
local count = 0
while true do
i = string.find(haystack, needle, i, true)
if i == nil then
break
end
count = count + 1
i = i + #needle
end
return count
end
`);
const code = functionName + '(' + text + ', ' + sub + ')';
return [code, Lua.ORDER_HIGH];
};
Lua['text_replace'] = function(block) {
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || '\'\'';
const from = Lua.valueToCode(block, 'FROM', Lua.ORDER_NONE) || '\'\'';
const to = Lua.valueToCode(block, 'TO', Lua.ORDER_NONE) || '\'\'';
const functionName = Lua.provideFunction_('text_replace', [
'function ' + Lua.FUNCTION_NAME_PLACEHOLDER_ +
'(haystack, needle, replacement)',
' local buf = {}',
' local i = 1',
' while i <= #haystack do',
' if string.sub(haystack, i, i + #needle - 1) == needle then',
' for j = 1, #replacement do',
' table.insert(buf, string.sub(replacement, j, j))',
' end',
' i = i + #needle',
' else',
' table.insert(buf, string.sub(haystack, i, i))',
' i = i + 1',
' end',
' end',
' return table.concat(buf)',
'end',
]);
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
const from = Lua.valueToCode(block, 'FROM', Lua.ORDER_NONE) || "''";
const to = Lua.valueToCode(block, 'TO', Lua.ORDER_NONE) || "''";
const functionName = Lua.provideFunction_('text_replace', `
function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(haystack, needle, replacement)
local buf = {}
local i = 1
while i <= #haystack do
if string.sub(haystack, i, i + #needle - 1) == needle then
for j = 1, #replacement do
table.insert(buf, string.sub(replacement, j, j))
end
i = i + #needle
else
table.insert(buf, string.sub(haystack, i, i))
i = i + 1
end
end
return table.concat(buf)
end
`);
const code = functionName + '(' + text + ', ' + from + ', ' + to + ')';
return [code, Lua.ORDER_HIGH];
};
Lua['text_reverse'] = function(block) {
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || '\'\'';
const text = Lua.valueToCode(block, 'TEXT', Lua.ORDER_NONE) || "''";
const code = 'string.reverse(' + text + ')';
return [code, Lua.ORDER_HIGH];
};