From 100da4a66c555569745c54843ee86fea20ed8630 Mon Sep 17 00:00:00 2001
From: Sam El-Husseini <sam.elhusseini@gmail.com>
Date: Thu, 24 Oct 2019 21:53:30 -0700
Subject: [PATCH] Revert "Wrap dummy inputs in a measurable so that it can be
 aligned appropriately. (#3337)"

This reverts commit 7fc733b81f6d70ac43e1883dbb9041e8850874f2.
---
 core/renderers/common/info.js        |  4 ++--
 core/renderers/geras/info.js         |  4 ++--
 core/renderers/measurables/inputs.js | 21 ---------------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 541eac5ce..f47b8c136 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -374,8 +374,8 @@ Blockly.blockRendering.RenderInfo.prototype.addInput_ = function(input, activeRo
         new Blockly.blockRendering.ExternalValueInput(this.constants_, input));
     activeRow.hasExternalInput = true;
   } else if (input.type == Blockly.DUMMY_INPUT) {
-    activeRow.elements.push(
-        new Blockly.blockRendering.DummyInput(this.constants_, input));
+    // Dummy inputs have no visual representation, but the information is still
+    // important.
     activeRow.hasDummyInput = true;
   }
 };
diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js
index 186b48eba..31b99e6b7 100644
--- a/core/renderers/geras/info.js
+++ b/core/renderers/geras/info.js
@@ -113,8 +113,8 @@ Blockly.geras.RenderInfo.prototype.addInput_ = function(input, activeRow) {
         new Blockly.blockRendering.ExternalValueInput(this.constants_, input));
     activeRow.hasExternalInput = true;
   } else if (input.type == Blockly.DUMMY_INPUT) {
-    activeRow.elements.push(
-        new Blockly.blockRendering.DummyInput(this.constants_, input));
+    // Dummy inputs have no visual representation, but the information is still
+    // important.
     activeRow.hasDummyInput = true;
   }
 };
diff --git a/core/renderers/measurables/inputs.js b/core/renderers/measurables/inputs.js
index 8b53ea4a6..754c624a7 100644
--- a/core/renderers/measurables/inputs.js
+++ b/core/renderers/measurables/inputs.js
@@ -70,27 +70,6 @@ Blockly.blockRendering.InputConnection = function(constants, input) {
 Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
     Blockly.blockRendering.Connection);
 
-/**
- * An object containing information about the space a dummy input takes up
- * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *     constants provider.
- * @param {!Blockly.Input} input The inline input to measure and store
- *     information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Measurable}
- */
-Blockly.blockRendering.DummyInput = function(constants, input) {
-  Blockly.blockRendering.DummyInput.superClass_.constructor.call(this,
-      constants);
-  this.type |= Blockly.blockRendering.Types.INPUT;
-  this.input = input;
-  this.align = input.align;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.DummyInput,
-    Blockly.blockRendering.Measurable);
-
 /**
  * An object containing information about the space an inline input takes up
  * during rendering