chore: revert #5730

blocks/loops.js

@@ -19,7 +19,6 @@ goog.require('Blockly.FieldLabel');
 goog.require('Blockly.FieldNumber');
 goog.require('Blockly.FieldVariable');
 goog.require('Blockly.Warning');
-goog.require('Blockly.loopMixin');
 
 
 /**
@@ -274,3 +273,73 @@ Blockly.Extensions.register('controls_for_tooltip',
 Blockly.Extensions.register('controls_forEach_tooltip',
     Blockly.Extensions.buildTooltipWithFieldText(
         '%{BKY_CONTROLS_FOREACH_TOOLTIP}', 'VAR'));
+
+/**
+ * This mixin adds a check to make sure the 'controls_flow_statements' block
+ * is contained in a loop. Otherwise a warning is added to the block.
+ * @mixin
+ * @augments Blockly.Block
+ * @public
+ * @readonly
+ */
+Blockly.Constants.Loops.CONTROL_FLOW_IN_LOOP_CHECK_MIXIN = {
+  /**
+   * List of block types that are loops and thus do not need warnings.
+   * To add a new loop type add this to your code:
+   * Blockly.Constants.Loops.CONTROL_FLOW_IN_LOOP_CHECK_MIXIN.LOOP_TYPES.push('custom_loop');
+   */
+  LOOP_TYPES: [
+    'controls_repeat',
+    'controls_repeat_ext',
+    'controls_forEach',
+    'controls_for',
+    'controls_whileUntil',
+  ],
+
+  /**
+   * Is the given block enclosed (at any level) by a loop?
+   * @param {!Blockly.Block} block Current block.
+   * @return {Blockly.Block} The nearest surrounding loop, or null if none.
+   */
+  getSurroundLoop: function(block) {
+    // Is the block nested in a loop?
+    do {
+      if (Blockly.Constants.Loops.CONTROL_FLOW_IN_LOOP_CHECK_MIXIN.LOOP_TYPES
+          .indexOf(block.type) !== -1) {
+        return block;
+      }
+      block = block.getSurroundParent();
+    } while (block);
+    return null;
+  },
+
+  /**
+   * Called whenever anything on the workspace changes.
+   * Add warning if this flow block is not nested inside a loop.
+   * @param {!Blockly.Events.Abstract} e Change event.
+   * @this {Blockly.Block}
+   */
+  onchange: function(e) {
+    // Don't change state if:
+    //   * It's at the start of a drag.
+    //   * It's not a move event.
+    if (!this.workspace.isDragging || this.workspace.isDragging() ||
+        e.type !== Blockly.Events.BLOCK_MOVE) {
+      return;
+    }
+    const enabled = Blockly.Constants.Loops.CONTROL_FLOW_IN_LOOP_CHECK_MIXIN
+        .getSurroundLoop(this);
+    this.setWarningText(enabled ? null :
+        Blockly.Msg['CONTROLS_FLOW_STATEMENTS_WARNING']);
+    if (!this.isInFlyout) {
+      const group = Blockly.Events.getGroup();
+      // Makes it so the move and the disable event get undone together.
+      Blockly.Events.setGroup(e.group);
+      this.setEnabled(enabled);
+      Blockly.Events.setGroup(group);
+    }
+  },
+};
+
+Blockly.Extensions.registerMixin('controls_flow_in_loop_check',
+    Blockly.Constants.Loops.CONTROL_FLOW_IN_LOOP_CHECK_MIXIN);

core/blockly.js

@@ -43,7 +43,6 @@ const dialog = goog.require('Blockly.dialog');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const geras = goog.require('Blockly.geras');
 const internalConstants = goog.require('Blockly.internalConstants');
-const loopMixin = goog.require('Blockly.loopMixin');
 const minimalist = goog.require('Blockly.minimalist');
 const registry = goog.require('Blockly.registry');
 const svgMath = goog.require('Blockly.utils.svgMath');
@@ -710,7 +709,6 @@ exports.fieldRegistry = fieldRegistry;
 exports.geras = geras;
 exports.inject = inject;
 exports.inputTypes = inputTypes;
-exports.loopMixin = loopMixin;
 exports.minimalist = minimalist;
 exports.registry = registry;
 exports.thrasos = thrasos;

generators/dart/loops.js

