Fix order errors in text generators (#4329)

* Fix dart text generator logic

* Fix Javascript text generator logic.

* Fix Lua text generator logic

* Fix php text generator logic

* Fix python text generator logic

* Fix error in substring logic

* Fix unit test block generators

* Update from ORDER_COMMA to ORDER_NONE

* Update golden files

generators/dart.js

@@ -50,7 +50,7 @@ Blockly.Dart.addReservedWords(
 
 /**
  * Order of operation ENUMs.
- * https://www.dartlang.org/docs/dart-up-and-running/ch02.html#operator_table
+ * https://dart.dev/guides/language/language-tour#operators
  */
 Blockly.Dart.ORDER_ATOMIC = 0;         // 0 "" ...
 Blockly.Dart.ORDER_UNARY_POSTFIX = 1;  // expr++ expr-- () [] . ?.
@@ -158,7 +158,7 @@ Blockly.Dart.scrubNakedValue = function(line) {
  * Encode a string as a properly escaped Dart string, complete with quotes.
  * @param {string} string Text to encode.
  * @return {string} Dart string.
- * @private
+ * @protected
  */
 Blockly.Dart.quote_ = function(string) {
   // Can't use goog.string.quote since $ must also be escaped.
@@ -174,7 +174,7 @@ Blockly.Dart.quote_ = function(string) {
  * quotes.
  * @param {string} string Text to encode.
  * @return {string} Dart string.
- * @private
+ * @protected
  */
 Blockly.Dart.multiline_quote_ = function (string) {
   var lines = string.split(/\n/g).map(Blockly.Dart.quote_);
@@ -183,7 +183,6 @@ Blockly.Dart.multiline_quote_ = function (string) {
   return lines.join(' + \'\\n\' + \n');
 };
 
-
 /**
  * Common tasks for generating Dart from blocks.
  * Handles comments for the specified block and any connected value blocks.
@@ -192,7 +191,7 @@ Blockly.Dart.multiline_quote_ = function (string) {
  * @param {string} code The Dart code created for this block.
  * @param {boolean=} opt_thisOnly True to generate code for only this statement.
  * @return {string} Dart code with comments and subsequent blocks added.
- * @private
+ * @protected
  */
 Blockly.Dart.scrub_ = function(block, code, opt_thisOnly) {
   var commentCode = '';

generators/dart/text.js

@@ -26,7 +26,9 @@ Blockly.Dart['text'] = function(block) {
 Blockly.Dart['text_multiline'] = function(block) {
   // Text value.
   var code = Blockly.Dart.multiline_quote_(block.getFieldValue('TEXT'));
-  return [code, Blockly.Dart.ORDER_ATOMIC];
+  var order = code.indexOf('+') != -1 ? Blockly.Dart.ORDER_ADDITIVE :
+      Blockly.Dart.ORDER_ATOMIC;
+  return [code, order];
 };
 
 Blockly.Dart['text_join'] = function(block) {
@@ -92,8 +94,9 @@ Blockly.Dart['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 text = Blockly.Dart.valueToCode(block, 'VALUE',
+  var textOrder = (where == 'FIRST' || where == 'FROM_START') ?
-      Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
+      Blockly.Dart.ORDER_UNARY_POSTFIX : Blockly.Dart.ORDER_NONE;
+  var text = Blockly.Dart.valueToCode(block, 'VALUE', textOrder) || '\'\'';
   switch (where) {
     case 'FIRST':
       var code = text + '[0]';
@@ -133,14 +136,16 @@ Blockly.Dart['text_charAt'] = function(block) {
 
 Blockly.Dart['text_getSubstring'] = function(block) {
   // Get substring.
-  var text = Blockly.Dart.valueToCode(block, 'STRING',
-      Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
   var where1 = block.getFieldValue('WHERE1');
   var where2 = block.getFieldValue('WHERE2');
+  var requiresLengthCall = (where1 != 'FROM_END' && where2 == 'FROM_START');
+  var textOrder = requiresLengthCall ? Blockly.Dart.ORDER_UNARY_POSTFIX :
+      Blockly.Dart.ORDER_NONE;
+  var text = Blockly.Dart.valueToCode(block, 'STRING', textOrder) || '\'\'';
   if (where1 == 'FIRST' && where2 == 'LAST') {
     var code = text;
-  } else if (text.match(/^'?\w+'?$/) ||
+    return [code, Blockly.Dart.ORDER_NONE];
-      (where1 != 'FROM_END' && where2 == 'FROM_START')) {
+  } else if (text.match(/^'?\w+'?$/) || requiresLengthCall) {
     // If the text is a variable or literal or doesn't require a call for
     // length, don't generate a helper function.
     switch (where1) {
@@ -290,7 +295,7 @@ Blockly.Dart['text_prompt'] = Blockly.Dart['text_prompt_ext'];
 
 Blockly.Dart['text_count'] = function(block) {
   var text = Blockly.Dart.valueToCode(block, 'TEXT',
-      Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
+      Blockly.Dart.ORDER_NONE) || '\'\'';
   var sub = Blockly.Dart.valueToCode(block, 'SUB',
       Blockly.Dart.ORDER_NONE) || '\'\'';
   // Substring count is not a native Dart function.  Define one.
@@ -334,6 +339,5 @@ Blockly.Dart['text_reverse'] = function(block) {
   var text = Blockly.Dart.valueToCode(block, 'TEXT',
       Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
   var code = 'new String.fromCharCodes(' + text + '.runes.toList().reversed)';
-  // XXX What should the operator precedence be for a `new`?
+  return [code, Blockly.Dart.ORDER_UNARY_PREFIX];
-  return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
 };

generators/javascript.js

@@ -188,7 +188,7 @@ Blockly.JavaScript.scrubNakedValue = function(line) {
  * quotes.
  * @param {string} string Text to encode.
  * @return {string} JavaScript string.
- * @private
+ * @protected
  */
 Blockly.JavaScript.quote_ = function(string) {
   // Can't use goog.string.quote since Google's style guide recommends
@@ -204,7 +204,7 @@ Blockly.JavaScript.quote_ = function(string) {
  * with quotes.
  * @param {string} string Text to encode.
  * @return {string} JavaScript string.
- * @private
+ * @protected
  */
 Blockly.JavaScript.multiline_quote_ = function(string) {
   // Can't use goog.string.quote since Google's style guide recommends
@@ -221,7 +221,7 @@ Blockly.JavaScript.multiline_quote_ = function(string) {
  * @param {string} code The JavaScript code created for this block.
  * @param {boolean=} opt_thisOnly True to generate code for only this statement.
  * @return {string} JavaScript code with comments and subsequent blocks added.
- * @private
+ * @protected
  */
 Blockly.JavaScript.scrub_ = function(block, code, opt_thisOnly) {
   var commentCode = '';

generators/javascript/text.js

@@ -24,24 +24,24 @@ Blockly.JavaScript['text'] = function(block) {
 Blockly.JavaScript['text_multiline'] = function(block) {
   // Text value.
   var code = Blockly.JavaScript.multiline_quote_(block.getFieldValue('TEXT'));
-  if (code.indexOf('\n') != -1) {
+  var order = code.indexOf('+') != -1 ? Blockly.JavaScript.ORDER_ADDITION :
-      code = '(' + code + ')'
+      Blockly.JavaScript.ORDER_ATOMIC;
-  }
+  return [code, order];
-  return [code, Blockly.JavaScript.ORDER_ATOMIC];
 };
 
 /**
  * Enclose the provided value in 'String(...)' function.
  * Leave string literals alone.
  * @param {string} value Code evaluating to a value.
- * @return {string} Code evaluating to a string.
+ * @return {[string, number]} Array containing code evaluating to a string and
+ *    the order of the returned code.
  * @private
  */
 Blockly.JavaScript.text.forceString_ = function(value) {
   if (Blockly.JavaScript.text.forceString_.strRegExp.test(value)) {
-    return value;
+    return [value, Blockly.JavaScript.ORDER_ATOMIC];
   }
-  return 'String(' + value + ')';
+  return ['String(' + value + ')', Blockly.JavaScript.ORDER_FUNCTION_CALL];
 };
 
 /**
@@ -57,21 +57,21 @@ Blockly.JavaScript['text_join'] = function(block) {
     case 1:
       var element = Blockly.JavaScript.valueToCode(block, 'ADD0',
           Blockly.JavaScript.ORDER_NONE) || '\'\'';
-      var code = Blockly.JavaScript.text.forceString_(element);
+      var codeAndOrder = Blockly.JavaScript.text.forceString_(element);
-      return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
+      return codeAndOrder;
     case 2:
       var element0 = Blockly.JavaScript.valueToCode(block, 'ADD0',
           Blockly.JavaScript.ORDER_NONE) || '\'\'';
       var element1 = Blockly.JavaScript.valueToCode(block, 'ADD1',
           Blockly.JavaScript.ORDER_NONE) || '\'\'';
-      var code = Blockly.JavaScript.text.forceString_(element0) + ' + ' +
+      var code = Blockly.JavaScript.text.forceString_(element0)[0] +
-          Blockly.JavaScript.text.forceString_(element1);
+          ' + ' + Blockly.JavaScript.text.forceString_(element1)[0];
       return [code, Blockly.JavaScript.ORDER_ADDITION];
     default:
       var elements = new Array(block.itemCount_);
       for (var i = 0; i < block.itemCount_; i++) {
         elements[i] = Blockly.JavaScript.valueToCode(block, 'ADD' + i,
-            Blockly.JavaScript.ORDER_COMMA) || '\'\'';
+            Blockly.JavaScript.ORDER_NONE) || '\'\'';
       }
       var code = '[' + elements.join(',') + '].join(\'\')';
       return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
@@ -84,13 +84,15 @@ Blockly.JavaScript['text_append'] = function(block) {
       block.getFieldValue('VAR'), Blockly.VARIABLE_CATEGORY_NAME);
   var value = Blockly.JavaScript.valueToCode(block, 'TEXT',
       Blockly.JavaScript.ORDER_NONE) || '\'\'';
-  return varName + ' += ' + Blockly.JavaScript.text.forceString_(value) + ';\n';
+  var code = varName + ' += ' +
+      Blockly.JavaScript.text.forceString_(value)[0] + ';\n';
+  return code;
 };
 
 Blockly.JavaScript['text_length'] = function(block) {
   // String or array length.
   var text = Blockly.JavaScript.valueToCode(block, 'VALUE',
-      Blockly.JavaScript.ORDER_FUNCTION_CALL) || '\'\'';
+      Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
   return [text + '.length', Blockly.JavaScript.ORDER_MEMBER];
 };
 
@@ -177,15 +179,20 @@ Blockly.JavaScript.text.getIndex_ = function(stringName, where, opt_at) {
 
 Blockly.JavaScript['text_getSubstring'] = function(block) {
   // Get substring.
-  var text = Blockly.JavaScript.valueToCode(block, 'STRING',
-      Blockly.JavaScript.ORDER_FUNCTION_CALL) || '\'\'';
   var where1 = block.getFieldValue('WHERE1');
   var where2 = block.getFieldValue('WHERE2');
+  var requiresLengthCall = (where1 != 'FROM_END' && where1 != 'LAST' &&
+      where2 != 'FROM_END' && where2 != 'LAST');
+  var textOrder = requiresLengthCall ? Blockly.JavaScript.ORDER_MEMBER :
+      Blockly.JavaScript.ORDER_NONE;
+  var text = Blockly.JavaScript.valueToCode(block, 'STRING',
+      textOrder) || '\'\'';
   if (where1 == 'FIRST' && where2 == 'LAST') {
+    var text = Blockly.JavaScript.valueToCode(block, 'STRING',
+        Blockly.JavaScript.ORDER_NONE) || '\'\'';
     var code = text;
-  } else if (text.match(/^'?\w+'?$/) ||
+    return [code, Blockly.JavaScript.ORDER_NONE];
-      (where1 != 'FROM_END' && where1 != 'LAST' &&
+  } else if (text.match(/^'?\w+'?$/) || requiresLengthCall) {
-      where2 != 'FROM_END' && where2 != 'LAST')) {
     // If the text is a variable or literal or doesn't require a call for
     // length, don't generate a helper function.
     switch (where1) {
@@ -320,7 +327,7 @@ Blockly.JavaScript['text_prompt'] = Blockly.JavaScript['text_prompt_ext'];
 
 Blockly.JavaScript['text_count'] = function(block) {
   var text = Blockly.JavaScript.valueToCode(block, 'TEXT',
-      Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
+      Blockly.JavaScript.ORDER_NONE) || '\'\'';
   var sub = Blockly.JavaScript.valueToCode(block, 'SUB',
       Blockly.JavaScript.ORDER_NONE) || '\'\'';
   var functionName = Blockly.JavaScript.provideFunction_(
@@ -334,12 +341,12 @@ Blockly.JavaScript['text_count'] = function(block) {
        '  }',
        '}']);
   var code = functionName + '(' + text + ', ' + sub + ')';
-  return [code, Blockly.JavaScript.ORDER_SUBTRACTION];
+  return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
 };
 
 Blockly.JavaScript['text_replace'] = function(block) {
   var text = Blockly.JavaScript.valueToCode(block, 'TEXT',
-      Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
+      Blockly.JavaScript.ORDER_NONE) || '\'\'';
   var from = Blockly.JavaScript.valueToCode(block, 'FROM',
       Blockly.JavaScript.ORDER_NONE) || '\'\'';
   var to = Blockly.JavaScript.valueToCode(block, 'TO',
@@ -356,12 +363,12 @@ Blockly.JavaScript['text_replace'] = function(block) {
        '  return haystack.replace(new RegExp(needle, \'g\'), replacement);',
        '}']);
   var code = functionName + '(' + text + ', ' + from + ', ' + to + ')';
-  return [code, Blockly.JavaScript.ORDER_MEMBER];
+  return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
 };
 
 Blockly.JavaScript['text_reverse'] = function(block) {
   var text = Blockly.JavaScript.valueToCode(block, 'TEXT',
       Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
   var code = text + '.split(\'\').reverse().join(\'\')';
-  return [code, Blockly.JavaScript.ORDER_MEMBER];
+  return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
 };

generators/lua.js

@@ -134,7 +134,7 @@ Blockly.Lua.scrubNakedValue = function(line) {
  * quotes.
  * @param {string} string Text to encode.
  * @return {string} Lua string.
- * @private
+ * @protected
  */
 Blockly.Lua.quote_ = function(string) {
   string = string.replace(/\\/g, '\\\\')
@@ -148,7 +148,7 @@ Blockly.Lua.quote_ = function(string) {
  * quotes.
  * @param {string} string Text to encode.
  * @return {string} Lua string.
- * @private
+ * @protected
  */
 Blockly.Lua.multiline_quote_ = function(string) {
   var lines = string.split(/\n/g).map(Blockly.Lua.quote_);
@@ -165,7 +165,7 @@ Blockly.Lua.multiline_quote_ = function(string) {
  * @param {string} code The Lua code created for this block.
  * @param {boolean=} opt_thisOnly True to generate code for only this statement.
  * @return {string} Lua code with comments and subsequent blocks added.
- * @private
+ * @protected
  */
 Blockly.Lua.scrub_ = function(block, code, opt_thisOnly) {
   var commentCode = '';

generators/lua/text.js

@@ -24,7 +24,9 @@ Blockly.Lua['text'] = function(block) {
 Blockly.Lua['text_multiline'] = function(block) {
   // Text value.
   var code = Blockly.Lua.multiline_quote_(block.getFieldValue('TEXT'));
-  return [code, Blockly.Lua.ORDER_ATOMIC];
+  var order = code.indexOf('..') != -1 ? Blockly.Lua.ORDER_CONCATENATION :
+      Blockly.Lua.ORDER_ATOMIC;
+  return [code, order];
 };
 
 Blockly.Lua['text_join'] = function(block) {
@@ -347,7 +349,7 @@ Blockly.Lua['text_replace'] = function(block) {
 
 Blockly.Lua['text_reverse'] = function(block) {
   var text = Blockly.Lua.valueToCode(block, 'TEXT',
-      Blockly.Lua.ORDER_HIGH) || '\'\'';
+      Blockly.Lua.ORDER_NONE) || '\'\'';
   var code = 'string.reverse(' + text + ')';
   return [code, Blockly.Lua.ORDER_HIGH];
 };

generators/php.js

@@ -190,7 +190,7 @@ Blockly.PHP.scrubNakedValue = function(line) {
  * quotes.
  * @param {string} string Text to encode.
  * @return {string} PHP string.
- * @private
+ * @protected
  */
 Blockly.PHP.quote_ = function(string) {
   string = string.replace(/\\/g, '\\\\')
@@ -204,7 +204,7 @@ Blockly.PHP.quote_ = function(string) {
  * quotes.
  * @param {string} string Text to encode.
  * @return {string} PHP string.
- * @private
+ * @protected
  */
 Blockly.PHP.multiline_quote_ = function (string) {
   var lines = string.split(/\n/g).map(Blockly.PHP.quote_);
@@ -222,7 +222,7 @@ Blockly.PHP.multiline_quote_ = function (string) {
  * @param {string} code The PHP code created for this block.
  * @param {boolean=} opt_thisOnly True to generate code for only this statement.
  * @return {string} PHP code with comments and subsequent blocks added.
- * @private
+ * @protected
  */
 Blockly.PHP.scrub_ = function(block, code, opt_thisOnly) {
   var commentCode = '';

generators/php/text.js

@@ -24,7 +24,9 @@ Blockly.PHP['text'] = function(block) {
 Blockly.PHP['text_multiline'] = function(block) {
   // Text value.
   var code = Blockly.PHP.multiline_quote_(block.getFieldValue('TEXT'));
-  return [code, Blockly.PHP.ORDER_ATOMIC];
+  var order = code.indexOf('.') != -1 ? Blockly.PHP.ORDER_STRING_CONCAT :
+      Blockly.PHP.ORDER_ATOMIC;
+  return [code, order];
 };
 
 Blockly.PHP['text_join'] = function(block) {
@@ -35,19 +37,19 @@ Blockly.PHP['text_join'] = function(block) {
     var element = Blockly.PHP.valueToCode(block, 'ADD0',
         Blockly.PHP.ORDER_NONE) || '\'\'';
     var code = element;
-    return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
+    return [code, Blockly.PHP.ORDER_NONE];
   } else if (block.itemCount_ == 2) {
     var element0 = Blockly.PHP.valueToCode(block, 'ADD0',
-        Blockly.PHP.ORDER_ATOMIC) || '\'\'';
+        Blockly.PHP.ORDER_STRING_CONCAT) || '\'\'';
     var element1 = Blockly.PHP.valueToCode(block, 'ADD1',
-        Blockly.PHP.ORDER_ATOMIC) || '\'\'';
+        Blockly.PHP.ORDER_STRING_CONCAT) || '\'\'';
     var code = element0 + ' . ' + element1;
     return [code, Blockly.PHP.ORDER_STRING_CONCAT];
   } else {
     var elements = new Array(block.itemCount_);
     for (var i = 0; i < block.itemCount_; i++) {
       elements[i] = Blockly.PHP.valueToCode(block, 'ADD' + i,
-          Blockly.PHP.ORDER_COMMA) || '\'\'';
+          Blockly.PHP.ORDER_NONE) || '\'\'';
     }
     var code = 'implode(\'\', array(' + elements.join(',') + '))';
     return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
@@ -118,7 +120,7 @@ Blockly.PHP['text_charAt'] = function(block) {
   // Get letter at index.
   var where = block.getFieldValue('WHERE') || 'FROM_START';
   var textOrder = (where == 'RANDOM') ? Blockly.PHP.ORDER_NONE :
-      Blockly.PHP.ORDER_COMMA;
+      Blockly.PHP.ORDER_NONE;
   var text = Blockly.PHP.valueToCode(block, 'VALUE', textOrder) || '\'\'';
   switch (where) {
     case 'FIRST':
@@ -149,13 +151,16 @@ Blockly.PHP['text_charAt'] = function(block) {
 
 Blockly.PHP['text_getSubstring'] = function(block) {
   // Get substring.
-  var text = Blockly.PHP.valueToCode(block, 'STRING',
-      Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
   var where1 = block.getFieldValue('WHERE1');
   var where2 = block.getFieldValue('WHERE2');
   if (where1 == 'FIRST' && where2 == 'LAST') {
+    var text = Blockly.PHP.valueToCode(block, 'STRING',
+        Blockly.PHP.ORDER_NONE) || '\'\'';
     var code = text;
+    return [code, Blockly.PHP.ORDER_NONE];
   } else {
+    var text = Blockly.PHP.valueToCode(block, 'STRING',
+        Blockly.PHP.ORDER_NONE) || '\'\'';
     var at1 = Blockly.PHP.getAdjusted(block, 'AT1');
     var at2 = Blockly.PHP.getAdjusted(block, 'AT2');
     var functionName = Blockly.PHP.provideFunction_(
@@ -183,8 +188,8 @@ Blockly.PHP['text_getSubstring'] = function(block) {
          '}']);
     var code = functionName + '(' + text + ', \'' +
         where1 + '\', ' + at1 + ', \'' + where2 + '\', ' + at2 + ')';
+    return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
   }
-  return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
 };
 
 Blockly.PHP['text_changeCase'] = function(block) {
@@ -243,7 +248,7 @@ Blockly.PHP['text_prompt'] = Blockly.PHP['text_prompt_ext'];
 
 Blockly.PHP['text_count'] = function(block) {
   var text = Blockly.PHP.valueToCode(block, 'TEXT',
-      Blockly.PHP.ORDER_MEMBER) || '\'\'';
+      Blockly.PHP.ORDER_NONE) || '\'\'';
   var sub = Blockly.PHP.valueToCode(block, 'SUB',
       Blockly.PHP.ORDER_NONE) || '\'\'';
   var code = 'strlen(' + sub + ') === 0'
@@ -254,7 +259,7 @@ Blockly.PHP['text_count'] = function(block) {
 
 Blockly.PHP['text_replace'] = function(block) {
   var text = Blockly.PHP.valueToCode(block, 'TEXT',
-      Blockly.PHP.ORDER_MEMBER) || '\'\'';
+      Blockly.PHP.ORDER_NONE) || '\'\'';
   var from = Blockly.PHP.valueToCode(block, 'FROM',
       Blockly.PHP.ORDER_NONE) || '\'\'';
   var to = Blockly.PHP.valueToCode(block, 'TO',
@@ -265,7 +270,7 @@ Blockly.PHP['text_replace'] = function(block) {
 
 Blockly.PHP['text_reverse'] = function(block) {
   var text = Blockly.PHP.valueToCode(block, 'TEXT',
-      Blockly.PHP.ORDER_MEMBER) || '\'\'';
+      Blockly.PHP.ORDER_NONE) || '\'\'';
   var code = 'strrev(' + text + ')';
   return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
 };

generators/python.js

@@ -207,7 +207,7 @@ Blockly.Python.scrubNakedValue = function(line) {
  * Encode a string as a properly escaped Python string, complete with quotes.
  * @param {string} string Text to encode.
  * @return {string} Python string.
- * @private
+ * @protected
  */
 Blockly.Python.quote_ = function(string) {
   // Can't use goog.string.quote since % must also be escaped.
@@ -222,7 +222,7 @@ Blockly.Python.quote_ = function(string) {
     } else {
       string = string.replace(/'/g, '\\\'');
     }
-  };
+  }
   return quote + string + quote;
 };
 
@@ -231,7 +231,7 @@ Blockly.Python.quote_ = function(string) {
  * with quotes.
  * @param {string} string Text to encode.
  * @return {string} Python string.
- * @private
+ * @protected
  */
 Blockly.Python.multiline_quote_ = function(string) {
   var lines = string.split(/\n/g).map(Blockly.Python.quote_);
@@ -248,7 +248,7 @@ Blockly.Python.multiline_quote_ = function(string) {
  * @param {string} code The Python code created for this block.
  * @param {boolean=} opt_thisOnly True to generate code for only this statement.
  * @return {string} Python code with comments and subsequent blocks added.
- * @private
+ * @protected
  */
 Blockly.Python.scrub_ = function(block, code, opt_thisOnly) {
   var commentCode = '';

generators/python/text.js

@@ -24,21 +24,24 @@ Blockly.Python['text'] = function(block) {
 Blockly.Python['text_multiline'] = function(block) {
   // Text value.
   var code = Blockly.Python.multiline_quote_(block.getFieldValue('TEXT'));
-  return [code, Blockly.Python.ORDER_ATOMIC];
+  var order = code.indexOf('+') != -1 ? Blockly.Python.ORDER_ADDITIVE :
+      Blockly.Python.ORDER_ATOMIC;
+  return [code, order];
 };
 
 /**
  * Enclose the provided value in 'str(...)' function.
  * Leave string literals alone.
  * @param {string} value Code evaluating to a value.
- * @return {string} Code evaluating to a string.
+ * @return {[string, number]} Array containing code evaluating to a string and
+ *    the order of the returned code.
  * @private
  */
 Blockly.Python.text.forceString_ = function(value) {
   if (Blockly.Python.text.forceString_.strRegExp.test(value)) {
-    return value;
+    return [value, Blockly.Python.ORDER_ATOMIC];
   }
-  return 'str(' + value + ')';
+  return ['str(' + value + ')', Blockly.Python.ORDER_FUNCTION_CALL];
 };
 
 /**
@@ -56,16 +59,16 @@ Blockly.Python['text_join'] = function(block) {
     case 1:
       var element = Blockly.Python.valueToCode(block, 'ADD0',
               Blockly.Python.ORDER_NONE) || '\'\'';
-      var code = Blockly.Python.text.forceString_(element);
+      var codeAndOrder = Blockly.Python.text.forceString_(element);
-      return [code, Blockly.Python.ORDER_FUNCTION_CALL];
+      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) + ' + ' +
+      var code = Blockly.Python.text.forceString_(element0)[0] + ' + ' +
-          Blockly.Python.text.forceString_(element1);
+          Blockly.Python.text.forceString_(element1)[0];
       return [code, Blockly.Python.ORDER_ADDITIVE];
       break;
     default:
@@ -89,7 +92,7 @@ Blockly.Python['text_append'] = function(block) {
   var value = Blockly.Python.valueToCode(block, 'TEXT',
       Blockly.Python.ORDER_NONE) || '\'\'';
   return varName + ' = str(' + varName + ') + ' +
-      Blockly.Python.text.forceString_(value) + '\n';
+      Blockly.Python.text.forceString_(value)[0] + '\n';
 };
 
 Blockly.Python['text_length'] = function(block) {
@@ -126,8 +129,9 @@ 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 text = Blockly.Python.valueToCode(block, 'VALUE',
+  var textOrder = (where == 'RANDOM') ? Blockly.Python.ORDER_NONE :
-      Blockly.Python.ORDER_MEMBER) || '\'\'';
+      Blockly.Python.ORDER_MEMBER;
+  var text = Blockly.Python.valueToCode(block, 'VALUE', textOrder) || '\'\'';
   switch (where) {
     case 'FIRST':
       var code = text + '[0]';
@@ -271,7 +275,7 @@ Blockly.Python['text_count'] = function(block) {
   var sub = Blockly.Python.valueToCode(block, 'SUB',
       Blockly.Python.ORDER_NONE) || '\'\'';
   var code = text + '.count(' + sub + ')';
-  return [code, Blockly.Python.ORDER_MEMBER];
+  return [code, Blockly.Python.ORDER_FUNCTION_CALL];
 };
 
 Blockly.Python['text_replace'] = function(block) {

tests/generators/golden/generated.dart

@@ -732,16 +732,16 @@ void test_get_text_complex() {
   unittest_assertequals((true ? get_Blockly() : null)[0], 'B', 'get first order complex');
   check_number_of_calls('get first order complex');
   number_of_calls = 0;
-  unittest_assertequals(text_get_from_end((get_Blockly()), 1), 'y', 'get last complex');
+  unittest_assertequals(text_get_from_end(get_Blockly(), 1), 'y', 'get last complex');
   check_number_of_calls('get last complex');
   number_of_calls = 0;
-  unittest_assertequals(text_get_from_end((true ? get_Blockly() : null), 1), 'y', 'get last order complex');
+  unittest_assertequals(text_get_from_end(true ? get_Blockly() : null, 1), 'y', 'get last order complex');
   check_number_of_calls('get last order complex');
   number_of_calls = 0;
-  unittest_assertequals(text.indexOf(text_random_letter((get_Blockly()))) + 1 > 0, true, 'get random complex');
+  unittest_assertequals(text.indexOf(text_random_letter(get_Blockly())) + 1 > 0, true, 'get random complex');
   check_number_of_calls('get random complex');
   number_of_calls = 0;
-  unittest_assertequals(text.indexOf(text_random_letter((true ? get_Blockly() : null))) + 1 > 0, true, 'get random order complex');
+  unittest_assertequals(text.indexOf(text_random_letter(true ? get_Blockly() : null)) + 1 > 0, true, 'get random order complex');
   check_number_of_calls('get random order complex');
   number_of_calls = 0;
   unittest_assertequals((get_Blockly())[2], 'o', 'get # complex');
@@ -750,11 +750,11 @@ void test_get_text_complex() {
   unittest_assertequals((true ? get_Blockly() : null)[((true ? 3 : null) - 1)], 'o', 'get # order complex');
   check_number_of_calls('get # order complex');
   number_of_calls = 0;
-  unittest_assertequals(text_get_from_end((get_Blockly()), 3), 'k', 'get #-end complex');
+  unittest_assertequals(text_get_from_end(get_Blockly(), 3), 'k', 'get #-end complex');
   check_number_of_calls('get #-end complex');
   number_of_calls = 0;
   // The order for index for #-end is addition because this will catch errors in generators where most perform the operation ... - index.
-  unittest_assertequals(text_get_from_end((true ? get_Blockly() : null), 0 + 3), 'k', 'get #-end order complex');
+  unittest_assertequals(text_get_from_end(true ? get_Blockly() : null, 0 + 3), 'k', 'get #-end order complex');
   check_number_of_calls('get #-end order complex');
 }
 
@@ -813,41 +813,41 @@ void test_substring_complex() {
   check_number_of_calls('substring # complex order');
   number_of_calls = 0;
   // The order for index for #-end is addition because this will catch errors in generators where most perform the operation ... - index.
-  unittest_assertequals(text_get_substring((get_numbers()), 'FROM_END', 2, 'FROM_END', 1), '78', 'substring #-end complex');
+  unittest_assertequals(text_get_substring(get_numbers(), 'FROM_END', 2, 'FROM_END', 1), '78', 'substring #-end complex');
   check_number_of_calls('substring #-end complex');
   number_of_calls = 0;
-  unittest_assertequals(text_get_substring((true ? get_numbers() : null), 'FROM_END', ((0 + 3) - 1), 'FROM_END', ((0 + 2) - 1)), '78', 'substring #-end order order');
+  unittest_assertequals(text_get_substring(true ? get_numbers() : null, 'FROM_END', ((0 + 3) - 1), 'FROM_END', ((0 + 2) - 1)), '78', 'substring #-end order order');
   check_number_of_calls('substring #-end order order');
   number_of_calls = 0;
-  unittest_assertequals((get_numbers()), text, 'substring first-last');
+  unittest_assertequals(get_numbers(), text, 'substring first-last');
   check_number_of_calls('substring first-last');
   number_of_calls = 0;
-  unittest_assertequals(text_get_substring((get_numbers()), 'FROM_START', 1, 'FROM_END', 1), '2345678', 'substring # #-end complex');
+  unittest_assertequals(text_get_substring(get_numbers(), 'FROM_START', 1, 'FROM_END', 1), '2345678', 'substring # #-end complex');
   check_number_of_calls('substring # #-end complex');
   number_of_calls = 0;
-  unittest_assertequals(text_get_substring((get_numbers()), 'FROM_END', 6, 'FROM_START', 3), '34', 'substring #-end # complex');
+  unittest_assertequals(text_get_substring(get_numbers(), 'FROM_END', 6, 'FROM_START', 3), '34', 'substring #-end # complex');
   check_number_of_calls('substring #-end # complex');
   number_of_calls = 0;
   unittest_assertequals((get_numbers()).substring(0, 4), '1234', 'substring first # complex');
   check_number_of_calls('substring first # complex');
   number_of_calls = 0;
-  unittest_assertequals(text_get_substring((get_numbers()), 'FIRST', 0, 'FROM_END', 1), '12345678', 'substring first #-end complex');
+  unittest_assertequals(text_get_substring(get_numbers(), 'FIRST', 0, 'FROM_END', 1), '12345678', 'substring first #-end complex');
   check_number_of_calls('substring first #-end complex');
   number_of_calls = 0;
-  unittest_assertequals(text_get_substring((get_numbers()), 'FROM_START', 6, 'LAST', 0), '789', 'substring # last complex');
+  unittest_assertequals(text_get_substring(get_numbers(), 'FROM_START', 6, 'LAST', 0), '789', 'substring # last complex');
   check_number_of_calls('substring # last complex');
   number_of_calls = 0;
-  unittest_assertequals(text_get_substring((get_numbers()), 'FROM_END', 2, 'LAST', 0), '789', 'substring #-end last complex');
+  unittest_assertequals(text_get_substring(get_numbers(), 'FROM_END', 2, 'LAST', 0), '789', 'substring #-end last complex');
   check_number_of_calls('substring #-end last complex');
   number_of_calls = 0;
-  unittest_assertequals(text_get_substring((get_numbers()), 'FROM_START', 0, 'FROM_END', 0), '123456789', 'substring all with # #-end complex');
+  unittest_assertequals(text_get_substring(get_numbers(), 'FROM_START', 0, 'FROM_END', 0), '123456789', 'substring all with # #-end complex');
   check_number_of_calls('substring all with # #-end complex');
   number_of_calls = 0;
-  unittest_assertequals(text_get_substring((get_numbers()), 'FROM_END', 8, 'FROM_START', 8), '123456789', 'substring all with #-end # complex');
+  unittest_assertequals(text_get_substring(get_numbers(), 'FROM_END', 8, 'FROM_START', 8), '123456789', 'substring all with #-end # complex');
   check_number_of_calls('substring all with #-end # complex');
   number_of_calls = 0;
   // Checks that the whole string is properly retrieved even if the value for start and end is not a simple number. This is especially important in generators where substring uses [x:length - y] for # #-end.
-  unittest_assertequals(text_get_substring((get_numbers()), 'FROM_START', ((0 + 1) - 1), 'FROM_END', ((0 + 1) - 1)), '123456789', 'substring all with # #-end math complex');
+  unittest_assertequals(text_get_substring(get_numbers(), 'FROM_START', ((0 + 1) - 1), 'FROM_END', ((0 + 1) - 1)), '123456789', 'substring all with # #-end math complex');
   check_number_of_calls('substring all with # #-end math complex');
 }
 

tests/generators/golden/generated.js

@@ -807,7 +807,7 @@ function test_substring_complex() {
   assertEquals(subsequenceFromEndFromEnd(get_numbers(), 2, 1), '78', 'substring #-end complex');
   check_number_of_calls('substring #-end complex');
   number_of_calls = 0;
-  assertEquals(subsequenceFromEndFromEnd((true ? get_numbers() : null), ((0 + 3) - 1), ((0 + 2) - 1)), '78', 'substring #-end order order');
+  assertEquals(subsequenceFromEndFromEnd(true ? get_numbers() : null, ((0 + 3) - 1), ((0 + 2) - 1)), '78', 'substring #-end order order');
   check_number_of_calls('substring #-end order order');
   number_of_calls = 0;
   assertEquals(get_numbers(), text, 'substring first-last');

tests/generators/golden/generated.php

@@ -820,48 +820,48 @@ function test_substring_simple() {
 function test_substring_complex() {
   global $test_name, $naked, $proc_x, $proc_y, $func_x, $func_y, $func_a, $n, $ok, $log, $count, $varToChange, $rand, $item, $text, $number_of_calls, $list2, $proc_z, $func_z, $x, $proc_w, $func_c, $if2, $i, $loglist, $changing_list, $list_copy, $unittestResults;
   $number_of_calls = 0;
-  assertEquals(text_get_substring((get_numbers()), 'FROM_START', 1, 'FROM_START', 2), '23', 'substring # complex');
+  assertEquals(text_get_substring(get_numbers(), 'FROM_START', 1, 'FROM_START', 2), '23', 'substring # complex');
   check_number_of_calls('substring # complex');
   $number_of_calls = 0;
-  assertEquals(text_get_substring((true ? get_numbers() : null), 'FROM_START', ((true ? 2 : null) - 1), 'FROM_START', ((true ? 3 : null) - 1)), '23', 'substring # complex order');
+  assertEquals(text_get_substring(true ? get_numbers() : null, 'FROM_START', ((true ? 2 : null) - 1), 'FROM_START', ((true ? 3 : null) - 1)), '23', 'substring # complex order');
   check_number_of_calls('substring # complex order');
   $number_of_calls = 0;
   // The order for index for #-end is addition because this will catch errors in generators where most perform the operation ... - index.
-  assertEquals(text_get_substring((get_numbers()), 'FROM_END', 2, 'FROM_END', 1), '78', 'substring #-end complex');
+  assertEquals(text_get_substring(get_numbers(), 'FROM_END', 2, 'FROM_END', 1), '78', 'substring #-end complex');
   check_number_of_calls('substring #-end complex');
   $number_of_calls = 0;
-  assertEquals(text_get_substring((true ? get_numbers() : null), 'FROM_END', ((0 + 3) - 1), 'FROM_END', ((0 + 2) - 1)), '78', 'substring #-end order order');
+  assertEquals(text_get_substring(true ? get_numbers() : null, 'FROM_END', ((0 + 3) - 1), 'FROM_END', ((0 + 2) - 1)), '78', 'substring #-end order order');
   check_number_of_calls('substring #-end order order');
   $number_of_calls = 0;
-  assertEquals((get_numbers()), $text, 'substring first-last');
+  assertEquals(get_numbers(), $text, 'substring first-last');
   check_number_of_calls('substring first-last');
   $number_of_calls = 0;
-  assertEquals(text_get_substring((get_numbers()), 'FROM_START', 1, 'FROM_END', 1), '2345678', 'substring # #-end complex');
+  assertEquals(text_get_substring(get_numbers(), 'FROM_START', 1, 'FROM_END', 1), '2345678', 'substring # #-end complex');
   check_number_of_calls('substring # #-end complex');
   $number_of_calls = 0;
-  assertEquals(text_get_substring((get_numbers()), 'FROM_END', 6, 'FROM_START', 3), '34', 'substring #-end # complex');
+  assertEquals(text_get_substring(get_numbers(), 'FROM_END', 6, 'FROM_START', 3), '34', 'substring #-end # complex');
   check_number_of_calls('substring #-end # complex');
   $number_of_calls = 0;
-  assertEquals(text_get_substring((get_numbers()), 'FIRST', 0, 'FROM_START', 3), '1234', 'substring first # complex');
+  assertEquals(text_get_substring(get_numbers(), 'FIRST', 0, 'FROM_START', 3), '1234', 'substring first # complex');
   check_number_of_calls('substring first # complex');
   $number_of_calls = 0;
-  assertEquals(text_get_substring((get_numbers()), 'FIRST', 0, 'FROM_END', 1), '12345678', 'substring first #-end complex');
+  assertEquals(text_get_substring(get_numbers(), 'FIRST', 0, 'FROM_END', 1), '12345678', 'substring first #-end complex');
   check_number_of_calls('substring first #-end complex');
   $number_of_calls = 0;
-  assertEquals(text_get_substring((get_numbers()), 'FROM_START', 6, 'LAST', 0), '789', 'substring # last complex');
+  assertEquals(text_get_substring(get_numbers(), 'FROM_START', 6, 'LAST', 0), '789', 'substring # last complex');
   check_number_of_calls('substring # last complex');
   $number_of_calls = 0;
-  assertEquals(text_get_substring((get_numbers()), 'FROM_END', 2, 'LAST', 0), '789', 'substring #-end last complex');
+  assertEquals(text_get_substring(get_numbers(), 'FROM_END', 2, 'LAST', 0), '789', 'substring #-end last complex');
   check_number_of_calls('substring #-end last complex');
   $number_of_calls = 0;
-  assertEquals(text_get_substring((get_numbers()), 'FROM_START', 0, 'FROM_END', 0), '123456789', 'substring all with # #-end complex');
+  assertEquals(text_get_substring(get_numbers(), 'FROM_START', 0, 'FROM_END', 0), '123456789', 'substring all with # #-end complex');
   check_number_of_calls('substring all with # #-end complex');
   $number_of_calls = 0;
-  assertEquals(text_get_substring((get_numbers()), 'FROM_END', 8, 'FROM_START', 8), '123456789', 'substring all with #-end # complex');
+  assertEquals(text_get_substring(get_numbers(), 'FROM_END', 8, 'FROM_START', 8), '123456789', 'substring all with #-end # complex');
   check_number_of_calls('substring all with #-end # complex');
   $number_of_calls = 0;
   // Checks that the whole string is properly retrieved even if the value for start and end is not a simple number. This is especially important in generators where substring uses [x:length - y] for # #-end.
-  assertEquals(text_get_substring((get_numbers()), 'FROM_START', ((0 + 1) - 1), 'FROM_END', ((0 + 1) - 1)), '123456789', 'substring all with # #-end math complex');
+  assertEquals(text_get_substring(get_numbers(), 'FROM_START', ((0 + 1) - 1), 'FROM_END', ((0 + 1) - 1)), '123456789', 'substring all with # #-end math complex');
   check_number_of_calls('substring all with # #-end math complex');
 }
 

tests/generators/golden/generated.py

@@ -636,7 +636,7 @@ def test_get_text_complex():
   assertEquals(text.find(text_random_letter(get_Blockly())) + 1 > 0, True, 'get random complex')
   check_number_of_calls('get random complex')
   number_of_calls = 0
-  assertEquals(text.find(text_random_letter((get_Blockly() if True else None))) + 1 > 0, True, 'get random order complex')
+  assertEquals(text.find(text_random_letter(get_Blockly() if True else None)) + 1 > 0, True, 'get random order complex')
   check_number_of_calls('get random order complex')
   number_of_calls = 0
   assertEquals(get_Blockly()[2], 'o', 'get # complex')

tests/generators/unittest_javascript.js

@@ -106,9 +106,9 @@ Blockly.JavaScript['unittest_assertequals'] = function(block) {
   var message = Blockly.JavaScript.valueToCode(block, 'MESSAGE',
       Blockly.JavaScript.ORDER_NONE) || '';
   var actual = Blockly.JavaScript.valueToCode(block, 'ACTUAL',
-      Blockly.JavaScript.ORDER_COMMA) || 'null';
+      Blockly.JavaScript.ORDER_NONE) || 'null';
   var expected = Blockly.JavaScript.valueToCode(block, 'EXPECTED',
-      Blockly.JavaScript.ORDER_COMMA) || 'null';
+      Blockly.JavaScript.ORDER_NONE) || 'null';
   return Blockly.JavaScript['unittest_main'].defineAssert_() +
       '(' + actual + ', ' + expected + ', ' + message + ');\n';
 };
@@ -118,7 +118,7 @@ Blockly.JavaScript['unittest_assertvalue'] = function(block) {
   var message = Blockly.JavaScript.valueToCode(block, 'MESSAGE',
       Blockly.JavaScript.ORDER_NONE) || '';
   var actual = Blockly.JavaScript.valueToCode(block, 'ACTUAL',
-      Blockly.JavaScript.ORDER_COMMA) || 'null';
+      Blockly.JavaScript.ORDER_NONE) || 'null';
   var expected = block.getFieldValue('EXPECTED');
   if (expected == 'TRUE') {
     expected = 'true';

tests/generators/unittest_lua.js

@@ -162,5 +162,5 @@ Blockly.Lua['unittest_adjustindex'] = function(block) {
     return [Number(index) + 1, Blockly.Lua.ORDER_ATOMIC];
   }
   // If the index is dynamic, adjust it in code.
-  return [index + ' + 1', Blockly.Lua.ORDER_ATOMIC];
+  return [index + ' + 1', Blockly.Lua.ORDER_ADDITIVE];
 };

tests/generators/unittest_php.js

@@ -92,9 +92,9 @@ Blockly.PHP['unittest_assertequals'] = function(block) {
   var message = Blockly.PHP.valueToCode(block, 'MESSAGE',
     Blockly.PHP.ORDER_NONE) || '';
   var actual = Blockly.PHP.valueToCode(block, 'ACTUAL',
-          Blockly.PHP.ORDER_COMMA) || 'null';
+          Blockly.PHP.ORDER_NONE) || 'null';
   var expected = Blockly.PHP.valueToCode(block, 'EXPECTED',
-          Blockly.PHP.ORDER_COMMA) || 'null';
+          Blockly.PHP.ORDER_NONE) || 'null';
   return Blockly.PHP['unittest_main'].defineAssert_() +
       '(' + actual + ', ' + expected + ', ' + message + ');\n';
 };
@@ -104,7 +104,7 @@ Blockly.PHP['unittest_assertvalue'] = function(block) {
   var message = Blockly.PHP.valueToCode(block, 'MESSAGE',
     Blockly.PHP.ORDER_NONE) || '';
   var actual = Blockly.PHP.valueToCode(block, 'ACTUAL',
-          Blockly.PHP.ORDER_COMMA) || 'null';
+          Blockly.PHP.ORDER_NONE) || 'null';
   var expected = block.getFieldValue('EXPECTED');
   if (expected == 'TRUE') {
       expected = 'true';