Removed classMethodNames field, and clearClassMethodNames, addClassMethodName, and getClassMethodName methods from GeneratorContext.

Removed nameFieldValue parameter from ExtendedPythonGenerator.addClassMethodDefinition method.

Author: lizlooney

src/blocks/mrc_class_method_def.ts

@@ -421,7 +421,7 @@ export const pythonFromBlock = function (
         xfix2 +
         returnValue;
     code = generator.scrub_(block, code);
-    generator.addClassMethodDefinition(block.getFieldValue('NAME'), funcName, code);
+    generator.addClassMethodDefinition(funcName, code);
 
     return '';
-}
+}

src/editor/extended_python_generator.ts

@@ -97,8 +97,7 @@ export class ExtendedPythonGenerator extends PythonGenerator {
   /**
    * Add a class method definition.
    */
-  addClassMethodDefinition(nameFieldValue: string, methodName: string, code: string): void {
-    this.context.addClassMethodName(nameFieldValue, methodName);
+  addClassMethodDefinition(methodName: string, code: string): void {
     this.classMethods[methodName] = code;
   }
 

src/editor/generator_context.ts

@@ -33,9 +33,6 @@ export class GeneratorContext {
   // The exported blocks for the current module.
   private exportedBlocks: Block[] = [];
 
-  // Key is the mrc_class_method_def block's NAME field, value is the python method name.
-  private classMethodNames: {[key: string]: string} = Object.create(null);
-
   // Has mechanisms (ie, needs in init)
   private hasMechanisms = false;
 
@@ -46,15 +43,14 @@ export class GeneratorContext {
 
   clear(): void {
     this.clearExportedBlocks();
-    this.clearClassMethodNames();
     this.hasMechanisms = false;
   }
+
   setHasMechanism():void{
     this.hasMechanisms = true;
   }
   getHasMechanisms():boolean{
     return this.hasMechanisms;
-  }
 
   getClassName(): string {
     if (this.module.moduleType === commonStorage.MODULE_TYPE_PROJECT) {
@@ -101,21 +97,4 @@ export class GeneratorContext {
   getExportedBlocks(): Block[] {
     return this.exportedBlocks;
   }
-
-  clearClassMethodNames() {
-    this.classMethodNames = Object.create(null);
-  }
-
-  addClassMethodName(nameFieldValue: string, methodName: string) {
-    if (nameFieldValue !== methodName) {
-      this.classMethodNames[nameFieldValue] = methodName;
-    }
-  }
-
-  getClassMethodName(nameFieldValue: string): string | null {
-    if (this.classMethodNames[nameFieldValue]) {
-      return this.classMethodNames[nameFieldValue];
-    }
-    return nameFieldValue;
-  }
 }