blockly 7.20211209.4 → 8.0.1

package/generators/dart/text.js

@@ -35,10 +35,10 @@ Dart['text_join'] = function(block) {
   // Create a string made up of any number of elements of any type.
   switch (block.itemCount_) {
     case 0:
-      return ['\'\'', Dart.ORDER_ATOMIC];
+      return ["''", Dart.ORDER_ATOMIC];
     case 1: {
       const element =
-          Dart.valueToCode(block, 'ADD0', Dart.ORDER_UNARY_POSTFIX) || '\'\'';
+          Dart.valueToCode(block, 'ADD0', Dart.ORDER_UNARY_POSTFIX) || "''";
       const code = element + '.toString()';
       return [code, Dart.ORDER_UNARY_POSTFIX];
     }
@@ -46,7 +46,7 @@ Dart['text_join'] = function(block) {
       const elements = new Array(block.itemCount_);
       for (let i = 0; i < block.itemCount_; i++) {
         elements[i] =
-            Dart.valueToCode(block, 'ADD' + i, Dart.ORDER_NONE) || '\'\'';
+            Dart.valueToCode(block, 'ADD' + i, Dart.ORDER_NONE) || "''";
       }
       const code = '[' + elements.join(',') + '].join()';
       return [code, Dart.ORDER_UNARY_POSTFIX];
@@ -58,21 +58,21 @@ Dart['text_append'] = function(block) {
   // Append to a variable in place.
   const varName =
       Dart.nameDB_.getName(block.getFieldValue('VAR'), NameType.VARIABLE);
-  const value = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || '\'\'';
+  const value = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
   return varName + ' = [' + varName + ', ' + value + '].join();\n';
 };
 
 Dart['text_length'] = function(block) {
   // String or array length.
   const text =
-      Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || '\'\'';
+      Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || "''";
   return [text + '.length', Dart.ORDER_UNARY_POSTFIX];
 };
 
 Dart['text_isEmpty'] = function(block) {
   // Is the string null or array empty?
   const text =
-      Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || '\'\'';
+      Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || "''";
   return [text + '.isEmpty', Dart.ORDER_UNARY_POSTFIX];
 };
 
@@ -80,9 +80,9 @@ Dart['text_indexOf'] = function(block) {
   // Search the text for a substring.
   const operator =
       block.getFieldValue('END') === 'FIRST' ? 'indexOf' : 'lastIndexOf';
-  const substring = Dart.valueToCode(block, 'FIND', Dart.ORDER_NONE) || '\'\'';
+  const substring = Dart.valueToCode(block, 'FIND', Dart.ORDER_NONE) || "''";
   const text =
-      Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || '\'\'';
+      Dart.valueToCode(block, 'VALUE', Dart.ORDER_UNARY_POSTFIX) || "''";
   const code = text + '.' + operator + '(' + substring + ')';
   if (block.workspace.options.oneBasedIndex) {
     return [code + ' + 1', Dart.ORDER_ADDITIVE];
@@ -97,7 +97,7 @@ Dart['text_charAt'] = function(block) {
   const textOrder = (where === 'FIRST' || where === 'FROM_START') ?
       Dart.ORDER_UNARY_POSTFIX :
       Dart.ORDER_NONE;
-  const text = Dart.valueToCode(block, 'VALUE', textOrder) || '\'\'';
+  const text = Dart.valueToCode(block, 'VALUE', textOrder) || "''";
   let at;
   switch (where) {
     case 'FIRST': {
@@ -114,20 +114,22 @@ Dart['text_charAt'] = function(block) {
       // Fall through.
     case 'FROM_END': {
       at = Dart.getAdjusted(block, 'AT', 1);
-      const functionName = Dart.provideFunction_('text_get_from_end', [
-        'String ' + Dart.FUNCTION_NAME_PLACEHOLDER_ + '(String text, num x) {',
-        '  return text[text.length - x];', '}'
-      ]);
+      const functionName = Dart.provideFunction_('text_get_from_end', `
+String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String text, num x) {
+  return text[text.length - x];
+}
+`);
       const code = functionName + '(' + text + ', ' + at + ')';
       return [code, Dart.ORDER_UNARY_POSTFIX];
     }
     case 'RANDOM': {
       Dart.definitions_['import_dart_math'] = 'import \'dart:math\' as Math;';
-      const functionName = Dart.provideFunction_('text_random_letter', [
-        'String ' + Dart.FUNCTION_NAME_PLACEHOLDER_ + '(String text) {',
-        '  int x = new Math.Random().nextInt(text.length);',
-        '  return text[x];', '}'
-      ]);
+      const functionName = Dart.provideFunction_('text_random_letter', `
+String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String text) {
+  int x = new Math.Random().nextInt(text.length);
+  return text[x];
+}
+`);
       const code = functionName + '(' + text + ')';
       return [code, Dart.ORDER_UNARY_POSTFIX];
     }
@@ -142,7 +144,7 @@ Dart['text_getSubstring'] = function(block) {
   const requiresLengthCall = (where1 !== 'FROM_END' && where2 === 'FROM_START');
   const textOrder =
       requiresLengthCall ? Dart.ORDER_UNARY_POSTFIX : Dart.ORDER_NONE;
-  const text = Dart.valueToCode(block, 'STRING', textOrder) || '\'\'';
+  const text = Dart.valueToCode(block, 'STRING', textOrder) || "''";
   let code;
   if (where1 === 'FIRST' && where2 === 'LAST') {
     code = text;
@@ -188,19 +190,25 @@ Dart['text_getSubstring'] = function(block) {
   } else {
     const at1 = Dart.getAdjusted(block, 'AT1');
     const at2 = Dart.getAdjusted(block, 'AT2');
-    const functionName = Dart.provideFunction_('text_get_substring', [
-      'String ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
-          '(String text, String where1, num at1, String where2, num at2) {',
-      '  int getAt(String where, num at) {', '    if (where == \'FROM_END\') {',
-      '      at = text.length - 1 - at;',
-      '    } else if (where == \'FIRST\') {', '      at = 0;',
-      '    } else if (where == \'LAST\') {', '      at = text.length - 1;',
-      '    } else if (where != \'FROM_START\') {',
-      '      throw \'Unhandled option (text_getSubstring).\';', '    }',
-      '    return at;', '  }', '  at1 = getAt(where1, at1);',
-      '  at2 = getAt(where2, at2) + 1;', '  return text.substring(at1, at2);',
-      '}'
-    ]);
+    const functionName = Dart.provideFunction_('text_get_substring', `
+String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String text, String where1, num at1, String where2, num at2) {
+  int getAt(String where, num at) {
+    if (where == 'FROM_END') {
+      at = text.length - 1 - at;
+    } else if (where == 'FIRST') {
+      at = 0;
+    } else if (where == 'LAST') {
+      at = text.length - 1;
+    } else if (where != 'FROM_START') {
+      throw 'Unhandled option (text_getSubstring).';
+    }
+    return at;
+  }
+  at1 = getAt(where1, at1);
+  at2 = getAt(where2, at2) + 1;
+  return text.substring(at1, at2);
+}
+`);
     code = functionName + '(' + text + ', \'' + where1 + '\', ' + at1 + ', \'' +
         where2 + '\', ' + at2 + ')';
   }
@@ -216,23 +224,29 @@ Dart['text_changeCase'] = function(block) {
   };
   const operator = OPERATORS[block.getFieldValue('CASE')];
   const textOrder = operator ? Dart.ORDER_UNARY_POSTFIX : Dart.ORDER_NONE;
-  const text = Dart.valueToCode(block, 'TEXT', textOrder) || '\'\'';
+  const text = Dart.valueToCode(block, 'TEXT', textOrder) || "''";
   let code;
   if (operator) {
     // Upper and lower case are functions built into Dart.
     code = text + operator;
   } else {
     // Title case is not a native Dart function.  Define one.
-    const functionName = Dart.provideFunction_('text_toTitleCase', [
-      'String ' + Dart.FUNCTION_NAME_PLACEHOLDER_ + '(String str) {',
-      '  RegExp exp = new RegExp(r\'\\b\');',
-      '  List<String> list = str.split(exp);',
-      '  final title = new StringBuffer();', '  for (String part in list) {',
-      '    if (part.length > 0) {', '      title.write(part[0].toUpperCase());',
-      '      if (part.length > 0) {',
-      '        title.write(part.substring(1).toLowerCase());', '      }',
-      '    }', '  }', '  return title.toString();', '}'
-    ]);
+    const functionName = Dart.provideFunction_('text_toTitleCase', `
+String ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String str) {
+  RegExp exp = new RegExp(r'\\b');
+  List<String> list = str.split(exp);
+  final title = new StringBuffer();
+  for (String part in list) {
+    if (part.length > 0) {
+      title.write(part[0].toUpperCase());
+      if (part.length > 0) {
+        title.write(part.substring(1).toLowerCase());
+      }
+    }
+  }
+  return title.toString();
+}
+`);
     code = functionName + '(' + text + ')';
   }
   return [code, Dart.ORDER_UNARY_POSTFIX];
@@ -247,13 +261,13 @@ Dart['text_trim'] = function(block) {
   };
   const operator = OPERATORS[block.getFieldValue('MODE')];
   const text =
-      Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || '\'\'';
+      Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || "''";
   return [text + operator, Dart.ORDER_UNARY_POSTFIX];
 };
 
 Dart['text_print'] = function(block) {
   // Print statement.
-  const msg = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || '\'\'';
+  const msg = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
   return 'print(' + msg + ');\n';
 };
 
@@ -266,7 +280,7 @@ Dart['text_prompt_ext'] = function(block) {
     msg = Dart.quote_(block.getFieldValue('TEXT'));
   } else {
     // External message.
-    msg = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || '\'\'';
+    msg = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
   }
   let code = 'Html.window.prompt(' + msg + ', \'\')';
   const toNumber = block.getFieldValue('TYPE') === 'NUMBER';
@@ -280,27 +294,35 @@ Dart['text_prompt_ext'] = function(block) {
 Dart['text_prompt'] = Dart['text_prompt_ext'];
 
 Dart['text_count'] = function(block) {
-  const text = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || '\'\'';
-  const sub = Dart.valueToCode(block, 'SUB', Dart.ORDER_NONE) || '\'\'';
+  const text = Dart.valueToCode(block, 'TEXT', Dart.ORDER_NONE) || "''";
+  const sub = Dart.valueToCode(block, 'SUB', Dart.ORDER_NONE) || "''";
   // Substring count is not a native Dart function.  Define one.
-  const functionName = Dart.provideFunction_('text_count', [
-    'int ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
-        '(String haystack, String needle) {',
-    '  if (needle.length == 0) {', '    return haystack.length + 1;', '  }',
-    '  int index = 0;', '  int count = 0;', '  while (index != -1) {',
-    '    index = haystack.indexOf(needle, index);', '    if (index != -1) {',
-    '      count++;', '     index += needle.length;', '    }', '  }',
-    '  return count;', '}'
-  ]);
+  const functionName = Dart.provideFunction_('text_count', `
+int ${Dart.FUNCTION_NAME_PLACEHOLDER_}(String haystack, String needle) {
+  if (needle.length == 0) {
+    return haystack.length + 1;
+  }
+  int index = 0;
+  int count = 0;
+  while (index != -1) {
+    index = haystack.indexOf(needle, index);
+    if (index != -1) {
+      count++;
+     index += needle.length;
+    }
+  }
+  return count;
+}
+`);
   const code = functionName + '(' + text + ', ' + sub + ')';
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
 Dart['text_replace'] = function(block) {
   const text =
-      Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || '\'\'';
-  const from = Dart.valueToCode(block, 'FROM', Dart.ORDER_NONE) || '\'\'';
-  const to = Dart.valueToCode(block, 'TO', Dart.ORDER_NONE) || '\'\'';
+      Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || "''";
+  const from = Dart.valueToCode(block, 'FROM', Dart.ORDER_NONE) || "''";
+  const to = Dart.valueToCode(block, 'TO', Dart.ORDER_NONE) || "''";
   const code = text + '.replaceAll(' + from + ', ' + to + ')';
   return [code, Dart.ORDER_UNARY_POSTFIX];
 };
@@ -310,7 +332,7 @@ Dart['text_reverse'] = function(block) {
   // http://stackoverflow.com/a/21613700/3529104
   // Implementing something is possibly better than not implementing anything?
   const text =
-      Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || '\'\'';
+      Dart.valueToCode(block, 'TEXT', Dart.ORDER_UNARY_POSTFIX) || "''";
   const code = 'new String.fromCharCodes(' + text + '.runes.toList().reversed)';
   return [code, Dart.ORDER_UNARY_PREFIX];
 };

package/generators/javascript/colour.js

@@ -22,11 +22,12 @@ JavaScript['colour_picker'] = function(block) {
 
 JavaScript['colour_random'] = function(block) {
   // Generate a random colour.
-  const functionName = JavaScript.provideFunction_('colourRandom', [
-    'function ' + JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '() {',
-    '  var num = Math.floor(Math.random() * Math.pow(2, 24));',
-    '  return \'#\' + (\'00000\' + num.toString(16)).substr(-6);', '}'
-  ]);
+  const functionName = JavaScript.provideFunction_('colourRandom', `
+function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}() {
+  var num = Math.floor(Math.random() * Math.pow(2, 24));
+  return '#' + ('00000' + num.toString(16)).substr(-6);
+}
+`);
   const code = functionName + '()';
   return [code, JavaScript.ORDER_FUNCTION_CALL];
 };
@@ -38,16 +39,17 @@ JavaScript['colour_rgb'] = function(block) {
       JavaScript.valueToCode(block, 'GREEN', JavaScript.ORDER_NONE) || 0;
   const blue =
       JavaScript.valueToCode(block, 'BLUE', JavaScript.ORDER_NONE) || 0;
-  const functionName = JavaScript.provideFunction_('colourRgb', [
-    'function ' + JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(r, g, b) {',
-    '  r = Math.max(Math.min(Number(r), 100), 0) * 2.55;',
-    '  g = Math.max(Math.min(Number(g), 100), 0) * 2.55;',
-    '  b = Math.max(Math.min(Number(b), 100), 0) * 2.55;',
-    '  r = (\'0\' + (Math.round(r) || 0).toString(16)).slice(-2);',
-    '  g = (\'0\' + (Math.round(g) || 0).toString(16)).slice(-2);',
-    '  b = (\'0\' + (Math.round(b) || 0).toString(16)).slice(-2);',
-    '  return \'#\' + r + g + b;', '}'
-  ]);
+  const functionName = JavaScript.provideFunction_('colourRgb', `
+function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(r, g, b) {
+  r = Math.max(Math.min(Number(r), 100), 0) * 2.55;
+  g = Math.max(Math.min(Number(g), 100), 0) * 2.55;
+  b = Math.max(Math.min(Number(b), 100), 0) * 2.55;
+  r = ('0' + (Math.round(r) || 0).toString(16)).slice(-2);
+  g = ('0' + (Math.round(g) || 0).toString(16)).slice(-2);
+  b = ('0' + (Math.round(b) || 0).toString(16)).slice(-2);
+  return '#' + r + g + b;
+}
+`);
   const code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
   return [code, JavaScript.ORDER_FUNCTION_CALL];
 };
@@ -55,28 +57,29 @@ JavaScript['colour_rgb'] = function(block) {
 JavaScript['colour_blend'] = function(block) {
   // Blend two colours together.
   const c1 = JavaScript.valueToCode(block, 'COLOUR1', JavaScript.ORDER_NONE) ||
-      '\'#000000\'';
+      "'#000000'";
   const c2 = JavaScript.valueToCode(block, 'COLOUR2', JavaScript.ORDER_NONE) ||
-      '\'#000000\'';
+      "'#000000'";
   const ratio =
       JavaScript.valueToCode(block, 'RATIO', JavaScript.ORDER_NONE) || 0.5;
-  const functionName = JavaScript.provideFunction_('colourBlend', [
-    'function ' + JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(c1, c2, ratio) {',
-    '  ratio = Math.max(Math.min(Number(ratio), 1), 0);',
-    '  var r1 = parseInt(c1.substring(1, 3), 16);',
-    '  var g1 = parseInt(c1.substring(3, 5), 16);',
-    '  var b1 = parseInt(c1.substring(5, 7), 16);',
-    '  var r2 = parseInt(c2.substring(1, 3), 16);',
-    '  var g2 = parseInt(c2.substring(3, 5), 16);',
-    '  var b2 = parseInt(c2.substring(5, 7), 16);',
-    '  var r = Math.round(r1 * (1 - ratio) + r2 * ratio);',
-    '  var g = Math.round(g1 * (1 - ratio) + g2 * ratio);',
-    '  var b = Math.round(b1 * (1 - ratio) + b2 * ratio);',
-    '  r = (\'0\' + (r || 0).toString(16)).slice(-2);',
-    '  g = (\'0\' + (g || 0).toString(16)).slice(-2);',
-    '  b = (\'0\' + (b || 0).toString(16)).slice(-2);',
-    '  return \'#\' + r + g + b;', '}'
-  ]);
+  const functionName = JavaScript.provideFunction_('colourBlend', `
+function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(c1, c2, ratio) {
+  ratio = Math.max(Math.min(Number(ratio), 1), 0);
+  var r1 = parseInt(c1.substring(1, 3), 16);
+  var g1 = parseInt(c1.substring(3, 5), 16);
+  var b1 = parseInt(c1.substring(5, 7), 16);
+  var r2 = parseInt(c2.substring(1, 3), 16);
+  var g2 = parseInt(c2.substring(3, 5), 16);
+  var b2 = parseInt(c2.substring(5, 7), 16);
+  var r = Math.round(r1 * (1 - ratio) + r2 * ratio);
+  var g = Math.round(g1 * (1 - ratio) + g2 * ratio);
+  var b = Math.round(b1 * (1 - ratio) + b2 * ratio);
+  r = ('0' + (r || 0).toString(16)).slice(-2);
+  g = ('0' + (g || 0).toString(16)).slice(-2);
+  b = ('0' + (b || 0).toString(16)).slice(-2);
+  return '#' + r + g + b;
+}
+`);
   const code = functionName + '(' + c1 + ', ' + c2 + ', ' + ratio + ')';
   return [code, JavaScript.ORDER_FUNCTION_CALL];
 };

package/generators/javascript/lists.js

@@ -35,11 +35,15 @@ JavaScript['lists_create_with'] = function(block) {
 
 JavaScript['lists_repeat'] = function(block) {
   // Create a list with one element repeated.
-  const functionName = JavaScript.provideFunction_('listsRepeat', [
-    'function ' + JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(value, n) {',
-    '  var array = [];', '  for (var i = 0; i < n; i++) {',
-    '    array[i] = value;', '  }', '  return array;', '}'
-  ]);
+  const functionName = JavaScript.provideFunction_('listsRepeat', `
+function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(value, n) {
+  var array = [];
+  for (var i = 0; i < n; i++) {
+    array[i] = value;
+  }
+  return array;
+}
+`);
   const element =
       JavaScript.valueToCode(block, 'ITEM', JavaScript.ORDER_NONE) || 'null';
   const repeatCount =
@@ -67,7 +71,7 @@ JavaScript['lists_indexOf'] = function(block) {
   const operator =
       block.getFieldValue('END') === 'FIRST' ? 'indexOf' : 'lastIndexOf';
   const item =
-      JavaScript.valueToCode(block, 'FIND', JavaScript.ORDER_NONE) || '\'\'';
+      JavaScript.valueToCode(block, 'FIND', JavaScript.ORDER_NONE) || "''";
   const list =
       JavaScript.valueToCode(block, 'VALUE', JavaScript.ORDER_MEMBER) || '[]';
   const code = list + '.' + operator + '(' + item + ')';
@@ -136,13 +140,16 @@ JavaScript['lists_getIndex'] = function(block) {
       break;
     }
     case ('RANDOM'): {
-      const functionName = JavaScript.provideFunction_('listsGetRandomItem', [
-        'function ' + JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
-            '(list, remove) {',
-        '  var x = Math.floor(Math.random() * list.length);', '  if (remove) {',
-        '    return list.splice(x, 1)[0];', '  } else {', '    return list[x];',
-        '  }', '}'
-      ]);
+      const functionName = JavaScript.provideFunction_('listsGetRandomItem', `
+function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(list, remove) {
+  var x = Math.floor(Math.random() * list.length);
+  if (remove) {
+    return list.splice(x, 1)[0];
+  } else {
+    return list[x];
+  }
+}
+`);
       const code = functionName + '(' + list + ', ' + (mode !== 'GET') + ')';
       if (mode === 'GET' || mode === 'GET_REMOVE') {
         return [code, JavaScript.ORDER_FUNCTION_CALL];
@@ -309,23 +316,22 @@ JavaScript['lists_getSublist'] = function(block) {
       'FIRST': 'First',
       'LAST': 'Last',
       'FROM_START': 'FromStart',
-      'FROM_END': 'FromEnd'
+      'FROM_END': 'FromEnd',
     };
+    // The value for 'FROM_END' and'FROM_START' depends on `at` so
+    // we add it as a parameter.
+    const at1Param =
+        (where1 === 'FROM_END' || where1 === 'FROM_START') ? ', at1' : '';
+    const at2Param =
+        (where2 === 'FROM_END' || where2 === 'FROM_START') ? ', at2' : '';
     const functionName = JavaScript.provideFunction_(
-        'subsequence' + wherePascalCase[where1] + wherePascalCase[where2], [
-          'function ' + JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(sequence' +
-              // The value for 'FROM_END' and'FROM_START' depends on `at` so
-              // we add it as a parameter.
-              ((where1 === 'FROM_END' || where1 === 'FROM_START') ? ', at1' :
-                                                                    '') +
-              ((where2 === 'FROM_END' || where2 === 'FROM_START') ? ', at2' :
-                                                                    '') +
-              ') {',
-          getSubstringIndex('sequence', where1, 'at1') + ';',
-          '  var end = ' + getSubstringIndex('sequence', where2, 'at2') +
-              ' + 1;',
-          '  return sequence.slice(start, end);', '}'
-        ]);
+        'subsequence' + wherePascalCase[where1] + wherePascalCase[where2], `
+function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(sequence${at1Param}${at2Param}) {
+  var start = ${getSubstringIndex('sequence', where1, 'at1')};
+  var end = ${getSubstringIndex('sequence', where2, 'at2')} + 1;
+  return sequence.slice(start, end);
+}
+`);
     code = functionName + '(' + list +
         // The value for 'FROM_END' and 'FROM_START' depends on `at` so we
         // pass it.
@@ -344,19 +350,20 @@ JavaScript['lists_sort'] = function(block) {
   const direction = block.getFieldValue('DIRECTION') === '1' ? 1 : -1;
   const type = block.getFieldValue('TYPE');
   const getCompareFunctionName =
-      JavaScript.provideFunction_('listsGetSortCompare', [
-        'function ' + JavaScript.FUNCTION_NAME_PLACEHOLDER_ +
-            '(type, direction) {',
-        '  var compareFuncs = {', '    "NUMERIC": function(a, b) {',
-        '        return Number(a) - Number(b); },',
-        '    "TEXT": function(a, b) {',
-        '        return a.toString() > b.toString() ? 1 : -1; },',
-        '    "IGNORE_CASE": function(a, b) {',
-        '        return a.toString().toLowerCase() > ' +
-            'b.toString().toLowerCase() ? 1 : -1; },',
-        '  };', '  var compare = compareFuncs[type];',
-        '  return function(a, b) { return compare(a, b) * direction; }', '}'
-      ]);
+      JavaScript.provideFunction_('listsGetSortCompare', `
+function ${JavaScript.FUNCTION_NAME_PLACEHOLDER_}(type, direction) {
+  var compareFuncs = {
+    'NUMERIC': function(a, b) {
+        return Number(a) - Number(b); },
+    'TEXT': function(a, b) {
+        return a.toString() > b.toString() ? 1 : -1; },
+    'IGNORE_CASE': function(a, b) {
+        return a.toString().toLowerCase() > b.toString().toLowerCase() ? 1 : -1; },
+  };
+  var compare = compareFuncs[type];
+  return function(a, b) { return compare(a, b) * direction; };
+}
+      `);
   return [
     list + '.slice().sort(' + getCompareFunctionName + '("' + type + '", ' +
         direction + '))',
@@ -368,12 +375,12 @@ JavaScript['lists_split'] = function(block) {
   // Block for splitting text into a list, or joining a list into text.
   let input = JavaScript.valueToCode(block, 'INPUT', JavaScript.ORDER_MEMBER);
   const delimiter =
-      JavaScript.valueToCode(block, 'DELIM', JavaScript.ORDER_NONE) || '\'\'';
+      JavaScript.valueToCode(block, 'DELIM', JavaScript.ORDER_NONE) || "''";
   const mode = block.getFieldValue('MODE');
   let functionName;
   if (mode === 'SPLIT') {
     if (!input) {
-      input = '\'\'';
+      input = "''";
     }
     functionName = 'split';
   } else if (mode === 'JOIN') {