From 714bb6120f9caebc04dc6707d300f784924b33b7 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 29 Jul 2021 12:52:14 -0700
Subject: [PATCH] Fix annotations

---
 core/blockly.js   |  6 +++---
 core/clipboard.js | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index ab82638fe..9fae4e84a 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -94,11 +94,11 @@ Blockly.draggingConnections = [];
 
 /**
  * Get the current contents of the clipboard and associated metadata.
- * @return {{xml: Element, source: WorkspaceSvg, typeCounts: Object}} An object
- *     containing the clipboard contents and associated metadata.
+ * @return {{xml: ?Element, source: ?Blockly.WorkspaceSvg, typeCounts: ?Object}}
+ *     An object containing the clipboard contents and associated metadata.
  * @public
  */
-Blockly.getClipboardInfo = Blockly.common.getClipboardInfo;
+Blockly.getClipboardInfo = Blockly.clipboard.getClipboardInfo;
 
 /**
  * Cached value for whether 3D is supported.
diff --git a/core/clipboard.js b/core/clipboard.js
index b93f92530..9f7097f71 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -22,29 +22,29 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 /**
  * Contents of the local clipboard.
- * @type {Element}
+ * @type {?Element}
  * @private
  */
 let xml = null;
 
 /**
  * Source of the local clipboard.
- * @type {WorkspaceSvg}
+ * @type {?WorkspaceSvg}
  * @private
  */
 let source = null;
 
 /**
  * Map of types to type counts for the clipboard object and descendants.
- * @type {Object}
+ * @type {?Object}
  * @private
  */
 let typeCounts = null;
 
 /**
  * Get the current contents of the clipboard and associated metadata.
- * @return {{xml: Element, source: WorkspaceSvg, typeCounts: Object}} An object
- *     containing the clipboard contents and associated metadata.
+ * @return {{xml: ?Element, source: ?WorkspaceSvg, typeCounts: ?Object}} An
+ *     object containing the clipboard contents and associated metadata.
  */
 const getClipboardInfo = function() {
   return {xml: xml, source: source, typeCounts: typeCounts};