pxt-core 8.2.4 → 8.2.7

package/built/pxtcompiler.js

@@ -665,6 +665,7 @@ var ts;
                 const info = utf8AsmStringLiteral(strLit);
                 return `
             .balign 4
+            .object ${lbl}
             ${lbl}: ${this.obj_header(info.vt)}
             ${info.asm}
 `;
@@ -675,6 +676,7 @@ var ts;
                 const align = /f{16}/i.test(data) ? 8 : 4;
                 return `
 .balign ${align}
+.object ${lbl}
 ${lbl}: ${this.obj_header("pxt::buffer_vt")}
 ${hexLiteralAsm(data)}
 `;
@@ -784,6 +786,7 @@ ${hexLiteralAsm(data)}
 ;
 `);
                 let baseLabel = this.proc.label();
+                this.write(`.object ${baseLabel} ${JSON.stringify(this.proc.getFullName())}`);
                 let preLabel = baseLabel + "_pre";
                 let bkptLabel = baseLabel + "_bkpt";
                 let locLabel = baseLabel + "_locals";
@@ -1148,9 +1151,13 @@ ${baseLabel}_nochk:
                     this.writeFailBranch();
                 });
             }
+            helperObject(desc) {
+                return `.object _pxt_helper_${desc.replace(/[^\w]+/g, "_")} "helper: ${desc}"`;
+            }
             emitBindHelper() {
                 const maxArgs = 12;
                 this.write(`
+                ${this.helperObject("bind")}
                 .section code
                 _pxt_bind_helper:
                     push {r0, r2}
