pxt-core 7.5.41 → 7.5.44

package/built/pxt.js

@@ -113450,7 +113450,7 @@ var ts;
             return r;
         }
         pxtc.emptyExtInfo = emptyExtInfo;
-        const numberAttributes = ["weight", "imageLiteral", "topblockWeight"];
+        const numberAttributes = ["weight", "imageLiteral", "topblockWeight", "inlineInputModeLimit"];
         const booleanAttributes = [
             "advanced",
             "handlerStatement",

package/built/pxtblockly.js

@@ -10911,7 +10911,13 @@ var pxt;
             const totalOptions = def.parameters.length;
             const buttonDelta = toggle ? totalOptions : 1;
             const variableInlineInputs = info.blocksById[b.type].attributes.inlineInputMode === "variable";
+            const inlineInputModeLimit = info.blocksById[b.type].attributes.inlineInputModeLimit || 4;
             const compileHiddenArguments = info.blocksById[b.type].attributes.compileHiddenArguments;
+            const breakString = info.blocksById[b.type].attributes.expandableArgumentBreaks;
+            let breaks;
+            if (breakString) {
+                breaks = breakString.split(/[;,]/).map(s => parseInt(s));
+            }
             const state = new MutationState(b);
             state.setEventsEnabled(false);
             state.setValue(numVisibleAttr, 0);
@@ -11019,7 +11025,7 @@ var pxt;
                 }
                 updateButtons();
                 if (variableInlineInputs)
-                    b.setInputsInline(visibleOptions < 4);
+                    b.setInputsInline(visibleOptions < inlineInputModeLimit);
                 if (!skipRender)
                     b.render();
             }
@@ -11066,7 +11072,28 @@ var pxt;
                 updateButtons();
             }
             function addDelta(delta) {
-                return Math.min(Math.max(state.getNumber(numVisibleAttr) + delta, 0), totalOptions);
+                const newValue = Math.min(Math.max(state.getNumber(numVisibleAttr) + delta, 0), totalOptions);
+                if (breaks) {
+                    if (delta >= 0) {
+                        if (newValue === 0)
+                            return 0;
+                        for (const breakpoint of breaks) {
+                            if (breakpoint >= newValue) {
+                                return breakpoint;
+                            }
+                        }
+                        return totalOptions;
+                    }
+                    else {
+                        for (let i = 0; i < breaks.length; i++) {
+                            if (breaks[i] >= newValue) {
+                                return i > 0 ? breaks[i - 1] : 0;
+                            }
+                        }
+                        return breaks[breaks.length - 1];
+                    }
+                }
+                return newValue;
             }
             function setInputVisible(input, visible) {
                 // If the block isn't rendered, Blockly will crash

package/built/pxtblocks.js

@@ -7349,7 +7349,13 @@ var pxt;
             const totalOptions = def.parameters.length;
             const buttonDelta = toggle ? totalOptions : 1;
             const variableInlineInputs = info.blocksById[b.type].attributes.inlineInputMode === "variable";
+            const inlineInputModeLimit = info.blocksById[b.type].attributes.inlineInputModeLimit || 4;
             const compileHiddenArguments = info.blocksById[b.type].attributes.compileHiddenArguments;
+            const breakString = info.blocksById[b.type].attributes.expandableArgumentBreaks;
+            let breaks;
+            if (breakString) {
+                breaks = breakString.split(/[;,]/).map(s => parseInt(s));
+            }
             const state = new MutationState(b);
             state.setEventsEnabled(false);
             state.setValue(numVisibleAttr, 0);
@@ -7457,7 +7463,7 @@ var pxt;
                 }
                 updateButtons();
                 if (variableInlineInputs)
-                    b.setInputsInline(visibleOptions < 4);
+                    b.setInputsInline(visibleOptions < inlineInputModeLimit);
                 if (!skipRender)
                     b.render();
             }
@@ -7504,7 +7510,28 @@ var pxt;
                 updateButtons();
             }
             function addDelta(delta) {
-                return Math.min(Math.max(state.getNumber(numVisibleAttr) + delta, 0), totalOptions);
+                const newValue = Math.min(Math.max(state.getNumber(numVisibleAttr) + delta, 0), totalOptions);
+                if (breaks) {
+                    if (delta >= 0) {
+                        if (newValue === 0)
+                            return 0;
+                        for (const breakpoint of breaks) {
+                            if (breakpoint >= newValue) {
+                                return breakpoint;
+                            }
+                        }
+                        return totalOptions;
+                    }
+                    else {
+                        for (let i = 0; i < breaks.length; i++) {
+                            if (breaks[i] >= newValue) {
+                                return i > 0 ? breaks[i - 1] : 0;
+                            }
+                        }
+                        return breaks[breaks.length - 1];
+                    }
+                }
+                return newValue;
             }
             function setInputVisible(input, visible) {
                 // If the block isn't rendered, Blockly will crash

package/built/pxtlib.js

@@ -15764,7 +15764,7 @@ var ts;
             return r;
         }
         pxtc.emptyExtInfo = emptyExtInfo;
