Make it so the App and the Editor use the same GeneratorContext.

Make GeneratorContext methods addClassMethodName and getClassMethodName only store the method name if it is different than the name field value.

Author: lizlooney

src/App.tsx

@@ -253,7 +253,7 @@ const App: React.FC = () => {
   const [deleteTooltip, setDeleteTooltip] = useState('Delete');
   const blocklyComponent = useRef<BlocklyComponentType | null>(null);
   const [triggerPythonRegeneration, setTriggerPythonRegeneration] = useState(0);
-  const generatorContext = useRef(createGeneratorContext());
+  const generatorContext = useRef<GeneratorContext | null>(null);
   const blocksEditor = useRef<editor.Editor | null>(null);
   const [generatedCode, setGeneratedCode] = useState('');
   const [newProjectNameModalPurpose, setNewProjectNameModalPurpose] = useState('');
@@ -534,7 +534,8 @@ const App: React.FC = () => {
       blocklyWorkspace.addChangeListener(mutatorOpenListener);
       blocklyWorkspace.addChangeListener(handleBlocksChanged);
     }
-    blocksEditor.current = new editor.Editor(blocklyWorkspace, storage);
+    generatorContext.current = createGeneratorContext();
+    blocksEditor.current = new editor.Editor(blocklyWorkspace, generatorContext.current, storage);
   }, [blocklyComponent, storage]);
 
   const handleBlocksChanged = (event: Blockly.Events.Abstract) => {

src/editor/editor.ts

@@ -22,7 +22,7 @@
 import * as Blockly from 'blockly/core';
 
 import { extendedPythonGenerator } from './extended_python_generator';
-import { createGeneratorContext, GeneratorContext } from './generator_context';
+import { GeneratorContext } from './generator_context';
 import * as commonStorage from '../storage/common_storage';
 import { getToolboxJSON } from '../toolbox/toolbox';
 
@@ -33,8 +33,8 @@ const EMPTY_TOOLBOX: Blockly.utils.toolbox.ToolboxDefinition = {
 };
 
 export class Editor {
-  private generatorContext = createGeneratorContext();
   private blocklyWorkspace: Blockly.WorkspaceSvg;
+  private generatorContext: GeneratorContext;
   private storage: commonStorage.Storage;
   private currentModule: commonStorage.Module | null = null;
   private modulePath: string = '';
@@ -44,8 +44,9 @@ export class Editor {
   private bindedOnChange: any = null;
   private toolbox: Blockly.utils.toolbox.ToolboxDefinition = EMPTY_TOOLBOX;
 
-  constructor(blocklyWorkspace: Blockly.WorkspaceSvg, storage: commonStorage.Storage) {
+  constructor(blocklyWorkspace: Blockly.WorkspaceSvg, generatorContext: GeneratorContext, storage: commonStorage.Storage) {
     this.blocklyWorkspace = blocklyWorkspace;
+    this.generatorContext = generatorContext;
     this.storage = storage;
   }
 

src/editor/generator_context.ts

@@ -97,13 +97,15 @@ export class GeneratorContext {
   }
 
   addClassMethodName(nameFieldValue: string, methodName: string) {
-    this.classMethodNames[nameFieldValue] = methodName;
+    if (nameFieldValue !== methodName) {
+      this.classMethodNames[nameFieldValue] = methodName;
+    }
   }
 
   getClassMethodName(nameFieldValue: string): string | null {
-    if (nameFieldValue in this.classMethodNames) {
+    if (this.classMethodNames[nameFieldValue]) {
       return this.classMethodNames[nameFieldValue];
     }
-    return null;
+    return nameFieldValue;
   }
 }