@@ -1625,6 +1632,7 @@ ${baseLabel}_nochk:
             emitFieldMethods() {
                 for (let op of ["get", "set"]) {
                     this.write(`
+                ${this.helperObject(op)}
                 .section code
                 _pxt_map_${op}:
                 `);
@@ -1666,6 +1674,7 @@ ${baseLabel}_nochk:
             }
             emitArrayMethod(op, isBuffer) {
                 this.write(`
+            ${this.helperObject(op + " " + (isBuffer ? "buffer" : "array"))}
             .section code
             _pxt_${isBuffer ? "buffer" : "array"}_${op}:
             `);
@@ -1750,6 +1759,7 @@ ${baseLabel}_nochk:
             emitLambdaTrampoline() {
                 let r3 = pxtc.target.stackAlign ? "r3," : "";
                 this.write(`
+            ${this.helperObject("trampoline")}
             .section code
             _pxt_lambda_trampoline:
                 push {${r3} r4, r5, r6, r7, lr}
@@ -1789,6 +1799,7 @@ ${baseLabel}_nochk:
                 mov r11, r7
                 pop {${r3} r4, r5, r6, r7, pc}`);
                 this.write(`
+            ${this.helperObject("exn")}
             .section code
             ; r0 - try frame
             ; r1 - handler PC
@@ -1817,6 +1828,7 @@ ${baseLabel}_nochk:
                 bx r1
                 `);
                 this.write(`
+            ${this.helperObject("stringconv")}
             .section code
             _pxt_stringConv:
             `);
@@ -3131,6 +3143,7 @@ _numops_fromInt:
                     // this make sure to set the Z flag correctly
                     r += `
 .section code
+.object _pxt_helper_cmp_${op}
 _cmp_${op}:
     lsls r2, r0, #31
     beq .boxed
@@ -7716,7 +7729,8 @@ var ts;
                                 lbl = "_ldlit_" + ++seq;
                                 values[v] = lbl;
                             }
-                            line.update(`ldr ${reg}, ${lbl}`);
+                            line.ldlitLabel = line.words[3];
+                            line.update(`ldr ${reg}, ${lbl} ; ${line.ldlitLabel}`);
                         }
                         if (line === nextGoodSpot) {
                             nextGoodSpot = null;
@@ -7724,6 +7738,7 @@ var ts;
                             let jmplbl = "_jmpwords_" + ++seq;
                             if (needsJumpOver)
                                 txtLines.push("bb " + jmplbl);
+                            txtLines.push(`.object PUSH`);
                             txtLines.push(".balign 4");
                             for (let v of Object.keys(values)) {
                                 let lbl = values[v];
@@ -7731,6 +7746,7 @@ var ts;
                             }
                             if (needsJumpOver)
                                 txtLines.push(jmplbl + ":");
+                            txtLines.push(`.object POP`);
                             for (let t of txtLines) {
                                 f.buildLine(t, outlines);
                                 let ll = outlines[outlines.length - 1];
@@ -9025,7 +9041,7 @@ var ts;
         function inspect(n) {
             console.log(stringKind(n));
         }
-        // next free error 9283
+        // next free error 9284
         function userError(code, msg, secondary = false) {
             let e = new Error(msg);
             e.ksEmitterUserError = true;
@@ -15195,7 +15211,8 @@ var ts;
                         asmLabels[lbl] = true;
                         return "";
                     });
-                    let code = ".section code\n" +
+                    let code = ".object inlineasm\n" +
+                        ".section code\n" +
                         "@stackmark func\n" +
                         "@scope user" + asmIdx++ + "\n" +
                         src + "\n" +
@@ -15728,6 +15745,7 @@ var ts;
             for (let data of Object.keys(bin.doubles)) {
                 let lbl = bin.doubles[data];
                 bin.otherLiterals.push(`
+.object ${lbl}
 .balign 4
 ${lbl}: ${snippets.obj_header("pxt::number_vt")}
         .hex ${data}
@@ -15820,6 +15838,7 @@ ${lbl}: ${snippets.obj_header("pxt::number_vt")}
             //    ifaceInfo.mult = 0
             let ptrSz = pxtc.target.shortPointers ? ".short" : ".word";
             let s = `
+        .object ${info.id}_VT
         .balign 4
 ${info.id}_VT:
         .short ${info.allfields.length * 4 + 4}  ; size in bytes
@@ -15917,14 +15936,18 @@ ${hexfile.hexPrelude()}
             asmsource += hexfile.asmTotalSource; // user-supplied asm
             asmsource += "_code_end:\n\n";
             pxtc.U.iterMap(bin.codeHelpers, (code, lbl) => {
-                asmsource += `    .section code\n${lbl}:\n${code}\n`;
+                asmsource +=
+                    `    .section code\n` +
+                        `    .object _code_helper_${lbl}\n` +
+                        `${lbl}:\n` +
+                        `${code}\n`;
             });
             asmsource += snippets.arithmetic();
             asmsource += "_helpers_end:\n\n";
             bin.usedClassInfos.forEach(info => {
                 asmsource += vtableToAsm(info, opts, bin);
             });
-            asmsource += `\n.balign 4\n_pxt_iface_member_names:\n`;
+            asmsource += `\n.balign 4\n.object _pxt_iface_member_names\n_pxt_iface_member_names:\n`;
             asmsource += `    .word ${bin.ifaceMembers.length}\n`;
             let idx = 0;
             for (let d of bin.ifaceMembers) {
@@ -15933,7 +15956,7 @@ ${hexfile.hexPrelude()}
             }
             asmsource += `    .word 0\n`;
             asmsource += "_vtables_end:\n\n";
-            asmsource += `\n.balign 4\n_pxt_config_data:\n`;
+            asmsource += `\n.balign 4\n.object _pxt_config_data\n_pxt_config_data:\n`;
             const cfg = bin.res.configData || [];
             // asmsource += `    .word ${cfg.length}, 0 ; num. entries`
             for (let d of cfg) {
@@ -15942,7 +15965,7 @@ ${hexfile.hexPrelude()}
             asmsource += `    .word 0\n\n`;
             emitStrings(snippets, bin);
             asmsource += bin.otherLiterals.join("");
-            asmsource += `\n.balign 4\n.section code\n_pxt_perf_counters:\n`;
+            asmsource += `\n.balign 4\n.section code\n.object _perf_counters\n_pxt_perf_counters:\n`;
             asmsource += `    .word ${perfCounters.length}\n`;
             let strs = "";
             for (let i = 0; i < perfCounters.length; ++i) {
@@ -15975,6 +15998,8 @@ ${hexfile.hexPrelude()}
             b.ei.testAssembler(); // just in case
             if (target.switches.noPeepHole)
                 b.disablePeepHole = true;
+            if (target.switches.size)
+                b.codeSizeStats = true;
             b.lookupExternalLabel = hexfile.lookupFunctionAddr;
             b.normalizeExternalLabel = s => {
                 let inf = hexfile.lookupFunc(s);
@@ -16035,6 +16060,7 @@ ${hexfile.hexPrelude()}
             }
             return `
     .balign 16
+    .object _stored_program
 _stored_program: .hex ${res}
 `;
         }
@@ -18582,7 +18608,7 @@ var ts;
                         }
                         const type = checker === null || checker === void 0 ? void 0 : checker.getTypeAtLocation(param);
                         const typeSymbol = service.getPxtSymbolFromTsSymbol(type === null || type === void 0 ? void 0 : type.symbol, apis, checker);
-                        if ((typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.fixedInstances) && python) {
+                        if (((typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.fixedInstances) || (typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.emitAsConstant)) && python) {
                             return pxt.Util.snakify(paramDefl);
                         }
                         if (python) {

package/built/pxteditor.d.ts

@@ -377,6 +377,7 @@ declare namespace pxt.editor {
         renderUsbPairDialog?: (firmwareUrl?: string, failedOnce?: boolean) => any;
         renderIncompatibleHardwareDialog?: (unsupportedParts: string[]) => any;
         showUploadInstructionsAsync?: (fn: string, url: string, confirmAsync: (options: any) => Promise<number>) => Promise<void>;
+        showProgramTooLargeErrorAsync?: (variants: string[], confirmAsync: (options: any) => Promise<number>) => Promise<pxt.commands.RecompileOptions>;
         toolboxOptions?: IToolboxOptions;
         blocklyPatch?: (pkgTargetVersion: string, dom: Element) => void;
         webUsbPairDialogAsync?: (pairAsync: () => Promise<boolean>, confirmAsync: (options: any) => Promise<number>) => Promise<number>;

package/built/pxteditor.js

@@ -558,6 +558,11 @@ var pxt;
                         name: lf("Blocks Error List"),
                         description: lf("Show an error list panel for Blocks")
                     },
+                    {
+                        id: "palettePicker",
+                        name: lf("Change Color Palette"),
+                        description: lf("Change the game palette in project settings")
+                    },
                 ].filter(experiment => ids.indexOf(experiment.id) > -1 && !(pxt.BrowserUtils.isPxtElectron() && experiment.enableOnline));
             }
             experiments_1.all = all;

package/built/pxtlib.d.ts

@@ -878,6 +878,10 @@ declare namespace pxt.cloud {
     };
 }
 declare namespace pxt.commands {
+    interface RecompileOptions {
+        recompile: boolean;
+        useVariants: string[];
+    }
     interface DeployOptions {
         reportError: (e: string) => void;
         showNotification: (msg: string) => void;
@@ -899,6 +903,7 @@ declare namespace pxt.commands {
         helpUrl: string;
     };
     let showUploadInstructionsAsync: (fn: string, url: string, confirmAsync: (options: any) => Promise<number>, saveonly?: boolean) => Promise<void>;
+    let showProgramTooLargeErrorAsync: (variants: string[], confirmAsync: (options: any) => Promise<number>) => Promise<RecompileOptions>;
     let saveProjectAsync: (project: pxt.cpp.HexFile) => Promise<void>;
     let electronDeployAsync: (r: ts.pxtc.CompileResult) => Promise<void>;
     let webUsbPairDialogAsync: (pairAsync: () => Promise<boolean>, confirmAsync: (options: any) => Promise<number>) => Promise<number>;
@@ -3400,6 +3405,7 @@ declare namespace ts.pxtc.assembler {
         opcode: number;
         stack: number;
         isLong: boolean;
+        ldlitLabel: string;
         constructor(bin: File, text: string);
         getOpExt(): string;
         getOp(): string;
@@ -3437,10 +3443,17 @@ declare namespace ts.pxtc.assembler {
         disablePeepHole: boolean;
         stackAtLabel: pxt.Map<number>;
         private prevLabel;
+        codeSizeStats: boolean;
+        private labelToObject;
+        private idToObject;
+        private objSuspendStart;
+        private currObject;
+        private labelsToObjectDone;
         protected emitShort(op: number): void;
         protected emitOpCode(op: number): void;
         location(): number;
         pc(): number;
+        useLabel(name: string): void;
         parseOneInt(s: string): number;
         private looksLikeLabel;
         private scopedName;
@@ -3461,6 +3474,7 @@ declare namespace ts.pxtc.assembler {
         private prepLines;
         private iterLines;
         getSourceMap(): pxt.Map<number[]>;
+        getCodeSizeStats(): string;
         getSource(clean: boolean, numStmts?: number, flashSize?: number): string;
         private peepHole;
         private clearLabels;

package/built/pxtlib.js

@@ -4110,7 +4110,7 @@ var pxt;
                         MATH_ADDITION_SYMBOL: pxt.Util.lf("{id:op}+"),
                         MATH_SUBTRACTION_SYMBOL: pxt.Util.lf("{id:op}-"),
                         MATH_MULTIPLICATION_SYMBOL: pxt.Util.lf("{id:op}×"),
-                        MATH_DIVISION_SYMBOL: pxt.Util.lf("{id:op}÷"),
+                        MATH_DIVISION_SYMBOL: pxt.Util.lf("{id:op}/"),
                         MATH_POWER_SYMBOL: pxt.Util.lf("{id:op}**")
                     }
                 },
@@ -4120,7 +4120,7 @@ var pxt;
                     url: '/blocks/math',
                     category: 'math',
                     block: {
-                        MATH_MODULO_TITLE: pxt.Util.lf("remainder of %1 ÷ %2")
+                        MATH_MODULO_TITLE: pxt.Util.lf("remainder of %1 / %2")
                     }
                 },
                 'math_js_op': {
@@ -4149,7 +4149,7 @@ var pxt;
                         "acos": pxt.Util.lf("{id:op}acos"),
                         "tan": pxt.Util.lf("{id:op}tan"),
                         "atan2": pxt.Util.lf("{id:op}atan2"),
-                        "idiv": pxt.Util.lf("{id:op}integer ÷"),
+                        "idiv": pxt.Util.lf("{id:op}integer /"),
                         "imul": pxt.Util.lf("{id:op}integer ×"),
                     }
                 },
@@ -8713,6 +8713,7 @@ var pxt;
         docs.prepTemplate = prepTemplate;
         function setupRenderer(renderer) {
             renderer.image = function (href, title, text) {
+                var _a, _b;
                 const endpointName = "makecodeprodmediaeastus-usea";
                 if (href.startsWith("youtube:")) {
                     let out = '<div class="tutorial-video-embed"><iframe class="yt-embed" src="https://www.youtube.com/embed/' + href.split(":").pop()
@@ -8720,7 +8721,24 @@ var pxt;
                     return out;
                 }
                 else if (href.startsWith("azuremedia:")) {
-                    let out = `<div class="tutorial-video-embed"><video class="ams-embed" controls src="https://${endpointName}.streaming.media.azure.net/` + href.split(":").pop() + '/manifest(format=mpd-time-cmaf)" /></div>';
+                    let videoID = href.split(":")[1];
+                    const flagsSplit = videoID.split("?");
+                    let startTime;
+                    let endTime;
+                    if (flagsSplit[1]) {
+                        videoID = flagsSplit[0];
+                        const passedParameters = flagsSplit[1];
+                        startTime = (_a = /start(?:time)?=(\d+)/i.exec(passedParameters)) === null || _a === void 0 ? void 0 : _a[1];
+                        endTime = (_b = /end(?:time)?=(\d+)/i.exec(passedParameters)) === null || _b === void 0 ? void 0 : _b[1];
+                    }
+                    const url = new URL(`https://${endpointName}.streaming.media.azure.net/${videoID}/manifest(format=mpd-time-csf).mpd`);
+                    if (startTime) {
+                        url.hash = `t=${startTime}`;
+                    }
+                    if (endTime) {
+                        url.searchParams.append("endTime", endTime);
+                    }
+                    let out = `<div class="tutorial-video-embed"><video class="ams-embed" controls src="${url.toString()}" /></div>`;
                     return out;
                 }
                 else {
@@ -14275,7 +14293,7 @@ var pxt;
                         // and pulls from master
                         const modtag = (modid === null || modid === void 0 ? void 0 : modid.tag) || ((_a = mod.config) === null || _a === void 0 ? void 0 : _a.version);
                         const vertag = verid.tag;
-                        // if there is no tag on the current dependency, 
+                        // if there is no tag on the current dependency,
                         // assume same as existing module version if any
                         if (modtag && !vertag) {
                             pxt.debug(`unversioned ${ver}, using ${modtag}`);
@@ -14734,6 +14752,8 @@ var pxt;
                     opts.otherMultiVariants.push(etarget);
                 }
                 else {
+                    etarget.target.isNative = opts.target.isNative;
+                    opts.target = etarget.target;
                     ext = einfo;
                     opts.otherMultiVariants = [];
                 }
@@ -15689,7 +15709,12 @@ var ts;
                 const left = param.substr(0, dotIdx);
                 let right = param.substr(dotIdx + 1);
                 right = pxtc.U.snakify(right).toUpperCase();
-                return `${left}.${right}`;
+                if (left) {
+                    return `${left}.${right}`;
+                }
+                else {
+                    return right;
+                }
             }
             return param;
         }
@@ -21603,6 +21628,18 @@ var ts;
                 }
             }
             assembler.Line = Line;
