fix karma bugs

microsoft · Jan 31, 2024 · 28f48a1 · 28f48a1
1 parent aecb618
commit 28f48a1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/newblocks/builtins/functions.ts b/newblocks/builtins/functions.ts
@@ -44,7 +44,7 @@ export function initFunctions() {
         this.setColour(pxt.toolbox.getNamespaceColor('functions'));
         this.arguments_ = [];
         this.argumentVarModels_ = [];
-        this.setStartHat(true);
+        this.hat = "cap";
         this.setStatements_(true);
         this.statementConnection_ = null;
     };

diff --git a/newblocks/compiler/typeChecker.ts b/newblocks/compiler/typeChecker.ts
@@ -482,7 +482,8 @@ function mkPlaceholderBlock(e: Environment, parent: Blockly.Block, type?: string
         type: "placeholder",
         p: mkPoint(type || null),
         workspace: e.workspace,
-        parentBlock_: parent
+        parentBlock_: parent,
+        getParent: () => parent
     } as any;
 }
 

diff --git a/newblocks/fields/field_procedure.ts b/newblocks/fields/field_procedure.ts
@@ -3,38 +3,48 @@
 import * as Blockly from "blockly";
 
 export class FieldProcedure extends Blockly.FieldDropdown {
+    protected rawValue: string;
 
     constructor(funcname: string, opt_validator?: Blockly.FieldValidator) {
-        super([["Temp", "Temp"]], opt_validator);
+        super(createMenuGenerator(), opt_validator);
 
         this.setValue(funcname || '');
     }
 
-    getOptions() {
-        return this.generateOptions();
-    };
+    getOptions(useCache?: boolean): Blockly.MenuOption[] {
+        return (this.menuGenerator_ as () => Blockly.MenuOption[])();
+    }
+
+    protected override doClassValidation_(newValue?: string): string {
+        if (newValue === undefined) {
+            return null;
+        }
+
+        return newValue;
+    }
+
+    protected override doValueUpdate_(newValue: string): void {
+        this.rawValue = newValue;
+        super.doValueUpdate_(newValue);
+    }
 
-    init() {
+    override init() {
         if (this.fieldGroup_) {
             // Dropdown has already been initialized once.
             return;
         }
         super.init.call(this);
     };
 
-    setSourceBlock(block: Blockly.Block) {
-        (goog as any).asserts.assert(!(block as any).isShadow(),
+    override setSourceBlock(block: Blockly.Block) {
+        pxt.Util.assert(!block.isShadow(),
             'Procedure fields are not allowed to exist on shadow blocks.');
         super.setSourceBlock.call(this, block);
     };
+}
 
-    /**
-     * Return a sorted list of variable names for procedure dropdown menus.
-     * Include a special option at the end for creating a new function name.
-     * @return {!Array.<string>} Array of procedure names.
-     * @this {pxtblockly.FieldProcedure}
-     */
-    public generateOptions() {
+function createMenuGenerator() {
+    return function (this: FieldProcedure) {
         let functionList: string[] = [];
         if (this.sourceBlock_ && this.sourceBlock_.workspace) {
             let blocks = this.sourceBlock_.workspace.getAllBlocks(false);
@@ -66,19 +76,17 @@ export class FieldProcedure extends Blockly.FieldDropdown {
             functionList.push("Temp");
         }
 
+        if (this.rawValue && functionList.indexOf(this.rawValue) === -1) {
+            functionList.push(this.rawValue);
+        }
+
         // Variables are not language-specific, use the name as both the user-facing
         // text and the internal representation.
         let options: [string, string][] = [];
         for (let i = 0; i < functionList.length; i++) {
             options[i] = [functionList[i], functionList[i]];
         }
-        return options;
-    }
 
-    onItemSelected(menu: any, menuItem: any) {
-        let itemText = menuItem.getValue();
-        if (itemText !== null) {
-            this.setValue(itemText);
-        }
+        return options;
     }
 }