diff --git a/tests/baselines/reference/templateStringBinaryOperations.js b/tests/baselines/reference/templateStringBinaryOperations.js index d155ba9eedd..691dad41f77 100644 --- a/tests/baselines/reference/templateStringBinaryOperations.js +++ b/tests/baselines/reference/templateStringBinaryOperations.js @@ -55,49 +55,49 @@ var l4 = 1 + `2${ 3 & 4 }5` + 6; //// [templateStringBinaryOperations.js] var a = 1 + ("" + 3); var b = 1 + ("2" + 3); -var c = 1 + ("" + 3 + "4"); +var c = 1 + (3 + "4"); var d = 1 + ("2" + 3 + "4"); var e = ("" + 3) + 5; var f = ("2" + 3) + 5; -var g = ("" + 3 + "4") + 5; +var g = (3 + "4") + 5; var h = ("2" + 3 + "4") + 5; var i = 1 + ("" + 3) + 5; var j = 1 + ("2" + 3) + 5; -var k = 1 + ("" + 3 + "4") + 5; +var k = 1 + (3 + "4") + 5; var l = 1 + ("2" + 3 + "4") + 5; var a2 = 1 + ("" + (3 - 4)); var b2 = 1 + ("2" + (3 - 4)); -var c2 = 1 + ("" + (3 - 4) + "5"); +var c2 = 1 + ((3 - 4) + "5"); var d2 = 1 + ("2" + (3 - 4) + "5"); var e2 = ("" + (3 - 4)) + 6; var f2 = ("2" + (3 - 4)) + 6; -var g2 = ("" + (3 - 4) + "5") + 6; +var g2 = ((3 - 4) + "5") + 6; var h2 = ("2" + (3 - 4) + "5") + 6; var i2 = 1 + ("" + (3 - 4)) + 6; var j2 = 1 + ("2" + (3 - 4)) + 6; -var k2 = 1 + ("" + (3 - 4) + "5") + 6; +var k2 = 1 + ((3 - 4) + "5") + 6; var l2 = 1 + ("2" + (3 - 4) + "5") + 6; var a3 = 1 + ("" + 3 * 4); var b3 = 1 + ("2" + 3 * 4); -var c3 = 1 + ("" + 3 * 4 + "5"); +var c3 = 1 + (3 * 4 + "5"); var d3 = 1 + ("2" + 3 * 4 + "5"); var e3 = ("" + 3 * 4) + 6; var f3 = ("2" + 3 * 4) + 6; -var g3 = ("" + 3 * 4 + "5") + 6; +var g3 = (3 * 4 + "5") + 6; var h3 = ("2" + 3 * 4 + "5") + 6; var i3 = 1 + ("" + 3 * 4) + 6; var j3 = 1 + ("2" + 3 * 4) + 6; -var k3 = 1 + ("" + 3 * 4 + "5") + 6; +var k3 = 1 + (3 * 4 + "5") + 6; var l3 = 1 + ("2" + 3 * 4 + "5") + 6; var a4 = 1 + ("" + (3 & 4)); var b4 = 1 + ("2" + (3 & 4)); -var c4 = 1 + ("" + (3 & 4) + "5"); +var c4 = 1 + ((3 & 4) + "5"); var d4 = 1 + ("2" + (3 & 4) + "5"); var e4 = ("" + (3 & 4)) + 6; var f4 = ("2" + (3 & 4)) + 6; -var g4 = ("" + (3 & 4) + "5") + 6; +var g4 = ((3 & 4) + "5") + 6; var h4 = ("2" + (3 & 4) + "5") + 6; var i4 = 1 + ("" + (3 & 4)) + 6; var j4 = 1 + ("2" + (3 & 4)) + 6; -var k4 = 1 + ("" + (3 & 4) + "5") + 6; +var k4 = 1 + ((3 & 4) + "5") + 6; var l4 = 1 + ("2" + (3 & 4) + "5") + 6; diff --git a/tests/baselines/reference/templateStringBinaryOperationsInvalid.js b/tests/baselines/reference/templateStringBinaryOperationsInvalid.js index 1edf1d3a563..f8c0344f44b 100644 --- a/tests/baselines/reference/templateStringBinaryOperationsInvalid.js +++ b/tests/baselines/reference/templateStringBinaryOperationsInvalid.js @@ -111,97 +111,97 @@ var hc = `2${ 3 & 4 }5` & 6; //// [templateStringBinaryOperationsInvalid.js] var a = 1 - ("" + 3); var b = 1 - ("2" + 3); -var c = 1 - ("" + 3 + "4"); +var c = 1 - (3 + "4"); var d = 1 - ("2" + 3 + "4"); var e = ("" + 3) - 5; var f = ("2" + 3) - 5; -var g = ("" + 3 + "4") - 5; +var g = (3 + "4") - 5; var h = ("2" + 3 + "4") - 5; var a2 = 1 * ("" + 3); var b2 = 1 * ("2" + 3); -var c2 = 1 * ("" + 3 + "4"); +var c2 = 1 * (3 + "4"); var d2 = 1 * ("2" + 3 + "4"); var e2 = ("" + 3) * 5; var f2 = ("2" + 3) * 5; -var g2 = ("" + 3 + "4") * 5; +var g2 = (3 + "4") * 5; var h2 = ("2" + 3 + "4") * 5; var a3 = 1 & "" + 3; var b3 = 1 & "2" + 3; -var c3 = 1 & "" + 3 + "4"; +var c3 = 1 & 3 + "4"; var d3 = 1 & "2" + 3 + "4"; var e3 = "" + 3 & 5; var f3 = "2" + 3 & 5; -var g3 = "" + 3 + "4" & 5; +var g3 = 3 + "4" & 5; var h3 = "2" + 3 + "4" & 5; var a4 = 1 - ("" + (3 - 4)); var b4 = 1 - ("2" + (3 - 4)); -var c4 = 1 - ("" + (3 - 4) + "5"); +var c4 = 1 - ((3 - 4) + "5"); var d4 = 1 - ("2" + (3 - 4) + "5"); var e4 = ("" + (3 - 4)) - 6; var f4 = ("2" + (3 - 4)) - 6; -var g4 = ("" + (3 - 4) + "5") - 6; +var g4 = ((3 - 4) + "5") - 6; var h4 = ("2" + (3 - 4) + "5") - 6; var a5 = 1 - ("" + 3 * 4); var b5 = 1 - ("2" + 3 * 4); -var c5 = 1 - ("" + 3 * 4 + "5"); +var c5 = 1 - (3 * 4 + "5"); var d5 = 1 - ("2" + 3 * 4 + "5"); var e5 = ("" + 3 * 4) - 6; var f5 = ("2" + 3 * 4) - 6; -var g5 = ("" + 3 * 4 + "5") - 6; +var g5 = (3 * 4 + "5") - 6; var h5 = ("2" + 3 * 4 + "5") - 6; var a6 = 1 - ("" + (3 & 4)); var b6 = 1 - ("2" + (3 & 4)); -var c6 = 1 - ("" + (3 & 4) + "5"); +var c6 = 1 - ((3 & 4) + "5"); var d6 = 1 - ("2" + (3 & 4) + "5"); var e6 = ("" + (3 & 4)) - 6; var f6 = ("2" + (3 & 4)) - 6; -var g6 = ("" + (3 & 4) + "5") - 6; +var g6 = ((3 & 4) + "5") - 6; var h6 = ("2" + (3 & 4) + "5") - 6; var a7 = 1 * ("" + (3 - 4)); var b7 = 1 * ("2" + (3 - 4)); -var c7 = 1 * ("" + (3 - 4) + "5"); +var c7 = 1 * ((3 - 4) + "5"); var d7 = 1 * ("2" + (3 - 4) + "5"); var e7 = ("" + (3 - 4)) * 6; var f7 = ("2" + (3 - 4)) * 6; -var g7 = ("" + (3 - 4) + "5") * 6; +var g7 = ((3 - 4) + "5") * 6; var h7 = ("2" + (3 - 4) + "5") * 6; var a8 = 1 * ("" + 3 * 4); var b8 = 1 * ("2" + 3 * 4); -var c8 = 1 * ("" + 3 * 4 + "5"); +var c8 = 1 * (3 * 4 + "5"); var d8 = 1 * ("2" + 3 * 4 + "5"); var e8 = ("" + 3 * 4) * 6; var f8 = ("2" + 3 * 4) * 6; -var g8 = ("" + 3 * 4 + "5") * 6; +var g8 = (3 * 4 + "5") * 6; var h8 = ("2" + 3 * 4 + "5") * 6; var a9 = 1 * ("" + (3 & 4)); var b9 = 1 * ("2" + (3 & 4)); -var c9 = 1 * ("" + (3 & 4) + "5"); +var c9 = 1 * ((3 & 4) + "5"); var d9 = 1 * ("2" + (3 & 4) + "5"); var e9 = ("" + (3 & 4)) * 6; var f9 = ("2" + (3 & 4)) * 6; -var g9 = ("" + (3 & 4) + "5") * 6; +var g9 = ((3 & 4) + "5") * 6; var h9 = ("2" + (3 & 4) + "5") * 6; var aa = 1 & "" + (3 - 4); var ba = 1 & "2" + (3 - 4); -var ca = 1 & "" + (3 - 4) + "5"; +var ca = 1 & (3 - 4) + "5"; var da = 1 & "2" + (3 - 4) + "5"; var ea = "" + (3 - 4) & 6; var fa = "2" + (3 - 4) & 6; -var ga = "" + (3 - 4) + "5" & 6; +var ga = (3 - 4) + "5" & 6; var ha = "2" + (3 - 4) + "5" & 6; var ab = 1 & "" + 3 * 4; var bb = 1 & "2" + 3 * 4; -var cb = 1 & "" + 3 * 4 + "5"; +var cb = 1 & 3 * 4 + "5"; var db = 1 & "2" + 3 * 4 + "5"; var eb = "" + 3 * 4 & 6; var fb = "2" + 3 * 4 & 6; -var gb = "" + 3 * 4 + "5" & 6; +var gb = 3 * 4 + "5" & 6; var hb = "2" + 3 * 4 + "5" & 6; var ac = 1 & "" + (3 & 4); var bc = 1 & "2" + (3 & 4); -var cc = 1 & "" + (3 & 4) + "5"; +var cc = 1 & (3 & 4) + "5"; var dc = 1 & "2" + (3 & 4) + "5"; var ec = "" + (3 & 4) & 6; var fc = "2" + (3 & 4) & 6; -var gc = "" + (3 & 4) + "5" & 6; +var gc = (3 & 4) + "5" & 6; var hc = "2" + (3 & 4) + "5" & 6; diff --git a/tests/baselines/reference/templateStringWithEmptyLiteralPortions.js b/tests/baselines/reference/templateStringWithEmptyLiteralPortions.js index 8bc6e2c4206..e7a35d76f45 100644 --- a/tests/baselines/reference/templateStringWithEmptyLiteralPortions.js +++ b/tests/baselines/reference/templateStringWithEmptyLiteralPortions.js @@ -21,18 +21,22 @@ var j = `${ 0 }${ 0 }3`; var k = `1${ 0 }${ 0 }3`; -var l = `1${ 0 }2${ 0 }3`; +var l = `${ 0 }2${ 0 }3`; + +var m = `1${ 0 }2${ 0 }3`; + //// [templateStringWithEmptyLiteralPortions.js] var a = ""; var b = "" + 0; var c = "1" + 0; -var d = "" + 0 + "2"; +var d = 0 + "2"; var e = "1" + 0 + "2"; var f = "" + 0 + 0; var g = "1" + 0 + 0; -var h = "" + 0 + "2" + 0; +var h = 0 + "2" + 0; var i = "1" + 0 + "2" + 0; var j = "" + 0 + 0 + "3"; var k = "1" + 0 + 0 + "3"; -var l = "1" + 0 + "2" + 0 + "3"; +var l = 0 + "2" + 0 + "3"; +var m = "1" + 0 + "2" + 0 + "3"; diff --git a/tests/baselines/reference/templateStringWithEmptyLiteralPortions.types b/tests/baselines/reference/templateStringWithEmptyLiteralPortions.types index a44bab8fe44..c901d674306 100644 --- a/tests/baselines/reference/templateStringWithEmptyLiteralPortions.types +++ b/tests/baselines/reference/templateStringWithEmptyLiteralPortions.types @@ -32,6 +32,9 @@ var j = `${ 0 }${ 0 }3`; var k = `1${ 0 }${ 0 }3`; >k : string -var l = `1${ 0 }2${ 0 }3`; +var l = `${ 0 }2${ 0 }3`; >l : string +var m = `1${ 0 }2${ 0 }3`; +>m : string + diff --git a/tests/baselines/reference/templateStringWithEmptyLiteralPortionsES6.js b/tests/baselines/reference/templateStringWithEmptyLiteralPortionsES6.js index f0e827cde63..fe1bce291f0 100644 --- a/tests/baselines/reference/templateStringWithEmptyLiteralPortionsES6.js +++ b/tests/baselines/reference/templateStringWithEmptyLiteralPortionsES6.js @@ -21,7 +21,10 @@ var j = `${ 0 }${ 0 }3`; var k = `1${ 0 }${ 0 }3`; -var l = `1${ 0 }2${ 0 }3`; +var l = `${ 0 }2${ 0 }3`; + +var m = `1${ 0 }2${ 0 }3`; + //// [templateStringWithEmptyLiteralPortionsES6.js] var a = ``; @@ -35,4 +38,5 @@ var h = `${0}2${0}`; var i = `1${0}2${0}`; var j = `${0}${0}3`; var k = `1${0}${0}3`; -var l = `1${0}2${0}3`; +var l = `${0}2${0}3`; +var m = `1${0}2${0}3`; diff --git a/tests/baselines/reference/templateStringWithEmptyLiteralPortionsES6.types b/tests/baselines/reference/templateStringWithEmptyLiteralPortionsES6.types index 4074831d410..d70dd29e4da 100644 --- a/tests/baselines/reference/templateStringWithEmptyLiteralPortionsES6.types +++ b/tests/baselines/reference/templateStringWithEmptyLiteralPortionsES6.types @@ -32,6 +32,9 @@ var j = `${ 0 }${ 0 }3`; var k = `1${ 0 }${ 0 }3`; >k : string -var l = `1${ 0 }2${ 0 }3`; +var l = `${ 0 }2${ 0 }3`; >l : string +var m = `1${ 0 }2${ 0 }3`; +>m : string + diff --git a/tests/cases/conformance/es6/templates/templateStringWithEmptyLiteralPortions.ts b/tests/cases/conformance/es6/templates/templateStringWithEmptyLiteralPortions.ts index 11dca4caf77..9191ca1934c 100644 --- a/tests/cases/conformance/es6/templates/templateStringWithEmptyLiteralPortions.ts +++ b/tests/cases/conformance/es6/templates/templateStringWithEmptyLiteralPortions.ts @@ -20,4 +20,6 @@ var j = `${ 0 }${ 0 }3`; var k = `1${ 0 }${ 0 }3`; -var l = `1${ 0 }2${ 0 }3`; \ No newline at end of file +var l = `${ 0 }2${ 0 }3`; + +var m = `1${ 0 }2${ 0 }3`; diff --git a/tests/cases/conformance/es6/templates/templateStringWithEmptyLiteralPortionsES6.ts b/tests/cases/conformance/es6/templates/templateStringWithEmptyLiteralPortionsES6.ts index 183da57dd45..ff178d22432 100644 --- a/tests/cases/conformance/es6/templates/templateStringWithEmptyLiteralPortionsES6.ts +++ b/tests/cases/conformance/es6/templates/templateStringWithEmptyLiteralPortionsES6.ts @@ -21,4 +21,6 @@ var j = `${ 0 }${ 0 }3`; var k = `1${ 0 }${ 0 }3`; -var l = `1${ 0 }2${ 0 }3`; \ No newline at end of file +var l = `${ 0 }2${ 0 }3`; + +var m = `1${ 0 }2${ 0 }3`;