+            const MAX_OBJ_USERS = 5;
+            class AsmObject {
+                constructor(id, description) {
+                    this.id = id;
+                    this.description = description;
+                    this.sizeAdj = 0;
+                    this.users = [];
+                }
+                get size() {
+                    return (this.endLocation - this.startLocation) - this.sizeAdj;
+                }
+            }
             // File is the center of the action: parsing a file into a sequence of Lines
             // and also emitting the binary (buf)
             class File {
@@ -21627,6 +21664,11 @@ var ts;
                     this.throwOnError = false;
                     this.disablePeepHole = false;
                     this.stackAtLabel = {};
+                    this.codeSizeStats = false;
+                    this.labelToObject = {};
+                    this.idToObject = {};
+                    this.objSuspendStart = 0;
+                    this.labelsToObjectDone = false;
                     this.currLine = new Line(this, "<start>");
                     this.currLine.lineNo = 0;
                     this.ei = ei;
@@ -21646,6 +21688,15 @@ var ts;
                 pc() {
                     return this.location() + this.baseOffset;
                 }
+                useLabel(name) {
+                    if (!this.currObject || name[0] == '.' || this.objSuspendStart)
+                        return;
+                    const obj = pxtc.U.lookup(this.labelToObject, name);
+                    if (!obj || obj == this.currObject)
+                        return;
+                    if (obj.users.length < MAX_OBJ_USERS && obj.users.indexOf(this.currObject) < 0)
+                        obj.users.push(this.currObject);
+                }
                 // parsing of an "integer", well actually much more than
                 // just that
                 parseOneInt(s) {
@@ -21775,6 +21826,7 @@ var ts;
                         return name;
                 }
                 lookupLabel(name, direct = false) {
+                    this.useLabel(name);
                     let v = null;
                     let scoped = this.scopedName(name);
                     if (this.labels.hasOwnProperty(scoped)) {
@@ -21933,6 +21985,37 @@ var ts;
                     };
                     let num0;
                     switch (words[0]) {
+                        case ".object":
+                            if (!this.codeSizeStats) {
+                                // do nothing
+                            }
+                            else if (words[1] == "PUSH") {
+                                this.objSuspendStart = this.location();
+                            }
+                            else if (words[1] == "POP") {
+                                if (this.objSuspendStart)
+                                    this.currObject.sizeAdj += this.location() - this.objSuspendStart;
+                                this.objSuspendStart = 0;
+                            }
+                            else {
+                                if (this.currObject)
+                                    this.currObject.endLocation = this.location();
+                                this.currObject = pxtc.U.lookup(this.idToObject, words[1]);
+                                if (!this.currObject) {
+                                    const str = l.text.replace(/^[^"]*/, "");
+                                    let parsed = words[1];
+                                    if (words.length > 2) {
+                                        parsed = parseString(str.trim());
+                                        if (parsed == null)
+                                            this.directiveError(lf("expecting string in .object"));
+                                    }
+                                    this.currObject = new AsmObject(words[1], parsed);
+                                    this.idToObject[words[1]] = this.currObject;
+                                }
+                                this.currObject.sizeAdj = 0;
+                                this.currObject.startLocation = this.location();
+                            }
+                            break;
                         case ".ascii":
                         case ".asciz":
                         case ".string":
@@ -22127,6 +22210,8 @@ var ts;
                     }
                 }
                 handleOneInstruction(ln, instr) {
+                    if (this.codeSizeStats && ln.ldlitLabel)
+                        this.useLabel(ln.ldlitLabel);
                     let op = instr.emit(ln);
                     if (!op.error) {
                         this.stack += op.stack;
@@ -22235,6 +22320,8 @@ var ts;
                         if (l.words.length == 0)
                             return;
                         if (l.type == "label") {
+                            if (this.currObject && !this.labelsToObjectDone && l.words[0][0] != '.')
+                                this.labelToObject[l.words[0]] = this.currObject;
                             let lblname = this.scopedName(l.words[0]);
                             this.prevLabel = lblname;
                             if (this.finalEmit) {
@@ -22275,6 +22362,8 @@ var ts;
                             pxtc.oops();
                         }
                     });
+                    this.labelsToObjectDone = true;
+                    this.currObject = null;
                 }
                 getSourceMap() {
                     const sourceMap = {};
@@ -22307,6 +22396,22 @@ var ts;
                     }
                     return sourceMap;
                 }
+                getCodeSizeStats() {
+                    if (!this.codeSizeStats)
+                        return "";
+                    const objs = pxtc.U.values(this.idToObject);
+                    objs.sort((a, b) => b.size - a.size);
+                    let r = ";\n; Code size:\n;\n";
+                    for (const obj of objs) {
+                        r += `; ${("         " + obj.size).slice(-6)} ${obj.description} [${obj.id}]\n`;
+                        if (obj.users.length >= MAX_OBJ_USERS)
+                            r += `;        by many, including ${obj.users[0].description}\n`;
+                        else
+                            for (const x of obj.users)
+                                r += `;        by ${x.description} [${x.id}]\n`;
+                    }
+                    return r;
+                }
                 getSource(clean, numStmts = 1, flashSize = 0) {
                     let lenPrev = 0;
                     let size = (lbl) => {
@@ -22322,8 +22427,11 @@ var ts;
                     let lenLiterals = size("_literals_end");
                     let lenAllCode = lenPrev;
                     let totalSize = (lenTotal + this.baseOffset) & 0xffffff;
-                    if (flashSize && totalSize > flashSize)
-                        pxtc.U.userError(lf("program too big by {0} bytes!", totalSize - flashSize));
+                    if (flashSize && totalSize > flashSize) {
+                        const e = new Error(lf("program too big by {0} bytes!", totalSize - flashSize));
+                        e.ksErrorCode = 9283;
+                        throw e;
+                    }
                     flashSize = flashSize || 128 * 1024;
                     let totalInfo = lf("; total bytes: {0} ({1}% of {2}k flash with {3} free)", totalSize, (100 * totalSize / flashSize).toFixed(1), (flashSize / 1024).toFixed(1), flashSize - totalSize);
                     let res = 
@@ -22331,7 +22439,7 @@ var ts;
                     lf("; generated code sizes (bytes): {0} (incl. {1} user, {2} helpers, {3} vtables, {4} lits); src size {5}\n", lenAllCode, lenCode, lenHelpers, lenVtables, lenLiterals, lenTotal - lenAllCode) +
                         lf("; assembly: {0} lines; density: {1} bytes/stmt; ({2} stmts)\n", this.lines.length, Math.round(100 * lenCode / numStmts) / 100, numStmts) +
                         totalInfo + "\n" +
-                        this.stats + "\n\n";
+                        this.stats + this.getCodeSizeStats() + "\n\n";
                     let skipOne = false;
                     this.lines.forEach((ln, i) => {
                         if (ln.words[0] == "_stored_program") {

package/built/pxtpy.d.ts

@@ -145,6 +145,7 @@ declare namespace pxt.py {
         vars: Map<ScopeSymbolInfo>;
         parent?: ScopeDef;
         blockDepth?: number;
+        nextHelperVariableId?: number;
     }
     interface FunctionDef extends Symbol, ScopeDef {
         kind: "FunctionDef";

package/built/pxtpy.js

@@ -342,6 +342,13 @@ var pxt;
                 error(a, 9503, pxt.U.lf("No module named '{0}'", name));
             return sym;
         }
+        function getHelperVariableName() {
+            const scope = currentScope();
+            if (scope.nextHelperVariableId === undefined) {
+                scope.nextHelperVariableId = 0;
+            }
+            return "___tempvar" + scope.nextHelperVariableId++;
+        }
         function defvar(name, opts, modifier, scope) {
             if (!scope)
                 scope = currentScope();
@@ -1648,20 +1655,7 @@ var pxt;
                 return B.mkStmt(B.mkText(pref), B.mkInfix(expr(target), "=", expr(value)));
             }
             if (!pref && target.kind == "Tuple") {
-                let tup = target;
-                let targs = [B.mkText("let "), B.mkText("[")];
-                let nonNames = tup.elts.filter(e => e.kind !== "Name");
-                if (nonNames.length) {
-                    error(n, 9556, pxt.U.lf("non-trivial tuple assignment unsupported"));
-                    return stmtTODO(n);
-                }
-                let tupNames = tup.elts
-                    .map(e => e)
-                    .map(convertName);
-                targs.push(B.mkCommaSep(tupNames));
-                targs.push(B.mkText("]"));
-                let res = B.mkStmt(B.mkInfix(B.mkGroup(targs), "=", expr(value)));
-                return res;
+                return convertDestructuring(n, target, value);
             }
             if (target.kind === "Name") {
                 const scopeSym = currentScope().vars[nm];
@@ -1689,12 +1683,41 @@ var pxt;
             if (!lExp)
                 lExp = expr(target);
             return B.mkStmt(B.mkText(pref), B.mkInfix(lExp, "=", expr(value)));
-            function convertName(n) {
+        }
+        function convertDestructuring(parent, targets, value) {
+            let nonNames = targets.elts.filter(e => e.kind !== "Name");
+            if (nonNames.length) {
+                error(parent, 9556, pxt.U.lf("non-trivial tuple assignment unsupported"));
+                return stmtTODO(parent);
+            }
+            const names = targets.elts.map(tryGetName);
+            const symbols = names
+                .map(nm => nm ? currentScope().vars[nm] : undefined);
+            if (symbols.some(s => (s === null || s === void 0 ? void 0 : s.modifier) !== undefined)) {
+                const helperVar = getHelperVariableName();
+                const valueAssign = B.mkStmt(B.mkInfix(B.mkGroup([B.mkText("let "), B.mkText(helperVar)]), "=", expr(value)));
+                const assignStatements = [valueAssign];
+                for (let i = 0; i < symbols.length; i++) {
+                    const name = convertName(targets.elts[i]);
+                    assignStatements.push(B.mkStmt(B.mkInfix(name, "=", B.mkGroup([B.mkText(helperVar), B.mkText(`[${i}]`)]))));
+                }
+                return B.mkGroup(assignStatements);
+            }
+            else {
+                let targs = [B.mkText("let "), B.mkText("[")];
+                let tupNames = targets.elts
+                    .map(e => e)
+                    .map(e => convertName(e, true));
+                targs.push(B.mkCommaSep(tupNames));
+                targs.push(B.mkText("]"));
+                return B.mkStmt(B.mkInfix(B.mkGroup(targs), "=", expr(value)));
+            }
+            function convertName(n, excludeLet = false) {
                 // TODO resuse with Name expr
                 markInfoNode(n, "identifierCompletion");
                 typeOf(n);
                 let v = lookupName(n);
-                return possibleDef(n, /*excludeLet*/ true);
+                return possibleDef(n, excludeLet);
             }
         }
         function possibleDef(n, excludeLet = false) {