From da6d28b81877794afcd6c600a28aba662c14ceae Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 5 Sep 2019 11:16:27 -0700
Subject: [PATCH] More cleanup

---
 blockly_uncompressed.js           | 2 +-
 core/renderers/common/renderer.js | 2 +-
 core/renderers/geras/renderer.js  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blockly_uncompressed.js b/blockly_uncompressed.js
index c824424e1..30b736f3e 100644
--- a/blockly_uncompressed.js
+++ b/blockly_uncompressed.js
@@ -102,7 +102,7 @@ goog.addDependency("../../../" + dir + "/core/renderers/geras/drawer.js", ['Bloc
 goog.addDependency("../../../" + dir + "/core/renderers/geras/highlight_constants.js", ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths']);
 goog.addDependency("../../../" + dir + "/core/renderers/geras/highlighter.js", ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow']);
 goog.addDependency("../../../" + dir + "/core/renderers/geras/info.js", ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.RenderedConnection']);
-goog.addDependency("../../../" + dir + "/core/renderers/geras/renderer.js", ['Blockly.geras.Renderer'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Renderer', 'Blockly.geras.Drawer', 'Blockly.geras.RenderInfo']);
+goog.addDependency("../../../" + dir + "/core/renderers/geras/renderer.js", ['Blockly.geras.Renderer'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Renderer', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.RenderInfo']);
 goog.addDependency("../../../" + dir + "/core/renderers/measurables/base.js", ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types']);
 goog.addDependency("../../../" + dir + "/core/renderers/measurables/connections.js", ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.RenderedConnection']);
 goog.addDependency("../../../" + dir + "/core/renderers/measurables/inputs.js", ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types']);
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index dbe0f2ef4..e197c8faf 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -40,7 +40,7 @@ Blockly.blockRendering.Renderer = function() {
   this.constantProvider = Blockly.blockRendering.ConstantProvider;
   this.renderInfo = Blockly.blockRendering.RenderInfo;
   this.drawer = Blockly.blockRendering.Drawer;
-  this.debugger = Blockly.blockRendering.Debugger;
+  this.debugger = Blockly.blockRendering.Debug;
 };
 
 /**
diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js
index e906e362c..f65417ea6 100644
--- a/core/renderers/geras/renderer.js
+++ b/core/renderers/geras/renderer.js
@@ -30,6 +30,7 @@ goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.blockRendering.Debug');
 goog.require('Blockly.blockRendering.Renderer');
 goog.require('Blockly.geras.Drawer');
+goog.require('Blockly.geras.HighlightConstantProvider');
 goog.require('Blockly.geras.RenderInfo');
 
 /**
@@ -53,6 +54,5 @@ goog.inherits(Blockly.geras.Renderer, Blockly.blockRendering.Renderer);
  */
 Blockly.geras.Renderer.prototype.init = function() {
   Blockly.geras.Renderer.superClass_.init.call(this);
-  this.highlightConstants =
-      new Blockly.geras.HighlightConstantProvider(this.constants);
+  this.highlightConstants = new Blockly.geras.HighlightConstantProvider();
 };