Create functions for registering custom categories.

Changed custom values to begin with MRC_.

Author: lizlooney

src/editor/editor.ts

@@ -32,8 +32,8 @@ import * as eventHandler from '../blocks/mrc_event_handler';
 import * as classMethodDef from '../blocks/mrc_class_method_def';
 import * as mechanismComponentHolder from '../blocks/mrc_mechanism_component_holder';
 //import { testAllBlocksInToolbox } from '../toolbox/toolbox_tests';
-import { MethodsCategory } from '../toolbox/methods_category';
-import { EventsCategory } from '../toolbox/event_category';
+import { registerCategory as registerMethodsCategory } from '../toolbox/methods_category';
+import { registerCategory as registerEventsCategory } from '../toolbox/event_category';
 import {
     registerRobotEventHandlersCategory,
     registerMechanismEventHandlersCategory
@@ -67,9 +67,9 @@ export class Editor {
     this.blocklyWorkspace = blocklyWorkspace;
     this.generatorContext = generatorContext;
     this.storage = storage;
-    // Create the custom toolbox categories so they register their flyout callbacks.
-    new MethodsCategory(blocklyWorkspace);
-    new EventsCategory(blocklyWorkspace);
+    // Register the custom toolbox categories.
+    registerMethodsCategory(blocklyWorkspace);
+    registerEventsCategory(blocklyWorkspace);
     registerRobotEventHandlersCategory(blocklyWorkspace);
   }
 

src/toolbox/event_category.ts

@@ -28,7 +28,11 @@ import { createCustomEventBlock } from '../blocks/mrc_event';
 import { addFireEventBlocks } from '../blocks/mrc_call_python_function';
 import { Editor } from '../editor/editor';
 
-const CUSTOM_CATEGORY_EVENTS = 'EVENTS';
+const CUSTOM_CATEGORY_EVENTS = 'MRC_EVENTS';
+
+export function registerCategory(blocklyWorkspace: Blockly.WorkspaceSvg): void {
+  new EventsCategory(blocklyWorkspace);
+}
 
 export function getCategory(): toolboxItems.Category {
   return {
@@ -39,7 +43,7 @@ export function getCategory(): toolboxItems.Category {
   };
 }
 
-export class EventsCategory {
+class EventsCategory {
   constructor(blocklyWorkspace: Blockly.WorkspaceSvg) {
     blocklyWorkspace.registerToolboxCategoryCallback(CUSTOM_CATEGORY_EVENTS, this.eventsFlyout.bind(this));
   }

src/toolbox/event_handlers_category.ts

@@ -34,10 +34,11 @@ import { Editor } from '../editor/editor';
 // doesn't contain blocks for the event handlers that have already been added to the blockly
 // workspace.
 
-const CUSTOM_CATEGORY_EVENT_HANDLERS_ROBOT = 'EVENT_HANDLERS_ROBOT';
-const CUSTOM_CATEGORY_EVENT_HANDLERS_MECHANISM_PREFIX = 'EVENT_HANDLERS_MECHANISM_';
+const CUSTOM_CATEGORY_EVENT_HANDLERS_ROBOT = 'MRC_EVENT_HANDLERS_ROBOT';
+const CUSTOM_CATEGORY_EVENT_HANDLERS_MECHANISM_PREFIX = 'MRC_EVENT_HANDLERS_MECHANISM_';
 
 function getCustomValue(mechanismInRobot: storageModuleContent.MechanismInRobot | null): string {
+  // If the event is defined in the robot, mechanismInRobot is null.
   return (mechanismInRobot === null)
       ? CUSTOM_CATEGORY_EVENT_HANDLERS_ROBOT
       : CUSTOM_CATEGORY_EVENT_HANDLERS_MECHANISM_PREFIX + mechanismInRobot.name;
@@ -70,6 +71,7 @@ export function getMechanismEventHandlersCategory(
 }
 
 class EventHandlersCategory {
+  // If the event is defined in the robot, mechanismInRobot is null.
   mechanismInRobot: storageModuleContent.MechanismInRobot | null;
 
   constructor(

src/toolbox/methods_category.ts

@@ -30,7 +30,11 @@ import { createCustomMethodBlock, getBaseClassBlocks, FIELD_METHOD_NAME } from '
 import { Editor } from '../editor/editor';
 
 
-const CUSTOM_CATEGORY_METHODS = 'METHODS';
+const CUSTOM_CATEGORY_METHODS = 'MRC_METHODS';
+
+export function registerCategory(blocklyWorkspace: Blockly.WorkspaceSvg): void {
+  new MethodsCategory(blocklyWorkspace);
+}
 
 export function getCategory(): toolboxItems.Category {
   return {
@@ -41,7 +45,7 @@ export function getCategory(): toolboxItems.Category {
   };
 }
 
-export class MethodsCategory {
+class MethodsCategory {
   private robotClassBlocks = getBaseClassBlocks(CLASS_NAME_ROBOT_BASE);
   private mechanismClassBlocks = getBaseClassBlocks(CLASS_NAME_MECHANISM);
   private opmodeClassBlocks = getBaseClassBlocks(CLASS_NAME_OPMODE);