Normalize ++x to x++. (#5660)

There are only 10 instances of ++x in our codebase, compared with over 500 instances of x++. The stlye guide has no opinion on which to use, nor do I. But the lack of consistency was making regex searches for bugs more difficult.
google · Nov 2, 2021 · fa47c3c · fa47c3c
1 parent 7ff6b93
commit fa47c3c
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/core/block.js b/core/block.js
@@ -1612,7 +1612,7 @@ Block.prototype.jsonInit = function(json) {
 
   const extensionNames = json['extensions'];
   if (Array.isArray(extensionNames)) {
-    for (let j = 0; j < extensionNames.length; ++j) {
+    for (let j = 0; j < extensionNames.length; j++) {
       Extensions.apply(extensionNames[j], this, false);
     }
   }

diff --git a/core/extensions.js b/core/extensions.js
@@ -426,7 +426,7 @@ const checkDropdownOptionsInTable = function(block, dropdownName, lookupTable) {
   const dropdown = block.getField(dropdownName);
   if (!dropdown.isOptionListDynamic()) {
     const options = dropdown.getOptions();
-    for (let i = 0; i < options.length; ++i) {
+    for (let i = 0; i < options.length; i++) {
       const optionKey = options[i][1];  // label, then value
       if (lookupTable[optionKey] === null) {
         console.warn(

diff --git a/core/field_dropdown.js b/core/field_dropdown.js
@@ -742,7 +742,7 @@ const validateOptions = function(options) {
     throw TypeError('FieldDropdown options must not be an empty array.');
   }
   let foundError = false;
-  for (let i = 0; i < options.length; ++i) {
+  for (let i = 0; i < options.length; i++) {
     const tuple = options[i];
     if (!Array.isArray(tuple)) {
       foundError = true;

diff --git a/core/input.js b/core/input.js
@@ -135,7 +135,7 @@ Input.prototype.insertFieldAt = function(index, field, opt_name) {
   }
   // Add the field to the field row.
   this.fieldRow.splice(index, 0, field);
-  ++index;
+  index++;
   if (field.suffixField) {
     // Add any suffix.
     index = this.insertFieldAt(index, field.suffixField);

diff --git a/core/utils.js b/core/utils.js
@@ -418,7 +418,7 @@ const tokenizeInterpolation_ = function(message, parseInterpolationTokens) {
   // Merge adjacent text tokens into a single string.
   const mergedTokens = [];
   buffer.length = 0;
-  for (let i = 0; i < tokens.length; ++i) {
+  for (let i = 0; i < tokens.length; i++) {
     if (typeof tokens[i] === 'string') {
       buffer.push(tokens[i]);
     } else {

diff --git a/generators/dart/logic.js b/generators/dart/logic.js
@@ -33,7 +33,7 @@ Blockly.Dart['controls_if'] = function(block) {
     }
     code += (n > 0 ? 'else ' : '') +
         'if (' + conditionCode + ') {\n' + branchCode + '}';
-    ++n;
+    n++;
   } while (block.getInput('IF' + n));
 
   if (block.getInput('ELSE') || Blockly.Dart.STATEMENT_SUFFIX) {

diff --git a/generators/javascript/logic.js b/generators/javascript/logic.js
@@ -34,7 +34,7 @@ Blockly.JavaScript['controls_if'] = function(block) {
     }
     code += (n > 0 ? ' else ' : '') +
         'if (' + conditionCode + ') {\n' + branchCode + '}';
-    ++n;
+    n++;
   } while (block.getInput('IF' + n));
 
   if (block.getInput('ELSE') || Blockly.JavaScript.STATEMENT_SUFFIX) {

diff --git a/generators/lua/logic.js b/generators/lua/logic.js
@@ -33,7 +33,7 @@ Blockly.Lua['controls_if'] = function(block) {
     }
     code += (n > 0 ? 'else' : '') +
         'if ' + conditionCode + ' then\n' + branchCode;
-    ++n;
+    n++;
   } while (block.getInput('IF' + n));
 
   if (block.getInput('ELSE') || Blockly.Lua.STATEMENT_SUFFIX) {

diff --git a/generators/php/logic.js b/generators/php/logic.js
@@ -33,7 +33,7 @@ Blockly.PHP['controls_if'] = function(block) {
     }
     code += (n > 0 ? ' else ' : '') +
         'if (' + conditionCode + ') {\n' + branchCode + '}';
-    ++n;
+    n++;
   } while (block.getInput('IF' + n));
 
   if (block.getInput('ELSE') || Blockly.PHP.STATEMENT_SUFFIX) {

diff --git a/generators/python/logic.js b/generators/python/logic.js
@@ -33,7 +33,7 @@ Blockly.Python['controls_if'] = function(block) {
           Blockly.Python.INDENT) + branchCode;
     }
     code += (n === 0 ? 'if ' : 'elif ') + conditionCode + ':\n' + branchCode;
-    ++n;
+    n++;
   } while (block.getInput('IF' + n));
 
   if (block.getInput('ELSE') || Blockly.Python.STATEMENT_SUFFIX) {