refactor!: Removed backwards compatibility for getDeveloperVars(). (#…

…6385)
google · Aug 25, 2022 · 3bc42c5 · 3bc42c5
1 parent 3a36ed5
commit 3bc42c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/core/variables.ts b/core/variables.ts
@@ -63,8 +63,6 @@ export function allUsedVarModels(ws: Workspace): VariableModel[] {
   return Array.from(variables.values());
 }
 
-const ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE: {[key: string]: boolean} = {};
-
 /**
  * Find all developer variables used by blocks in the workspace.
  * Developer variables are never shown to the user, but are declared as global
@@ -81,18 +79,7 @@ export function allDeveloperVariables(workspace: Workspace): string[] {
   const blocks = workspace.getAllBlocks(false);
   const variables = new Set<string>();
   for (let i = 0, block; block = blocks[i]; i++) {
-    let getDeveloperVariables = block.getDeveloperVariables;
-    if (!getDeveloperVariables && (block as any).getDeveloperVars) {
-      // August 2018: getDeveloperVars() was deprecated and renamed
-      // getDeveloperVariables().
-      getDeveloperVariables = (block as any).getDeveloperVars;
-      if (!ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE[block.type]) {
-        console.warn(
-            'Function getDeveloperVars() deprecated. Use ' +
-            'getDeveloperVariables() (block type \'' + block.type + '\')');
-        ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE[block.type] = true;
-      }
-    }
+    const getDeveloperVariables = block.getDeveloperVariables;
     if (getDeveloperVariables) {
       const devVars = getDeveloperVariables();
       for (let j = 0; j < devVars.length; j++) {

diff --git a/tests/generators/unittest.js b/tests/generators/unittest.js
@@ -20,7 +20,7 @@ Blockly.Blocks['unittest_main'] = {
     this.setTooltip('Executes the enclosed unit tests,\n' +
                     'then prints a summary.');
   },
-  getDeveloperVars: function() {
+  getDeveloperVariables: function() {
     return ['unittestResults'];
   }
 };
@@ -40,7 +40,7 @@ Blockly.Blocks['unittest_assertequals'] = {
         .appendField('expected');
     this.setTooltip('Tests that "actual == expected".');
   },
-  getDeveloperVars: function() {
+  getDeveloperVariables: function() {
     return ['unittestResults'];
   }
 };
@@ -60,7 +60,7 @@ Blockly.Blocks['unittest_assertvalue'] = {
         [['true', 'TRUE'], ['false', 'FALSE'], ['null', 'NULL']]), 'EXPECTED');
     this.setTooltip('Tests that the value is true, false, or null.');
   },
-  getDeveloperVars: function() {
+  getDeveloperVariables: function() {
     return ['unittestResults'];
   }
 };
@@ -76,7 +76,7 @@ Blockly.Blocks['unittest_fail'] = {
         .appendField('fail');
     this.setTooltip('Records an error.');
   },
-  getDeveloperVars: function() {
+  getDeveloperVariables: function() {
     return ['unittestResults'];
   }
 };