From 98b436031c421def2f92689f1c153bf28fb917f7 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 17 Jul 2020 10:51:39 -0600
Subject: [PATCH] Use registry for connection checker

---
 core/connection_checker.js | 5 +++++
 core/registry.js           | 5 +++++
 core/workspace.js          | 4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/connection_checker.js b/core/connection_checker.js
index d05de79e4..d4056064c 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -13,6 +13,8 @@
 
 goog.provide('Blockly.ConnectionChecker');
 
+goog.require('Blockly.registry');
+
 goog.requireType('Blockly.Connection');
 goog.requireType('Blockly.IConnectionChecker');
 
@@ -278,3 +280,6 @@ Blockly.ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
   // marker is in the middle of a stack, it won't work.
   return !targetBlock.getPreviousBlock();
 };
+
+Blockly.registry.register(Blockly.registry.Type.CONNECTION_CHECKER,
+    Blockly.registry.DEFAULT, Blockly.ConnectionChecker);
diff --git a/core/registry.js b/core/registry.js
index 08f9dc037..ffa5c6c14 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -15,6 +15,7 @@ goog.provide('Blockly.registry');
 
 goog.requireType('Blockly.blockRendering.Renderer');
 goog.requireType('Blockly.Field');
+goog.requireType('Blockly.IConnectionChecker');
 goog.requireType('Blockly.IToolbox');
 goog.requireType('Blockly.Theme');
 goog.requireType('Blockly.utils.toolbox');
@@ -70,6 +71,10 @@ Blockly.registry.Type.TOOLBOX = new Blockly.registry.Type('toolbox');
 /** @type {!Blockly.registry.Type<Blockly.Theme>} */
 Blockly.registry.Type.THEME = new Blockly.registry.Type('theme');
 
+/** @type {!Blockly.registry.Type<Blockly.IConnectionChecker>} */
+Blockly.registry.Type.CONNECTION_CHECKER =
+    new Blockly.registry.Type('connectionChecker');
+
 /**
  * Registers a class based on a type and name.
  * @param {string|Blockly.registry.Type<T>} type The type of the plugin.
diff --git a/core/workspace.js b/core/workspace.js
index 3f3d0ceff..6c480d054 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -44,11 +44,13 @@ Blockly.Workspace = function(opt_options) {
   /** @type {number} */
   this.toolboxPosition = this.options.toolboxPosition;
 
+  var connectionCheckerClass = Blockly.registry.getClassFromOptions(
+      Blockly.registry.Type.CONNECTION_CHECKER, this.options);
   /**
    * An object that encapsulates logic for safety, type, and dragging checks.
    * @type {!Blockly.IConnectionChecker}
    */
-  this.connectionChecker = new Blockly.ConnectionChecker();
+  this.connectionChecker = new connectionCheckerClass(this);
 
   /**
    * @type {!Array.<!Blockly.Block>}