revert f718740 -> bb4281a which was accidentally commit to master :(

Was fixing a branch and accidentally pulled instead of checkout'd

pxtblocks/blocklycompiler.ts

@@ -1129,26 +1129,10 @@ namespace pxt.blocks {
         return mkCallWithCallback(e, "basic", "forever", [], body);
     }
 
-    let PICTOGRAPHIC_REGEX: RegExp;
-    try { // Some browsers do not support unicode property escape, in which case we can just use _ replacement
-        PICTOGRAPHIC_REGEX = new RegExp("\\p{Extended_Pictographic}", "ug")
-    } catch {}
-    function escapePictographic(name: string) {
-        if (PICTOGRAPHIC_REGEX) {
-            return name.replace(
-                PICTOGRAPHIC_REGEX,
-                s => `Ex${s.codePointAt(0).toString(16)}`
-            );
-        }
-        return name;
-    }
-
     // convert to javascript friendly name
     export function escapeVarName(name: string, e: Environment, isFunction = false): string {
         if (!name) return '_';
 
-        name = escapePictographic(name);
-
         if (isFunction) {
             if (e.renames.oldToNewFunctions[name]) {
                 return e.renames.oldToNewFunctions[name];
@@ -2270,8 +2254,6 @@ namespace pxt.blocks {
         function escapeVarName(originalName: string): string {
             if (!originalName) return '_';
 
-            originalName = escapePictographic(originalName);
-
             let n = ts.pxtc.escapeIdentifier(originalName);
 
             if (e.renames.takenNames[n] || nameIsTaken(n, current, originalName)) {

pxtcompiler/emitter/decompiler.ts

@@ -715,7 +715,7 @@ ${output}</xml>`;
                 mChildren.forEach(c => {
                     write(`<${c.nodeName} `, "");
                     Object.keys(c.attributes).forEach(attrName => {
-                        write(`${attrName}="${U.htmlEscape(c.attributes[attrName])}" `, "");
+                        write(`${attrName}="${c.attributes[attrName]}" `, "");
                     });
                     write("/>");
                 });
@@ -2448,10 +2448,10 @@ ${output}</xml>`;
             if (renameMap) {
                 const rename = renameMap.getRenameForPosition(name.getStart());
                 if (rename) {
-                    return unescapeVarName(rename.name);
+                    return rename.name;
                 }
             }
-            return unescapeVarName(name.text);
+            return name.text;
         }
     }
 
@@ -2661,7 +2661,7 @@ ${output}</xml>`;
             let userFunction: FunctionDeclaration;
 
             if (ts.isIdentifier(n.expression)) {
-                userFunction = env.declaredFunctions[unescapeVarName(n.expression.text)];
+                userFunction = env.declaredFunctions[n.expression.text];
             }
 
             if (!asExpression) {
@@ -3488,13 +3488,6 @@ ${output}</xml>`;
         }
     }
 
-    function unescapeVarName(name: string) {
-        return name.replace(
-            /Ex([0-9a-f]{4,6})/g,
-            s => String.fromCodePoint(+`0x${s.slice(2)}`)
-        );
-    }
-
     function isFunctionExpression(node: Node) {
         return node.kind === SK.ArrowFunction || node.kind === SK.FunctionExpression;
     }

pxtlib/commonutil.ts

@@ -28,8 +28,8 @@ namespace ts.pxtc.Util {
     }
 
     export function htmlEscape(_input: string) {
-        if (!_input) return _input;
-        return _input.replace(/[<>&"']/gu, c => `&#${c.charCodeAt(0)};`);
+        if (!_input) return _input; // null, undefined, empty string test
+        return _input.replace(/([^\w .!?\-$])/g, c => "&#" + c.charCodeAt(0) + ";");
     }
 
     export function htmlUnescape(_input: string) {

tests/decompile-test/baselines/always_bad_variable_declarations.blocks

@@ -2,7 +2,7 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation declaredvars="x" numlines="1" error="Variable declarations must have an initializer" line0="let x: number;" />
+<mutation declaredvars="x" numlines="1" line0="let x&#58; number&#59;" />
 </block>
 </statement>
 </block>

tests/decompile-test/baselines/always_decompile_classes.blocks

@@ -2,10 +2,10 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation numlines="6" error="Unsupported statement in block: ClassDeclaration" line0="class Foo {" line1="    x: number;" line2="    constructor() {" line3="        this.x = 0" line4="    }" line5="}" />
+<mutation numlines="6" error="Unsupported statement in block&#58; ClassDeclaration" line0="class Foo &#123;" line1="    x&#58; number&#59;" line2="    constructor&#40;&#41; &#123;" line3="        this.x &#61; 0" line4="    &#125;" line5="&#125;" />
 <next>
 <block type="typescript_statement">
-<mutation declaredvars="y" numlines="1" error="Unsupported syntax kind for output expression block: NewExpression" line0="let y = new Foo()" />
+<mutation declaredvars="y" numlines="1" error="Unsupported syntax kind for output expression block&#58; NewExpression" line0="let y &#61; new Foo&#40;&#41;" />
 <next>
 <block type="device_show_number">
 <value name="number">

tests/decompile-test/baselines/always_decompile_renames.blocks

@@ -2,10 +2,10 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation declaredvars="someVar" numlines="1" error="Could not find operator &#38;" line0="let someVar = 0 &#38; 9;" />
+<mutation declaredvars="someVar" numlines="1" line0="let someVar &#61; 0 &#38; 9&#59;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="5" error="for loops must have an initializer, incrementor, and condition" line0="for (;;) {" line1="    let someVar2 = 38;" line2="    someVar2 ++;" line3="    someVar2 = 7 ^ 6;" line4="}" />
+<mutation numlines="5" line0="for &#40;&#59;&#59;&#41; &#123;" line1="    let someVar2 &#61; 38&#59;" line2="    someVar2 &#43;&#43;&#59;" line3="    someVar2 &#61; 7 &#94; 6&#59;" line4="&#125;" />
 </block>
 </next>
 </block>

tests/decompile-test/baselines/always_decompile_renames_expressions.blocks

@@ -25,7 +25,7 @@
 <value name="A">
 <shadow type="math_number"><field name="NUM">0</field></shadow>
 <block type="typescript_expression">
-<field name="EXPRESSION">(x2 &#38; 7)</field>
+<field name="EXPRESSION">&#40;x2 &#38; 7&#41;</field>
 </block>
 </value>
 <value name="B">

tests/decompile-test/baselines/always_enums.blocks

@@ -15,7 +15,7 @@
 </value>
 <statement name="DO">
 <block type="typescript_statement">
-<mutation numlines="1" error="Enum arguments may only be literal property access expressions" line0="testNamespace.enumArgument(i);" />
+<mutation numlines="1" error="Enum arguments may only be literal property access expressions" line0="testNamespace.enumArgument&#40;i&#41;&#59;" />
 </block>
 </statement>
 </block>

tests/decompile-test/baselines/always_enums2.blocks

@@ -2,7 +2,7 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation numlines="1" error="Enum arguments may only be literal property access expressions" line0="testNamespace.enumArgument(testNamespace.numberArgumentOutput(0));" />
+<mutation numlines="1" error="Enum arguments may only be literal property access expressions" line0="testNamespace.enumArgument&#40;testNamespace.numberArgumentOutput&#40;0&#41;&#41;&#59;" />
 </block>
 </statement>
 </block>

tests/decompile-test/baselines/always_enums4.blocks

@@ -23,7 +23,7 @@
 </value>
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="Enum arguments may only be literal property access expressions" line0="x.testMethodWithEnum(58)" />
+<mutation numlines="1" error="Enum arguments may only be literal property access expressions" line0="x.testMethodWithEnum&#40;58&#41;" />
 </block>
 </next>
 </block>

tests/decompile-test/baselines/always_fixed_instance.blocks

@@ -2,7 +2,7 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation declaredvars="a" numlines="1" error="No call info found" line0="let a = pins.A9" />
+<mutation declaredvars="a" numlines="1" error="No call info found" line0="let a &#61; pins.A9" />
 <next>
 <block type="pin_analog_pitch">
 <field name="pin">pins.A10</field>

tests/decompile-test/baselines/always_for_loop_bad_conditional.blocks

@@ -10,19 +10,19 @@
 </value>
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="left side of for loop conditional must be the variable declared in the initializer" line0="for (let x = 0; y &#60;= 5; x++) {}" />
+<mutation numlines="1" error="left side of for loop conditional must be the variable declared in the initializer" line0="for &#40;let x &#61; 0&#59; y &#60;&#61; 5&#59; x&#43;&#43;&#41; &#123;&#125;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="for loop conditionals must be binary comparison operations" line0="for (let x2 = 0; false; x2++) {}" />
+<mutation numlines="1" error="for loop conditionals must be binary comparison operations" line0="for &#40;let x2 &#61; 0&#59; false&#59; x2&#43;&#43;&#41; &#123;&#125;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="for loop conditional operator must be either &#60; or &#60;=" line0="for (let x3 = 0; x3 == 2; x3++) {}" />
+<mutation numlines="1" error="for loop conditional operator must be either &#60; or &#60;&#61;" line0="for &#40;let x3 &#61; 0&#59; x3 &#61;&#61; 2&#59; x3&#43;&#43;&#41; &#123;&#125;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="left side of for loop conditional must be the variable declared in the initializer" line0="for (let x4 = 0; 2 &#60;= 2; x4++) {}" />
+<mutation numlines="1" error="left side of for loop conditional must be the variable declared in the initializer" line0="for &#40;let x4 &#61; 0&#59; 2 &#60;&#61; 2&#59; x4&#43;&#43;&#41; &#123;&#125;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="for loops must have an initializer, incrementor, and condition" line0="for (let x5 = 0; ; x5++) {}" />
+<mutation numlines="1" error="for loops must have an initializer&#44; incrementor&#44; and condition" line0="for &#40;let x5 &#61; 0&#59; &#59; x5&#43;&#43;&#41; &#123;&#125;" />
 </block>
 </next>
 </block>

tests/decompile-test/baselines/always_for_loop_bad_incrementor.blocks

@@ -2,10 +2,10 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation numlines="1" error="for loop incrementors may only increment the variable declared in the initializer" line0="for (let x = 0; x &#60;= 5; x+= 1) {}" />
+<mutation numlines="1" error="for loop incrementors may only increment the variable declared in the initializer" line0="for &#40;let x &#61; 0&#59; x &#60;&#61; 5&#59; x&#43;&#61; 1&#41; &#123;&#125;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="for loop incrementors may only increment the variable declared in the initializer" line0="for (let x2 = 0; x2 &#60;= 5; x2--) {}" />
+<mutation numlines="1" error="for loop incrementors may only increment the variable declared in the initializer" line0="for &#40;let x2 &#61; 0&#59; x2 &#60;&#61; 5&#59; x2--&#41; &#123;&#125;" />
 <next>
 <block type="variables_set">
 <field name="VAR">y</field>
@@ -16,10 +16,10 @@
 </value>
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="for loop incrementors may only increment the variable declared in the initializer" line0="for (let x3 = 0; x3 &#60;= 5; y++) {}" />
+<mutation numlines="1" error="for loop incrementors may only increment the variable declared in the initializer" line0="for &#40;let x3 &#61; 0&#59; x3 &#60;&#61; 5&#59; y&#43;&#43;&#41; &#123;&#125;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="for loops must have an initializer, incrementor, and condition" line0="for (let x4 = 0; x4 &#60;= 5;) {}" />
+<mutation numlines="1" error="for loops must have an initializer&#44; incrementor&#44; and condition" line0="for &#40;let x4 &#61; 0&#59; x4 &#60;&#61; 5&#59;&#41; &#123;&#125;" />
 </block>
 </next>
 </block>

tests/decompile-test/baselines/always_for_loop_bad_initializer.blocks

@@ -10,7 +10,7 @@
 </value>
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="only variable declarations are permitted in for loop initializers" line0="for (1 + 1; x &#60;= 5; x++) {}" />
+<mutation numlines="1" error="only variable declarations are permitted in for loop initializers" line0="for &#40;1 &#43; 1&#59; x &#60;&#61; 5&#59; x&#43;&#43;&#41; &#123;&#125;" />
 <next>
 <block type="variables_set">
 <field name="VAR">x2</field>
@@ -21,10 +21,10 @@
 </value>
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="for loops must have an initializer, incrementor, and condition" line0="for (; x2 &#60;= 5; x2++) {}" />
+<mutation numlines="1" error="for loops must have an initializer&#44; incrementor&#44; and condition" line0="for &#40;&#59; x2 &#60;&#61; 5&#59; x2&#43;&#43;&#41; &#123;&#125;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="for loop with multiple variables not supported" line0="for (let x3 = 0, y = 2; x3 &#60;= 5; x3++) {}" />
+<mutation numlines="1" error="for loop with multiple variables not supported" line0="for &#40;let x3 &#61; 0&#44; y &#61; 2&#59; x3 &#60;&#61; 5&#59; x3&#43;&#43;&#41; &#123;&#125;" />
 </block>
 </next>
 </block>

tests/decompile-test/baselines/always_image_too_large.blocks

@@ -2,10 +2,10 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation declaredvars="item" numlines="7" error="Invalid image pattern (50 expected vs 75 actual)" line0="let item = images.createBigImage(`" line1="    . . . . .   . . . . .   . . . . ." line2="    . # # # .   . # # # .   . # # # ." line3="    . # . # .   . # . # .   . # . # ." line4="    . # # # .   . # # # .   . # # # ." line5="    . . . . .   . . . . .   . . . . ." line6="    `)" />
+<mutation declaredvars="item" numlines="7" error="Invalid image pattern &#40;50 expected vs 75 actual&#41;" line0="let item &#61; images.createBigImage&#40;&#96;" line1="    . . . . .   . . . . .   . . . . ." line2="    . &#35; &#35; &#35; .   . &#35; &#35; &#35; .   . &#35; &#35; &#35; ." line3="    . &#35; . &#35; .   . &#35; . &#35; .   . &#35; . &#35; ." line4="    . &#35; &#35; &#35; .   . &#35; &#35; &#35; .   . &#35; &#35; &#35; ." line5="    . . . . .   . . . . .   . . . . ." line6="    &#96;&#41;" />
 <next>
 <block type="typescript_statement">
-<mutation declaredvars="z" numlines="7" error="Invalid image pattern (50 expected vs 10 actual)" line0="let z = images.createBigImage(`" line1="    . ." line2="    . #" line3="    . #" line4="    . #" line5="    . ." line6="    `)" />
+<mutation declaredvars="z" numlines="7" error="Invalid image pattern &#40;50 expected vs 10 actual&#41;" line0="let z &#61; images.createBigImage&#40;&#96;" line1="    . ." line2="    . &#35;" line3="    . &#35;" line4="    . &#35;" line5="    . ." line6="    &#96;&#41;" />
 </block>
 </next>
 </block>

tests/decompile-test/baselines/always_local_variable.blocks

@@ -2,10 +2,10 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation declaredvars="x" numlines="1" line0="let x = 0" />
+<mutation declaredvars="x" numlines="1" line0="let x &#61; 0" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="3" error="for loops must have an initializer, incrementor, and condition" line0="for (;;) {" line1="    x++;" line2="}" />
+<mutation numlines="3" line0="for &#40;&#59;&#59;&#41; &#123;" line1="    x&#43;&#43;&#59;" line2="&#125;" />
 </block>
 </next>
 </block>

tests/decompile-test/baselines/always_null_and_undefined.blocks

@@ -2,16 +2,16 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation declaredvars="x2" numlines="1" line0="let x2 = 0" />
+<mutation declaredvars="x2" numlines="1" line0="let x2 &#61; 0" />
 <next>
 <block type="typescript_statement">
-<mutation declaredvars="x" numlines="1" line0="let x = 0" />
+<mutation declaredvars="x" numlines="1" line0="let x &#61; 0" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="Unsupported syntax kind for output expression block: NullKeyword" line0="x = null;" />
+<mutation numlines="1" error="Unsupported syntax kind for output expression block&#58; NullKeyword" line0="x &#61; null&#59;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="Undefined is not supported in blocks" line0="x2 = undefined;" />
+<mutation numlines="1" error="Undefined is not supported in blocks" line0="x2 &#61; undefined&#59;" />
 </block>
 </next>
 </block>

tests/decompile-test/baselines/always_optional_parameters.blocks

@@ -2,16 +2,16 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation numlines="1" error="Function call has more arguments than are supported by its block" line0="testNamespace.defaultArguments(40, 50);" />
+<mutation numlines="1" error="Function call has more arguments than are supported by its block" line0="testNamespace.defaultArguments&#40;40&#44; 50&#41;&#59;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="Function call has more arguments than are supported by its block" line0="testNamespace.multipleDefaultArguments(40, 50);" />
+<mutation numlines="1" error="Function call has more arguments than are supported by its block" line0="testNamespace.multipleDefaultArguments&#40;40&#44; 50&#41;&#59;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="Function call has more arguments than are supported by its block" line0="testNamespace.optionalArgument(40, 50);" />
+<mutation numlines="1" error="Function call has more arguments than are supported by its block" line0="testNamespace.optionalArgument&#40;40&#44; 50&#41;&#59;" />
 <next>
 <block type="typescript_statement">
-<mutation numlines="1" error="Function call has more arguments than are supported by its block" line0="testNamespace.optionalArgumentWithCallback(() =&#62; {}, 500);" />
+<mutation numlines="1" error="Function call has more arguments than are supported by its block" line0="testNamespace.optionalArgumentWithCallback&#40;&#40;&#41; &#61;&#62; &#123;&#125;&#44; 500&#41;&#59;" />
 </block>
 </next>
 </block>

tests/decompile-test/baselines/always_output_expressions_local_scope.blocks

@@ -2,7 +2,9 @@
 <block type="pxt-on-start">
 <statement name="HANDLER">
 <block type="typescript_statement">
-<mutation numlines="1" error="This expression cannot be assigned to" line0="1 + 1" />
+<mutation numlines="1"
+line0="1 &#43; 1"
+/>
 </block>
 </statement>
 </block>