pxt-core 13.2.15 → 13.2.17

package/built/backendutils.js

@@ -572,6 +572,8 @@ const lf = ts.pxtc.Util.lf;
                     let parts = k.split(".");
                     for (let i = 0; i < parts.length; ++i) {
                         let part = parts[i];
+                        if (part === "__proto__" || part === "constructor" || part === "prototype")
+                            Util.userError("Invalid configuration key: " + k);
                         if (i == parts.length - 1)
                             ptr[part] = v[k];
                         else {
@@ -1416,12 +1418,20 @@ ${opts.repo.name.replace(/^pxt-/, '')}=github:${opts.repo.fullName}#${opts.repo.
             strong: 1,
             em: 1,
         };
+        /** Keeps metadata and token-only HTML out of the translation catalog. */
+        function isNonTranslatable(text) {
+            if (text.startsWith("IE=edge,") || text.startsWith("width=device-width"))
+                return true;
+            // Remove URLs, template placeholders, and spacing entities to look for prose.
+            const prose = text.replace(/(?:https?:\/\/|\/)[\w@\/.]+|@[-\w]+@|\{[^{}]+\}|&nbsp;/g, "");
+            return !/[a-zA-Z]/.test(prose);
+        }
         function translate(html, locale) {
             const missing = {};
             function translateOne(toTranslate) {
                 let spm = /^(\s*)([^]*?)(\s*)$/.exec(toTranslate);
                 let text = spm[2].replace(/\s+/g, " ");
-                if (text == "" || /^((IE=edge,.*|width=device-width.*|(https?:\/\/|\/)[\w@\/\.]+|@[\-\w]+@|\{[^\{\}]+\}|[^a-zA-Z]*|(&nbsp;)+)\s*)+$/.test(text))
+                if (isNonTranslatable(text))
                     return null;
                 let v = U.lookup(locale, text);
                 if (v)
@@ -3056,10 +3066,11 @@ var pxt;
                 if (!inEnum)
                     return;
                 // parse the enum case, with lots of optional stuff (?)
-                let mm = /^\s*(\w+)\s*(=\s*(.*?))?,?\s*$/.exec(lnNC);
+                const enumLine = lnNC.trim().replace(/,$/, "").trim();
+                let mm = /^(\w+)(?:\s*=(.*))?$/.exec(enumLine);
                 if (mm) {
                     let nm = mm[1];
-                    let v = mm[3];
+                    let v = mm[2] && mm[2].trim();
                     let opt = "";
                     if (v) {
                         // user-supplied value
@@ -3097,23 +3108,26 @@ var pxt;
             }
             function parseArg(parsedAttrs, s) {
                 s = s.trim();
-                let m = /(.*)=\s*(-?\w+)$/.exec(s);
+                const equals = s.lastIndexOf("=");
+                const m = equals < 0 ? null : /^\s*(-?\w+)$/.exec(s.slice(equals + 1));
                 let defl = "";
                 let qm = "";
                 if (m) {
-                    defl = m[2];
+                    defl = m[1];
                     qm = "?";
-                    s = m[1].trim();
+                    s = s.slice(0, equals).trim();
                 }
-                m = /^(.*?)(\w+)$/.exec(s);
-                if (!m) {
+                let nameStart = s.length;
+                while (nameStart > 0 && /\w/.test(s.charAt(nameStart - 1)))
+                    --nameStart;
+                if (nameStart == s.length || /[\r\n\u2028\u2029]/.test(s.slice(0, nameStart))) {
                     err("invalid argument: " + s);
                     return {
                         name: "???",
                         type: "int"
                     };
                 }
-                let argName = m[2];
+                let argName = s.slice(nameStart);
                 if (parsedAttrs.paramDefl[argName]) {
                     defl = parsedAttrs.paramDefl[argName];
                     qm = "?";
@@ -3128,7 +3142,7 @@ var pxt;
                 }
                 return {
                     name: argName + qm,
-                    type: m[1]
+                    type: s.slice(0, nameStart)
                 };
             }
             function parseCpp(src, isHeader) {
@@ -3138,9 +3152,28 @@ var pxt;
                 inDocComment = false;
                 let indexedInstanceAttrs;
                 let indexedInstanceIdx = -1;
-                // replace #if 0 .... #endif with newlines
-                src = src.replace(/^(\s*#\s*if\s+(\w+)\s*$)([^]*?)(^\s*#\s*(elif|else|endif)\s*$)/mg, (f, _if, arg, middle, _endif) => hash_if_options.indexOf(arg) >= 0 && !cpp_options[arg] ?
-                    _if + middle.replace(/[^\n]/g, "") + _endif : f);
+                // Match directives one line at a time so unterminated blocks cannot rescan the source.
+                const lines = src.split(/\r?\n/);
+                let ifStart = -1;
+                let ifArg = "";
+                lines.forEach((ln, i) => {
+                    const directive = /^#\s*(?:if\s+(\w+)|(elif|else|endif))$/.exec(ln.trim());
+                    if (!directive)
+                        return;
+                    if (ifStart < 0) {
+                        if (directive[1]) {
+                            ifStart = i;
+                            ifArg = directive[1];
+                        }
+                    }
+                    else if (directive[2]) {
+                        if (hash_if_options.indexOf(ifArg) >= 0 && !cpp_options[ifArg]) {
+                            for (let j = ifStart + 1; j < i; ++j)
+                                lines[j] = "";
+                        }
+                        ifStart = -1;
+                    }
+                });
                 // special handling of C++ namespace that ends with Methods (e.g. FooMethods)
                 // such a namespace will be converted into a TypeScript interface
                 // this enables simple objects with methods to be defined. See, for example:
@@ -3218,10 +3251,14 @@ var pxt;
                             return "T";
                         case "String":
                             return "S";
-                        default:
+                        default: {
                             if (U.lookup(knownEnums, tp))
                                 return "I";
-                            return "_" + tp.replace(/[\*_]+$/, "");
+                            let typeEnd = tp.length;
+                            while (typeEnd > 0 && /[\*_]/.test(tp.charAt(typeEnd - 1)))
+                                --typeEnd;
+                            return "_" + tp.slice(0, typeEnd);
+                        }
                     }
                 }
                 function generateVMWrapper(fi, argTypes) {
@@ -3303,7 +3340,7 @@ var pxt;
                 enumVal = 0;
                 enumsDTS.setNs("");
                 shimsDTS.setNs("");
-                src.split(/\r?\n/).forEach(ln => {
+                lines.forEach(ln => {
                     ++lineNo;
                     // remove comments (NC = no comments)
                     let lnNC = stripComments(ln);

package/built/cli.js

@@ -618,10 +618,14 @@ async function bumpAsync(parsed) {
     }
     catch (e) {
         console.warn(chalk.yellow("Unable to determine branch protection status."), e.message);
+        pr = true;
     }
     if (nopr) {
         pr = false;
     }
+    if (pr && (!currBranchName || !token || !user || !owner || !repo)) {
+        U.userError("Unable to prepare a bump pull request. Check GitHub credentials and the origin URL, or explicitly use --nopr for a direct push.");
+    }
     if (fs.existsSync(pxt.CONFIG_NAME)) {
         if (upload) {
             U.userError("upload only supported on targets");
@@ -634,7 +638,7 @@ async function bumpAsync(parsed) {
                 .then(() => nodeutil.runGitAsync("pull"))
                 .then(() => nodeutil.createBranchAsync(newBranchName))
                 .then(() => justBumpPkgAsync(bumpType, false)) // don't tag when creating a PR
-                .then((version) => nodeutil.gitPushAsync().then(() => version))
+                .then((version) => nodeutil.gitPushAsync(false).then(() => version))
                 .then((version) => nodeutil.createPullRequestAsync({
                 title: `[pxt-cli] bump version to ${version}`,
                 body: "__Do not edit the PR title.__\n" +
@@ -654,8 +658,7 @@ async function bumpAsync(parsed) {
             return Promise.resolve()
                 .then(() => nodeutil.runGitAsync("pull"))
                 .then(() => justBumpPkgAsync(bumpType))
-                .then(() => nodeutil.runGitAsync("push", "--follow-tags"))
-                .then(() => nodeutil.runGitAsync("push"));
+                .then(() => nodeutil.runGitAsync("push", "--atomic", "--follow-tags"));
         }
     }
     else if (fs.existsSync("pxtarget.json"))
@@ -668,7 +671,7 @@ async function bumpAsync(parsed) {
                 .then(() => nodeutil.createBranchAsync(newBranchName))
                 .then(() => bumpPxt ? bumpPxtCoreDepAsync() : Promise.resolve())
                 .then(() => nodeutil.npmVersionBumpAsync(bumpType, false)) // don't tag when creating a PR
-                .then((version) => nodeutil.gitPushAsync().then(() => version))
+                .then((version) => nodeutil.gitPushAsync(false).then(() => version))
                 .then((version) => nodeutil.createPullRequestAsync({
                 title: `[pxt-cli] bump version to ${version}`,
                 body: "__Do not edit the PR title.__\n" +
@@ -687,10 +690,9 @@ async function bumpAsync(parsed) {
             console.log("Bumping via direct push.");
             return Promise.resolve()
                 .then(() => nodeutil.runGitAsync("pull"))
-                .then(() => bumpPxt ? bumpPxtCoreDepAsync().then(() => nodeutil.runGitAsync("push")) : Promise.resolve())
+                .then(() => bumpPxt ? bumpPxtCoreDepAsync().then(() => nodeutil.runGitAsync("push", "--atomic", "--no-follow-tags")) : Promise.resolve())
                 .then(() => nodeutil.runNpmAsync("version", bumpType))
-                .then(() => nodeutil.runGitAsync("push", "--follow-tags"))
-                .then(() => nodeutil.runGitAsync("push"))
+                .then(() => nodeutil.runGitAsync("push", "--atomic", "--follow-tags"))
                 .then(() => upload ? uploadTaggedTargetAsync() : Promise.resolve());
         }
     else {
@@ -4701,7 +4703,7 @@ async function staticpkgAsync(parsed) {
     pxt.log(`packaging editor to ${builtPackaged}`);
     await rimrafAsync(builtPackaged, {});
     if (bump) {
-        await bumpAsync();
+        await bumpAsync(parsed);
     }
     if (locs) {
         await internalGenDocsAsync(false, true);
@@ -6552,7 +6554,7 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
             update: { description: "(package only) Updates pxt-core reference to the latest release" },
             upload: { description: "(package only) Upload after bumping" },
             pr: { description: "Bump via pull request rather than direct push" },
-            nopr: { description: "Bump via direct push rather than pull request (overrides --pr)" },
+            nopr: { description: "Force a direct bump (overrides --pr and protection detection)" },
             version: {
                 description: "Which part of the version to bump, or a complete version number to assign. Defaults to 'patch'",
                 argument: "version",
@@ -6670,6 +6672,9 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
             bump: {
                 description: "bump version number prior to package"
             },
+            nopr: {
+                description: "With --bump, force a direct bump rather than a pull request"
+            },
             cloudbuild: {
                 description: "(deprecated) forces build to happen in the cloud",
                 aliases: ["cloud", "cloud-build", "cb"]

package/built/nodeutil.js

@@ -219,7 +219,7 @@ async function getGitHubOwnerAndRepoAsync() {
     if (!remoteUrl) {
         Util.userError("No remote origin URL found");
     }
-    const match = remoteUrl.match(/github\.com[:\/](.+?)\/(.+?)(\.git)?$/);
+    const match = remoteUrl.replace(/\/+$/, "").match(/github\.com[:\/](.+?)\/(.+?)(\.git)?$/);
     if (!match) {
         Util.userError("Invalid remote origin URL: " + remoteUrl);
     }
@@ -236,7 +236,7 @@ async function createBranchAsync(branchName) {
     });
     await spawnAsync({
         cmd: "git",
-        args: ["push", "--set-upstream", "origin", branchName],
+        args: ["push", "--no-follow-tags", "--set-upstream", "origin", branchName],
         silent: true,
     });
 }
@@ -299,13 +299,9 @@ function quoteIfNeeded(arg) {
     return arg;
 }
 function gitPushAsync(followTags = true) {
-    const args = ["push"];
-    if (followTags)
-        args.push("--follow-tags");
-    args.push("origin", "HEAD");
     return spawnAsync({
         cmd: "git",
-        args,
+        args: ["push", "--atomic", followTags ? "--follow-tags" : "--no-follow-tags", "origin", "HEAD"],
         cwd: ".",
         silent: true,
     });

package/built/pxt.js

@@ -99231,6 +99231,8 @@ const lf = ts.pxtc.Util.lf;
                     let parts = k.split(".");
                     for (let i = 0; i < parts.length; ++i) {
                         let part = parts[i];
+                        if (part === "__proto__" || part === "constructor" || part === "prototype")
+                            Util.userError("Invalid configuration key: " + k);
                         if (i == parts.length - 1)
                             ptr[part] = v[k];
                         else {
@@ -105525,10 +105527,11 @@ var pxt;
                 if (!inEnum)
                     return;
                 // parse the enum case, with lots of optional stuff (?)
-                let mm = /^\s*(\w+)\s*(=\s*(.*?))?,?\s*$/.exec(lnNC);
+                const enumLine = lnNC.trim().replace(/,$/, "").trim();
+                let mm = /^(\w+)(?:\s*=(.*))?$/.exec(enumLine);
                 if (mm) {
                     let nm = mm[1];
-                    let v = mm[3];
+                    let v = mm[2] && mm[2].trim();
                     let opt = "";
                     if (v) {
                         // user-supplied value
@@ -105566,23 +105569,26 @@ var pxt;
             }
             function parseArg(parsedAttrs, s) {
                 s = s.trim();
-                let m = /(.*)=\s*(-?\w+)$/.exec(s);
+                const equals = s.lastIndexOf("=");
+                const m = equals < 0 ? null : /^\s*(-?\w+)$/.exec(s.slice(equals + 1));
                 let defl = "";
                 let qm = "";
                 if (m) {
-                    defl = m[2];
+                    defl = m[1];
                     qm = "?";
-                    s = m[1].trim();
+                    s = s.slice(0, equals).trim();
                 }
-                m = /^(.*?)(\w+)$/.exec(s);
-                if (!m) {
+                let nameStart = s.length;
+                while (nameStart > 0 && /\w/.test(s.charAt(nameStart - 1)))
+                    --nameStart;
+                if (nameStart == s.length || /[\r\n\u2028\u2029]/.test(s.slice(0, nameStart))) {
                     err("invalid argument: " + s);
                     return {
                         name: "???",
                         type: "int"
                     };
                 }
-                let argName = m[2];
+                let argName = s.slice(nameStart);
                 if (parsedAttrs.paramDefl[argName]) {
                     defl = parsedAttrs.paramDefl[argName];
                     qm = "?";
@@ -105597,7 +105603,7 @@ var pxt;
                 }
                 return {
                     name: argName + qm,
-                    type: m[1]
+                    type: s.slice(0, nameStart)
                 };
             }
             function parseCpp(src, isHeader) {
@@ -105607,9 +105613,28 @@ var pxt;
                 inDocComment = false;
                 let indexedInstanceAttrs;
                 let indexedInstanceIdx = -1;
-                // replace #if 0 .... #endif with newlines
-                src = src.replace(/^(\s*#\s*if\s+(\w+)\s*$)([^]*?)(^\s*#\s*(elif|else|endif)\s*$)/mg, (f, _if, arg, middle, _endif) => hash_if_options.indexOf(arg) >= 0 && !cpp_options[arg] ?
-                    _if + middle.replace(/[^\n]/g, "") + _endif : f);
+                // Match directives one line at a time so unterminated blocks cannot rescan the source.
+                const lines = src.split(/\r?\n/);
+                let ifStart = -1;
+                let ifArg = "";
+                lines.forEach((ln, i) => {
+                    const directive = /^#\s*(?:if\s+(\w+)|(elif|else|endif))$/.exec(ln.trim());
+                    if (!directive)
+                        return;
+                    if (ifStart < 0) {
+                        if (directive[1]) {
+                            ifStart = i;
+                            ifArg = directive[1];
+                        }
+                    }
+                    else if (directive[2]) {
+                        if (hash_if_options.indexOf(ifArg) >= 0 && !cpp_options[ifArg]) {
+                            for (let j = ifStart + 1; j < i; ++j)
+                                lines[j] = "";
+                        }
+                        ifStart = -1;
+                    }
+                });
                 // special handling of C++ namespace that ends with Methods (e.g. FooMethods)
                 // such a namespace will be converted into a TypeScript interface
                 // this enables simple objects with methods to be defined. See, for example:
@@ -105687,10 +105712,14 @@ var pxt;
                             return "T";
                         case "String":
                             return "S";
-                        default:
+                        default: {
                             if (U.lookup(knownEnums, tp))
                                 return "I";
-                            return "_" + tp.replace(/[\*_]+$/, "");
+                            let typeEnd = tp.length;
+                            while (typeEnd > 0 && /[\*_]/.test(tp.charAt(typeEnd - 1)))
+                                --typeEnd;
+                            return "_" + tp.slice(0, typeEnd);
+                        }
                     }
                 }
                 function generateVMWrapper(fi, argTypes) {
@@ -105772,7 +105801,7 @@ var pxt;
                 enumVal = 0;
                 enumsDTS.setNs("");
                 shimsDTS.setNs("");
-                src.split(/\r?\n/).forEach(ln => {
+                lines.forEach(ln => {
                     ++lineNo;
                     // remove comments (NC = no comments)
                     let lnNC = stripComments(ln);
@@ -124958,12 +124987,20 @@ ${opts.repo.name.replace(/^pxt-/, '')}=github:${opts.repo.fullName}#${opts.repo.
             strong: 1,
             em: 1,
         };
+        /** Keeps metadata and token-only HTML out of the translation catalog. */
+        function isNonTranslatable(text) {
+            if (text.startsWith("IE=edge,") || text.startsWith("width=device-width"))
+                return true;
+            // Remove URLs, template placeholders, and spacing entities to look for prose.
+            const prose = text.replace(/(?:https?:\/\/|\/)[\w@\/.]+|@[-\w]+@|\{[^{}]+\}|&nbsp;/g, "");
+            return !/[a-zA-Z]/.test(prose);
+        }
         function translate(html, locale) {
             const missing = {};
             function translateOne(toTranslate) {
                 let spm = /^(\s*)([^]*?)(\s*)$/.exec(toTranslate);
                 let text = spm[2].replace(/\s+/g, " ");
-                if (text == "" || /^((IE=edge,.*|width=device-width.*|(https?:\/\/|\/)[\w@\/\.]+|@[\-\w]+@|\{[^\{\}]+\}|[^a-zA-Z]*|(&nbsp;)+)\s*)+$/.test(text))
+                if (isNonTranslatable(text))
                     return null;
                 let v = U.lookup(locale, text);
                 if (v)
@@ -165904,10 +165941,14 @@ async function bumpAsync(parsed) {
     }
     catch (e) {
         console.warn(chalk.yellow("Unable to determine branch protection status."), e.message);
+        pr = true;
     }
     if (nopr) {
         pr = false;
     }
+    if (pr && (!currBranchName || !token || !user || !owner || !repo)) {
+        U.userError("Unable to prepare a bump pull request. Check GitHub credentials and the origin URL, or explicitly use --nopr for a direct push.");
+    }
     if (fs.existsSync(pxt.CONFIG_NAME)) {
         if (upload) {
             U.userError("upload only supported on targets");
@@ -165920,7 +165961,7 @@ async function bumpAsync(parsed) {
                 .then(() => nodeutil.runGitAsync("pull"))
                 .then(() => nodeutil.createBranchAsync(newBranchName))
                 .then(() => justBumpPkgAsync(bumpType, false)) // don't tag when creating a PR
-                .then((version) => nodeutil.gitPushAsync().then(() => version))
+                .then((version) => nodeutil.gitPushAsync(false).then(() => version))
                 .then((version) => nodeutil.createPullRequestAsync({
                 title: `[pxt-cli] bump version to ${version}`,
                 body: "__Do not edit the PR title.__\n" +
@@ -165940,8 +165981,7 @@ async function bumpAsync(parsed) {
             return Promise.resolve()
                 .then(() => nodeutil.runGitAsync("pull"))
                 .then(() => justBumpPkgAsync(bumpType))
-                .then(() => nodeutil.runGitAsync("push", "--follow-tags"))
-                .then(() => nodeutil.runGitAsync("push"));
+                .then(() => nodeutil.runGitAsync("push", "--atomic", "--follow-tags"));
         }
     }
     else if (fs.existsSync("pxtarget.json"))
@@ -165954,7 +165994,7 @@ async function bumpAsync(parsed) {
                 .then(() => nodeutil.createBranchAsync(newBranchName))
                 .then(() => bumpPxt ? bumpPxtCoreDepAsync() : Promise.resolve())
                 .then(() => nodeutil.npmVersionBumpAsync(bumpType, false)) // don't tag when creating a PR
-                .then((version) => nodeutil.gitPushAsync().then(() => version))
+                .then((version) => nodeutil.gitPushAsync(false).then(() => version))
                 .then((version) => nodeutil.createPullRequestAsync({
                 title: `[pxt-cli] bump version to ${version}`,
                 body: "__Do not edit the PR title.__\n" +
@@ -165973,10 +166013,9 @@ async function bumpAsync(parsed) {
             console.log("Bumping via direct push.");
             return Promise.resolve()
                 .then(() => nodeutil.runGitAsync("pull"))
-                .then(() => bumpPxt ? bumpPxtCoreDepAsync().then(() => nodeutil.runGitAsync("push")) : Promise.resolve())
+                .then(() => bumpPxt ? bumpPxtCoreDepAsync().then(() => nodeutil.runGitAsync("push", "--atomic", "--no-follow-tags")) : Promise.resolve())
                 .then(() => nodeutil.runNpmAsync("version", bumpType))
-                .then(() => nodeutil.runGitAsync("push", "--follow-tags"))
-                .then(() => nodeutil.runGitAsync("push"))
+                .then(() => nodeutil.runGitAsync("push", "--atomic", "--follow-tags"))
                 .then(() => upload ? uploadTaggedTargetAsync() : Promise.resolve());
         }
     else {
@@ -169987,7 +170026,7 @@ async function staticpkgAsync(parsed) {
     pxt.log(`packaging editor to ${builtPackaged}`);
     await rimrafAsync(builtPackaged, {});
     if (bump) {
-        await bumpAsync();
+        await bumpAsync(parsed);
     }
     if (locs) {
         await internalGenDocsAsync(false, true);
@@ -171838,7 +171877,7 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
             update: { description: "(package only) Updates pxt-core reference to the latest release" },
             upload: { description: "(package only) Upload after bumping" },
             pr: { description: "Bump via pull request rather than direct push" },
-            nopr: { description: "Bump via direct push rather than pull request (overrides --pr)" },
+            nopr: { description: "Force a direct bump (overrides --pr and protection detection)" },
             version: {
                 description: "Which part of the version to bump, or a complete version number to assign. Defaults to 'patch'",
                 argument: "version",
@@ -171956,6 +171995,9 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
             bump: {
                 description: "bump version number prior to package"
             },
+            nopr: {
+                description: "With --bump, force a direct bump rather than a pull request"
+            },
             cloudbuild: {
                 description: "(deprecated) forces build to happen in the cloud",
                 aliases: ["cloud", "cloud-build", "cb"]

package/built/pxtlib.js

@@ -1510,6 +1510,8 @@ const lf = ts.pxtc.Util.lf;
                     let parts = k.split(".");
                     for (let i = 0; i < parts.length; ++i) {
                         let part = parts[i];
+                        if (part === "__proto__" || part === "constructor" || part === "prototype")
+                            Util.userError("Invalid configuration key: " + k);
                         if (i == parts.length - 1)
                             ptr[part] = v[k];
                         else {
@@ -7804,10 +7806,11 @@ var pxt;
                 if (!inEnum)
                     return;
                 // parse the enum case, with lots of optional stuff (?)
-                let mm = /^\s*(\w+)\s*(=\s*(.*?))?,?\s*$/.exec(lnNC);
+                const enumLine = lnNC.trim().replace(/,$/, "").trim();
+                let mm = /^(\w+)(?:\s*=(.*))?$/.exec(enumLine);
                 if (mm) {
                     let nm = mm[1];
-                    let v = mm[3];
+                    let v = mm[2] && mm[2].trim();
                     let opt = "";
                     if (v) {
                         // user-supplied value
@@ -7845,23 +7848,26 @@ var pxt;
             }
             function parseArg(parsedAttrs, s) {
                 s = s.trim();
-                let m = /(.*)=\s*(-?\w+)$/.exec(s);
+                const equals = s.lastIndexOf("=");
+                const m = equals < 0 ? null : /^\s*(-?\w+)$/.exec(s.slice(equals + 1));
                 let defl = "";
                 let qm = "";
                 if (m) {
-                    defl = m[2];
+                    defl = m[1];
                     qm = "?";
-                    s = m[1].trim();
+                    s = s.slice(0, equals).trim();
                 }
-                m = /^(.*?)(\w+)$/.exec(s);
-                if (!m) {
+                let nameStart = s.length;
+                while (nameStart > 0 && /\w/.test(s.charAt(nameStart - 1)))
+                    --nameStart;
+                if (nameStart == s.length || /[\r\n\u2028\u2029]/.test(s.slice(0, nameStart))) {
                     err("invalid argument: " + s);
                     return {
                         name: "???",
                         type: "int"
                     };
                 }
-                let argName = m[2];
+                let argName = s.slice(nameStart);
                 if (parsedAttrs.paramDefl[argName]) {
                     defl = parsedAttrs.paramDefl[argName];
                     qm = "?";
@@ -7876,7 +7882,7 @@ var pxt;
                 }
                 return {
                     name: argName + qm,
-                    type: m[1]
+                    type: s.slice(0, nameStart)
                 };
             }
             function parseCpp(src, isHeader) {
@@ -7886,9 +7892,28 @@ var pxt;
                 inDocComment = false;
                 let indexedInstanceAttrs;
                 let indexedInstanceIdx = -1;
-                // replace #if 0 .... #endif with newlines
-                src = src.replace(/^(\s*#\s*if\s+(\w+)\s*$)([^]*?)(^\s*#\s*(elif|else|endif)\s*$)/mg, (f, _if, arg, middle, _endif) => hash_if_options.indexOf(arg) >= 0 && !cpp_options[arg] ?
-                    _if + middle.replace(/[^\n]/g, "") + _endif : f);
+                // Match directives one line at a time so unterminated blocks cannot rescan the source.
+                const lines = src.split(/\r?\n/);
+                let ifStart = -1;
+                let ifArg = "";
+                lines.forEach((ln, i) => {
+                    const directive = /^#\s*(?:if\s+(\w+)|(elif|else|endif))$/.exec(ln.trim());
+                    if (!directive)
+                        return;
+                    if (ifStart < 0) {
+                        if (directive[1]) {
+                            ifStart = i;
+                            ifArg = directive[1];
+                        }
+                    }
+                    else if (directive[2]) {
+                        if (hash_if_options.indexOf(ifArg) >= 0 && !cpp_options[ifArg]) {
+                            for (let j = ifStart + 1; j < i; ++j)
+                                lines[j] = "";
+                        }
+                        ifStart = -1;
+                    }
+                });
                 // special handling of C++ namespace that ends with Methods (e.g. FooMethods)
                 // such a namespace will be converted into a TypeScript interface
                 // this enables simple objects with methods to be defined. See, for example:
@@ -7966,10 +7991,14 @@ var pxt;
                             return "T";
                         case "String":
                             return "S";
-                        default:
+                        default: {
                             if (U.lookup(knownEnums, tp))
                                 return "I";
-                            return "_" + tp.replace(/[\*_]+$/, "");
+                            let typeEnd = tp.length;
+                            while (typeEnd > 0 && /[\*_]/.test(tp.charAt(typeEnd - 1)))
+                                --typeEnd;
+                            return "_" + tp.slice(0, typeEnd);
+                        }
                     }
                 }
                 function generateVMWrapper(fi, argTypes) {
@@ -8051,7 +8080,7 @@ var pxt;
                 enumVal = 0;
                 enumsDTS.setNs("");
                 shimsDTS.setNs("");
-                src.split(/\r?\n/).forEach(ln => {
+                lines.forEach(ln => {
                     ++lineNo;
                     // remove comments (NC = no comments)
                     let lnNC = stripComments(ln);
@@ -27237,12 +27266,20 @@ ${opts.repo.name.replace(/^pxt-/, '')}=github:${opts.repo.fullName}#${opts.repo.
             strong: 1,
             em: 1,
         };
+        /** Keeps metadata and token-only HTML out of the translation catalog. */
+        function isNonTranslatable(text) {
+            if (text.startsWith("IE=edge,") || text.startsWith("width=device-width"))
+                return true;
+            // Remove URLs, template placeholders, and spacing entities to look for prose.
+            const prose = text.replace(/(?:https?:\/\/|\/)[\w@\/.]+|@[-\w]+@|\{[^{}]+\}|&nbsp;/g, "");
+            return !/[a-zA-Z]/.test(prose);
+        }
         function translate(html, locale) {
             const missing = {};
             function translateOne(toTranslate) {
                 let spm = /^(\s*)([^]*?)(\s*)$/.exec(toTranslate);
                 let text = spm[2].replace(/\s+/g, " ");
-                if (text == "" || /^((IE=edge,.*|width=device-width.*|(https?:\/\/|\/)[\w@\/\.]+|@[\-\w]+@|\{[^\{\}]+\}|[^a-zA-Z]*|(&nbsp;)+)\s*)+$/.test(text))
+                if (isNonTranslatable(text))
                     return null;
                 let v = U.lookup(locale, text);
                 if (v)