Added optional parameter returnCurrentIfNotFound to getEditorForBlocklyWorkspace.

Author: lizlooney

src/blocks/mrc_call_python_function.ts

@@ -531,7 +531,7 @@ const CALL_PYTHON_FUNCTION = {
   getComponents: function(this: CallPythonFunctionBlock): storageModuleContent.Component[] {
     // Get the list of components whose type matches this.mrcComponentClassName.
     const components: storageModuleContent.Component[] = [];
-    const editor = Editor.getEditorForBlocklyWorkspace(this.workspace) || Editor.getCurrentEditor();
+    const editor = Editor.getEditorForBlocklyWorkspace(this.workspace, true /* returnCurrentIfNotFound */);
     if (editor) {
       let componentsToConsider: storageModuleContent.Component[] = [];
       if (this.mrcMechanismId) {
@@ -567,7 +567,7 @@ const CALL_PYTHON_FUNCTION = {
   },
   mrcOnLoad: function(this: CallPythonFunctionBlock): void {
     // mrcOnLoad is called for each CallPythonFunctionBlock when the blocks are loaded in the blockly workspace.
-    const editor = Editor.getEditorForBlocklyWorkspace(this.workspace) || Editor.getCurrentEditor();
+    const editor = Editor.getEditorForBlocklyWorkspace(this.workspace, true /* returnCurrentIfNotFound */);
     if (!editor) {
       return;
     }

src/blocks/mrc_component.ts

@@ -127,7 +127,7 @@ const COMPONENT = {
    * Update the block to reflect the newly loaded extra state.
    */
   updateBlock_: function (this: ComponentBlock): void {
-    const editor = Editor.getEditorForBlocklyWorkspace(this.workspace) || Editor.getCurrentEditor();
+    const editor = Editor.getEditorForBlocklyWorkspace(this.workspace, true /* returnCurrentIfNotFound */);
     if (editor && editor.getModuleType() === storageModule.ModuleType.ROBOT) {
       // Add input sockets for the arguments.
       for (let i = 0; i < this.mrcArgs.length; i++) {

src/blocks/mrc_event_handler.ts

@@ -178,7 +178,7 @@ const EVENT_HANDLER = {
   mrcOnLoad: function(this: EventHandlerBlock): void {
     const warnings: string[] = [];
 
-    const editor = Editor.getEditorForBlocklyWorkspace(this.workspace) || Editor.getCurrentEditor();
+    const editor = Editor.getEditorForBlocklyWorkspace(this.workspace, true /* returnCurrentIfNotFound */);
     if (editor) {
       if (this.mrcSenderType === SenderType.ROBOT) {
         // This block is an event handler for a robot event.

src/blocks/mrc_mechanism.ts

@@ -178,7 +178,7 @@ const MECHANISM = {
     // mrcOnLoad is called for each MechanismBlock when the blocks are loaded in the blockly workspace.
     const warnings: string[] = [];
 
-    const editor = Editor.getEditorForBlocklyWorkspace(this.workspace) || Editor.getCurrentEditor();
+    const editor = Editor.getEditorForBlocklyWorkspace(this.workspace, true /* returnCurrentIfNotFound */);
     if (editor) {
       // Find the mechanism.
       let foundMechanism: storageModule.Mechanism | null = null;

src/editor/editor.ts

@@ -498,7 +498,7 @@ export class Editor {
     throw new Error('getMethodsFromMechanism: mechanism not found: ' + mechanism.className);
   }
 
-  public static getEditorForBlocklyWorkspace(workspace: Blockly.Workspace): Editor | null {
+  public static getEditorForBlocklyWorkspace(workspace: Blockly.Workspace, opt_returnCurrentIfNotFound?: boolean): Editor | null {
     if (workspace.id in Editor.workspaceIdToEditor) {
       return Editor.workspaceIdToEditor[workspace.id];
     }
@@ -511,7 +511,7 @@ export class Editor {
       return Editor.workspaceIdToEditor[rootWorkspace.id];
     }
 
-    return null;
+    return opt_returnCurrentIfNotFound ? Editor.currentEditor : null;
   }
 
   public static getEditorForBlocklyWorkspaceId(workspaceId: string): Editor | null {