blockly 7.20211209.2 → 8.0.0

package/generators/dart/colour.js

@@ -24,17 +24,16 @@ Dart['colour_picker'] = function(block) {
 
 Dart['colour_random'] = function(block) {
   // Generate a random colour.
-  Dart.definitions_['import_dart_math'] =
-      'import \'dart:math\' as Math;';
-  const functionName = Dart.provideFunction_(
-      'colour_random',
-      ['String ' + Dart.FUNCTION_NAME_PLACEHOLDER_ + '() {',
-       '  String hex = \'0123456789abcdef\';',
-       '  var rnd = new Math.Random();',
-       '  return \'#${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\'',
-       '      \'${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\'',
-       '      \'${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\';',
-       '}']);
+  Dart.definitions_['import_dart_math'] = "import 'dart:math' as Math;";
+  const functionName = Dart.provideFunction_('colour_random', `
+String ${Dart.FUNCTION_NAME_PLACEHOLDER_}() {
+  String hex = '0123456789abcdef';
+  var rnd = new Math.Random();
+  return '#\${hex[rnd.nextInt(16)]}\${hex[rnd.nextInt(16)]}'
+      '\${hex[rnd.nextInt(16)]}\${hex[rnd.nextInt(16)]}'
+      '\${hex[rnd.nextInt(16)]}\${hex[rnd.nextInt(16)]}';
+}
+`);
   const code = functionName + '()';
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
@@ -48,66 +47,59 @@ Dart['colour_rgb'] = function(block) {
   const blue = Dart.valueToCode(block, 'BLUE',
       Dart.ORDER_NONE) || 0;
 
-  Dart.definitions_['import_dart_math'] =
-      'import \'dart:math\' as Math;';
-  const functionName = Dart.provideFunction_(
-      'colour_rgb',
-      ['String ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
-          '(num r, num g, num b) {',
-       '  num rn = (Math.max(Math.min(r, 100), 0) * 2.55).round();',
-       '  String rs = rn.toInt().toRadixString(16);',
-       '  rs = \'0$rs\';',
-       '  rs = rs.substring(rs.length - 2);',
-       '  num gn = (Math.max(Math.min(g, 100), 0) * 2.55).round();',
-       '  String gs = gn.toInt().toRadixString(16);',
-       '  gs = \'0$gs\';',
-       '  gs = gs.substring(gs.length - 2);',
-       '  num bn = (Math.max(Math.min(b, 100), 0) * 2.55).round();',
-       '  String bs = bn.toInt().toRadixString(16);',
-       '  bs = \'0$bs\';',
-       '  bs = bs.substring(bs.length - 2);',
-       '  return \'#$rs$gs$bs\';',
-       '}']);
+  Dart.definitions_['import_dart_math'] = "import 'dart:math' as Math;";
+  const functionName = Dart.provideFunction_('colour_rgb', `
+String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(num r, num g, num b) {
+  num rn = (Math.max(Math.min(r, 100), 0) * 2.55).round();
+  String rs = rn.toInt().toRadixString(16);
+  rs = '0$rs';
+  rs = rs.substring(rs.length - 2);
+  num gn = (Math.max(Math.min(g, 100), 0) * 2.55).round();
+  String gs = gn.toInt().toRadixString(16);
+  gs = '0$gs';
+  gs = gs.substring(gs.length - 2);
+  num bn = (Math.max(Math.min(b, 100), 0) * 2.55).round();
+  String bs = bn.toInt().toRadixString(16);
+  bs = '0$bs';
+  bs = bs.substring(bs.length - 2);
+  return '#$rs$gs$bs';
+}
+`);
   const code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
 Dart['colour_blend'] = function(block) {
   // Blend two colours together.
-  const c1 = Dart.valueToCode(block, 'COLOUR1',
-      Dart.ORDER_NONE) || '\'#000000\'';
-  const c2 = Dart.valueToCode(block, 'COLOUR2',
-      Dart.ORDER_NONE) || '\'#000000\'';
-  const ratio = Dart.valueToCode(block, 'RATIO',
-      Dart.ORDER_NONE) || 0.5;
+  const c1 = Dart.valueToCode(block, 'COLOUR1', Dart.ORDER_NONE) || "'#000000'";
+  const c2 = Dart.valueToCode(block, 'COLOUR2', Dart.ORDER_NONE) || "'#000000'";
+  const ratio = Dart.valueToCode(block, 'RATIO', Dart.ORDER_NONE) || 0.5;
 
-  Dart.definitions_['import_dart_math'] =
-      'import \'dart:math\' as Math;';
-  const functionName = Dart.provideFunction_(
-      'colour_blend',
-      ['String ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
-          '(String c1, String c2, num ratio) {',
-       '  ratio = Math.max(Math.min(ratio, 1), 0);',
-       '  int r1 = int.parse(\'0x${c1.substring(1, 3)}\');',
-       '  int g1 = int.parse(\'0x${c1.substring(3, 5)}\');',
-       '  int b1 = int.parse(\'0x${c1.substring(5, 7)}\');',
-       '  int r2 = int.parse(\'0x${c2.substring(1, 3)}\');',
-       '  int g2 = int.parse(\'0x${c2.substring(3, 5)}\');',
-       '  int b2 = int.parse(\'0x${c2.substring(5, 7)}\');',
-       '  num rn = (r1 * (1 - ratio) + r2 * ratio).round();',
-       '  String rs = rn.toInt().toRadixString(16);',
-       '  num gn = (g1 * (1 - ratio) + g2 * ratio).round();',
-       '  String gs = gn.toInt().toRadixString(16);',
-       '  num bn = (b1 * (1 - ratio) + b2 * ratio).round();',
-       '  String bs = bn.toInt().toRadixString(16);',
-       '  rs = \'0$rs\';',
-       '  rs = rs.substring(rs.length - 2);',
-       '  gs = \'0$gs\';',
-       '  gs = gs.substring(gs.length - 2);',
-       '  bs = \'0$bs\';',
-       '  bs = bs.substring(bs.length - 2);',
-       '  return \'#$rs$gs$bs\';',
-       '}']);
+  Dart.definitions_['import_dart_math'] = "import 'dart:math' as Math;";
+  const functionName = Dart.provideFunction_('colour_blend', `
+String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String c1, String c2, num ratio) {
+  ratio = Math.max(Math.min(ratio, 1), 0);
+  int r1 = int.parse('0x\${c1.substring(1, 3)}');
+  int g1 = int.parse('0x\${c1.substring(3, 5)}');
+  int b1 = int.parse('0x\${c1.substring(5, 7)}');
+  int r2 = int.parse('0x\${c2.substring(1, 3)}');
+  int g2 = int.parse('0x\${c2.substring(3, 5)}');
+  int b2 = int.parse('0x\${c2.substring(5, 7)}');
+  num rn = (r1 * (1 - ratio) + r2 * ratio).round();
+  String rs = rn.toInt().toRadixString(16);
+  num gn = (g1 * (1 - ratio) + g2 * ratio).round();
+  String gs = gn.toInt().toRadixString(16);
+  num bn = (b1 * (1 - ratio) + b2 * ratio).round();
+  String bs = bn.toInt().toRadixString(16);
+  rs = '0$rs';
+  rs = rs.substring(rs.length - 2);
+  gs = '0$gs';
+  gs = gs.substring(gs.length - 2);
+  bs = '0$bs';
+  bs = bs.substring(bs.length - 2);
+  return '#$rs$gs$bs';
+}
+`);
   const code = functionName + '(' + c1 + ', ' + c2 + ', ' + ratio + ')';
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };

package/generators/dart/lists.js

@@ -58,7 +58,7 @@ Dart['lists_indexOf'] = function(block) {
   // Find an item in the list.
   const operator =
       block.getFieldValue('END') === 'FIRST' ? 'indexOf' : 'lastIndexOf';
-  const item = Dart.valueToCode(block, 'FIND', Dart.ORDER_NONE) || '\'\'';
+  const item = Dart.valueToCode(block, 'FIND', Dart.ORDER_NONE) || "''";
   const list =
       Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || '[]';
   const code = list + '.' + operator + '(' + item + ')';
@@ -112,21 +112,23 @@ Dart['lists_getIndex'] = function(block) {
       } else if (mode === 'GET') {
         const at = Dart.getAdjusted(block, 'AT', 1);
         // We need to create a procedure to avoid reevaluating values.
-        const functionName = Dart.provideFunction_('lists_get_from_end', [
-          'dynamic ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
-              '(List my_list, num x) {',
-          '  x = my_list.length - x;', '  return my_list[x];', '}'
-        ]);
+        const functionName = Dart.provideFunction_('lists_get_from_end', `
+dynamic ${Dart.FUNCTION_NAME_PLACEHOLDER_}(List my_list, num x) {
+  x = my_list.length - x;
+  return my_list[x];
+}
+`);
         const code = functionName + '(' + list + ', ' + at + ')';
         return [code, Dart.ORDER_UNARY_POSTFIX];
       } else if (mode === 'GET_REMOVE') {
         const at = Dart.getAdjusted(block, 'AT', 1);
         // We need to create a procedure to avoid reevaluating values.
-        const functionName = Dart.provideFunction_('lists_remove_from_end', [
-          'dynamic ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
-              '(List my_list, num x) {',
-          '  x = my_list.length - x;', '  return my_list.removeAt(x);', '}'
-        ]);
+        const functionName = Dart.provideFunction_('lists_remove_from_end', `
+dynamic ${Dart.FUNCTION_NAME_PLACEHOLDER_}(List my_list, num x) {
+  x = my_list.length - x;
+  return my_list.removeAt(x);
+}
+`);
         const code = functionName + '(' + list + ', ' + at + ')';
         return [code, Dart.ORDER_UNARY_POSTFIX];
       }
@@ -195,21 +197,22 @@ Dart['lists_getIndex'] = function(block) {
           code += list + '.removeAt(' + xVar + ');\n';
           return code;
         } else if (mode === 'GET') {
-          const functionName = Dart.provideFunction_('lists_get_random_item', [
-            'dynamic ' + Dart.FUNCTION_NAME_PLACEHOLDER_ + '(List my_list) {',
-            '  int x = new Math.Random().nextInt(my_list.length);',
-            '  return my_list[x];', '}'
-          ]);
+          const functionName = Dart.provideFunction_('lists_get_random_item', `
+dynamic ${Dart.FUNCTION_NAME_PLACEHOLDER_}(List my_list) {
+  int x = new Math.Random().nextInt(my_list.length);
+  return my_list[x];
+}
+`);
           const code = functionName + '(' + list + ')';
           return [code, Dart.ORDER_UNARY_POSTFIX];
         } else if (mode === 'GET_REMOVE') {
           const functionName =
-              Dart.provideFunction_('lists_remove_random_item', [
-                'dynamic ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
-                    '(List my_list) {',
-                '  int x = new Math.Random().nextInt(my_list.length);',
-                '  return my_list.removeAt(x);', '}'
-              ]);
+              Dart.provideFunction_('lists_remove_random_item', `
+dynamic ${Dart.FUNCTION_NAME_PLACEHOLDER_}(List my_list) {
+  int x = new Math.Random().nextInt(my_list.length);
+  return my_list.removeAt(x);
+}
+`);
           const code = functionName + '(' + list + ')';
           return [code, Dart.ORDER_UNARY_POSTFIX];
         }
@@ -344,18 +347,25 @@ Dart['lists_getSublist'] = function(block) {
   } else {
     const at1 = Dart.getAdjusted(block, 'AT1');
     const at2 = Dart.getAdjusted(block, 'AT2');
-    const functionName = Dart.provideFunction_('lists_get_sublist', [
-      'List ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
-          '(List list, String where1, num at1, String where2, num at2) {',
-      '  int getAt(String where, num at) {', '    if (where == \'FROM_END\') {',
-      '      at = list.length - 1 - at;',
-      '    } else if (where == \'FIRST\') {', '      at = 0;',
-      '    } else if (where == \'LAST\') {', '      at = list.length - 1;',
-      '    } else if (where != \'FROM_START\') {',
-      '      throw \'Unhandled option (lists_getSublist).\';', '    }',
-      '    return at;', '  }', '  at1 = getAt(where1, at1);',
-      '  at2 = getAt(where2, at2) + 1;', '  return list.sublist(at1, at2);', '}'
-    ]);
+    const functionName = Dart.provideFunction_('lists_get_sublist', `
+List ${Dart.FUNCTION_NAME_PLACEHOLDER_}(List list, String where1, num at1, String where2, num at2) {
+  int getAt(String where, num at) {
+    if (where == 'FROM_END') {
+      at = list.length - 1 - at;
+    } else if (where == 'FIRST') {
+      at = 0;
+    } else if (where == 'LAST') {
+      at = list.length - 1;
+    } else if (where != 'FROM_START') {
+      throw 'Unhandled option (lists_getSublist).';
+    }
+    return at;
+  }
+  at1 = getAt(where1, at1);
+  at2 = getAt(where2, at2) + 1;
+  return list.sublist(at1, at2);
+}
+`);
     code = functionName + '(' + list + ', \'' + where1 + '\', ' + at1 + ', \'' +
         where2 + '\', ' + at2 + ')';
   }
@@ -367,20 +377,21 @@ Dart['lists_sort'] = function(block) {
   const list = Dart.valueToCode(block, 'LIST', Dart.ORDER_NONE) || '[]';
   const direction = block.getFieldValue('DIRECTION') === '1' ? 1 : -1;
   const type = block.getFieldValue('TYPE');
-  const sortFunctionName = Dart.provideFunction_('lists_sort', [
-    'List ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
-        '(List list, String type, int direction) {',
-    '  var compareFuncs = {',
-    '    "NUMERIC": (a, b) => (direction * a.compareTo(b)).toInt(),',
-    '    "TEXT": (a, b) => direction * ' +
-        'a.toString().compareTo(b.toString()),',
-    '    "IGNORE_CASE": ', '       (a, b) => direction * ',
-    '      a.toString().toLowerCase().compareTo(b.toString().toLowerCase())',
-    '  };',
-    '  list = new List.from(list);',  // Clone the list.
-    '  var compare = compareFuncs[type];', '  list.sort(compare);',
-    '  return list;', '}'
-  ]);
+  const sortFunctionName = Dart.provideFunction_('lists_sort', `
+List ${Dart.FUNCTION_NAME_PLACEHOLDER_}(List list, String type, int direction) {
+  var compareFuncs = {
+    'NUMERIC': (a, b) => (direction * a.compareTo(b)).toInt(),
+    'TEXT': (a, b) => direction * a.toString().compareTo(b.toString()),
+    'IGNORE_CASE':
+      (a, b) => direction *
+      a.toString().toLowerCase().compareTo(b.toString().toLowerCase())
+  };
+  list = new List.from(list);
+  var compare = compareFuncs[type];
+  list.sort(compare);
+  return list;
+}
+`);
   return [
     sortFunctionName + '(' + list + ', ' +
         '"' + type + '", ' + direction + ')',
@@ -391,12 +402,12 @@ Dart['lists_sort'] = function(block) {
 Dart['lists_split'] = function(block) {
   // Block for splitting text into a list, or joining a list into text.
   let input = Dart.valueToCode(block, 'INPUT', Dart.ORDER_UNARY_POSTFIX);
-  const delimiter = Dart.valueToCode(block, 'DELIM', Dart.ORDER_NONE) || '\'\'';
+  const delimiter = Dart.valueToCode(block, 'DELIM', Dart.ORDER_NONE) || "''";
   const mode = block.getFieldValue('MODE');
   let functionName;
   if (mode === 'SPLIT') {
     if (!input) {
-      input = '\'\'';
+      input = "''";
     }
     functionName = 'split';
   } else if (mode === 'JOIN') {