@@ -152,7 +152,7 @@ Blockly.Dart['controls_flow_statements'] = function(block) {
     xfix += Blockly.Dart.injectId(Blockly.Dart.STATEMENT_SUFFIX, block);
   }
   if (Blockly.Dart.STATEMENT_PREFIX) {
-    const loop = Blockly.loopMixin
+    const loop = Blockly.Constants.Loops
         .CONTROL_FLOW_IN_LOOP_CHECK_MIXIN.getSurroundLoop(block);
     if (loop && !loop.suppressPrefixSuffix) {
       // Inject loop's statement prefix here since the regular one at the end

generators/javascript/loops.js

@@ -12,8 +12,8 @@
 
 goog.provide('Blockly.JavaScript.loops');
 
+goog.require('Blockly.Constants.Loops');
 goog.require('Blockly.JavaScript');
-goog.require('Blockly.loopMixin');
 goog.require('Blockly.utils.string');
 
 
@@ -167,7 +167,7 @@ Blockly.JavaScript['controls_flow_statements'] = function(block) {
         block);
   }
   if (Blockly.JavaScript.STATEMENT_PREFIX) {
-    const loop = Blockly.loopMixin
+    const loop = Blockly.Constants.Loops
         .CONTROL_FLOW_IN_LOOP_CHECK_MIXIN.getSurroundLoop(block);
     if (loop && !loop.suppressPrefixSuffix) {
       // Inject loop's statement prefix here since the regular one at the end

generators/lua/loops.js

@@ -156,7 +156,7 @@ Blockly.Lua['controls_flow_statements'] = function(block) {
     xfix += Blockly.Lua.injectId(Blockly.Lua.STATEMENT_SUFFIX, block);
   }
   if (Blockly.Lua.STATEMENT_PREFIX) {
-    const loop = Blockly.loopMixin
+    const loop = Blockly.Constants.Loops
         .CONTROL_FLOW_IN_LOOP_CHECK_MIXIN.getSurroundLoop(block);
     if (loop && !loop.suppressPrefixSuffix) {
       // Inject loop's statement prefix here since the regular one at the end

generators/php/loops.js

@@ -153,7 +153,7 @@ Blockly.PHP['controls_flow_statements'] = function(block) {
     xfix += Blockly.PHP.injectId(Blockly.PHP.STATEMENT_SUFFIX, block);
   }
   if (Blockly.PHP.STATEMENT_PREFIX) {
-    const loop = Blockly.loopMixin
+    const loop = Blockly.Constants.Loops
         .CONTROL_FLOW_IN_LOOP_CHECK_MIXIN.getSurroundLoop(block);
     if (loop && !loop.suppressPrefixSuffix) {
       // Inject loop's statement prefix here since the regular one at the end

generators/python/loops.js

@@ -197,7 +197,7 @@ Blockly.Python['controls_flow_statements'] = function(block) {
     xfix += Blockly.Python.injectId(Blockly.Python.STATEMENT_SUFFIX, block);
   }
   if (Blockly.Python.STATEMENT_PREFIX) {
-    const loop = Blockly.loopMixin
+    const loop = Blockly.Constants.Loops
         .CONTROL_FLOW_IN_LOOP_CHECK_MIXIN.getSurroundLoop(block);
     if (loop && !loop.suppressPrefixSuffix) {
       // Inject loop's statement prefix here since the regular one at the end

scripts/gulpfiles/chunks.json

@@ -1,7 +1,7 @@
 {
   "chunk": [
     "requires:259",
-    "all:10:requires",
+    "all:9:requires",
     "all1:11:requires",
     "all2:11:requires",
     "all3:11:requires",
@@ -11,64 +11,63 @@
   "js": [
     "./core/serialization/workspaces.js",
     "./core/serialization/variables.js",
-    "./core/widgetdiv.js",
-    "./core/clipboard.js",
-    "./core/menuitem.js",
-    "./core/menu.js",
-    "./core/contextmenu.js",
-    "./core/contextmenu_items.js",
-    "./core/shortcut_items.js",
-    "./core/theme/zelos.js",
-    "./core/theme/themes.js",
-    "./core/renderers/geras/constants.js",
-    "./core/renderers/geras/highlight_constants.js",
-    "./core/renderers/geras/measurables/inline_input.js",
+    "./core/inject.js",
+    "./core/flyout_vertical.js",
+    "./core/toolbox/toolbox.js",
+    "./core/interfaces/i_styleable.js",
+    "./core/flyout_horizontal.js",
+    "./core/flyout_base.js",
+    "./core/flyout_metrics_manager.js",
+    "./core/field_variable.js",
+    "./core/field_number.js",
+    "./core/field_multilineinput.js",
+    "./core/field_label_serializable.js",
+    "./core/field_colour.js",
+    "./core/field_checkbox.js",
+    "./core/field_angle.js",
+    "./core/toolbox/collapsible_category.js",
+    "./core/renderers/zelos/measurables/top_row.js",
+    "./core/renderers/zelos/measurables/inputs.js",
+    "./core/renderers/zelos/measurables/row_elements.js",
+    "./core/renderers/zelos/marker_svg.js",
+    "./core/renderers/zelos/renderer.js",
+    "./core/field_textinput.js",
+    "./core/field_image.js",
+    "./core/renderers/zelos/info.js",
+    "./core/renderers/zelos/path_object.js",
+    "./core/renderers/zelos/drawer.js",
+    "./core/renderers/zelos/constants.js",
+    "./core/renderers/zelos/measurables/bottom_row.js",
+    "./core/renderers/zelos/zelos.js",
+    "./core/renderers/thrasos/renderer.js",
+    "./core/renderers/thrasos/info.js",
+    "./core/renderers/thrasos/thrasos.js",
+    "./core/renderers/minimalist/renderer.js",
+    "./core/renderers/minimalist/info.js",
+    "./core/renderers/minimalist/drawer.js",
+    "./core/renderers/minimalist/constants.js",
+    "./core/renderers/minimalist/minimalist.js",
+    "./core/renderers/geras/measurables/statement_input.js",
     "./core/renderers/geras/path_object.js",
     "./core/renderers/geras/renderer.js",
-    "./core/renderers/geras/measurables/statement_input.js",
+    "./core/renderers/geras/measurables/inline_input.js",
     "./core/renderers/geras/info.js",
+    "./core/renderers/geras/highlight_constants.js",
     "./core/renderers/geras/highlighter.js",
     "./core/renderers/geras/drawer.js",
+    "./core/renderers/geras/constants.js",
     "./core/renderers/geras/geras.js",
-    "./core/loop_mixin.js",
-    "./core/renderers/minimalist/constants.js",
-    "./core/renderers/minimalist/renderer.js",
-    "./core/renderers/minimalist/info.js",
-    "./core/renderers/minimalist/drawer.js",
-    "./core/renderers/minimalist/minimalist.js",
-    "./core/renderers/thrasos/renderer.js",
-    "./core/renderers/thrasos/info.js",
-    "./core/renderers/thrasos/thrasos.js",
-    "./core/renderers/zelos/measurables/bottom_row.js",
-    "./core/renderers/zelos/constants.js",
-    "./core/renderers/zelos/path_object.js",
-    "./core/field_image.js",
-    "./core/field_textinput.js",
-    "./core/renderers/zelos/marker_svg.js",
-    "./core/renderers/zelos/renderer.js",
-    "./core/renderers/zelos/measurables/row_elements.js",
-    "./core/renderers/zelos/measurables/inputs.js",
-    "./core/renderers/zelos/measurables/top_row.js",
-    "./core/renderers/zelos/info.js",
-    "./core/renderers/zelos/drawer.js",
-    "./core/renderers/zelos/zelos.js",
-    "./core/toolbox/collapsible_category.js",
-    "./core/field_angle.js",
-    "./core/field_checkbox.js",
-    "./core/field_colour.js",
-    "./core/field_label_serializable.js",
-    "./core/field_multilineinput.js",
-    "./core/field_number.js",
-    "./core/field_variable.js",
-    "./core/flyout_metrics_manager.js",
-    "./core/flyout_base.js",
-    "./core/generator.js",
-    "./core/flyout_horizontal.js",
-    "./core/interfaces/i_styleable.js",
-    "./core/toolbox/toolbox.js",
-    "./core/flyout_vertical.js",
-    "./core/inject.js",
+    "./core/theme/zelos.js",
+    "./core/theme/themes.js",
+    "./core/shortcut_items.js",
+    "./core/contextmenu_items.js",
+    "./core/menu.js",
+    "./core/menuitem.js",
+    "./core/clipboard.js",
+    "./core/widgetdiv.js",
+    "./core/contextmenu.js",
     "./core/blockly.js",
+    "./core/generator.js",
     "./core/field_dropdown.js",
     "./core/events/workspace_events.js",
     "./core/events/events_toolbox_item_select.js",
@@ -267,13 +266,13 @@
     "./core/utils/global.js",
     "./core/msg.js",
     "./closure/goog/base_minimal.js",
+    "./blocks/loops.js",
     "./core/requires.js",
     "./blocks/variables_dynamic.js",
     "./blocks/variables.js",
     "./blocks/text.js",
     "./blocks/procedures.js",
     "./blocks/math.js",
-    "./blocks/loops.js",
     "./blocks/logic.js",
     "./blocks/lists.js",
     "./blocks/colour.js",