-        const numberAttributes = ["weight", "imageLiteral", "topblockWeight"];
+        const numberAttributes = ["weight", "imageLiteral", "topblockWeight", "inlineInputModeLimit"];
         const booleanAttributes = [
             "advanced",
             "handlerStatement",

package/built/pxtrunner.d.ts

@@ -107,7 +107,8 @@ declare namespace pxt.runner {
     function buildSimJsInfo(simOptions: SimulateOptions): Promise<pxtc.BuiltSimJsInfo>;
     enum LanguageMode {
         Blocks = 0,
-        TypeScript = 1
+        TypeScript = 1,
+        Python = 2
     }
     let editorLanguageMode: LanguageMode;
     function setEditorContextAsync(mode: LanguageMode, localeInfo: string): Promise<void>;

package/built/pxtrunner.js

@@ -1845,6 +1845,7 @@ var pxt;
         (function (LanguageMode) {
             LanguageMode[LanguageMode["Blocks"] = 0] = "Blocks";
             LanguageMode[LanguageMode["TypeScript"] = 1] = "TypeScript";
+            LanguageMode[LanguageMode["Python"] = 2] = "Python";
         })(LanguageMode = runner.LanguageMode || (runner.LanguageMode = {}));
         runner.editorLanguageMode = LanguageMode.Blocks;
         function setEditorContextAsync(mode, localeInfo) {
@@ -1874,7 +1875,14 @@ var pxt;
                 case "fileloaded":
                     let fm = m;
                     let name = fm.name;
-                    setEditorContextAsync(/\.ts$/i.test(name) ? LanguageMode.TypeScript : LanguageMode.Blocks, fm.locale);
+                    let mode = LanguageMode.Blocks;
+                    if (/\.ts$/i.test(name)) {
+                        mode = LanguageMode.TypeScript;
+                    }
+                    else if (/\.py$/i.test(name)) {
+                        mode = LanguageMode.Python;
+                    }
+                    setEditorContextAsync(mode, fm.locale);
                     break;
                 case "popout":
                     let mp = /((\/v[0-9+])\/)?[^\/]*#(doc|md):([^&?:]+)/i.exec(window.location.href);
@@ -2072,24 +2080,33 @@ var pxt;
                     el.setAttribute("aria-disabled", "false");
                 }
             }
-            function renderHash() {
+            async function renderHashAsync() {
                 let m = /^#(doc|md|tutorial|book|project|projectid|print):([^&?:]+)(:([^&?:]+):([^&?:]+))?/i.exec(window.location.hash);
                 if (m) {
                     pushHistory();
+                    if (m[4]) {
+                        let mode = LanguageMode.TypeScript;
+                        if (/^blocks$/i.test(m[4])) {
+                            mode = LanguageMode.Blocks;
+                        }
+                        else if (/^python$/i.test(m[4])) {
+                            mode = LanguageMode.Python;
+                        }
+                        await setEditorContextAsync(mode, m[5]);
+                    }
                     // navigation occured
-                    const p = m[4] ? setEditorContextAsync(/^blocks$/.test(m[4]) ? LanguageMode.Blocks : LanguageMode.TypeScript, m[5]) : Promise.resolve();
-                    p.then(() => render(m[1], decodeURIComponent(m[2])));
+                    render(m[1], decodeURIComponent(m[2]));
                 }
             }
             let promise = pxt.editor.initEditorExtensionsAsync();
             promise.then(() => {
                 window.addEventListener("message", receiveDocMessage, false);
                 window.addEventListener("hashchange", () => {
-                    renderHash();
+                    renderHashAsync();
                 }, false);
                 parent.postMessage({ type: "sidedocready" }, "*");
                 // delay load doc page to allow simulator to load first
-                setTimeout(() => renderHash(), 1);
+                setTimeout(() => renderHashAsync(), 1);
             });
         }
         runner.startDocsServer = startDocsServer;
@@ -2108,7 +2125,7 @@ var pxt;
             if (files[readme])
                 md += files[readme].replace(/^#+/, "$0#") + '\n'; // bump all headers down 1
             cfg.files.filter(f => f != pxt.CONFIG_NAME && f != readme)
-                .filter(f => (runner.editorLanguageMode == LanguageMode.Blocks) == /\.blocks?$/.test(f))
+                .filter(f => matchesLanguageMode(f, runner.editorLanguageMode))
                 .forEach(f => {
                 if (!/^main\.(ts|blocks)$/.test(f))
                     md += `
@@ -2163,6 +2180,16 @@ ${linkString}
             return renderMarkdownAsync(content, md, options);
         }
         runner.renderProjectFilesAsync = renderProjectFilesAsync;
+        function matchesLanguageMode(filename, mode) {
+            switch (mode) {
+                case LanguageMode.Blocks:
+                    return /\.blocks?$/.test(filename);
+                case LanguageMode.TypeScript:
+                    return /\.ts?$/.test(filename);
+                case LanguageMode.Python:
+                    return /\.py?$/.test(filename);
+            }
+        }
         function renderDocAsync(content, docid) {
             docid = docid.replace(/^\//, "");
             return pxt.Cloud.markdownAsync(docid)