From 623e901b1c35039d82e277c3629b1c22a6d2f152 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 4 Aug 2021 08:23:38 -0700
Subject: [PATCH] Migrate core/events/events_trashcan_open.js to goog.module
 syntax (#5277)

* Migrate core/events/events_trashcan_open.js to ES6 const/let

* Migrate core/events/events_trashcan_open.js to goog.module

* Migrate core/events/events_trashcan_open.js to named requires

* clang-format core/events/events_trashcan_open.js
---
 core/events/events_trashcan_open.js | 34 +++++++++++++++--------------
 tests/deps.js                       |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/core/events/events_trashcan_open.js b/core/events/events_trashcan_open.js
index ab388d909..6f5318213 100644
--- a/core/events/events_trashcan_open.js
+++ b/core/events/events_trashcan_open.js
@@ -10,12 +10,13 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.TrashcanOpen');
+goog.module('Blockly.Events.TrashcanOpen');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -24,11 +25,11 @@ goog.require('Blockly.utils.object');
  *    opening). Undefined for a blank event.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.TrashcanOpen = function(opt_isOpen, opt_workspaceId) {
-  Blockly.Events.TrashcanOpen.superClass_.constructor.call(this, opt_workspaceId);
+const TrashcanOpen = function(opt_isOpen, opt_workspaceId) {
+  TrashcanOpen.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * Whether the trashcan flyout is opening (false if closing).
@@ -36,20 +37,20 @@ Blockly.Events.TrashcanOpen = function(opt_isOpen, opt_workspaceId) {
    */
   this.isOpen = opt_isOpen;
 };
-Blockly.utils.object.inherits(Blockly.Events.TrashcanOpen, Blockly.Events.UiBase);
+object.inherits(TrashcanOpen, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.TrashcanOpen.prototype.type = Blockly.Events.TRASHCAN_OPEN;
+TrashcanOpen.prototype.type = Events.TRASHCAN_OPEN;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.TrashcanOpen.prototype.toJson = function() {
-  var json = Blockly.Events.TrashcanOpen.superClass_.toJson.call(this);
+TrashcanOpen.prototype.toJson = function() {
+  const json = TrashcanOpen.superClass_.toJson.call(this);
   json['isOpen'] = this.isOpen;
   return json;
 };
@@ -58,10 +59,11 @@ Blockly.Events.TrashcanOpen.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.TrashcanOpen.prototype.fromJson = function(json) {
-  Blockly.Events.TrashcanOpen.superClass_.fromJson.call(this, json);
+TrashcanOpen.prototype.fromJson = function(json) {
+  TrashcanOpen.superClass_.fromJson.call(this, json);
   this.isOpen = json['isOpen'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.TRASHCAN_OPEN, Blockly.Events.TrashcanOpen);
+registry.register(registry.Type.EVENT, Events.TRASHCAN_OPEN, TrashcanOpen);
+
+exports = TrashcanOpen;
diff --git a/tests/deps.js b/tests/deps.js
index 8cccc9ea1..e379b9add 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -43,7 +43,7 @@ goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.M
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);