From f16e875966e7103bf9790e4860c1d2dc8602d626 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 24 Feb 2015 16:50:25 -0800
Subject: [PATCH 01/14] Added tests for escapes in strings, regexes, and
 templates.

---
 ...tendedEscapesInRegularExpressions01_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions01_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions01_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions01_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions02_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions02_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions02_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions02_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions03_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions03_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions03_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions03_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions04_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions04_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions04_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions04_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions05_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions05_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions05_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions05_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions06_ES5.js | 11 +++++
 ...dedEscapesInRegularExpressions06_ES5.types |  7 +++
 ...tendedEscapesInRegularExpressions06_ES6.js | 11 +++++
 ...dedEscapesInRegularExpressions06_ES6.types |  7 +++
 ...tendedEscapesInRegularExpressions07_ES5.js | 11 +++++
 ...dedEscapesInRegularExpressions07_ES5.types |  7 +++
 ...tendedEscapesInRegularExpressions07_ES6.js | 11 +++++
 ...dedEscapesInRegularExpressions07_ES6.types |  7 +++
 ...tendedEscapesInRegularExpressions08_ES5.js | 13 +++++
 ...dedEscapesInRegularExpressions08_ES5.types |  8 ++++
 ...tendedEscapesInRegularExpressions08_ES6.js | 13 +++++
 ...dedEscapesInRegularExpressions08_ES6.types |  8 ++++
 ...tendedEscapesInRegularExpressions09_ES5.js | 13 +++++
 ...dedEscapesInRegularExpressions09_ES5.types |  8 ++++
 ...tendedEscapesInRegularExpressions09_ES6.js | 13 +++++
 ...dedEscapesInRegularExpressions09_ES6.types |  8 ++++
 ...tendedEscapesInRegularExpressions10_ES5.js | 15 ++++++
 ...dedEscapesInRegularExpressions10_ES5.types |  9 ++++
 ...tendedEscapesInRegularExpressions10_ES6.js | 15 ++++++
 ...dedEscapesInRegularExpressions10_ES6.types |  9 ++++
 ...tendedEscapesInRegularExpressions11_ES5.js | 15 ++++++
 ...dedEscapesInRegularExpressions11_ES5.types |  9 ++++
 ...tendedEscapesInRegularExpressions11_ES6.js | 15 ++++++
 ...dedEscapesInRegularExpressions11_ES6.types |  9 ++++
 ...tendedEscapesInRegularExpressions12_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions12_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions12_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions12_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions13_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions13_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions13_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions13_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions14_ES5.js |  9 ++++
 ...dedEscapesInRegularExpressions14_ES5.types |  6 +++
 ...tendedEscapesInRegularExpressions14_ES6.js |  9 ++++
 ...dedEscapesInRegularExpressions14_ES6.types |  6 +++
 ...tendedEscapesInRegularExpressions15_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions15_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions15_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions15_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions16_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions16_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions16_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions16_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions17_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions17_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions17_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions17_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions18_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions18_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions18_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions18_ES6.types |  5 ++
 ...tendedEscapesInRegularExpressions19_ES5.js |  7 +++
 ...dedEscapesInRegularExpressions19_ES5.types |  5 ++
 ...tendedEscapesInRegularExpressions19_ES6.js |  7 +++
 ...dedEscapesInRegularExpressions19_ES6.types |  5 ++
 ...eExtendedEscapesInStrings01_ES5.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings01_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings01_ES6.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings01_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings02_ES5.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings02_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings02_ES6.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings02_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings03_ES5.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings03_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings03_ES6.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings03_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings04_ES5.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings04_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings04_ES6.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings04_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings05_ES5.errors.txt | 39 +++++++++++++++
 .../unicodeExtendedEscapesInStrings05_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings05_ES6.errors.txt | 39 +++++++++++++++
 .../unicodeExtendedEscapesInStrings05_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings06_ES5.errors.txt | 11 +++++
 .../unicodeExtendedEscapesInStrings06_ES5.js  | 11 +++++
 ...eExtendedEscapesInStrings06_ES6.errors.txt | 11 +++++
 .../unicodeExtendedEscapesInStrings06_ES6.js  | 11 +++++
 ...eExtendedEscapesInStrings07_ES5.errors.txt | 11 +++++
 .../unicodeExtendedEscapesInStrings07_ES5.js  | 11 +++++
 ...eExtendedEscapesInStrings07_ES6.errors.txt | 11 +++++
 .../unicodeExtendedEscapesInStrings07_ES6.js  | 11 +++++
 ...eExtendedEscapesInStrings08_ES5.errors.txt | 12 +++++
 .../unicodeExtendedEscapesInStrings08_ES5.js  | 13 +++++
 ...eExtendedEscapesInStrings08_ES6.errors.txt | 12 +++++
 .../unicodeExtendedEscapesInStrings08_ES6.js  | 13 +++++
 ...eExtendedEscapesInStrings09_ES5.errors.txt | 12 +++++
 .../unicodeExtendedEscapesInStrings09_ES5.js  | 13 +++++
 ...eExtendedEscapesInStrings09_ES6.errors.txt | 12 +++++
 .../unicodeExtendedEscapesInStrings09_ES6.js  | 13 +++++
 ...eExtendedEscapesInStrings10_ES5.errors.txt | 13 +++++
 .../unicodeExtendedEscapesInStrings10_ES5.js  | 15 ++++++
 ...eExtendedEscapesInStrings10_ES6.errors.txt | 13 +++++
 .../unicodeExtendedEscapesInStrings10_ES6.js  | 15 ++++++
 ...eExtendedEscapesInStrings11_ES5.errors.txt | 13 +++++
 .../unicodeExtendedEscapesInStrings11_ES5.js  | 15 ++++++
 ...eExtendedEscapesInStrings11_ES6.errors.txt | 13 +++++
 .../unicodeExtendedEscapesInStrings11_ES6.js  | 15 ++++++
 ...eExtendedEscapesInStrings12_ES5.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings12_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings12_ES6.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings12_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings13_ES5.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings13_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings13_ES6.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings13_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings14_ES5.errors.txt | 10 ++++
 .../unicodeExtendedEscapesInStrings14_ES5.js  |  9 ++++
 ...eExtendedEscapesInStrings14_ES6.errors.txt | 10 ++++
 .../unicodeExtendedEscapesInStrings14_ES6.js  |  9 ++++
 ...eExtendedEscapesInStrings15_ES5.errors.txt | 18 +++++++
 .../unicodeExtendedEscapesInStrings15_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings15_ES6.errors.txt | 18 +++++++
 .../unicodeExtendedEscapesInStrings15_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings16_ES5.errors.txt | 18 +++++++
 .../unicodeExtendedEscapesInStrings16_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings16_ES6.errors.txt | 18 +++++++
 .../unicodeExtendedEscapesInStrings16_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings17_ES5.errors.txt | 15 ++++++
 .../unicodeExtendedEscapesInStrings17_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings17_ES6.errors.txt | 15 ++++++
 .../unicodeExtendedEscapesInStrings17_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings18_ES5.errors.txt | 12 +++++
 .../unicodeExtendedEscapesInStrings18_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings18_ES6.errors.txt | 12 +++++
 .../unicodeExtendedEscapesInStrings18_ES6.js  |  7 +++
 ...eExtendedEscapesInStrings19_ES5.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings19_ES5.js  |  7 +++
 ...eExtendedEscapesInStrings19_ES6.errors.txt |  9 ++++
 .../unicodeExtendedEscapesInStrings19_ES6.js  |  7 +++
 ...xtendedEscapesInTemplates01_ES5.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates01_ES5.js |  7 +++
 ...xtendedEscapesInTemplates01_ES6.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates01_ES6.js |  7 +++
 ...xtendedEscapesInTemplates02_ES5.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates02_ES5.js |  7 +++
 ...xtendedEscapesInTemplates02_ES6.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates02_ES6.js |  7 +++
 ...xtendedEscapesInTemplates03_ES5.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates03_ES5.js |  7 +++
 ...xtendedEscapesInTemplates03_ES6.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates03_ES6.js |  7 +++
 ...xtendedEscapesInTemplates04_ES5.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates04_ES5.js |  7 +++
 ...xtendedEscapesInTemplates04_ES6.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates04_ES6.js |  7 +++
 ...xtendedEscapesInTemplates05_ES5.errors.txt | 39 +++++++++++++++
 ...unicodeExtendedEscapesInTemplates05_ES5.js |  7 +++
 ...xtendedEscapesInTemplates05_ES6.errors.txt | 39 +++++++++++++++
 ...unicodeExtendedEscapesInTemplates05_ES6.js |  7 +++
 ...xtendedEscapesInTemplates06_ES5.errors.txt | 11 +++++
 ...unicodeExtendedEscapesInTemplates06_ES5.js | 11 +++++
 ...xtendedEscapesInTemplates06_ES6.errors.txt | 11 +++++
 ...unicodeExtendedEscapesInTemplates06_ES6.js | 11 +++++
 ...xtendedEscapesInTemplates07_ES5.errors.txt | 11 +++++
 ...unicodeExtendedEscapesInTemplates07_ES5.js | 11 +++++
 ...xtendedEscapesInTemplates07_ES6.errors.txt | 11 +++++
 ...unicodeExtendedEscapesInTemplates07_ES6.js | 11 +++++
 ...xtendedEscapesInTemplates08_ES5.errors.txt | 12 +++++
 ...unicodeExtendedEscapesInTemplates08_ES5.js | 13 +++++
 ...xtendedEscapesInTemplates08_ES6.errors.txt | 12 +++++
 ...unicodeExtendedEscapesInTemplates08_ES6.js | 13 +++++
 ...xtendedEscapesInTemplates09_ES5.errors.txt | 12 +++++
 ...unicodeExtendedEscapesInTemplates09_ES5.js | 13 +++++
 ...xtendedEscapesInTemplates09_ES6.errors.txt | 12 +++++
 ...unicodeExtendedEscapesInTemplates09_ES6.js | 13 +++++
 ...xtendedEscapesInTemplates10_ES5.errors.txt | 13 +++++
 ...unicodeExtendedEscapesInTemplates10_ES5.js | 15 ++++++
 ...xtendedEscapesInTemplates10_ES6.errors.txt | 13 +++++
 ...unicodeExtendedEscapesInTemplates10_ES6.js | 15 ++++++
 ...xtendedEscapesInTemplates11_ES5.errors.txt | 13 +++++
 ...unicodeExtendedEscapesInTemplates11_ES5.js | 15 ++++++
 ...xtendedEscapesInTemplates11_ES6.errors.txt | 13 +++++
 ...unicodeExtendedEscapesInTemplates11_ES6.js | 15 ++++++
 ...xtendedEscapesInTemplates12_ES5.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates12_ES5.js |  7 +++
 ...xtendedEscapesInTemplates12_ES6.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates12_ES6.js |  7 +++
 ...xtendedEscapesInTemplates13_ES5.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates13_ES5.js |  7 +++
 ...xtendedEscapesInTemplates13_ES6.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates13_ES6.js |  7 +++
 ...xtendedEscapesInTemplates14_ES5.errors.txt | 10 ++++
 ...unicodeExtendedEscapesInTemplates14_ES5.js |  9 ++++
 ...xtendedEscapesInTemplates14_ES6.errors.txt | 10 ++++
 ...unicodeExtendedEscapesInTemplates14_ES6.js |  9 ++++
 ...xtendedEscapesInTemplates15_ES5.errors.txt | 18 +++++++
 ...unicodeExtendedEscapesInTemplates15_ES5.js |  7 +++
 ...xtendedEscapesInTemplates15_ES6.errors.txt | 18 +++++++
 ...unicodeExtendedEscapesInTemplates15_ES6.js |  7 +++
 ...xtendedEscapesInTemplates16_ES5.errors.txt | 18 +++++++
 ...unicodeExtendedEscapesInTemplates16_ES5.js |  7 +++
 ...xtendedEscapesInTemplates16_ES6.errors.txt | 18 +++++++
 ...unicodeExtendedEscapesInTemplates16_ES6.js |  7 +++
 ...xtendedEscapesInTemplates17_ES5.errors.txt | 15 ++++++
 ...unicodeExtendedEscapesInTemplates17_ES5.js |  7 +++
 ...xtendedEscapesInTemplates17_ES6.errors.txt | 15 ++++++
 ...unicodeExtendedEscapesInTemplates17_ES6.js |  7 +++
 ...xtendedEscapesInTemplates18_ES5.errors.txt | 12 +++++
 ...unicodeExtendedEscapesInTemplates18_ES5.js |  7 +++
 ...xtendedEscapesInTemplates18_ES6.errors.txt | 12 +++++
 ...unicodeExtendedEscapesInTemplates18_ES6.js |  7 +++
 ...xtendedEscapesInTemplates19_ES5.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates19_ES5.js |  7 +++
 ...xtendedEscapesInTemplates19_ES6.errors.txt |  9 ++++
 ...unicodeExtendedEscapesInTemplates19_ES6.js |  7 +++
 ...xtendedEscapesInTemplates20_ES5.errors.txt | 48 +++++++++++++++++++
 ...unicodeExtendedEscapesInTemplates20_ES5.js |  7 +++
 ...xtendedEscapesInTemplates20_ES6.errors.txt | 48 +++++++++++++++++++
 ...unicodeExtendedEscapesInTemplates20_ES6.js |  7 +++
 ...tendedEscapesInRegularExpressions01_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions01_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions02_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions02_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions03_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions03_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions04_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions04_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions05_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions05_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions06_ES5.ts |  5 ++
 ...tendedEscapesInRegularExpressions06_ES6.ts |  5 ++
 ...tendedEscapesInRegularExpressions07_ES5.ts |  5 ++
 ...tendedEscapesInRegularExpressions07_ES6.ts |  5 ++
 ...tendedEscapesInRegularExpressions08_ES5.ts |  6 +++
 ...tendedEscapesInRegularExpressions08_ES6.ts |  6 +++
 ...tendedEscapesInRegularExpressions09_ES5.ts |  6 +++
 ...tendedEscapesInRegularExpressions09_ES6.ts |  6 +++
 ...tendedEscapesInRegularExpressions10_ES5.ts |  7 +++
 ...tendedEscapesInRegularExpressions10_ES6.ts |  7 +++
 ...tendedEscapesInRegularExpressions11_ES5.ts |  7 +++
 ...tendedEscapesInRegularExpressions11_ES6.ts |  7 +++
 ...tendedEscapesInRegularExpressions12_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions12_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions13_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions13_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions14_ES5.ts |  4 ++
 ...tendedEscapesInRegularExpressions14_ES6.ts |  4 ++
 ...tendedEscapesInRegularExpressions15_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions15_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions16_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions16_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions17_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions17_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions18_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions18_ES6.ts |  3 ++
 ...tendedEscapesInRegularExpressions19_ES5.ts |  3 ++
 ...tendedEscapesInRegularExpressions19_ES6.ts |  3 ++
 .../unicodeExtendedEscapesInStrings01_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings01_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings02_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings02_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings03_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings03_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings04_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings04_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings05_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings05_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings06_ES5.ts  |  5 ++
 .../unicodeExtendedEscapesInStrings06_ES6.ts  |  5 ++
 .../unicodeExtendedEscapesInStrings07_ES5.ts  |  5 ++
 .../unicodeExtendedEscapesInStrings07_ES6.ts  |  5 ++
 .../unicodeExtendedEscapesInStrings08_ES5.ts  |  6 +++
 .../unicodeExtendedEscapesInStrings08_ES6.ts  |  6 +++
 .../unicodeExtendedEscapesInStrings09_ES5.ts  |  6 +++
 .../unicodeExtendedEscapesInStrings09_ES6.ts  |  6 +++
 .../unicodeExtendedEscapesInStrings10_ES5.ts  |  7 +++
 .../unicodeExtendedEscapesInStrings10_ES6.ts  |  7 +++
 .../unicodeExtendedEscapesInStrings11_ES5.ts  |  7 +++
 .../unicodeExtendedEscapesInStrings11_ES6.ts  |  7 +++
 .../unicodeExtendedEscapesInStrings12_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings12_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings13_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings13_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings14_ES5.ts  |  4 ++
 .../unicodeExtendedEscapesInStrings14_ES6.ts  |  4 ++
 .../unicodeExtendedEscapesInStrings15_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings15_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings16_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings16_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings17_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings17_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings18_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings18_ES6.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings19_ES5.ts  |  3 ++
 .../unicodeExtendedEscapesInStrings19_ES6.ts  |  3 ++
 ...unicodeExtendedEscapesInTemplates01_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates01_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates02_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates02_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates03_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates03_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates04_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates04_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates05_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates05_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates06_ES5.ts |  5 ++
 ...unicodeExtendedEscapesInTemplates06_ES6.ts |  5 ++
 ...unicodeExtendedEscapesInTemplates07_ES5.ts |  5 ++
 ...unicodeExtendedEscapesInTemplates07_ES6.ts |  5 ++
 ...unicodeExtendedEscapesInTemplates08_ES5.ts |  6 +++
 ...unicodeExtendedEscapesInTemplates08_ES6.ts |  6 +++
 ...unicodeExtendedEscapesInTemplates09_ES5.ts |  6 +++
 ...unicodeExtendedEscapesInTemplates09_ES6.ts |  6 +++
 ...unicodeExtendedEscapesInTemplates10_ES5.ts |  7 +++
 ...unicodeExtendedEscapesInTemplates10_ES6.ts |  7 +++
 ...unicodeExtendedEscapesInTemplates11_ES5.ts |  7 +++
 ...unicodeExtendedEscapesInTemplates11_ES6.ts |  7 +++
 ...unicodeExtendedEscapesInTemplates12_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates12_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates13_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates13_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates14_ES5.ts |  4 ++
 ...unicodeExtendedEscapesInTemplates14_ES6.ts |  4 ++
 ...unicodeExtendedEscapesInTemplates15_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates15_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates16_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates16_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates17_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates17_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates18_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates18_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates19_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates19_ES6.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates20_ES5.ts |  3 ++
 ...unicodeExtendedEscapesInTemplates20_ES6.ts |  3 ++
 348 files changed, 2814 insertions(+)
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES5.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES6.types
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.js
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts

diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES5.js
new file mode 100644
index 0000000000000..49f4de1c5914e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions01_ES5.ts]
+
+var x = /\u{0}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions01_ES5.js]
+var x = /\u{0}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES5.types
new file mode 100644
index 0000000000000..fa577bcfc1633
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES5.ts ===
+
+var x = /\u{0}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES6.js
new file mode 100644
index 0000000000000..b31baaa63f25b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions01_ES6.ts]
+
+var x = /\u{0}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions01_ES6.js]
+var x = /\u{0}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES6.types
new file mode 100644
index 0000000000000..81494521810d0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES6.ts ===
+
+var x = /\u{0}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES5.js
new file mode 100644
index 0000000000000..27b81ecf8d809
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions02_ES5.ts]
+
+var x = /\u{00}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions02_ES5.js]
+var x = /\u{00}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES5.types
new file mode 100644
index 0000000000000..f1d17df285096
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES5.ts ===
+
+var x = /\u{00}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES6.js
new file mode 100644
index 0000000000000..af619137b6102
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions02_ES6.ts]
+
+var x = /\u{00}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions02_ES6.js]
+var x = /\u{00}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES6.types
new file mode 100644
index 0000000000000..18e2f69f906f8
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES6.ts ===
+
+var x = /\u{00}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES5.js
new file mode 100644
index 0000000000000..02cb13ac329c6
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions03_ES5.ts]
+
+var x = /\u{0000}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions03_ES5.js]
+var x = /\u{0000}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES5.types
new file mode 100644
index 0000000000000..1b83317b11f1f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES5.ts ===
+
+var x = /\u{0000}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES6.js
new file mode 100644
index 0000000000000..b084737d9ccb3
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions03_ES6.ts]
+
+var x = /\u{0000}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions03_ES6.js]
+var x = /\u{0000}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES6.types
new file mode 100644
index 0000000000000..a3fba6321cb36
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES6.ts ===
+
+var x = /\u{0000}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES5.js
new file mode 100644
index 0000000000000..d42f08ff10bc2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions04_ES5.ts]
+
+var x = /\u{00000000}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions04_ES5.js]
+var x = /\u{00000000}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES5.types
new file mode 100644
index 0000000000000..bd9473c5f7fd9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES5.ts ===
+
+var x = /\u{00000000}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES6.js
new file mode 100644
index 0000000000000..1226b4ca6c901
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions04_ES6.ts]
+
+var x = /\u{00000000}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions04_ES6.js]
+var x = /\u{00000000}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES6.types
new file mode 100644
index 0000000000000..b7d166722b662
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES6.ts ===
+
+var x = /\u{00000000}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES5.js
new file mode 100644
index 0000000000000..35ff99573766b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions05_ES5.ts]
+
+var x = /\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions05_ES5.js]
+var x = /\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES5.types
new file mode 100644
index 0000000000000..5b9630740c39c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES5.ts ===
+
+var x = /\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES6.js
new file mode 100644
index 0000000000000..21dd287a74568
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions05_ES6.ts]
+
+var x = /\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions05_ES6.js]
+var x = /\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES6.types
new file mode 100644
index 0000000000000..5f9eff8356173
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES6.ts ===
+
+var x = /\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES5.js
new file mode 100644
index 0000000000000..4587d78452f35
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES5.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInRegularExpressions06_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{10FFFF}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions06_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{10FFFF}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES5.types
new file mode 100644
index 0000000000000..84a5459d0ac3e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES5.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{10FFFF}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES6.js
new file mode 100644
index 0000000000000..9460a59016018
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES6.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInRegularExpressions06_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{10FFFF}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions06_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{10FFFF}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES6.types
new file mode 100644
index 0000000000000..ec0af85e104e1
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06_ES6.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{10FFFF}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES5.js
new file mode 100644
index 0000000000000..b68eb48649427
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES5.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInRegularExpressions07_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{110000}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions07_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{110000}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES5.types
new file mode 100644
index 0000000000000..dc7e3ac471523
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES5.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{110000}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES6.js
new file mode 100644
index 0000000000000..a1f3c6e3c0ebb
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES6.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInRegularExpressions07_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{110000}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions07_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{110000}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES6.types
new file mode 100644
index 0000000000000..c21e0be727370
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07_ES6.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{110000}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES5.js
new file mode 100644
index 0000000000000..f0e3778d152a0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES5.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInRegularExpressions08_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = /\u{FFFF}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions08_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = /\u{FFFF}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES5.types
new file mode 100644
index 0000000000000..de3dda5fb60f8
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = /\u{FFFF}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES6.js
new file mode 100644
index 0000000000000..04fb9c5427be8
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES6.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInRegularExpressions08_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = /\u{FFFF}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions08_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = /\u{FFFF}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES6.types
new file mode 100644
index 0000000000000..680433c431393
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08_ES6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = /\u{FFFF}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES5.js
new file mode 100644
index 0000000000000..002e26ab49a24
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES5.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInRegularExpressions09_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = /\u{10000}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions09_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = /\u{10000}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES5.types
new file mode 100644
index 0000000000000..6041cde94198a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = /\u{10000}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES6.js
new file mode 100644
index 0000000000000..0c44e6fc6bc12
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES6.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInRegularExpressions09_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = /\u{10000}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions09_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = /\u{10000}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES6.types
new file mode 100644
index 0000000000000..bb4286dd3a81d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09_ES6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = /\u{10000}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES5.js
new file mode 100644
index 0000000000000..166c856cab1b4
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES5.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInRegularExpressions10_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = /\u{D800}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions10_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = /\u{D800}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES5.types
new file mode 100644
index 0000000000000..151805012161f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = /\u{D800}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES6.js
new file mode 100644
index 0000000000000..f15a4a92c964b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES6.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInRegularExpressions10_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = /\u{D800}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions10_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = /\u{D800}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES6.types
new file mode 100644
index 0000000000000..d7ebea7cd2975
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10_ES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = /\u{D800}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES5.js
new file mode 100644
index 0000000000000..39557fa969f5d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES5.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInRegularExpressions11_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = /\u{DC00}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions11_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = /\u{DC00}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES5.types
new file mode 100644
index 0000000000000..caacb94c1c3c4
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = /\u{DC00}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES6.js
new file mode 100644
index 0000000000000..b4ac426e201c0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES6.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInRegularExpressions11_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = /\u{DC00}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions11_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = /\u{DC00}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES6.types
new file mode 100644
index 0000000000000..b690bd600df0d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11_ES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = /\u{DC00}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES5.js
new file mode 100644
index 0000000000000..eeb36274721b3
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions12_ES5.ts]
+
+var x = /\u{FFFFFFFF}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions12_ES5.js]
+var x = /\u{FFFFFFFF}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES5.types
new file mode 100644
index 0000000000000..e674a8f2e6540
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES5.ts ===
+
+var x = /\u{FFFFFFFF}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES6.js
new file mode 100644
index 0000000000000..26b18dc4e825c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions12_ES6.ts]
+
+var x = /\u{FFFFFFFF}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions12_ES6.js]
+var x = /\u{FFFFFFFF}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES6.types
new file mode 100644
index 0000000000000..e68c99a8170f0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES6.ts ===
+
+var x = /\u{FFFFFFFF}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES5.js
new file mode 100644
index 0000000000000..a67accc9698ab
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions13_ES5.ts]
+
+var x = /\u{DDDDD}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions13_ES5.js]
+var x = /\u{DDDDD}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES5.types
new file mode 100644
index 0000000000000..fa4bb204a3982
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES5.ts ===
+
+var x = /\u{DDDDD}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES6.js
new file mode 100644
index 0000000000000..5b15e6e967a96
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions13_ES6.ts]
+
+var x = /\u{DDDDD}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions13_ES6.js]
+var x = /\u{DDDDD}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES6.types
new file mode 100644
index 0000000000000..6959dbc15d3f2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES6.ts ===
+
+var x = /\u{DDDDD}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES5.js
new file mode 100644
index 0000000000000..71f00a1ecbaa0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES5.js
@@ -0,0 +1,9 @@
+//// [unicodeExtendedEscapesInRegularExpressions14_ES5.ts]
+
+// Shouldn't work, negatives are not allowed.
+var x = /\u{-DDDD}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions14_ES5.js]
+// Shouldn't work, negatives are not allowed.
+var x = /\u{-DDDD}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES5.types
new file mode 100644
index 0000000000000..a0b789ac51beb
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES5.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES5.ts ===
+
+// Shouldn't work, negatives are not allowed.
+var x = /\u{-DDDD}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES6.js
new file mode 100644
index 0000000000000..997f1c32158ea
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES6.js
@@ -0,0 +1,9 @@
+//// [unicodeExtendedEscapesInRegularExpressions14_ES6.ts]
+
+// Shouldn't work, negatives are not allowed.
+var x = /\u{-DDDD}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions14_ES6.js]
+// Shouldn't work, negatives are not allowed.
+var x = /\u{-DDDD}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES6.types
new file mode 100644
index 0000000000000..e727ad14f7027
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14_ES6.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES6.ts ===
+
+// Shouldn't work, negatives are not allowed.
+var x = /\u{-DDDD}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES5.js
new file mode 100644
index 0000000000000..cc30faab96244
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions15_ES5.ts]
+
+var x = /\u{abcd}\u{ef12}\u{3456}\u{7890}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions15_ES5.js]
+var x = /\u{abcd}\u{ef12}\u{3456}\u{7890}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES5.types
new file mode 100644
index 0000000000000..bb4abfc408cc3
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES5.ts ===
+
+var x = /\u{abcd}\u{ef12}\u{3456}\u{7890}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES6.js
new file mode 100644
index 0000000000000..d0b8b824729d7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions15_ES6.ts]
+
+var x = /\u{abcd}\u{ef12}\u{3456}\u{7890}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions15_ES6.js]
+var x = /\u{abcd}\u{ef12}\u{3456}\u{7890}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES6.types
new file mode 100644
index 0000000000000..770e0bd129449
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES6.ts ===
+
+var x = /\u{abcd}\u{ef12}\u{3456}\u{7890}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES5.js
new file mode 100644
index 0000000000000..989925f6c4bf0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions16_ES5.ts]
+
+var x = /\u{ABCD}\u{EF12}\u{3456}\u{7890}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions16_ES5.js]
+var x = /\u{ABCD}\u{EF12}\u{3456}\u{7890}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES5.types
new file mode 100644
index 0000000000000..90e1b468f3345
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES5.ts ===
+
+var x = /\u{ABCD}\u{EF12}\u{3456}\u{7890}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES6.js
new file mode 100644
index 0000000000000..5b1d1afb52dfb
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions16_ES6.ts]
+
+var x = /\u{ABCD}\u{EF12}\u{3456}\u{7890}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions16_ES6.js]
+var x = /\u{ABCD}\u{EF12}\u{3456}\u{7890}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES6.types
new file mode 100644
index 0000000000000..4b04fc6b8fc59
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES6.ts ===
+
+var x = /\u{ABCD}\u{EF12}\u{3456}\u{7890}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES5.js
new file mode 100644
index 0000000000000..4492af405d82d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions17_ES5.ts]
+
+var x = /\u{r}\u{n}\u{t}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions17_ES5.js]
+var x = /\u{r}\u{n}\u{t}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES5.types
new file mode 100644
index 0000000000000..00cccc3ad5fa5
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES5.ts ===
+
+var x = /\u{r}\u{n}\u{t}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES6.js
new file mode 100644
index 0000000000000..2cd10594be29f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions17_ES6.ts]
+
+var x = /\u{r}\u{n}\u{t}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions17_ES6.js]
+var x = /\u{r}\u{n}\u{t}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES6.types
new file mode 100644
index 0000000000000..c735927c8e009
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES6.ts ===
+
+var x = /\u{r}\u{n}\u{t}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES5.js
new file mode 100644
index 0000000000000..0d1365fee69b7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions18_ES5.ts]
+
+var x = /\u{65}\u{65}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions18_ES5.js]
+var x = /\u{65}\u{65}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES5.types
new file mode 100644
index 0000000000000..f8a2bf7b6e40b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES5.ts ===
+
+var x = /\u{65}\u{65}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES6.js
new file mode 100644
index 0000000000000..f378f3be93a07
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions18_ES6.ts]
+
+var x = /\u{65}\u{65}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions18_ES6.js]
+var x = /\u{65}\u{65}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES6.types
new file mode 100644
index 0000000000000..6cb0f54338c7b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES6.ts ===
+
+var x = /\u{65}\u{65}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES5.js
new file mode 100644
index 0000000000000..2d52ad3568a31
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions19_ES5.ts]
+
+var x = /\u{}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions19_ES5.js]
+var x = /\u{}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES5.types
new file mode 100644
index 0000000000000..78a855710fcb9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES5.ts ===
+
+var x = /\u{}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES6.js
new file mode 100644
index 0000000000000..3414a314aba93
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInRegularExpressions19_ES6.ts]
+
+var x = /\u{}/g;
+
+
+//// [unicodeExtendedEscapesInRegularExpressions19_ES6.js]
+var x = /\u{}/g;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES6.types
new file mode 100644
index 0000000000000..d5b59120147cd
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES6.ts ===
+
+var x = /\u{}/g;
+>x : RegExp
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt
new file mode 100644
index 0000000000000..f6e522c7462ac
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts (1 errors) ====
+    
+    var x = "\u{0}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.js
new file mode 100644
index 0000000000000..889695a771608
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings01_ES5.ts]
+
+var x = "\u{0}";
+
+
+//// [unicodeExtendedEscapesInStrings01_ES5.js]
+var x = "\u{0}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt
new file mode 100644
index 0000000000000..6e807fdae9dc0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts (1 errors) ====
+    
+    var x = "\u{0}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.js
new file mode 100644
index 0000000000000..1135d950dcbd7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings01_ES6.ts]
+
+var x = "\u{0}";
+
+
+//// [unicodeExtendedEscapesInStrings01_ES6.js]
+var x = "\u{0}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt
new file mode 100644
index 0000000000000..b5b874edfb34a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts (1 errors) ====
+    
+    var x = "\u{00}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.js
new file mode 100644
index 0000000000000..5e9df9895f63e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings02_ES5.ts]
+
+var x = "\u{00}";
+
+
+//// [unicodeExtendedEscapesInStrings02_ES5.js]
+var x = "\u{00}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt
new file mode 100644
index 0000000000000..c779458cfb3e8
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts (1 errors) ====
+    
+    var x = "\u{00}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.js
new file mode 100644
index 0000000000000..f8858a24b8e56
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings02_ES6.ts]
+
+var x = "\u{00}";
+
+
+//// [unicodeExtendedEscapesInStrings02_ES6.js]
+var x = "\u{00}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt
new file mode 100644
index 0000000000000..68620245fb3dc
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts (1 errors) ====
+    
+    var x = "\u{0000}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.js
new file mode 100644
index 0000000000000..38445f149a74f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings03_ES5.ts]
+
+var x = "\u{0000}";
+
+
+//// [unicodeExtendedEscapesInStrings03_ES5.js]
+var x = "\u{0000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt
new file mode 100644
index 0000000000000..b2cc2e1abb145
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts (1 errors) ====
+    
+    var x = "\u{0000}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.js
new file mode 100644
index 0000000000000..b9c7c0ea8d0a0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings03_ES6.ts]
+
+var x = "\u{0000}";
+
+
+//// [unicodeExtendedEscapesInStrings03_ES6.js]
+var x = "\u{0000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt
new file mode 100644
index 0000000000000..f0a76a1b1f93b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts (1 errors) ====
+    
+    var x = "\u{00000000}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.js
new file mode 100644
index 0000000000000..16bd4a7098144
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings04_ES5.ts]
+
+var x = "\u{00000000}";
+
+
+//// [unicodeExtendedEscapesInStrings04_ES5.js]
+var x = "\u{00000000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt
new file mode 100644
index 0000000000000..ad73340bbf690
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts (1 errors) ====
+    
+    var x = "\u{00000000}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.js
new file mode 100644
index 0000000000000..4e9e05ae1a22e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings04_ES6.ts]
+
+var x = "\u{00000000}";
+
+
+//// [unicodeExtendedEscapesInStrings04_ES6.js]
+var x = "\u{00000000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt
new file mode 100644
index 0000000000000..66de2730a0f72
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt
@@ -0,0 +1,39 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,24): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,30): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,42): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,48): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,54): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,60): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,66): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,72): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts (11 errors) ====
+    
+    var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+                     
+!!! error TS1125: Hexadecimal digit expected.
+                           
+!!! error TS1125: Hexadecimal digit expected.
+                                 
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+                                             
+!!! error TS1125: Hexadecimal digit expected.
+                                                   
+!!! error TS1125: Hexadecimal digit expected.
+                                                         
+!!! error TS1125: Hexadecimal digit expected.
+                                                               
+!!! error TS1125: Hexadecimal digit expected.
+                                                                     
+!!! error TS1125: Hexadecimal digit expected.
+                                                                           
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.js
new file mode 100644
index 0000000000000..6988fbb68a62a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings05_ES5.ts]
+
+var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
+
+
+//// [unicodeExtendedEscapesInStrings05_ES5.js]
+var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt
new file mode 100644
index 0000000000000..10ea76fcd979a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt
@@ -0,0 +1,39 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,24): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,30): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,42): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,48): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,54): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,60): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,66): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,72): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts (11 errors) ====
+    
+    var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+                     
+!!! error TS1125: Hexadecimal digit expected.
+                           
+!!! error TS1125: Hexadecimal digit expected.
+                                 
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+                                             
+!!! error TS1125: Hexadecimal digit expected.
+                                                   
+!!! error TS1125: Hexadecimal digit expected.
+                                                         
+!!! error TS1125: Hexadecimal digit expected.
+                                                               
+!!! error TS1125: Hexadecimal digit expected.
+                                                                     
+!!! error TS1125: Hexadecimal digit expected.
+                                                                           
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.js
new file mode 100644
index 0000000000000..1d958566f725a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings05_ES6.ts]
+
+var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
+
+
+//// [unicodeExtendedEscapesInStrings05_ES6.js]
+var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt
new file mode 100644
index 0000000000000..78b8ebf73db88
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+    var x = "\u{10FFFF}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.js
new file mode 100644
index 0000000000000..f41ff81625ac0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInStrings06_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{10FFFF}";
+
+
+//// [unicodeExtendedEscapesInStrings06_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{10FFFF}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt
new file mode 100644
index 0000000000000..07bfa2803bf52
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+    var x = "\u{10FFFF}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.js
new file mode 100644
index 0000000000000..ee7e4e1657d21
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInStrings06_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{10FFFF}";
+
+
+//// [unicodeExtendedEscapesInStrings06_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{10FFFF}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt
new file mode 100644
index 0000000000000..e2e5a27826941
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+    var x = "\u{110000}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js
new file mode 100644
index 0000000000000..48c3bd78bbedd
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInStrings07_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{110000}";
+
+
+//// [unicodeExtendedEscapesInStrings07_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{110000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt
new file mode 100644
index 0000000000000..9ce28a3692268
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+    var x = "\u{110000}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.js
new file mode 100644
index 0000000000000..4a93647f384f9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInStrings07_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{110000}";
+
+
+//// [unicodeExtendedEscapesInStrings07_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{110000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt
new file mode 100644
index 0000000000000..2082a82583d82
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. If cp ≤ 65535, return cp.
+    // (FFFF == 65535)
+    var x = "\u{FFFF}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.js
new file mode 100644
index 0000000000000..aea5dec2e7dec
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInStrings08_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "\u{FFFF}";
+
+
+//// [unicodeExtendedEscapesInStrings08_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "\u{FFFF}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt
new file mode 100644
index 0000000000000..7e91f7ce8919a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. If cp ≤ 65535, return cp.
+    // (FFFF == 65535)
+    var x = "\u{FFFF}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.js
new file mode 100644
index 0000000000000..76d16b18495d0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInStrings08_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "\u{FFFF}";
+
+
+//// [unicodeExtendedEscapesInStrings08_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "\u{FFFF}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt
new file mode 100644
index 0000000000000..1df05a3d27001
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. If cp ≤ 65535, return cp.
+    // (10000 == 65536)
+    var x = "\u{10000}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.js
new file mode 100644
index 0000000000000..21d143d9a7995
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInStrings09_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "\u{10000}";
+
+
+//// [unicodeExtendedEscapesInStrings09_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "\u{10000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt
new file mode 100644
index 0000000000000..eda5060456d28
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. If cp ≤ 65535, return cp.
+    // (10000 == 65536)
+    var x = "\u{10000}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.js
new file mode 100644
index 0000000000000..32d8dfdb13d0d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInStrings09_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "\u{10000}";
+
+
+//// [unicodeExtendedEscapesInStrings09_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "\u{10000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt
new file mode 100644
index 0000000000000..a3c99aaf5ddfc
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+    // Although we should just get back a single code point value of 0xD800,
+    // this is a useful edge-case test.
+    var x = "\u{D800}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.js
new file mode 100644
index 0000000000000..f323802d07933
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInStrings10_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "\u{D800}";
+
+
+//// [unicodeExtendedEscapesInStrings10_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "\u{D800}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt
new file mode 100644
index 0000000000000..0a7876cfc710c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+    // Although we should just get back a single code point value of 0xD800,
+    // this is a useful edge-case test.
+    var x = "\u{D800}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.js
new file mode 100644
index 0000000000000..abd041c8a18f6
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInStrings10_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "\u{D800}";
+
+
+//// [unicodeExtendedEscapesInStrings10_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "\u{D800}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt
new file mode 100644
index 0000000000000..da8207b2e115f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+    // Although we should just get back a single code point value of 0xDC00,
+    // this is a useful edge-case test.
+    var x = "\u{DC00}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.js
new file mode 100644
index 0000000000000..d1140d966edf2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInStrings11_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "\u{DC00}";
+
+
+//// [unicodeExtendedEscapesInStrings11_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "\u{DC00}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt
new file mode 100644
index 0000000000000..51357e5b7a6bf
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+    // Although we should just get back a single code point value of 0xDC00,
+    // this is a useful edge-case test.
+    var x = "\u{DC00}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.js
new file mode 100644
index 0000000000000..7712a12e6f36e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInStrings11_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "\u{DC00}";
+
+
+//// [unicodeExtendedEscapesInStrings11_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "\u{DC00}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt
new file mode 100644
index 0000000000000..4a311e3460b48
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts (1 errors) ====
+    
+    var x = "\u{FFFFFFFF}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js
new file mode 100644
index 0000000000000..edd1eb875a213
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings12_ES5.ts]
+
+var x = "\u{FFFFFFFF}";
+
+
+//// [unicodeExtendedEscapesInStrings12_ES5.js]
+var x = "\u{FFFFFFFF}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt
new file mode 100644
index 0000000000000..238cfb178133b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts (1 errors) ====
+    
+    var x = "\u{FFFFFFFF}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.js
new file mode 100644
index 0000000000000..7436bdcd326a5
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings12_ES6.ts]
+
+var x = "\u{FFFFFFFF}";
+
+
+//// [unicodeExtendedEscapesInStrings12_ES6.js]
+var x = "\u{FFFFFFFF}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt
new file mode 100644
index 0000000000000..581ab88da400e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts (1 errors) ====
+    
+    var x = "\u{DDDDD}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.js
new file mode 100644
index 0000000000000..1469aa4aaae0f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings13_ES5.ts]
+
+var x = "\u{DDDDD}";
+
+
+//// [unicodeExtendedEscapesInStrings13_ES5.js]
+var x = "\u{DDDDD}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt
new file mode 100644
index 0000000000000..9ffeb1ac4418b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts (1 errors) ====
+    
+    var x = "\u{DDDDD}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.js
new file mode 100644
index 0000000000000..d3cc7a9673a61
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings13_ES6.ts]
+
+var x = "\u{DDDDD}";
+
+
+//// [unicodeExtendedEscapesInStrings13_ES6.js]
+var x = "\u{DDDDD}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt
new file mode 100644
index 0000000000000..e886e90ff3a3c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts(3,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts (1 errors) ====
+    
+    // Shouldn't work, negatives are not allowed.
+    var x = "\u{-DDDD}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.js
new file mode 100644
index 0000000000000..037a176e7e7ff
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.js
@@ -0,0 +1,9 @@
+//// [unicodeExtendedEscapesInStrings14_ES5.ts]
+
+// Shouldn't work, negatives are not allowed.
+var x = "\u{-DDDD}";
+
+
+//// [unicodeExtendedEscapesInStrings14_ES5.js]
+// Shouldn't work, negatives are not allowed.
+var x = "\u{-DDDD}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt
new file mode 100644
index 0000000000000..5a253a2408ad5
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts(3,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts (1 errors) ====
+    
+    // Shouldn't work, negatives are not allowed.
+    var x = "\u{-DDDD}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.js
new file mode 100644
index 0000000000000..3c68fde98bffb
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.js
@@ -0,0 +1,9 @@
+//// [unicodeExtendedEscapesInStrings14_ES6.ts]
+
+// Shouldn't work, negatives are not allowed.
+var x = "\u{-DDDD}";
+
+
+//// [unicodeExtendedEscapesInStrings14_ES6.js]
+// Shouldn't work, negatives are not allowed.
+var x = "\u{-DDDD}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt
new file mode 100644
index 0000000000000..74035937ab6fc
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts (4 errors) ====
+    
+    var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+                       
+!!! error TS1125: Hexadecimal digit expected.
+                               
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.js
new file mode 100644
index 0000000000000..be647bc543b8f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings15_ES5.ts]
+
+var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
+
+
+//// [unicodeExtendedEscapesInStrings15_ES5.js]
+var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt
new file mode 100644
index 0000000000000..a265dd8ab9258
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts (4 errors) ====
+    
+    var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+                       
+!!! error TS1125: Hexadecimal digit expected.
+                               
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.js
new file mode 100644
index 0000000000000..7b9d78f4a7d21
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings15_ES6.ts]
+
+var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
+
+
+//// [unicodeExtendedEscapesInStrings15_ES6.js]
+var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt
new file mode 100644
index 0000000000000..8df651f156a91
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts (4 errors) ====
+    
+    var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+                       
+!!! error TS1125: Hexadecimal digit expected.
+                               
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.js
new file mode 100644
index 0000000000000..fb5c33d814efe
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings16_ES5.ts]
+
+var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
+
+
+//// [unicodeExtendedEscapesInStrings16_ES5.js]
+var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt
new file mode 100644
index 0000000000000..a4d23fd81df20
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts (4 errors) ====
+    
+    var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+                       
+!!! error TS1125: Hexadecimal digit expected.
+                               
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.js
new file mode 100644
index 0000000000000..7e97f6aa1cb55
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings16_ES6.ts]
+
+var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
+
+
+//// [unicodeExtendedEscapesInStrings16_ES6.js]
+var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt
new file mode 100644
index 0000000000000..f67b264b0a378
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,17): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,22): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts (3 errors) ====
+    
+    var x = "\u{r}\u{n}\u{t}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+                    
+!!! error TS1125: Hexadecimal digit expected.
+                         
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.js
new file mode 100644
index 0000000000000..3ed04f82268cb
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings17_ES5.ts]
+
+var x = "\u{r}\u{n}\u{t}";
+
+
+//// [unicodeExtendedEscapesInStrings17_ES5.js]
+var x = "\u{r}\u{n}\u{t}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt
new file mode 100644
index 0000000000000..1823486dc806c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,17): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,22): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts (3 errors) ====
+    
+    var x = "\u{r}\u{n}\u{t}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+                    
+!!! error TS1125: Hexadecimal digit expected.
+                         
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.js
new file mode 100644
index 0000000000000..cfc8592e998b2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings17_ES6.ts]
+
+var x = "\u{r}\u{n}\u{t}";
+
+
+//// [unicodeExtendedEscapesInStrings17_ES6.js]
+var x = "\u{r}\u{n}\u{t}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt
new file mode 100644
index 0000000000000..7c4aaa7d01feb
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts (2 errors) ====
+    
+    var x = "\u{65}\u{65}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+                     
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.js
new file mode 100644
index 0000000000000..8778b92afff08
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings18_ES5.ts]
+
+var x = "\u{65}\u{65}";
+
+
+//// [unicodeExtendedEscapesInStrings18_ES5.js]
+var x = "\u{65}\u{65}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt
new file mode 100644
index 0000000000000..cb680b2f826c1
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts (2 errors) ====
+    
+    var x = "\u{65}\u{65}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+                     
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.js
new file mode 100644
index 0000000000000..6e3508c13f986
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings18_ES6.ts]
+
+var x = "\u{65}\u{65}";
+
+
+//// [unicodeExtendedEscapesInStrings18_ES6.js]
+var x = "\u{65}\u{65}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt
new file mode 100644
index 0000000000000..961a83f50a95a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts (1 errors) ====
+    
+    var x = "\u{}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js
new file mode 100644
index 0000000000000..5ca68cd253385
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings19_ES5.ts]
+
+var x = "\u{}";
+
+
+//// [unicodeExtendedEscapesInStrings19_ES5.js]
+var x = "\u{}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt
new file mode 100644
index 0000000000000..cc780a79e8d6d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts (1 errors) ====
+    
+    var x = "\u{}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.js
new file mode 100644
index 0000000000000..17370710a9d3d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings19_ES6.ts]
+
+var x = "\u{}";
+
+
+//// [unicodeExtendedEscapesInStrings19_ES6.js]
+var x = "\u{}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt
new file mode 100644
index 0000000000000..493285c5ef2ee
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts (1 errors) ====
+    
+    var x = `\u{0}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js
new file mode 100644
index 0000000000000..2fdab7d7e055f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates01_ES5.ts]
+
+var x = `\u{0}`;
+
+
+//// [unicodeExtendedEscapesInTemplates01_ES5.js]
+var x = "{0}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt
new file mode 100644
index 0000000000000..1de4bf97d7623
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts (1 errors) ====
+    
+    var x = `\u{0}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.js
new file mode 100644
index 0000000000000..1311521fa54c6
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates01_ES6.ts]
+
+var x = `\u{0}`;
+
+
+//// [unicodeExtendedEscapesInTemplates01_ES6.js]
+var x = `\u{0}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt
new file mode 100644
index 0000000000000..d74b1ae969537
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts (1 errors) ====
+    
+    var x = `\u{00}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js
new file mode 100644
index 0000000000000..cfcd7fcd2ba5e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates02_ES5.ts]
+
+var x = `\u{00}`;
+
+
+//// [unicodeExtendedEscapesInTemplates02_ES5.js]
+var x = "{00}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt
new file mode 100644
index 0000000000000..84bbc74ab8bf6
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts (1 errors) ====
+    
+    var x = `\u{00}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.js
new file mode 100644
index 0000000000000..7b4483dfb4fcd
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates02_ES6.ts]
+
+var x = `\u{00}`;
+
+
+//// [unicodeExtendedEscapesInTemplates02_ES6.js]
+var x = `\u{00}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt
new file mode 100644
index 0000000000000..6de8745cf1dea
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts (1 errors) ====
+    
+    var x = `\u{0000}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js
new file mode 100644
index 0000000000000..99aba05ca1fc8
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates03_ES5.ts]
+
+var x = `\u{0000}`;
+
+
+//// [unicodeExtendedEscapesInTemplates03_ES5.js]
+var x = "{0000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt
new file mode 100644
index 0000000000000..9ee2d70fc699e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts (1 errors) ====
+    
+    var x = `\u{0000}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.js
new file mode 100644
index 0000000000000..25cd8e4b1229a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates03_ES6.ts]
+
+var x = `\u{0000}`;
+
+
+//// [unicodeExtendedEscapesInTemplates03_ES6.js]
+var x = `\u{0000}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt
new file mode 100644
index 0000000000000..e80bbd659bbee
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts (1 errors) ====
+    
+    var x = `\u{00000000}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js
new file mode 100644
index 0000000000000..372be222ada75
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates04_ES5.ts]
+
+var x = `\u{00000000}`;
+
+
+//// [unicodeExtendedEscapesInTemplates04_ES5.js]
+var x = "{00000000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt
new file mode 100644
index 0000000000000..68964b1d9431e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts (1 errors) ====
+    
+    var x = `\u{00000000}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.js
new file mode 100644
index 0000000000000..ef79d6750c731
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates04_ES6.ts]
+
+var x = `\u{00000000}`;
+
+
+//// [unicodeExtendedEscapesInTemplates04_ES6.js]
+var x = `\u{00000000}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt
new file mode 100644
index 0000000000000..e9b54c58b2cb9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt
@@ -0,0 +1,39 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,24): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,30): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,42): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,48): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,54): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,60): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,66): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,72): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts (11 errors) ====
+    
+    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                     
+!!! error TS1125: Hexadecimal digit expected.
+                           
+!!! error TS1125: Hexadecimal digit expected.
+                                 
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+                                             
+!!! error TS1125: Hexadecimal digit expected.
+                                                   
+!!! error TS1125: Hexadecimal digit expected.
+                                                         
+!!! error TS1125: Hexadecimal digit expected.
+                                                               
+!!! error TS1125: Hexadecimal digit expected.
+                                                                     
+!!! error TS1125: Hexadecimal digit expected.
+                                                                           
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js
new file mode 100644
index 0000000000000..766c61601fa2f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates05_ES5.ts]
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+
+
+//// [unicodeExtendedEscapesInTemplates05_ES5.js]
+var x = "{48}{65}{6c}{6c}{6f}{20}{77}{6f}{72}{6c}{64}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt
new file mode 100644
index 0000000000000..a00ecb7c2fe5f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt
@@ -0,0 +1,39 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,24): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,30): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,42): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,48): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,54): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,60): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,66): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,72): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts (11 errors) ====
+    
+    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                     
+!!! error TS1125: Hexadecimal digit expected.
+                           
+!!! error TS1125: Hexadecimal digit expected.
+                                 
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+                                             
+!!! error TS1125: Hexadecimal digit expected.
+                                                   
+!!! error TS1125: Hexadecimal digit expected.
+                                                         
+!!! error TS1125: Hexadecimal digit expected.
+                                                               
+!!! error TS1125: Hexadecimal digit expected.
+                                                                     
+!!! error TS1125: Hexadecimal digit expected.
+                                                                           
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.js
new file mode 100644
index 0000000000000..8befdcac07887
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates05_ES6.ts]
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+
+
+//// [unicodeExtendedEscapesInTemplates05_ES6.js]
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt
new file mode 100644
index 0000000000000..f803765e0a4d1
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+    var x = `\u{10FFFF}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
new file mode 100644
index 0000000000000..dd554fd3f3482
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInTemplates06_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{10FFFF}`;
+
+
+//// [unicodeExtendedEscapesInTemplates06_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "{10FFFF}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt
new file mode 100644
index 0000000000000..f31fcb0010665
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+    var x = `\u{10FFFF}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.js
new file mode 100644
index 0000000000000..a00c0c8759403
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInTemplates06_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{10FFFF}`;
+
+
+//// [unicodeExtendedEscapesInTemplates06_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{10FFFF}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt
new file mode 100644
index 0000000000000..9b291aae179b8
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+    var x = `\u{110000}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
new file mode 100644
index 0000000000000..f9a423a6bb023
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInTemplates07_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{110000}`;
+
+
+//// [unicodeExtendedEscapesInTemplates07_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "{110000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt
new file mode 100644
index 0000000000000..ac2d5f84d831b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+    var x = `\u{110000}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.js
new file mode 100644
index 0000000000000..95f6989adf4e9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.js
@@ -0,0 +1,11 @@
+//// [unicodeExtendedEscapesInTemplates07_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{110000}`;
+
+
+//// [unicodeExtendedEscapesInTemplates07_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{110000}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt
new file mode 100644
index 0000000000000..905f5e54549d7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. If cp ≤ 65535, return cp.
+    // (FFFF == 65535)
+    var x = `\u{FFFF}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
new file mode 100644
index 0000000000000..b7d70f1d78fd4
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInTemplates08_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = `\u{FFFF}`;
+
+
+//// [unicodeExtendedEscapesInTemplates08_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "{FFFF}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt
new file mode 100644
index 0000000000000..51c436e073675
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. If cp ≤ 65535, return cp.
+    // (FFFF == 65535)
+    var x = `\u{FFFF}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.js
new file mode 100644
index 0000000000000..e4611073f8f74
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInTemplates08_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = `\u{FFFF}`;
+
+
+//// [unicodeExtendedEscapesInTemplates08_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = `\u{FFFF}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt
new file mode 100644
index 0000000000000..b0e3d49d05feb
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. If cp ≤ 65535, return cp.
+    // (10000 == 65536)
+    var x = `\u{10000}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
new file mode 100644
index 0000000000000..9c3440a645e43
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInTemplates09_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = `\u{10000}`;
+
+
+//// [unicodeExtendedEscapesInTemplates09_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "{10000}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt
new file mode 100644
index 0000000000000..80b72e3d2ada3
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. If cp ≤ 65535, return cp.
+    // (10000 == 65536)
+    var x = `\u{10000}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.js
new file mode 100644
index 0000000000000..940cdccb24790
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.js
@@ -0,0 +1,13 @@
+//// [unicodeExtendedEscapesInTemplates09_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = `\u{10000}`;
+
+
+//// [unicodeExtendedEscapesInTemplates09_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = `\u{10000}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt
new file mode 100644
index 0000000000000..20a504a7c7297
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+    // Although we should just get back a single code point value of 0xD800,
+    // this is a useful edge-case test.
+    var x = `\u{D800}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
new file mode 100644
index 0000000000000..9c51b4aa5de67
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInTemplates10_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = `\u{D800}`;
+
+
+//// [unicodeExtendedEscapesInTemplates10_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "{D800}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt
new file mode 100644
index 0000000000000..baf6fee361127
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+    // Although we should just get back a single code point value of 0xD800,
+    // this is a useful edge-case test.
+    var x = `\u{D800}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.js
new file mode 100644
index 0000000000000..8e4458e620840
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInTemplates10_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = `\u{D800}`;
+
+
+//// [unicodeExtendedEscapesInTemplates10_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = `\u{D800}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt
new file mode 100644
index 0000000000000..5a319bc534ba0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+    // Although we should just get back a single code point value of 0xDC00,
+    // this is a useful edge-case test.
+    var x = `\u{DC00}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
new file mode 100644
index 0000000000000..f0abbf09b841b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInTemplates11_ES5.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = `\u{DC00}`;
+
+
+//// [unicodeExtendedEscapesInTemplates11_ES5.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "{DC00}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt
new file mode 100644
index 0000000000000..a651159fb3048
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts (1 errors) ====
+    
+    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+    // Although we should just get back a single code point value of 0xDC00,
+    // this is a useful edge-case test.
+    var x = `\u{DC00}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.js
new file mode 100644
index 0000000000000..cf4ee38d765d4
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.js
@@ -0,0 +1,15 @@
+//// [unicodeExtendedEscapesInTemplates11_ES6.ts]
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = `\u{DC00}`;
+
+
+//// [unicodeExtendedEscapesInTemplates11_ES6.js]
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = `\u{DC00}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt
new file mode 100644
index 0000000000000..2d2676c8dde54
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts (1 errors) ====
+    
+    var x = `\u{FFFFFFFF}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
new file mode 100644
index 0000000000000..04b2e8311d26b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates12_ES5.ts]
+
+var x = `\u{FFFFFFFF}`;
+
+
+//// [unicodeExtendedEscapesInTemplates12_ES5.js]
+var x = "{FFFFFFFF}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt
new file mode 100644
index 0000000000000..164ba5080baf4
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts (1 errors) ====
+    
+    var x = `\u{FFFFFFFF}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.js
new file mode 100644
index 0000000000000..5d3610d8714ee
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates12_ES6.ts]
+
+var x = `\u{FFFFFFFF}`;
+
+
+//// [unicodeExtendedEscapesInTemplates12_ES6.js]
+var x = `\u{FFFFFFFF}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt
new file mode 100644
index 0000000000000..f654afaeae9a7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts (1 errors) ====
+    
+    var x = `\u{DDDDD}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
new file mode 100644
index 0000000000000..a2ee97d9605ca
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates13_ES5.ts]
+
+var x = `\u{DDDDD}`;
+
+
+//// [unicodeExtendedEscapesInTemplates13_ES5.js]
+var x = "{DDDDD}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt
new file mode 100644
index 0000000000000..384678ddff788
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts (1 errors) ====
+    
+    var x = `\u{DDDDD}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.js
new file mode 100644
index 0000000000000..3ebe144e9e6d2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates13_ES6.ts]
+
+var x = `\u{DDDDD}`;
+
+
+//// [unicodeExtendedEscapesInTemplates13_ES6.js]
+var x = `\u{DDDDD}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt
new file mode 100644
index 0000000000000..08d816b17b48c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts(3,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts (1 errors) ====
+    
+    // Shouldn't work, negatives are not allowed.
+    var x = `\u{-DDDD}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js
new file mode 100644
index 0000000000000..2c190856f5772
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js
@@ -0,0 +1,9 @@
+//// [unicodeExtendedEscapesInTemplates14_ES5.ts]
+
+// Shouldn't work, negatives are not allowed.
+var x = `\u{-DDDD}`;
+
+
+//// [unicodeExtendedEscapesInTemplates14_ES5.js]
+// Shouldn't work, negatives are not allowed.
+var x = "{-DDDD}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt
new file mode 100644
index 0000000000000..23b82ede3e66d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts(3,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts (1 errors) ====
+    
+    // Shouldn't work, negatives are not allowed.
+    var x = `\u{-DDDD}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.js
new file mode 100644
index 0000000000000..d5bbd8dc66031
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.js
@@ -0,0 +1,9 @@
+//// [unicodeExtendedEscapesInTemplates14_ES6.ts]
+
+// Shouldn't work, negatives are not allowed.
+var x = `\u{-DDDD}`;
+
+
+//// [unicodeExtendedEscapesInTemplates14_ES6.js]
+// Shouldn't work, negatives are not allowed.
+var x = `\u{-DDDD}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt
new file mode 100644
index 0000000000000..6d5fad519d01c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts (4 errors) ====
+    
+    var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                       
+!!! error TS1125: Hexadecimal digit expected.
+                               
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
new file mode 100644
index 0000000000000..c3de6c153087b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates15_ES5.ts]
+
+var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
+
+
+//// [unicodeExtendedEscapesInTemplates15_ES5.js]
+var x = "{abcd}{ef12}{3456}{78\u00390}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt
new file mode 100644
index 0000000000000..a9a6c15a1f8a2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts (4 errors) ====
+    
+    var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                       
+!!! error TS1125: Hexadecimal digit expected.
+                               
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.js
new file mode 100644
index 0000000000000..52d016f826db5
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates15_ES6.ts]
+
+var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
+
+
+//// [unicodeExtendedEscapesInTemplates15_ES6.js]
+var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt
new file mode 100644
index 0000000000000..81c1046cb8aa9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts (4 errors) ====
+    
+    var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                       
+!!! error TS1125: Hexadecimal digit expected.
+                               
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
new file mode 100644
index 0000000000000..d9cc290370c22
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates16_ES5.ts]
+
+var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
+
+
+//// [unicodeExtendedEscapesInTemplates16_ES5.js]
+var x = "{ABCD}{EF12}{3456}{78\u00390}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt
new file mode 100644
index 0000000000000..cd010bd94019f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt
@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts (4 errors) ====
+    
+    var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                       
+!!! error TS1125: Hexadecimal digit expected.
+                               
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.js
new file mode 100644
index 0000000000000..cd1c62db2144e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates16_ES6.ts]
+
+var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
+
+
+//// [unicodeExtendedEscapesInTemplates16_ES6.js]
+var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt
new file mode 100644
index 0000000000000..91b53ec2f0acc
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,17): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,22): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts (3 errors) ====
+    
+    var x = `\u{r}\u{n}\u{t}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                    
+!!! error TS1125: Hexadecimal digit expected.
+                         
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js
new file mode 100644
index 0000000000000..cf8dbccc96a7d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates17_ES5.ts]
+
+var x = `\u{r}\u{n}\u{t}`;
+
+
+//// [unicodeExtendedEscapesInTemplates17_ES5.js]
+var x = "{r}{n}{t}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt
new file mode 100644
index 0000000000000..c24cceedc3b5a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,17): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,22): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts (3 errors) ====
+    
+    var x = `\u{r}\u{n}\u{t}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                    
+!!! error TS1125: Hexadecimal digit expected.
+                         
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.js
new file mode 100644
index 0000000000000..16bae560521a6
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates17_ES6.ts]
+
+var x = `\u{r}\u{n}\u{t}`;
+
+
+//// [unicodeExtendedEscapesInTemplates17_ES6.js]
+var x = `\u{r}\u{n}\u{t}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt
new file mode 100644
index 0000000000000..26fd16fe419ed
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts (2 errors) ====
+    
+    var x = `\u{65}\u{65}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                     
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js
new file mode 100644
index 0000000000000..5bf26237a1410
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates18_ES5.ts]
+
+var x = `\u{65}\u{65}`;
+
+
+//// [unicodeExtendedEscapesInTemplates18_ES5.js]
+var x = "{65}{65}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt
new file mode 100644
index 0000000000000..ed0260fbfa087
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts (2 errors) ====
+    
+    var x = `\u{65}\u{65}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                     
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.js
new file mode 100644
index 0000000000000..5f3da7837bd1b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates18_ES6.ts]
+
+var x = `\u{65}\u{65}`;
+
+
+//// [unicodeExtendedEscapesInTemplates18_ES6.js]
+var x = `\u{65}\u{65}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt
new file mode 100644
index 0000000000000..6165a3778799c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts (1 errors) ====
+    
+    var x = `\u{}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
new file mode 100644
index 0000000000000..4cee5a73d8cdd
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates19_ES5.ts]
+
+var x = `\u{}`;
+
+
+//// [unicodeExtendedEscapesInTemplates19_ES5.js]
+var x = "{}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt
new file mode 100644
index 0000000000000..c2ba97e704e7e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts (1 errors) ====
+    
+    var x = `\u{}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.js
new file mode 100644
index 0000000000000..9833fd84ba865
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates19_ES6.ts]
+
+var x = `\u{}`;
+
+
+//// [unicodeExtendedEscapesInTemplates19_ES6.js]
+var x = `\u{}`;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt
new file mode 100644
index 0000000000000..38f4cef43357b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt
@@ -0,0 +1,48 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,24): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,30): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,45): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,51): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,58): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,66): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,78): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,84): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,90): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,96): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,102): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts (14 errors) ====
+    
+    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                     
+!!! error TS1125: Hexadecimal digit expected.
+                           
+!!! error TS1125: Hexadecimal digit expected.
+                                 
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+                                                
+!!! error TS1125: Hexadecimal digit expected.
+                                                      
+!!! error TS1125: Hexadecimal digit expected.
+                                                             
+!!! error TS1125: Hexadecimal digit expected.
+                                                                     
+!!! error TS1125: Hexadecimal digit expected.
+                                                                                 
+!!! error TS1125: Hexadecimal digit expected.
+                                                                                       
+!!! error TS1125: Hexadecimal digit expected.
+                                                                                             
+!!! error TS1125: Hexadecimal digit expected.
+                                                                                                   
+!!! error TS1125: Hexadecimal digit expected.
+                                                                                                         
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js
new file mode 100644
index 0000000000000..8ddd2b7a084a8
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates20_ES5.ts]
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+
+
+//// [unicodeExtendedEscapesInTemplates20_ES5.js]
+var x = "{48}{65}{6c}{6c}{6f}" + "{20}{020}{0020}{000020}" + "{77}{6f}{72}{6c}{64}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt
new file mode 100644
index 0000000000000..fd77edb7b3cd1
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt
@@ -0,0 +1,48 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,24): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,30): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,45): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,51): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,58): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,66): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,78): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,84): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,90): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,96): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,102): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts (14 errors) ====
+    
+    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+               
+!!! error TS1125: Hexadecimal digit expected.
+                     
+!!! error TS1125: Hexadecimal digit expected.
+                           
+!!! error TS1125: Hexadecimal digit expected.
+                                 
+!!! error TS1125: Hexadecimal digit expected.
+                                       
+!!! error TS1125: Hexadecimal digit expected.
+                                                
+!!! error TS1125: Hexadecimal digit expected.
+                                                      
+!!! error TS1125: Hexadecimal digit expected.
+                                                             
+!!! error TS1125: Hexadecimal digit expected.
+                                                                     
+!!! error TS1125: Hexadecimal digit expected.
+                                                                                 
+!!! error TS1125: Hexadecimal digit expected.
+                                                                                       
+!!! error TS1125: Hexadecimal digit expected.
+                                                                                             
+!!! error TS1125: Hexadecimal digit expected.
+                                                                                                   
+!!! error TS1125: Hexadecimal digit expected.
+                                                                                                         
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.js
new file mode 100644
index 0000000000000..c2b98f755339c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInTemplates20_ES6.ts]
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+
+
+//// [unicodeExtendedEscapesInTemplates20_ES6.js]
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES5.ts
new file mode 100644
index 0000000000000..eb02cf47018db
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{0}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES6.ts
new file mode 100644
index 0000000000000..c287f529b0f0c
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions01_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{0}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES5.ts
new file mode 100644
index 0000000000000..7885e4449acfa
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{00}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES6.ts
new file mode 100644
index 0000000000000..45affc888b388
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions02_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{00}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES5.ts
new file mode 100644
index 0000000000000..22d2a1588c72d
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{0000}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES6.ts
new file mode 100644
index 0000000000000..a66cfd534c716
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions03_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{0000}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES5.ts
new file mode 100644
index 0000000000000..5359adbf8ccf8
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{00000000}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES6.ts
new file mode 100644
index 0000000000000..1b897565ef42e
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions04_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{00000000}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES5.ts
new file mode 100644
index 0000000000000..2bee2de87a0ba
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES6.ts
new file mode 100644
index 0000000000000..77c98f28853eb
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions05_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES5.ts
new file mode 100644
index 0000000000000..1af6018179845
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES5.ts
@@ -0,0 +1,5 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{10FFFF}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES6.ts
new file mode 100644
index 0000000000000..9f77ab0646d0c
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions06_ES6.ts
@@ -0,0 +1,5 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{10FFFF}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES5.ts
new file mode 100644
index 0000000000000..4a0b3d6bda61e
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES5.ts
@@ -0,0 +1,5 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{110000}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES6.ts
new file mode 100644
index 0000000000000..0d1a3b57dd285
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions07_ES6.ts
@@ -0,0 +1,5 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = /\u{110000}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES5.ts
new file mode 100644
index 0000000000000..b8c863126533d
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES5.ts
@@ -0,0 +1,6 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = /\u{FFFF}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES6.ts
new file mode 100644
index 0000000000000..94ad08e6edfff
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions08_ES6.ts
@@ -0,0 +1,6 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = /\u{FFFF}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES5.ts
new file mode 100644
index 0000000000000..cc92efd69161d
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES5.ts
@@ -0,0 +1,6 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = /\u{10000}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES6.ts
new file mode 100644
index 0000000000000..a1f2f2a74bbce
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions09_ES6.ts
@@ -0,0 +1,6 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = /\u{10000}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES5.ts
new file mode 100644
index 0000000000000..921f17b009cd5
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES5.ts
@@ -0,0 +1,7 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = /\u{D800}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES6.ts
new file mode 100644
index 0000000000000..ade4d57ae0954
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions10_ES6.ts
@@ -0,0 +1,7 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = /\u{D800}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES5.ts
new file mode 100644
index 0000000000000..136bb692826e9
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES5.ts
@@ -0,0 +1,7 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = /\u{DC00}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES6.ts
new file mode 100644
index 0000000000000..ecfd43a36b29e
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions11_ES6.ts
@@ -0,0 +1,7 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = /\u{DC00}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES5.ts
new file mode 100644
index 0000000000000..43b8ac377594e
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{FFFFFFFF}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES6.ts
new file mode 100644
index 0000000000000..c01c8f41d1e69
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions12_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{FFFFFFFF}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES5.ts
new file mode 100644
index 0000000000000..535ae033765e7
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{DDDDD}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES6.ts
new file mode 100644
index 0000000000000..812e90be12054
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions13_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{DDDDD}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES5.ts
new file mode 100644
index 0000000000000..0594590af5e9d
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES5.ts
@@ -0,0 +1,4 @@
+// @target: es5
+
+// Shouldn't work, negatives are not allowed.
+var x = /\u{-DDDD}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES6.ts
new file mode 100644
index 0000000000000..a48e688b2094f
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions14_ES6.ts
@@ -0,0 +1,4 @@
+// @target: es6
+
+// Shouldn't work, negatives are not allowed.
+var x = /\u{-DDDD}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES5.ts
new file mode 100644
index 0000000000000..b616bf1b24d99
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{abcd}\u{ef12}\u{3456}\u{7890}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES6.ts
new file mode 100644
index 0000000000000..b586d3098069a
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions15_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{abcd}\u{ef12}\u{3456}\u{7890}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES5.ts
new file mode 100644
index 0000000000000..cd246e7413713
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{ABCD}\u{EF12}\u{3456}\u{7890}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES6.ts
new file mode 100644
index 0000000000000..4a22da6847ea0
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions16_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{ABCD}\u{EF12}\u{3456}\u{7890}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES5.ts
new file mode 100644
index 0000000000000..14cb600474bff
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{r}\u{n}\u{t}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES6.ts
new file mode 100644
index 0000000000000..5231cf6be36be
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions17_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{r}\u{n}\u{t}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES5.ts
new file mode 100644
index 0000000000000..38fe89ac3b240
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{65}\u{65}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES6.ts
new file mode 100644
index 0000000000000..f3977bdd9c7f3
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions18_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{65}\u{65}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES5.ts
new file mode 100644
index 0000000000000..0bc5643a43c38
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = /\u{}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES6.ts
new file mode 100644
index 0000000000000..2a34f16ceefa6
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInRegularExpressions19_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = /\u{}/g;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts
new file mode 100644
index 0000000000000..45ee21b10995d
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{0}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts
new file mode 100644
index 0000000000000..e6406ac6a7280
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{0}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts
new file mode 100644
index 0000000000000..2e32741b6ee19
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{00}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts
new file mode 100644
index 0000000000000..c98efca58a3ff
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{00}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts
new file mode 100644
index 0000000000000..928ed3a665281
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{0000}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts
new file mode 100644
index 0000000000000..b67eedd889624
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{0000}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts
new file mode 100644
index 0000000000000..2bac49c8aeb43
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{00000000}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts
new file mode 100644
index 0000000000000..2d53d9883b42c
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{00000000}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts
new file mode 100644
index 0000000000000..f006c0bee8909
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts
new file mode 100644
index 0000000000000..890e60c770ec9
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts
new file mode 100644
index 0000000000000..b456e35a76bf6
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts
@@ -0,0 +1,5 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{10FFFF}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts
new file mode 100644
index 0000000000000..33a7e72ef5315
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts
@@ -0,0 +1,5 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{10FFFF}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts
new file mode 100644
index 0000000000000..717212da028f3
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts
@@ -0,0 +1,5 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{110000}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts
new file mode 100644
index 0000000000000..aa98d80a70543
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts
@@ -0,0 +1,5 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{110000}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts
new file mode 100644
index 0000000000000..eba3f3b085b22
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts
@@ -0,0 +1,6 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "\u{FFFF}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts
new file mode 100644
index 0000000000000..08e217bc8ad96
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts
@@ -0,0 +1,6 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "\u{FFFF}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts
new file mode 100644
index 0000000000000..5b3c175be0e0a
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts
@@ -0,0 +1,6 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "\u{10000}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts
new file mode 100644
index 0000000000000..2a756d9aaa2c3
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts
@@ -0,0 +1,6 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "\u{10000}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts
new file mode 100644
index 0000000000000..9f5bafe85f4f7
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts
@@ -0,0 +1,7 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "\u{D800}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts
new file mode 100644
index 0000000000000..f4198c989b5f4
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts
@@ -0,0 +1,7 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "\u{D800}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts
new file mode 100644
index 0000000000000..ff2af662767c2
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts
@@ -0,0 +1,7 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "\u{DC00}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts
new file mode 100644
index 0000000000000..4a99f8ab9ef6f
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts
@@ -0,0 +1,7 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "\u{DC00}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts
new file mode 100644
index 0000000000000..f8ec9e605f669
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{FFFFFFFF}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts
new file mode 100644
index 0000000000000..c1b4119fdf375
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{FFFFFFFF}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts
new file mode 100644
index 0000000000000..d1d8c6d3eee30
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{DDDDD}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts
new file mode 100644
index 0000000000000..9d359562d40bc
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{DDDDD}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts
new file mode 100644
index 0000000000000..b122578014c9d
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts
@@ -0,0 +1,4 @@
+// @target: es5
+
+// Shouldn't work, negatives are not allowed.
+var x = "\u{-DDDD}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts
new file mode 100644
index 0000000000000..9b8786417db17
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts
@@ -0,0 +1,4 @@
+// @target: es6
+
+// Shouldn't work, negatives are not allowed.
+var x = "\u{-DDDD}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts
new file mode 100644
index 0000000000000..4418e2d69e2cb
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts
new file mode 100644
index 0000000000000..eba0d1969cabd
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts
new file mode 100644
index 0000000000000..4f34e96a1a34f
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts
new file mode 100644
index 0000000000000..9cb17be1132a1
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts
new file mode 100644
index 0000000000000..047a74240d48c
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{r}\u{n}\u{t}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts
new file mode 100644
index 0000000000000..6adcc7ff543d3
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{r}\u{n}\u{t}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts
new file mode 100644
index 0000000000000..1ce7990ca67c9
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{65}\u{65}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts
new file mode 100644
index 0000000000000..b6f8025a66388
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{65}\u{65}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts
new file mode 100644
index 0000000000000..84c23026e525f
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts
new file mode 100644
index 0000000000000..6cc35d178bcb3
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts
new file mode 100644
index 0000000000000..a3f5ca04e9912
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{0}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts
new file mode 100644
index 0000000000000..c70a5406d19e5
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{0}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts
new file mode 100644
index 0000000000000..408913fb44408
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{00}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts
new file mode 100644
index 0000000000000..3337977619c80
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{00}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts
new file mode 100644
index 0000000000000..006d51b5618c2
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{0000}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts
new file mode 100644
index 0000000000000..88605749bb6f1
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{0000}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts
new file mode 100644
index 0000000000000..aa24d50d8f3f5
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{00000000}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts
new file mode 100644
index 0000000000000..b9cd247ebf349
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{00000000}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts
new file mode 100644
index 0000000000000..fce22dd9fbd4b
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts
new file mode 100644
index 0000000000000..02c9596ebfade
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts
new file mode 100644
index 0000000000000..f64e434813575
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts
@@ -0,0 +1,5 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{10FFFF}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts
new file mode 100644
index 0000000000000..fbd9f33ed5a8d
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts
@@ -0,0 +1,5 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{10FFFF}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts
new file mode 100644
index 0000000000000..f5ee893a5da82
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts
@@ -0,0 +1,5 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{110000}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts
new file mode 100644
index 0000000000000..9a7d2d08ba72b
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts
@@ -0,0 +1,5 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{110000}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts
new file mode 100644
index 0000000000000..8196cc5425782
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts
@@ -0,0 +1,6 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = `\u{FFFF}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts
new file mode 100644
index 0000000000000..cbecb8db2b870
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts
@@ -0,0 +1,6 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = `\u{FFFF}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts
new file mode 100644
index 0000000000000..e298707289351
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts
@@ -0,0 +1,6 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = `\u{10000}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts
new file mode 100644
index 0000000000000..e1fbd90adbac1
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts
@@ -0,0 +1,6 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = `\u{10000}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts
new file mode 100644
index 0000000000000..cdaaacc605d0c
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts
@@ -0,0 +1,7 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = `\u{D800}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts
new file mode 100644
index 0000000000000..3e803853fecf6
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts
@@ -0,0 +1,7 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = `\u{D800}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts
new file mode 100644
index 0000000000000..8cc530143f0d4
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts
@@ -0,0 +1,7 @@
+// @target: es5
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = `\u{DC00}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts
new file mode 100644
index 0000000000000..bdaf39469d46b
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts
@@ -0,0 +1,7 @@
+// @target: es6
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = `\u{DC00}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts
new file mode 100644
index 0000000000000..c6208320d6ea3
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{FFFFFFFF}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts
new file mode 100644
index 0000000000000..de05ff15bc68f
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{FFFFFFFF}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts
new file mode 100644
index 0000000000000..af7cf18db1543
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{DDDDD}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts
new file mode 100644
index 0000000000000..cf4dc13951eae
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{DDDDD}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts
new file mode 100644
index 0000000000000..dbdbfc7167359
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts
@@ -0,0 +1,4 @@
+// @target: es5
+
+// Shouldn't work, negatives are not allowed.
+var x = `\u{-DDDD}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts
new file mode 100644
index 0000000000000..ede4fa3b16d21
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts
@@ -0,0 +1,4 @@
+// @target: es6
+
+// Shouldn't work, negatives are not allowed.
+var x = `\u{-DDDD}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts
new file mode 100644
index 0000000000000..f338a79458ced
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts
new file mode 100644
index 0000000000000..260f3efa00a0c
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts
new file mode 100644
index 0000000000000..c1cddec50d491
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts
new file mode 100644
index 0000000000000..c7dd77e3cb018
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts
new file mode 100644
index 0000000000000..9b1a60569db44
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{r}\u{n}\u{t}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts
new file mode 100644
index 0000000000000..47585de2acbe9
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{r}\u{n}\u{t}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts
new file mode 100644
index 0000000000000..1babc2a3035e4
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{65}\u{65}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts
new file mode 100644
index 0000000000000..8ef16ef38bcb0
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{65}\u{65}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts
new file mode 100644
index 0000000000000..cf55400a03388
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts
new file mode 100644
index 0000000000000..957a0c68105ae
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts
new file mode 100644
index 0000000000000..1a258ffbf2076
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts
new file mode 100644
index 0000000000000..55d87dbfed74a
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;

From ee71954964057de352bae7af176f8d706ce723fe Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 25 Feb 2015 12:17:26 -0800
Subject: [PATCH 02/14] Simplified scanHexDigits by just wrapping the intended
 functionality in separate functions.

---
 src/compiler/scanner.ts | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 9536e2bf1f1ab..6ee71b7e49483 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -606,11 +606,21 @@ module ts {
             }
             return +(text.substring(start, pos));
         }
+        
+        function scanExactNumberOfHexDigits(count: number): number {
+            return scanHexDigits(/*minCount*/ count, /*maxCount*/ count);
+        }
+        
+        function scanMinimumNumberOfHexDigits(count: number): number {
+            return scanHexDigits(/*minCount*/ count, /*maxCount*/ undefined);
+        }
 
-        function scanHexDigits(count: number, mustMatchCount?: boolean): number {
+        function scanHexDigits(minCount: number, maxCount?: number): number {
+            var maxCountSpecified = maxCount !== undefined;
+            
             var digits = 0;
             var value = 0;
-            while (digits < count || !mustMatchCount) {
+            while (!maxCountSpecified || digits < maxCount) {
                 var ch = text.charCodeAt(pos);
                 if (ch >= CharacterCodes._0 && ch <= CharacterCodes._9) {
                     value = value * 16 + ch - CharacterCodes._0;
@@ -627,7 +637,7 @@ module ts {
                 pos++;
                 digits++;
             }
-            if (digits < count) {
+            if (digits < minCount) {
                 value = -1;
             }
             return value;
@@ -766,7 +776,7 @@ module ts {
                     return "\"";
                 case CharacterCodes.x:
                 case CharacterCodes.u:
-                    var ch = scanHexDigits(ch === CharacterCodes.x ? 2 : 4, /*mustMatchCount*/ true);
+                    var ch = scanExactNumberOfHexDigits(ch === CharacterCodes.x ? 2 : 4);
                     if (ch >= 0) {
                         return String.fromCharCode(ch);
                     }
@@ -797,7 +807,7 @@ module ts {
             if (pos + 5 < len && text.charCodeAt(pos + 1) === CharacterCodes.u) {
                 var start = pos;
                 pos += 2;
-                var value = scanHexDigits(4, /*mustMatchCount*/ true);
+                var value = scanExactNumberOfHexDigits(4);
                 pos = start;
                 return value;
             }
@@ -1034,7 +1044,7 @@ module ts {
                     case CharacterCodes._0:
                         if (pos + 2 < len && (text.charCodeAt(pos + 1) === CharacterCodes.X || text.charCodeAt(pos + 1) === CharacterCodes.x)) {
                             pos += 2;
-                            var value = scanHexDigits(1, /*mustMatchCount*/ false);
+                            var value = scanMinimumNumberOfHexDigits(1);
                             if (value < 0) {
                                 error(Diagnostics.Hexadecimal_digit_expected);
                                 value = 0;

From 6ad17805182fa5ff47d155191171daa441e2c179 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 26 Feb 2015 13:51:51 -0800
Subject: [PATCH 03/14] Added tests and updated baselines.

---
 .../unicodeExtendedEscapesInStrings20_ES5.errors.txt |  9 +++++++++
 .../unicodeExtendedEscapesInStrings20_ES5.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings20_ES6.errors.txt |  9 +++++++++
 .../unicodeExtendedEscapesInStrings20_ES6.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings21_ES5.errors.txt |  9 +++++++++
 .../unicodeExtendedEscapesInStrings21_ES5.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings21_ES6.errors.txt |  9 +++++++++
 .../unicodeExtendedEscapesInStrings21_ES6.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings22_ES5.errors.txt |  9 +++++++++
 .../unicodeExtendedEscapesInStrings22_ES5.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings22_ES6.errors.txt |  9 +++++++++
 .../unicodeExtendedEscapesInStrings22_ES6.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings23_ES5.errors.txt |  9 +++++++++
 .../unicodeExtendedEscapesInStrings23_ES5.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings23_ES6.errors.txt |  9 +++++++++
 .../unicodeExtendedEscapesInStrings23_ES6.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings24_ES5.errors.txt | 12 ++++++++++++
 .../unicodeExtendedEscapesInStrings24_ES5.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings24_ES6.errors.txt | 12 ++++++++++++
 .../unicodeExtendedEscapesInStrings24_ES6.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings25_ES5.errors.txt | 12 ++++++++++++
 .../unicodeExtendedEscapesInStrings25_ES5.js         |  7 +++++++
 .../unicodeExtendedEscapesInStrings25_ES6.errors.txt | 12 ++++++++++++
 .../unicodeExtendedEscapesInStrings25_ES6.js         |  7 +++++++
 .../unicodeExtendedEscapesInTemplates15_ES5.js       |  2 +-
 .../unicodeExtendedEscapesInTemplates16_ES5.js       |  2 +-
 .../unicodeExtendedEscapesInStrings20_ES5.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings20_ES6.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings21_ES5.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings21_ES6.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings22_ES5.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings22_ES6.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings23_ES5.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings23_ES6.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings24_ES5.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings24_ES6.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings25_ES5.ts         |  3 +++
 .../unicodeExtendedEscapesInStrings25_ES6.ts         |  3 +++
 38 files changed, 242 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.js
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.js
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts
 create mode 100644 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts

diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt
new file mode 100644
index 0000000000000..de3746f77cf49
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts (1 errors) ====
+    
+    var x = "\u{";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.js
new file mode 100644
index 0000000000000..01d06586dd768
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings20_ES5.ts]
+
+var x = "\u{";
+
+
+//// [unicodeExtendedEscapesInStrings20_ES5.js]
+var x = "\u{";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt
new file mode 100644
index 0000000000000..ab0c756306b26
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts (1 errors) ====
+    
+    var x = "\u{";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.js
new file mode 100644
index 0000000000000..a06b6d9f81fb7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings20_ES6.ts]
+
+var x = "\u{";
+
+
+//// [unicodeExtendedEscapesInStrings20_ES6.js]
+var x = "\u{";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
new file mode 100644
index 0000000000000..c626a43d75bc3
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts (1 errors) ====
+    
+    var x = "\u{67";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js
new file mode 100644
index 0000000000000..7dfdd1c2dc42e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings21_ES5.ts]
+
+var x = "\u{67";
+
+
+//// [unicodeExtendedEscapesInStrings21_ES5.js]
+var x = "\u{67";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
new file mode 100644
index 0000000000000..345161440abe3
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts (1 errors) ====
+    
+    var x = "\u{67";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.js
new file mode 100644
index 0000000000000..66c5e879841e9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings21_ES6.ts]
+
+var x = "\u{67";
+
+
+//// [unicodeExtendedEscapesInStrings21_ES6.js]
+var x = "\u{67";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
new file mode 100644
index 0000000000000..90979077107ca
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts (1 errors) ====
+    
+    var x = "\u{00000000000067";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js
new file mode 100644
index 0000000000000..b65afc2df979d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings22_ES5.ts]
+
+var x = "\u{00000000000067";
+
+
+//// [unicodeExtendedEscapesInStrings22_ES5.js]
+var x = "\u{00000000000067";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
new file mode 100644
index 0000000000000..dcabb7f4cf7b0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts (1 errors) ====
+    
+    var x = "\u{00000000000067";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.js
new file mode 100644
index 0000000000000..7d778bec55a7d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings22_ES6.ts]
+
+var x = "\u{00000000000067";
+
+
+//// [unicodeExtendedEscapesInStrings22_ES6.js]
+var x = "\u{00000000000067";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt
new file mode 100644
index 0000000000000..b68a8add103a2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts (1 errors) ====
+    
+    var x = "\u{00000000000067}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.js
new file mode 100644
index 0000000000000..2272be7150bdd
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings23_ES5.ts]
+
+var x = "\u{00000000000067}";
+
+
+//// [unicodeExtendedEscapesInStrings23_ES5.js]
+var x = "\u{00000000000067}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt
new file mode 100644
index 0000000000000..2f91b0ac308b1
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts (1 errors) ====
+    
+    var x = "\u{00000000000067}";
+               
+!!! error TS1125: Hexadecimal digit expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.js
new file mode 100644
index 0000000000000..105ddbbb23323
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings23_ES6.ts]
+
+var x = "\u{00000000000067}";
+
+
+//// [unicodeExtendedEscapesInStrings23_ES6.js]
+var x = "\u{00000000000067}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
new file mode 100644
index 0000000000000..287b87a042e9b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,27): error TS1002: Unterminated string literal.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts (2 errors) ====
+    
+    var x = "\u{00000000000067
+               
+!!! error TS1125: Hexadecimal digit expected.
+                              
+!!! error TS1002: Unterminated string literal.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js
new file mode 100644
index 0000000000000..aaa6375184655
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings24_ES5.ts]
+
+var x = "\u{00000000000067
+
+
+//// [unicodeExtendedEscapesInStrings24_ES5.js]
+var x = "\u{00000000000067;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
new file mode 100644
index 0000000000000..5bfce61a2d7c9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,27): error TS1002: Unterminated string literal.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts (2 errors) ====
+    
+    var x = "\u{00000000000067
+               
+!!! error TS1125: Hexadecimal digit expected.
+                              
+!!! error TS1002: Unterminated string literal.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.js
new file mode 100644
index 0000000000000..0a7a35d861ae7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings24_ES6.ts]
+
+var x = "\u{00000000000067
+
+
+//// [unicodeExtendedEscapesInStrings24_ES6.js]
+var x = "\u{00000000000067;
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt
new file mode 100644
index 0000000000000..5e1b4fdb757eb
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts(2,28): error TS1002: Unterminated string literal.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts (2 errors) ====
+    
+    var x = "\u{00000000000067}
+               
+!!! error TS1125: Hexadecimal digit expected.
+                               
+!!! error TS1002: Unterminated string literal.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.js
new file mode 100644
index 0000000000000..4bd5f06503690
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings25_ES5.ts]
+
+var x = "\u{00000000000067}
+
+
+//// [unicodeExtendedEscapesInStrings25_ES5.js]
+var x = "\u{00000000000067};
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt
new file mode 100644
index 0000000000000..65d5175eca6ba
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts(2,28): error TS1002: Unterminated string literal.
+
+
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts (2 errors) ====
+    
+    var x = "\u{00000000000067}
+               
+!!! error TS1125: Hexadecimal digit expected.
+                               
+!!! error TS1002: Unterminated string literal.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.js
new file mode 100644
index 0000000000000..3aee74d99b20d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.js
@@ -0,0 +1,7 @@
+//// [unicodeExtendedEscapesInStrings25_ES6.ts]
+
+var x = "\u{00000000000067}
+
+
+//// [unicodeExtendedEscapesInStrings25_ES6.js]
+var x = "\u{00000000000067};
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
index c3de6c153087b..008ded0452335 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
 
 
 //// [unicodeExtendedEscapesInTemplates15_ES5.js]
-var x = "{abcd}{ef12}{3456}{78\u00390}";
+var x = "{abcd}{ef12}{3456}{7890}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
index d9cc290370c22..4351e145acd34 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
 
 
 //// [unicodeExtendedEscapesInTemplates16_ES5.js]
-var x = "{ABCD}{EF12}{3456}{78\u00390}";
+var x = "{ABCD}{EF12}{3456}{7890}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts
new file mode 100644
index 0000000000000..0044877f223f2
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts
new file mode 100644
index 0000000000000..26fb00fa4058e
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts
new file mode 100644
index 0000000000000..1956008e439c2
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{67";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts
new file mode 100644
index 0000000000000..318ca43a93a3d
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{67";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts
new file mode 100644
index 0000000000000..fa2521ef6d787
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{00000000000067";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts
new file mode 100644
index 0000000000000..11d5f011763dc
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{00000000000067";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts
new file mode 100644
index 0000000000000..d78a62132a60a
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{00000000000067}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts
new file mode 100644
index 0000000000000..f47e18a60e909
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{00000000000067}";
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts
new file mode 100644
index 0000000000000..44933c03864db
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{00000000000067
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts
new file mode 100644
index 0000000000000..dd89512753cf5
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{00000000000067
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts
new file mode 100644
index 0000000000000..c2e1b8c4ee531
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts
@@ -0,0 +1,3 @@
+// @target: es5
+
+var x = "\u{00000000000067}
diff --git a/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts
new file mode 100644
index 0000000000000..21915aafccab7
--- /dev/null
+++ b/tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts
@@ -0,0 +1,3 @@
+// @target: es6
+
+var x = "\u{00000000000067}

From bbf9579021cbc89fa73157ae11b5af5fd5e7164d Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 26 Feb 2015 14:41:14 -0800
Subject: [PATCH 04/14] Added scanning support for extended escapes.

---
 .../diagnosticInformationMap.generated.ts     |  2 +
 src/compiler/diagnosticMessages.json          | 11 +++-
 src/compiler/scanner.ts                       | 55 +++++++++++++++++--
 ...mplateStringsWithUnicodeEscapes.errors.txt | 10 ----
 ...taggedTemplateStringsWithUnicodeEscapes.js |  2 +-
 ...gedTemplateStringsWithUnicodeEscapes.types |  9 +++
 ...ateStringsWithUnicodeEscapesES6.errors.txt | 10 ----
 ...TemplateStringsWithUnicodeEscapesES6.types |  9 +++
 ...eExtendedEscapesInStrings01_ES5.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings01_ES5.types |  5 ++
 ...eExtendedEscapesInStrings01_ES6.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings01_ES6.types |  5 ++
 ...eExtendedEscapesInStrings02_ES5.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings02_ES5.types |  5 ++
 ...eExtendedEscapesInStrings02_ES6.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings02_ES6.types |  5 ++
 ...eExtendedEscapesInStrings03_ES5.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings03_ES5.types |  5 ++
 ...eExtendedEscapesInStrings03_ES6.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings03_ES6.types |  5 ++
 ...eExtendedEscapesInStrings04_ES5.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings04_ES5.types |  5 ++
 ...eExtendedEscapesInStrings04_ES6.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings04_ES6.types |  5 ++
 ...eExtendedEscapesInStrings05_ES5.errors.txt | 39 -------------
 ...nicodeExtendedEscapesInStrings05_ES5.types |  5 ++
 ...eExtendedEscapesInStrings05_ES6.errors.txt | 39 -------------
 ...nicodeExtendedEscapesInStrings05_ES6.types |  5 ++
 ...eExtendedEscapesInStrings06_ES5.errors.txt | 11 ----
 ...nicodeExtendedEscapesInStrings06_ES5.types |  7 +++
 ...eExtendedEscapesInStrings06_ES6.errors.txt | 11 ----
 ...nicodeExtendedEscapesInStrings06_ES6.types |  7 +++
 ...eExtendedEscapesInStrings07_ES5.errors.txt |  6 +-
 ...eExtendedEscapesInStrings07_ES6.errors.txt |  6 +-
 ...eExtendedEscapesInStrings08_ES5.errors.txt | 12 ----
 ...nicodeExtendedEscapesInStrings08_ES5.types |  8 +++
 ...eExtendedEscapesInStrings08_ES6.errors.txt | 12 ----
 ...nicodeExtendedEscapesInStrings08_ES6.types |  8 +++
 ...eExtendedEscapesInStrings09_ES5.errors.txt | 12 ----
 ...nicodeExtendedEscapesInStrings09_ES5.types |  8 +++
 ...eExtendedEscapesInStrings09_ES6.errors.txt | 12 ----
 ...nicodeExtendedEscapesInStrings09_ES6.types |  8 +++
 ...eExtendedEscapesInStrings10_ES5.errors.txt | 13 -----
 ...nicodeExtendedEscapesInStrings10_ES5.types |  9 +++
 ...eExtendedEscapesInStrings10_ES6.errors.txt | 13 -----
 ...nicodeExtendedEscapesInStrings10_ES6.types |  9 +++
 ...eExtendedEscapesInStrings11_ES5.errors.txt | 13 -----
 ...nicodeExtendedEscapesInStrings11_ES5.types |  9 +++
 ...eExtendedEscapesInStrings11_ES6.errors.txt | 13 -----
 ...nicodeExtendedEscapesInStrings11_ES6.types |  9 +++
 ...eExtendedEscapesInStrings12_ES5.errors.txt |  6 +-
 ...eExtendedEscapesInStrings12_ES6.errors.txt |  6 +-
 ...eExtendedEscapesInStrings13_ES5.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings13_ES5.types |  5 ++
 ...eExtendedEscapesInStrings13_ES6.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings13_ES6.types |  5 ++
 ...eExtendedEscapesInStrings14_ES5.errors.txt |  4 +-
 ...eExtendedEscapesInStrings14_ES6.errors.txt |  4 +-
 ...eExtendedEscapesInStrings15_ES5.errors.txt | 18 ------
 ...nicodeExtendedEscapesInStrings15_ES5.types |  5 ++
 ...eExtendedEscapesInStrings15_ES6.errors.txt | 18 ------
 ...nicodeExtendedEscapesInStrings15_ES6.types |  5 ++
 ...eExtendedEscapesInStrings16_ES5.errors.txt | 18 ------
 ...nicodeExtendedEscapesInStrings16_ES5.types |  5 ++
 ...eExtendedEscapesInStrings16_ES6.errors.txt | 18 ------
 ...nicodeExtendedEscapesInStrings16_ES6.types |  5 ++
 ...eExtendedEscapesInStrings17_ES5.errors.txt | 12 ++--
 ...eExtendedEscapesInStrings17_ES6.errors.txt | 12 ++--
 ...eExtendedEscapesInStrings18_ES5.errors.txt | 12 ----
 ...nicodeExtendedEscapesInStrings18_ES5.types |  5 ++
 ...eExtendedEscapesInStrings18_ES6.errors.txt | 12 ----
 ...nicodeExtendedEscapesInStrings18_ES6.types |  5 ++
 ...eExtendedEscapesInStrings19_ES5.errors.txt |  4 +-
 ...eExtendedEscapesInStrings19_ES6.errors.txt |  4 +-
 ...eExtendedEscapesInStrings20_ES5.errors.txt |  4 +-
 ...eExtendedEscapesInStrings20_ES6.errors.txt |  4 +-
 ...eExtendedEscapesInStrings21_ES5.errors.txt |  6 +-
 ...eExtendedEscapesInStrings21_ES6.errors.txt |  6 +-
 ...eExtendedEscapesInStrings22_ES5.errors.txt |  6 +-
 ...eExtendedEscapesInStrings22_ES6.errors.txt |  6 +-
 ...eExtendedEscapesInStrings23_ES5.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings23_ES5.types |  5 ++
 ...eExtendedEscapesInStrings23_ES6.errors.txt |  9 ---
 ...nicodeExtendedEscapesInStrings23_ES6.types |  5 ++
 ...eExtendedEscapesInStrings24_ES5.errors.txt |  9 +--
 ...eExtendedEscapesInStrings24_ES6.errors.txt |  9 +--
 ...eExtendedEscapesInStrings25_ES5.errors.txt |  5 +-
 ...eExtendedEscapesInStrings25_ES6.errors.txt |  5 +-
 ...xtendedEscapesInTemplates01_ES5.errors.txt |  9 ---
 ...unicodeExtendedEscapesInTemplates01_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates01_ES5.types |  5 ++
 ...xtendedEscapesInTemplates01_ES6.errors.txt |  9 ---
 ...codeExtendedEscapesInTemplates01_ES6.types |  5 ++
 ...xtendedEscapesInTemplates02_ES5.errors.txt |  9 ---
 ...unicodeExtendedEscapesInTemplates02_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates02_ES5.types |  5 ++
 ...xtendedEscapesInTemplates02_ES6.errors.txt |  9 ---
 ...codeExtendedEscapesInTemplates02_ES6.types |  5 ++
 ...xtendedEscapesInTemplates03_ES5.errors.txt |  9 ---
 ...unicodeExtendedEscapesInTemplates03_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates03_ES5.types |  5 ++
 ...xtendedEscapesInTemplates03_ES6.errors.txt |  9 ---
 ...codeExtendedEscapesInTemplates03_ES6.types |  5 ++
 ...xtendedEscapesInTemplates04_ES5.errors.txt |  9 ---
 ...unicodeExtendedEscapesInTemplates04_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates04_ES5.types |  5 ++
 ...xtendedEscapesInTemplates04_ES6.errors.txt |  9 ---
 ...codeExtendedEscapesInTemplates04_ES6.types |  5 ++
 ...xtendedEscapesInTemplates05_ES5.errors.txt | 39 -------------
 ...unicodeExtendedEscapesInTemplates05_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates05_ES5.types |  5 ++
 ...xtendedEscapesInTemplates05_ES6.errors.txt | 39 -------------
 ...codeExtendedEscapesInTemplates05_ES6.types |  5 ++
 ...xtendedEscapesInTemplates06_ES5.errors.txt | 11 ----
 ...unicodeExtendedEscapesInTemplates06_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates06_ES5.types |  7 +++
 ...xtendedEscapesInTemplates06_ES6.errors.txt | 11 ----
 ...codeExtendedEscapesInTemplates06_ES6.types |  7 +++
 ...xtendedEscapesInTemplates07_ES5.errors.txt |  6 +-
 ...unicodeExtendedEscapesInTemplates07_ES5.js |  2 +-
 ...xtendedEscapesInTemplates07_ES6.errors.txt |  6 +-
 ...xtendedEscapesInTemplates08_ES5.errors.txt | 12 ----
 ...unicodeExtendedEscapesInTemplates08_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates08_ES5.types |  8 +++
 ...xtendedEscapesInTemplates08_ES6.errors.txt | 12 ----
 ...codeExtendedEscapesInTemplates08_ES6.types |  8 +++
 ...xtendedEscapesInTemplates09_ES5.errors.txt | 12 ----
 ...unicodeExtendedEscapesInTemplates09_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates09_ES5.types |  8 +++
 ...xtendedEscapesInTemplates09_ES6.errors.txt | 12 ----
 ...codeExtendedEscapesInTemplates09_ES6.types |  8 +++
 ...xtendedEscapesInTemplates10_ES5.errors.txt | 13 -----
 ...unicodeExtendedEscapesInTemplates10_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates10_ES5.types |  9 +++
 ...xtendedEscapesInTemplates10_ES6.errors.txt | 13 -----
 ...codeExtendedEscapesInTemplates10_ES6.types |  9 +++
 ...xtendedEscapesInTemplates11_ES5.errors.txt | 13 -----
 ...unicodeExtendedEscapesInTemplates11_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates11_ES5.types |  9 +++
 ...xtendedEscapesInTemplates11_ES6.errors.txt | 13 -----
 ...codeExtendedEscapesInTemplates11_ES6.types |  9 +++
 ...xtendedEscapesInTemplates12_ES5.errors.txt |  6 +-
 ...unicodeExtendedEscapesInTemplates12_ES5.js |  2 +-
 ...xtendedEscapesInTemplates12_ES6.errors.txt |  6 +-
 ...xtendedEscapesInTemplates13_ES5.errors.txt |  9 ---
 ...unicodeExtendedEscapesInTemplates13_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates13_ES5.types |  5 ++
 ...xtendedEscapesInTemplates13_ES6.errors.txt |  9 ---
 ...codeExtendedEscapesInTemplates13_ES6.types |  5 ++
 ...xtendedEscapesInTemplates14_ES5.errors.txt |  4 +-
 ...unicodeExtendedEscapesInTemplates14_ES5.js |  2 +-
 ...xtendedEscapesInTemplates14_ES6.errors.txt |  4 +-
 ...xtendedEscapesInTemplates15_ES5.errors.txt | 18 ------
 ...unicodeExtendedEscapesInTemplates15_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates15_ES5.types |  5 ++
 ...xtendedEscapesInTemplates15_ES6.errors.txt | 18 ------
 ...codeExtendedEscapesInTemplates15_ES6.types |  5 ++
 ...xtendedEscapesInTemplates16_ES5.errors.txt | 18 ------
 ...unicodeExtendedEscapesInTemplates16_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates16_ES5.types |  5 ++
 ...xtendedEscapesInTemplates16_ES6.errors.txt | 18 ------
 ...codeExtendedEscapesInTemplates16_ES6.types |  5 ++
 ...xtendedEscapesInTemplates17_ES5.errors.txt | 12 ++--
 ...unicodeExtendedEscapesInTemplates17_ES5.js |  2 +-
 ...xtendedEscapesInTemplates17_ES6.errors.txt | 12 ++--
 ...xtendedEscapesInTemplates18_ES5.errors.txt | 12 ----
 ...unicodeExtendedEscapesInTemplates18_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates18_ES5.types |  5 ++
 ...xtendedEscapesInTemplates18_ES6.errors.txt | 12 ----
 ...codeExtendedEscapesInTemplates18_ES6.types |  5 ++
 ...xtendedEscapesInTemplates19_ES5.errors.txt |  4 +-
 ...unicodeExtendedEscapesInTemplates19_ES5.js |  2 +-
 ...xtendedEscapesInTemplates19_ES6.errors.txt |  4 +-
 ...xtendedEscapesInTemplates20_ES5.errors.txt | 48 ----------------
 ...unicodeExtendedEscapesInTemplates20_ES5.js |  2 +-
 ...codeExtendedEscapesInTemplates20_ES5.types |  5 ++
 ...xtendedEscapesInTemplates20_ES6.errors.txt | 48 ----------------
 ...codeExtendedEscapesInTemplates20_ES6.types |  5 ++
 178 files changed, 553 insertions(+), 1033 deletions(-)
 delete mode 100644 tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.errors.txt
 create mode 100644 tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.types
 delete mode 100644 tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.errors.txt
 create mode 100644 tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.types
 delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt
 create mode 100644 tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.types

diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index 7c53d70f5911d..6e5a140985698 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -153,6 +153,8 @@ module ts {
         External_module_0_has_no_default_export_or_export_assignment: { code: 1192, category: DiagnosticCategory.Error, key: "External module '{0}' has no default export or export assignment." },
         An_export_declaration_cannot_have_modifiers: { code: 1193, category: DiagnosticCategory.Error, key: "An export declaration cannot have modifiers." },
         Export_declarations_are_not_permitted_in_an_internal_module: { code: 1194, category: DiagnosticCategory.Error, key: "Export declarations are not permitted in an internal module." },
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1195, category: DiagnosticCategory.Error, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
+        expected: { code: 1196, category: DiagnosticCategory.Error, key: "'}' expected." },
         Duplicate_identifier_0: { code: 2300, category: DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 7a7efe4e43ceb..dc2c9b29bb547 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -603,7 +603,14 @@
         "category": "Error",
         "code": 1194
     },
-
+    "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.": {
+        "category": "Error",
+        "code": 1195
+    },
+    "'}' expected.": {
+        "category": "Error",
+        "code":  1196
+    },
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2300
@@ -1572,7 +1579,7 @@
     "Exported type alias '{0}' has or is using private name '{1}'.": {
         "category": "Error",
         "code": 4081
-    },
+    },
     "The current host does not support the '{0}' option.": {
         "category": "Error",
         "code": 5001
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 6ee71b7e49483..5e3a7e3a112c0 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -774,11 +774,44 @@ module ts {
                     return "\'";
                 case CharacterCodes.doubleQuote:
                     return "\"";
-                case CharacterCodes.x:
                 case CharacterCodes.u:
-                    var ch = scanExactNumberOfHexDigits(ch === CharacterCodes.x ? 2 : 4);
-                    if (ch >= 0) {
-                        return String.fromCharCode(ch);
+                    if (text.charCodeAt(pos) === CharacterCodes.openBrace) {
+                        pos++;
+                        var escapedValue = scanMinimumNumberOfHexDigits(1);
+                        
+                        if (escapedValue < 0) {
+                            // TODO(drosen): give a proper error message for escaped values that are too large.
+                            error(Diagnostics.Hexadecimal_digit_expected)
+                            return "";
+                        }
+                        
+                        if (escapedValue > 0x10FFFF) {
+                            error(Diagnostics.An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive);
+                            return "";
+                        }
+                        
+                        if (pos >= len) {
+                            error(Diagnostics.Unexpected_end_of_text);
+                            return "";
+                        }
+                        
+                        // Only swallow the following character up if it's a '}'.
+                        var escapeTerminator = text.charCodeAt(pos);
+                        if (escapeTerminator == CharacterCodes.closeBrace) {
+                            pos++;
+                        }
+                        else {
+                            // '}' expected.
+                            error(Diagnostics.expected);
+                        }
+                        
+                        return utf16EncodeAsString(escapedValue);
+                    }
+                    // fall through
+                case CharacterCodes.x:
+                    var escapedValue = scanExactNumberOfHexDigits(ch === CharacterCodes.x ? 2 : 4);
+                    if (escapedValue >= 0) {
+                        return String.fromCharCode(escapedValue);
                     }
                     else {
                         error(Diagnostics.Hexadecimal_digit_expected);
@@ -800,6 +833,20 @@ module ts {
                     return String.fromCharCode(ch);
             }
         }
+        
+        // Derived from the 10.1.1 UTF16Encoding of the ES6 Spec.
+        function utf16EncodeAsString(codePoint: number): string {
+            Debug.assert(0x0 <= codePoint && codePoint <= 0x10FFFF);
+            
+            if (codePoint <= 65535) {
+                return String.fromCharCode(codePoint);
+            }
+            
+            var codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800;
+            var codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00;
+            
+            return String.fromCharCode(codeUnit1, codeUnit2);
+        }
 
         // Current character is known to be a backslash. Check for Unicode escape of the form '\uXXXX'
         // and return code point value if valid Unicode escape is found. Otherwise return -1.
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.errors.txt
deleted file mode 100644
index df3def2cb2229..0000000000000
--- a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapes.ts(4,7): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapes.ts (1 errors) ====
-    function f(...args: any[]) {
-    }
-    
-    f `'\u{1f4a9}'${ " should be converted to " }'\uD83D\uDCA9'`;
-          
-!!! error TS1125: Hexadecimal digit expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
index bcf0732218ac7..e2f6b608f9603 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
@@ -11,5 +11,5 @@ function f() {
         args[_i - 0] = arguments[_i];
     }
 }
-(_a = ["'{1f4a9}'", "'💩'"], _a.raw = ["'\\u{1f4a9}'", "'\\uD83D\\uDCA9'"], f(_a, " should be converted to "));
+(_a = ["'💩'", "'💩'"], _a.raw = ["'\\u{1f4a9}'", "'\\uD83D\\uDCA9'"], f(_a, " should be converted to "));
 var _a;
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.types b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.types
new file mode 100644
index 0000000000000..30c27d376d187
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapes.ts ===
+function f(...args: any[]) {
+>f : (...args: any[]) => void
+>args : any[]
+}
+
+f `'\u{1f4a9}'${ " should be converted to " }'\uD83D\uDCA9'`;
+>f : (...args: any[]) => void
+
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.errors.txt
deleted file mode 100644
index c48b43dc3ff88..0000000000000
--- a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapesES6.ts(4,7): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapesES6.ts (1 errors) ====
-    function f(...args: any[]) {
-    }
-    
-    f `'\u{1f4a9}'${ " should be converted to " }'\uD83D\uDCA9'`;
-          
-!!! error TS1125: Hexadecimal digit expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.types b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.types
new file mode 100644
index 0000000000000..d3c9ad68c2181
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapesES6.ts ===
+function f(...args: any[]) {
+>f : (...args: any[]) => void
+>args : any[]
+}
+
+f `'\u{1f4a9}'${ " should be converted to " }'\uD83D\uDCA9'`;
+>f : (...args: any[]) => void
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt
deleted file mode 100644
index f6e522c7462ac..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts (1 errors) ====
-    
-    var x = "\u{0}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.types
new file mode 100644
index 0000000000000..7dec031af28ad
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts ===
+
+var x = "\u{0}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt
deleted file mode 100644
index 6e807fdae9dc0..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts (1 errors) ====
-    
-    var x = "\u{0}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.types
new file mode 100644
index 0000000000000..77e507e0129cd
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts ===
+
+var x = "\u{0}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt
deleted file mode 100644
index b5b874edfb34a..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts (1 errors) ====
-    
-    var x = "\u{00}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.types
new file mode 100644
index 0000000000000..9ab14e5e1ad74
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts ===
+
+var x = "\u{00}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt
deleted file mode 100644
index c779458cfb3e8..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts (1 errors) ====
-    
-    var x = "\u{00}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.types
new file mode 100644
index 0000000000000..37178d5c3902a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts ===
+
+var x = "\u{00}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt
deleted file mode 100644
index 68620245fb3dc..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts (1 errors) ====
-    
-    var x = "\u{0000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.types
new file mode 100644
index 0000000000000..1b601533fe18d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts ===
+
+var x = "\u{0000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt
deleted file mode 100644
index b2cc2e1abb145..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts (1 errors) ====
-    
-    var x = "\u{0000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.types
new file mode 100644
index 0000000000000..b1ec28bfe0737
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts ===
+
+var x = "\u{0000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt
deleted file mode 100644
index f0a76a1b1f93b..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts (1 errors) ====
-    
-    var x = "\u{00000000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.types
new file mode 100644
index 0000000000000..c7d45d6b086b9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts ===
+
+var x = "\u{00000000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt
deleted file mode 100644
index ad73340bbf690..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts (1 errors) ====
-    
-    var x = "\u{00000000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.types
new file mode 100644
index 0000000000000..f1f2a2937deab
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts ===
+
+var x = "\u{00000000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt
deleted file mode 100644
index 66de2730a0f72..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,42): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,48): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,54): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,60): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,72): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts (11 errors) ====
-    
-    var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                         
-!!! error TS1125: Hexadecimal digit expected.
-                                                               
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                           
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.types
new file mode 100644
index 0000000000000..9e09678415541
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts ===
+
+var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt
deleted file mode 100644
index 10ea76fcd979a..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,42): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,48): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,54): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,60): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,72): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts (11 errors) ====
-    
-    var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                         
-!!! error TS1125: Hexadecimal digit expected.
-                                                               
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                           
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.types
new file mode 100644
index 0000000000000..febfe78595c06
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts ===
+
+var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt
deleted file mode 100644
index 78b8ebf73db88..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-    var x = "\u{10FFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.types
new file mode 100644
index 0000000000000..fb979e6b7baa7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{10FFFF}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt
deleted file mode 100644
index 07bfa2803bf52..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-    var x = "\u{10FFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.types
new file mode 100644
index 0000000000000..e61467ab47fb6
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{10FFFF}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt
index e2e5a27826941..345d53cdc6563 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts(4,19): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrin
     // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
     //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
     var x = "\u{110000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                      
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt
index 9ce28a3692268..497ccf480cf00 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts(4,19): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrin
     // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
     //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
     var x = "\u{110000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                      
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt
deleted file mode 100644
index 2082a82583d82..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (FFFF == 65535)
-    var x = "\u{FFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.types
new file mode 100644
index 0000000000000..31a6a586dffc0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "\u{FFFF}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt
deleted file mode 100644
index 7e91f7ce8919a..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (FFFF == 65535)
-    var x = "\u{FFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.types
new file mode 100644
index 0000000000000..5060bb11305b2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "\u{FFFF}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt
deleted file mode 100644
index 1df05a3d27001..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (10000 == 65536)
-    var x = "\u{10000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.types
new file mode 100644
index 0000000000000..ffc1bb7d67d13
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "\u{10000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt
deleted file mode 100644
index eda5060456d28..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (10000 == 65536)
-    var x = "\u{10000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.types
new file mode 100644
index 0000000000000..e7a303a069977
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "\u{10000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt
deleted file mode 100644
index a3c99aaf5ddfc..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
-    // Although we should just get back a single code point value of 0xD800,
-    // this is a useful edge-case test.
-    var x = "\u{D800}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.types
new file mode 100644
index 0000000000000..bbe19a788a051
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "\u{D800}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt
deleted file mode 100644
index 0a7876cfc710c..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
-    // Although we should just get back a single code point value of 0xD800,
-    // this is a useful edge-case test.
-    var x = "\u{D800}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.types
new file mode 100644
index 0000000000000..6ce1f692cece3
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "\u{D800}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt
deleted file mode 100644
index da8207b2e115f..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
-    // Although we should just get back a single code point value of 0xDC00,
-    // this is a useful edge-case test.
-    var x = "\u{DC00}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.types
new file mode 100644
index 0000000000000..b413a2a5509b2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "\u{DC00}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt
deleted file mode 100644
index 51357e5b7a6bf..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
-    // Although we should just get back a single code point value of 0xDC00,
-    // this is a useful edge-case test.
-    var x = "\u{DC00}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.types
new file mode 100644
index 0000000000000..b07f9f0a35da2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "\u{DC00}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt
index 4a311e3460b48..b85e959f5d350 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts(2,21): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts (1 errors) ====
     
     var x = "\u{FFFFFFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                        
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt
index 238cfb178133b..1aa973df3ff56 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts(2,21): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts (1 errors) ====
     
     var x = "\u{FFFFFFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                        
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt
deleted file mode 100644
index 581ab88da400e..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts (1 errors) ====
-    
-    var x = "\u{DDDDD}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.types
new file mode 100644
index 0000000000000..597e10ab6dcc5
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts ===
+
+var x = "\u{DDDDD}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt
deleted file mode 100644
index 9ffeb1ac4418b..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts (1 errors) ====
-    
-    var x = "\u{DDDDD}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.types
new file mode 100644
index 0000000000000..c0092e04c5f3c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts ===
+
+var x = "\u{DDDDD}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt
index e886e90ff3a3c..76abc30d5eb4f 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts(3,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts(3,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts (1 errors) ====
     
     // Shouldn't work, negatives are not allowed.
     var x = "\u{-DDDD}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt
index 5a253a2408ad5..4ccf4311b33e5 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts(3,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts(3,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts (1 errors) ====
     
     // Shouldn't work, negatives are not allowed.
     var x = "\u{-DDDD}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt
deleted file mode 100644
index 74035937ab6fc..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts (4 errors) ====
-    
-    var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.types
new file mode 100644
index 0000000000000..449bd7d2bdcbc
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts ===
+
+var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt
deleted file mode 100644
index a265dd8ab9258..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts (4 errors) ====
-    
-    var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.types
new file mode 100644
index 0000000000000..c4352dd72e0c9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts ===
+
+var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt
deleted file mode 100644
index 8df651f156a91..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts (4 errors) ====
-    
-    var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.types
new file mode 100644
index 0000000000000..cd295c842537c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts ===
+
+var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt
deleted file mode 100644
index a4d23fd81df20..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts (4 errors) ====
-    
-    var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.types
new file mode 100644
index 0000000000000..f63afc17b1cc4
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts ===
+
+var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt
index f67b264b0a378..ddf4b8dba7a36 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,17): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,22): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,13): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,23): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts (3 errors) ====
     
     var x = "\u{r}\u{n}\u{t}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
-                    
+                     
 !!! error TS1125: Hexadecimal digit expected.
-                         
+                          
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt
index 1823486dc806c..b338efb03e545 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,17): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,22): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,13): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,23): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts (3 errors) ====
     
     var x = "\u{r}\u{n}\u{t}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
-                    
+                     
 !!! error TS1125: Hexadecimal digit expected.
-                         
+                          
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt
deleted file mode 100644
index 7c4aaa7d01feb..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts (2 errors) ====
-    
-    var x = "\u{65}\u{65}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.types
new file mode 100644
index 0000000000000..34343989c5b69
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts ===
+
+var x = "\u{65}\u{65}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt
deleted file mode 100644
index cb680b2f826c1..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts (2 errors) ====
-    
-    var x = "\u{65}\u{65}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.types
new file mode 100644
index 0000000000000..615682a283aa9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts ===
+
+var x = "\u{65}\u{65}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt
index 961a83f50a95a..b670f28fe6923 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts (1 errors) ====
     
     var x = "\u{}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt
index cc780a79e8d6d..9ddc49eff1b55 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts (1 errors) ====
     
     var x = "\u{}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt
index de3746f77cf49..949d0a95ae75f 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts (1 errors) ====
     
     var x = "\u{";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt
index ab0c756306b26..94297328683cc 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts (1 errors) ====
     
     var x = "\u{";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
index c626a43d75bc3..fa5b59f7c14a6 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts(2,15): error TS1196: '}' expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts (1 errors) ====
     
     var x = "\u{67";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                  
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
index 345161440abe3..bc0c46e44b02b 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts(2,15): error TS1196: '}' expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts (1 errors) ====
     
     var x = "\u{67";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                  
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
index 90979077107ca..d64bb4e676892 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts(2,27): error TS1196: '}' expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts (1 errors) ====
     
     var x = "\u{00000000000067";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                              
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
index dcabb7f4cf7b0..9adf18df0d4c1 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts(2,27): error TS1196: '}' expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts (1 errors) ====
     
     var x = "\u{00000000000067";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                              
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt
deleted file mode 100644
index b68a8add103a2..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts (1 errors) ====
-    
-    var x = "\u{00000000000067}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.types
new file mode 100644
index 0000000000000..63bcf37051627
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts ===
+
+var x = "\u{00000000000067}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt
deleted file mode 100644
index 2f91b0ac308b1..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts (1 errors) ====
-    
-    var x = "\u{00000000000067}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.types
new file mode 100644
index 0000000000000..2601f6028693f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts ===
+
+var x = "\u{00000000000067}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
index 287b87a042e9b..45127ca415785 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,27): error TS1002: Unterminated string literal.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,27): error TS1196: '}' expected.
 
 
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts (2 errors) ====
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts (1 errors) ====
     
     var x = "\u{00000000000067
-               
-!!! error TS1125: Hexadecimal digit expected.
                               
-!!! error TS1002: Unterminated string literal.
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
index 5bfce61a2d7c9..7b78c16c8c4a1 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,27): error TS1002: Unterminated string literal.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,27): error TS1196: '}' expected.
 
 
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts (2 errors) ====
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts (1 errors) ====
     
     var x = "\u{00000000000067
-               
-!!! error TS1125: Hexadecimal digit expected.
                               
-!!! error TS1002: Unterminated string literal.
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt
index 5e1b4fdb757eb..afa8fa143c0f9 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts(2,28): error TS1002: Unterminated string literal.
 
 
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts (2 errors) ====
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts (1 errors) ====
     
     var x = "\u{00000000000067}
-               
-!!! error TS1125: Hexadecimal digit expected.
                                
 !!! error TS1002: Unterminated string literal.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt
index 65d5175eca6ba..7118024206e43 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts(2,28): error TS1002: Unterminated string literal.
 
 
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts (2 errors) ====
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts (1 errors) ====
     
     var x = "\u{00000000000067}
-               
-!!! error TS1125: Hexadecimal digit expected.
                                
 !!! error TS1002: Unterminated string literal.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt
deleted file mode 100644
index 493285c5ef2ee..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts (1 errors) ====
-    
-    var x = `\u{0}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js
index 2fdab7d7e055f..1b312d2431dd4 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{0}`;
 
 
 //// [unicodeExtendedEscapesInTemplates01_ES5.js]
-var x = "{0}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.types
new file mode 100644
index 0000000000000..e0108da56965b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts ===
+
+var x = `\u{0}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt
deleted file mode 100644
index 1de4bf97d7623..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts (1 errors) ====
-    
-    var x = `\u{0}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.types
new file mode 100644
index 0000000000000..f8aed1df46486
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts ===
+
+var x = `\u{0}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt
deleted file mode 100644
index d74b1ae969537..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts (1 errors) ====
-    
-    var x = `\u{00}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js
index cfcd7fcd2ba5e..05bb8d6eaec64 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{00}`;
 
 
 //// [unicodeExtendedEscapesInTemplates02_ES5.js]
-var x = "{00}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.types
new file mode 100644
index 0000000000000..da23666c4f7a9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts ===
+
+var x = `\u{00}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt
deleted file mode 100644
index 84bbc74ab8bf6..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts (1 errors) ====
-    
-    var x = `\u{00}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.types
new file mode 100644
index 0000000000000..008d41b6793c9
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts ===
+
+var x = `\u{00}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt
deleted file mode 100644
index 6de8745cf1dea..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts (1 errors) ====
-    
-    var x = `\u{0000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js
index 99aba05ca1fc8..0ded955b074f8 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{0000}`;
 
 
 //// [unicodeExtendedEscapesInTemplates03_ES5.js]
-var x = "{0000}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.types
new file mode 100644
index 0000000000000..3465eeedae3b1
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts ===
+
+var x = `\u{0000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt
deleted file mode 100644
index 9ee2d70fc699e..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts (1 errors) ====
-    
-    var x = `\u{0000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.types
new file mode 100644
index 0000000000000..f47d8b6f8de8d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts ===
+
+var x = `\u{0000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt
deleted file mode 100644
index e80bbd659bbee..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts (1 errors) ====
-    
-    var x = `\u{00000000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js
index 372be222ada75..01d86e88a02ea 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{00000000}`;
 
 
 //// [unicodeExtendedEscapesInTemplates04_ES5.js]
-var x = "{00000000}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.types
new file mode 100644
index 0000000000000..ed85074ce7b87
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts ===
+
+var x = `\u{00000000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt
deleted file mode 100644
index 68964b1d9431e..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts (1 errors) ====
-    
-    var x = `\u{00000000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.types
new file mode 100644
index 0000000000000..134d7e74d97f8
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts ===
+
+var x = `\u{00000000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt
deleted file mode 100644
index e9b54c58b2cb9..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,42): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,48): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,54): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,60): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,72): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts (11 errors) ====
-    
-    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                         
-!!! error TS1125: Hexadecimal digit expected.
-                                                               
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                           
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js
index 766c61601fa2f..58372d69e9cfa 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
 
 
 //// [unicodeExtendedEscapesInTemplates05_ES5.js]
-var x = "{48}{65}{6c}{6c}{6f}{20}{77}{6f}{72}{6c}{64}";
+var x = "Hello world";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.types
new file mode 100644
index 0000000000000..4c2d3bcaabd86
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts ===
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt
deleted file mode 100644
index a00ecb7c2fe5f..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,42): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,48): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,54): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,60): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,72): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts (11 errors) ====
-    
-    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                         
-!!! error TS1125: Hexadecimal digit expected.
-                                                               
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                           
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.types
new file mode 100644
index 0000000000000..b7ea9bdacb79e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts ===
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt
deleted file mode 100644
index f803765e0a4d1..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-    var x = `\u{10FFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
index dd554fd3f3482..cb470d5adf63c 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
@@ -8,4 +8,4 @@ var x = `\u{10FFFF}`;
 //// [unicodeExtendedEscapesInTemplates06_ES5.js]
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-var x = "{10FFFF}";
+var x = "􏿿";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.types
new file mode 100644
index 0000000000000..7df17768955e2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{10FFFF}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt
deleted file mode 100644
index f31fcb0010665..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-    var x = `\u{10FFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.types
new file mode 100644
index 0000000000000..c1c62840534ee
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{10FFFF}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt
index 9b291aae179b8..8a4e1603e394a 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts(4,19): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTempl
     // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
     //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
     var x = `\u{110000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
+                      
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
index f9a423a6bb023..0411061e3eb7f 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
@@ -8,4 +8,4 @@ var x = `\u{110000}`;
 //// [unicodeExtendedEscapesInTemplates07_ES5.js]
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-var x = "{110000}";
+var x = "}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt
index ac2d5f84d831b..c81272fc1b0e9 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts(4,19): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTempl
     // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
     //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
     var x = `\u{110000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
+                      
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt
deleted file mode 100644
index 905f5e54549d7..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (FFFF == 65535)
-    var x = `\u{FFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
index b7d70f1d78fd4..03445e734b10a 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
@@ -10,4 +10,4 @@ var x = `\u{FFFF}`;
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  2. If cp ≤ 65535, return cp.
 // (FFFF == 65535)
-var x = "{FFFF}";
+var x = "￿";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.types
new file mode 100644
index 0000000000000..f889bd268e895
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = `\u{FFFF}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt
deleted file mode 100644
index 51c436e073675..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (FFFF == 65535)
-    var x = `\u{FFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.types
new file mode 100644
index 0000000000000..76bb7148e6dc1
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = `\u{FFFF}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt
deleted file mode 100644
index b0e3d49d05feb..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (10000 == 65536)
-    var x = `\u{10000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
index 9c3440a645e43..8c18768a22928 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
@@ -10,4 +10,4 @@ var x = `\u{10000}`;
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  2. If cp ≤ 65535, return cp.
 // (10000 == 65536)
-var x = "{10000}";
+var x = "𐀀";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.types
new file mode 100644
index 0000000000000..d821032140137
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = `\u{10000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt
deleted file mode 100644
index 80b72e3d2ada3..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (10000 == 65536)
-    var x = `\u{10000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.types
new file mode 100644
index 0000000000000..3b6edb2f91bbd
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = `\u{10000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt
deleted file mode 100644
index 20a504a7c7297..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
-    // Although we should just get back a single code point value of 0xD800,
-    // this is a useful edge-case test.
-    var x = `\u{D800}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
index 9c51b4aa5de67..68693d6fd4292 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
@@ -12,4 +12,4 @@ var x = `\u{D800}`;
 //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
 // Although we should just get back a single code point value of 0xD800,
 // this is a useful edge-case test.
-var x = "{D800}";
+var x = "�";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.types
new file mode 100644
index 0000000000000..e8a47efe0cde7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = `\u{D800}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt
deleted file mode 100644
index baf6fee361127..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
-    // Although we should just get back a single code point value of 0xD800,
-    // this is a useful edge-case test.
-    var x = `\u{D800}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.types
new file mode 100644
index 0000000000000..77f9bd420f20a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = `\u{D800}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt
deleted file mode 100644
index 5a319bc534ba0..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
-    // Although we should just get back a single code point value of 0xDC00,
-    // this is a useful edge-case test.
-    var x = `\u{DC00}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
index f0abbf09b841b..336030c54fcf8 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
@@ -12,4 +12,4 @@ var x = `\u{DC00}`;
 //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
 // Although we should just get back a single code point value of 0xDC00,
 // this is a useful edge-case test.
-var x = "{DC00}";
+var x = "�";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.types
new file mode 100644
index 0000000000000..d6dce3dbfc623
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = `\u{DC00}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt
deleted file mode 100644
index a651159fb3048..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
-    // Although we should just get back a single code point value of 0xDC00,
-    // this is a useful edge-case test.
-    var x = `\u{DC00}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.types
new file mode 100644
index 0000000000000..213f009c53d03
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = `\u{DC00}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt
index 2d2676c8dde54..f1166a156c46c 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts(2,21): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts (1 errors) ====
     
     var x = `\u{FFFFFFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
+                        
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
index 04b2e8311d26b..d460573a9f082 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{FFFFFFFF}`;
 
 
 //// [unicodeExtendedEscapesInTemplates12_ES5.js]
-var x = "{FFFFFFFF}";
+var x = "}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt
index 164ba5080baf4..737c4a704af71 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts(2,21): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts (1 errors) ====
     
     var x = `\u{FFFFFFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
+                        
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt
deleted file mode 100644
index f654afaeae9a7..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts (1 errors) ====
-    
-    var x = `\u{DDDDD}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
index a2ee97d9605ca..f59110e062c25 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{DDDDD}`;
 
 
 //// [unicodeExtendedEscapesInTemplates13_ES5.js]
-var x = "{DDDDD}";
+var x = "󝷝";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.types
new file mode 100644
index 0000000000000..70b0f580f021f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts ===
+
+var x = `\u{DDDDD}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt
deleted file mode 100644
index 384678ddff788..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts (1 errors) ====
-    
-    var x = `\u{DDDDD}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.types
new file mode 100644
index 0000000000000..c0be97ce558e1
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts ===
+
+var x = `\u{DDDDD}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt
index 08d816b17b48c..6179a41b3476e 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts(3,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts(3,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts (1 errors) ====
     
     // Shouldn't work, negatives are not allowed.
     var x = `\u{-DDDD}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js
index 2c190856f5772..cc2c1c1158e02 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js
@@ -6,4 +6,4 @@ var x = `\u{-DDDD}`;
 
 //// [unicodeExtendedEscapesInTemplates14_ES5.js]
 // Shouldn't work, negatives are not allowed.
-var x = "{-DDDD}";
+var x = "-DDDD}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt
index 23b82ede3e66d..86a956159a7bc 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts(3,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts(3,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts (1 errors) ====
     
     // Shouldn't work, negatives are not allowed.
     var x = `\u{-DDDD}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt
deleted file mode 100644
index 6d5fad519d01c..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts (4 errors) ====
-    
-    var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
index 008ded0452335..91b928af87751 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
 
 
 //// [unicodeExtendedEscapesInTemplates15_ES5.js]
-var x = "{abcd}{ef12}{3456}{7890}";
+var x = "ꯍ㑖碐";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.types
new file mode 100644
index 0000000000000..95eb2a2f75c15
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts ===
+
+var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt
deleted file mode 100644
index a9a6c15a1f8a2..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts (4 errors) ====
-    
-    var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.types
new file mode 100644
index 0000000000000..d7a42b3ff2475
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts ===
+
+var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt
deleted file mode 100644
index 81c1046cb8aa9..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts (4 errors) ====
-    
-    var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
index 4351e145acd34..6333eb753b50a 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
 
 
 //// [unicodeExtendedEscapesInTemplates16_ES5.js]
-var x = "{ABCD}{EF12}{3456}{7890}";
+var x = "ꯍ㑖碐";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.types
new file mode 100644
index 0000000000000..9eb8ed1e645e2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts ===
+
+var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt
deleted file mode 100644
index cd010bd94019f..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts (4 errors) ====
-    
-    var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.types
new file mode 100644
index 0000000000000..c5413c44c9224
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts ===
+
+var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt
index 91b53ec2f0acc..006a455963c7c 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,17): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,22): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,13): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,23): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts (3 errors) ====
     
     var x = `\u{r}\u{n}\u{t}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
-                    
+                     
 !!! error TS1125: Hexadecimal digit expected.
-                         
+                          
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js
index cf8dbccc96a7d..fbab1ea1149f5 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{r}\u{n}\u{t}`;
 
 
 //// [unicodeExtendedEscapesInTemplates17_ES5.js]
-var x = "{r}{n}{t}";
+var x = "r}n}t}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt
index c24cceedc3b5a..88dca427b67e6 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,17): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,22): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,13): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,23): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts (3 errors) ====
     
     var x = `\u{r}\u{n}\u{t}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
-                    
+                     
 !!! error TS1125: Hexadecimal digit expected.
-                         
+                          
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt
deleted file mode 100644
index 26fd16fe419ed..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts (2 errors) ====
-    
-    var x = `\u{65}\u{65}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js
index 5bf26237a1410..62df3ca631ac9 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{65}\u{65}`;
 
 
 //// [unicodeExtendedEscapesInTemplates18_ES5.js]
-var x = "{65}{65}";
+var x = "ee";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.types
new file mode 100644
index 0000000000000..84cd31b0dc0d2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts ===
+
+var x = `\u{65}\u{65}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt
deleted file mode 100644
index ed0260fbfa087..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts (2 errors) ====
-    
-    var x = `\u{65}\u{65}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.types
new file mode 100644
index 0000000000000..b7390bb9b68e0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts ===
+
+var x = `\u{65}\u{65}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt
index 6165a3778799c..47d3880a7618a 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts (1 errors) ====
     
     var x = `\u{}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
index 4cee5a73d8cdd..6656b9f3efea1 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{}`;
 
 
 //// [unicodeExtendedEscapesInTemplates19_ES5.js]
-var x = "{}";
+var x = "}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt
index c2ba97e704e7e..d22bab8d28fa8 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts (1 errors) ====
     
     var x = `\u{}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt
deleted file mode 100644
index 38f4cef43357b..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,45): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,51): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,58): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,78): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,84): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,90): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,96): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,102): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts (14 errors) ====
-    
-    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                                
-!!! error TS1125: Hexadecimal digit expected.
-                                                      
-!!! error TS1125: Hexadecimal digit expected.
-                                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                                         
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js
index 8ddd2b7a084a8..cbc5319d89700 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77
 
 
 //// [unicodeExtendedEscapesInTemplates20_ES5.js]
-var x = "{48}{65}{6c}{6c}{6f}" + "{20}{020}{0020}{000020}" + "{77}{6f}{72}{6c}{64}";
+var x = "Hello" + "    " + "world";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.types
new file mode 100644
index 0000000000000..cd29759d49e41
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts ===
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt
deleted file mode 100644
index fd77edb7b3cd1..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,45): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,51): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,58): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,78): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,84): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,90): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,96): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,102): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts (14 errors) ====
-    
-    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                                
-!!! error TS1125: Hexadecimal digit expected.
-                                                      
-!!! error TS1125: Hexadecimal digit expected.
-                                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                                         
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.types
new file mode 100644
index 0000000000000..92722ab2df5d8
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts ===
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+>x : string
+

From a81bf8cdadeb351bc048ff096b246a8ccd48c527 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Fri, 27 Feb 2015 11:33:39 -0800
Subject: [PATCH 05/14] Emit non-ASCII characters with unicode escape
 sequences.

---
 src/compiler/core.ts                          | 23 ---------
 src/compiler/emitter.ts                       |  7 ++-
 src/compiler/utilities.ts                     | 51 ++++++++++++++++++-
 ...taggedTemplateStringsWithUnicodeEscapes.js |  2 +-
 .../templateStringWhitespaceEscapes2.js       |  2 +-
 ...unicodeExtendedEscapesInTemplates06_ES5.js |  2 +-
 ...unicodeExtendedEscapesInTemplates08_ES5.js |  2 +-
 ...unicodeExtendedEscapesInTemplates09_ES5.js |  2 +-
 ...unicodeExtendedEscapesInTemplates10_ES5.js |  2 +-
 ...unicodeExtendedEscapesInTemplates11_ES5.js |  2 +-
 ...unicodeExtendedEscapesInTemplates13_ES5.js |  2 +-
 ...unicodeExtendedEscapesInTemplates15_ES5.js |  2 +-
 ...unicodeExtendedEscapesInTemplates16_ES5.js |  2 +-
 13 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index e27d3cb520740..2518b95d37ed0 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -623,29 +623,6 @@ module ts {
         "\u0085": "\\u0085"  // nextLine
     };
 
-    /**
-     * Based heavily on the abstract 'Quote'/ 'QuoteJSONString' operation from ECMA-262 (24.3.2.2),
-     * but augmented for a few select characters.
-     * Note that this doesn't actually wrap the input in double quotes.
-     */
-    export function escapeString(s: string): string {
-        // Prioritize '"' and '\'
-        s = backslashOrDoubleQuote.test(s) ? s.replace(backslashOrDoubleQuote, getReplacement) : s;
-        s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s;
-
-        return s;
-
-        function getReplacement(c: string) {
-            return escapedCharsMap[c] || unicodeEscape(c);
-        }
-
-        function unicodeEscape(c: string): string {
-            var hexCharCode = c.charCodeAt(0).toString(16);
-            var paddedHexCode = ("0000" + hexCharCode).slice(-4);
-            return "\\u" + paddedHexCode;
-        }
-    }
-
     export function getDefaultLibFileName(options: CompilerOptions): string {
         return options.target === ScriptTarget.ES6 ? "lib.es6.d.ts" : "lib.d.ts";
     }
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index e57255a776b0c..777968ee68383 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2201,9 +2201,12 @@ module ts {
                     write(text);
                 }
             }
-
+            
             function getTemplateLiteralAsStringLiteral(node: LiteralExpression): string {
-                return '"' + escapeString(node.text) + '"';
+                var result = escapeString(node.text);
+                result = replaceNonAsciiCharacters(result);
+                
+                return '"' + result + '"';
             }
             
             function emitDownlevelRawTemplateLiteral(node: LiteralExpression) {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index b53c0007248cd..51981db016397 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1120,7 +1120,7 @@ module ts {
             newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2));
         }
 
-        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), /*newLength: */newEndN - oldStartN);
+        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), /*newLength: */ newEndN - oldStartN);
     }
 
     // @internal
@@ -1202,4 +1202,53 @@ module ts {
             }
         }
     }
+    
+    var backslashOrDoubleQuote = /[\"\\]/g;
+    var escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
+    var escapedCharsMap: Map<string> = {
+        "\0": "\\0",
+        "\t": "\\t",
+        "\v": "\\v",
+        "\f": "\\f",
+        "\b": "\\b",
+        "\r": "\\r",
+        "\n": "\\n",
+        "\\": "\\\\",
+        "\"": "\\\"",
+        "\u2028": "\\u2028", // lineSeparator
+        "\u2029": "\\u2029", // paragraphSeparator
+        "\u0085": "\\u0085"  // nextLine
+    };
+
+    /**
+     * Based heavily on the abstract 'Quote'/ 'QuoteJSONString' operation from ECMA-262 (24.3.2.2),
+     * but augmented for a few select characters.
+     * Note that this doesn't actually wrap the input in double quotes.
+     */
+    export function escapeString(s: string): string {
+        // Prioritize '"' and '\'
+        s = backslashOrDoubleQuote.test(s) ? s.replace(backslashOrDoubleQuote, getReplacement) : s;
+        s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s;
+
+        return s;
+
+        function getReplacement(c: string) {
+            return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0));
+        }
+    }
+    
+    function get16BitUnicodeEscapeSequence(charCode: number): string {
+        var hexCharCode = charCode.toString(16);
+        var paddedHexCode = ("0000" + hexCharCode).slice(-4);
+        return "\\u" + paddedHexCode;
+    }
+    
+    var nonAsciiCharacters = /[^\u0000-\u007F]/g;
+    export function replaceNonAsciiCharacters(s: string): string {
+        // Replace non-ASCII characters with '\uNNNN' escapes if any exist.
+        // Otherwise just return the original string.
+        return nonAsciiCharacters.test(s) ?
+            s.replace(nonAsciiCharacters, c => get16BitUnicodeEscapeSequence(c.charCodeAt(0))) :
+            s;
+    }
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
index e2f6b608f9603..bf4501804a675 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
@@ -11,5 +11,5 @@ function f() {
         args[_i - 0] = arguments[_i];
     }
 }
-(_a = ["'💩'", "'💩'"], _a.raw = ["'\\u{1f4a9}'", "'\\uD83D\\uDCA9'"], f(_a, " should be converted to "));
+(_a = ["'\ud83d\udca9'", "'\ud83d\udca9'"], _a.raw = ["'\\u{1f4a9}'", "'\\uD83D\\uDCA9'"], f(_a, " should be converted to "));
 var _a;
diff --git a/tests/baselines/reference/templateStringWhitespaceEscapes2.js b/tests/baselines/reference/templateStringWhitespaceEscapes2.js
index 144b1e78b8bdc..d836bb11b801f 100644
--- a/tests/baselines/reference/templateStringWhitespaceEscapes2.js
+++ b/tests/baselines/reference/templateStringWhitespaceEscapes2.js
@@ -6,4 +6,4 @@
 
 //// [templateStringWhitespaceEscapes2.js]
 // <TAB>, <VT>, <FF>, <SP>, <NBSP>, <BOM>
-"\t\v\f  ";
+"\t\v\f \u00a0\ufeff";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
index cb470d5adf63c..cf3eadfeb7743 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
@@ -8,4 +8,4 @@ var x = `\u{10FFFF}`;
 //// [unicodeExtendedEscapesInTemplates06_ES5.js]
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-var x = "􏿿";
+var x = "\udbff\udfff";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
index 03445e734b10a..5744dfb8e4f3d 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
@@ -10,4 +10,4 @@ var x = `\u{FFFF}`;
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  2. If cp ≤ 65535, return cp.
 // (FFFF == 65535)
-var x = "￿";
+var x = "\uffff";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
index 8c18768a22928..d2bfe6a45f4fb 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
@@ -10,4 +10,4 @@ var x = `\u{10000}`;
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  2. If cp ≤ 65535, return cp.
 // (10000 == 65536)
-var x = "𐀀";
+var x = "\ud800\udc00";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
index 68693d6fd4292..ed8d60f3b69d3 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
@@ -12,4 +12,4 @@ var x = `\u{D800}`;
 //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
 // Although we should just get back a single code point value of 0xD800,
 // this is a useful edge-case test.
-var x = "�";
+var x = "\ud800";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
index 336030c54fcf8..f6bd2d7643771 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
@@ -12,4 +12,4 @@ var x = `\u{DC00}`;
 //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
 // Although we should just get back a single code point value of 0xDC00,
 // this is a useful edge-case test.
-var x = "�";
+var x = "\udc00";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
index f59110e062c25..7de26d0ed2263 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{DDDDD}`;
 
 
 //// [unicodeExtendedEscapesInTemplates13_ES5.js]
-var x = "󝷝";
+var x = "\udb37\udddd";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
index 91b928af87751..ec40b21787083 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
 
 
 //// [unicodeExtendedEscapesInTemplates15_ES5.js]
-var x = "ꯍ㑖碐";
+var x = "\uabcd\uef12\u3456\u7890";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
index 6333eb753b50a..e3464ce05fb77 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
 
 
 //// [unicodeExtendedEscapesInTemplates16_ES5.js]
-var x = "ꯍ㑖碐";
+var x = "\uabcd\uef12\u3456\u7890";

From 9d89668516faea08d91b4d15f9e85b2c302454ae Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Fri, 27 Feb 2015 11:41:14 -0800
Subject: [PATCH 06/14] Made unicode escapes use uppercase hex codes.

...because caps lock is cruise control for cool.
---
 src/compiler/utilities.ts                                       | 2 +-
 .../reference/taggedTemplateStringsWithUnicodeEscapes.js        | 2 +-
 .../reference/templateStringControlCharacterEscapes03.js        | 2 +-
 tests/baselines/reference/templateStringWhitespaceEscapes2.js   | 2 +-
 .../reference/unicodeExtendedEscapesInTemplates06_ES5.js        | 2 +-
 .../reference/unicodeExtendedEscapesInTemplates08_ES5.js        | 2 +-
 .../reference/unicodeExtendedEscapesInTemplates09_ES5.js        | 2 +-
 .../reference/unicodeExtendedEscapesInTemplates10_ES5.js        | 2 +-
 .../reference/unicodeExtendedEscapesInTemplates11_ES5.js        | 2 +-
 .../reference/unicodeExtendedEscapesInTemplates13_ES5.js        | 2 +-
 .../reference/unicodeExtendedEscapesInTemplates15_ES5.js        | 2 +-
 .../reference/unicodeExtendedEscapesInTemplates16_ES5.js        | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 51981db016397..a9a9f98b82d7a 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1238,7 +1238,7 @@ module ts {
     }
     
     function get16BitUnicodeEscapeSequence(charCode: number): string {
-        var hexCharCode = charCode.toString(16);
+        var hexCharCode = charCode.toString(16).toUpperCase();
         var paddedHexCode = ("0000" + hexCharCode).slice(-4);
         return "\\u" + paddedHexCode;
     }
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
index bf4501804a675..ae73b0b227e58 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
@@ -11,5 +11,5 @@ function f() {
         args[_i - 0] = arguments[_i];
     }
 }
-(_a = ["'\ud83d\udca9'", "'\ud83d\udca9'"], _a.raw = ["'\\u{1f4a9}'", "'\\uD83D\\uDCA9'"], f(_a, " should be converted to "));
+(_a = ["'\uD83D\uDCA9'", "'\uD83D\uDCA9'"], _a.raw = ["'\\u{1f4a9}'", "'\\uD83D\\uDCA9'"], f(_a, " should be converted to "));
 var _a;
diff --git a/tests/baselines/reference/templateStringControlCharacterEscapes03.js b/tests/baselines/reference/templateStringControlCharacterEscapes03.js
index ae9774d952a53..a0e87fc7e0ea4 100644
--- a/tests/baselines/reference/templateStringControlCharacterEscapes03.js
+++ b/tests/baselines/reference/templateStringControlCharacterEscapes03.js
@@ -4,4 +4,4 @@
 var x = `\x1F\u001f 1F 1f`;
 
 //// [templateStringControlCharacterEscapes03.js]
-var x = "\u001f\u001f 1F 1f";
+var x = "\u001F\u001F 1F 1f";
diff --git a/tests/baselines/reference/templateStringWhitespaceEscapes2.js b/tests/baselines/reference/templateStringWhitespaceEscapes2.js
index d836bb11b801f..1a46cc7f75079 100644
--- a/tests/baselines/reference/templateStringWhitespaceEscapes2.js
+++ b/tests/baselines/reference/templateStringWhitespaceEscapes2.js
@@ -6,4 +6,4 @@
 
 //// [templateStringWhitespaceEscapes2.js]
 // <TAB>, <VT>, <FF>, <SP>, <NBSP>, <BOM>
-"\t\v\f \u00a0\ufeff";
+"\t\v\f \u00A0\uFEFF";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
index cf3eadfeb7743..5eb89de178b91 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
@@ -8,4 +8,4 @@ var x = `\u{10FFFF}`;
 //// [unicodeExtendedEscapesInTemplates06_ES5.js]
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-var x = "\udbff\udfff";
+var x = "\uDBFF\uDFFF";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
index 5744dfb8e4f3d..955007898596c 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
@@ -10,4 +10,4 @@ var x = `\u{FFFF}`;
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  2. If cp ≤ 65535, return cp.
 // (FFFF == 65535)
-var x = "\uffff";
+var x = "\uFFFF";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
index d2bfe6a45f4fb..9bb44e7b246b4 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
@@ -10,4 +10,4 @@ var x = `\u{10000}`;
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  2. If cp ≤ 65535, return cp.
 // (10000 == 65536)
-var x = "\ud800\udc00";
+var x = "\uD800\uDC00";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
index ed8d60f3b69d3..affe915c0dd82 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
@@ -12,4 +12,4 @@ var x = `\u{D800}`;
 //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
 // Although we should just get back a single code point value of 0xD800,
 // this is a useful edge-case test.
-var x = "\ud800";
+var x = "\uD800";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
index f6bd2d7643771..576d732849023 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
@@ -12,4 +12,4 @@ var x = `\u{DC00}`;
 //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
 // Although we should just get back a single code point value of 0xDC00,
 // this is a useful edge-case test.
-var x = "\udc00";
+var x = "\uDC00";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
index 7de26d0ed2263..ce151783523ff 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{DDDDD}`;
 
 
 //// [unicodeExtendedEscapesInTemplates13_ES5.js]
-var x = "\udb37\udddd";
+var x = "\uDB37\uDDDD";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
index ec40b21787083..a383fd516bb1f 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
 
 
 //// [unicodeExtendedEscapesInTemplates15_ES5.js]
-var x = "\uabcd\uef12\u3456\u7890";
+var x = "\uABCD\uEF12\u3456\u7890";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
index e3464ce05fb77..1a47acc902737 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
 
 
 //// [unicodeExtendedEscapesInTemplates16_ES5.js]
-var x = "\uabcd\uef12\u3456\u7890";
+var x = "\uABCD\uEF12\u3456\u7890";

From 4657c2dfd505fbae96ab3b2eedc2ebd9faef097a Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Fri, 27 Feb 2015 12:55:46 -0800
Subject: [PATCH 07/14] Emit all strings with extended escapes using the same
 scheme as templates.

---
 src/compiler/emitter.ts                               | 11 +++++++----
 src/compiler/parser.ts                                |  4 ++++
 src/compiler/scanner.ts                               |  5 +++++
 src/compiler/types.ts                                 |  1 +
 tests/baselines/reference/APISample_compile.js        |  2 ++
 tests/baselines/reference/APISample_compile.types     |  6 ++++++
 tests/baselines/reference/APISample_linter.js         |  2 ++
 tests/baselines/reference/APISample_linter.types      |  6 ++++++
 tests/baselines/reference/APISample_transform.js      |  2 ++
 tests/baselines/reference/APISample_transform.types   |  6 ++++++
 tests/baselines/reference/APISample_watcher.js        |  2 ++
 tests/baselines/reference/APISample_watcher.types     |  6 ++++++
 .../unicodeExtendedEscapesInStrings01_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings02_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings03_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings04_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings05_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings06_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings07_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings08_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings09_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings10_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings11_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings12_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings13_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings14_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings15_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings16_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings17_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings18_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings19_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings20_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings21_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings22_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings23_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings24_ES5.js          |  2 +-
 .../unicodeExtendedEscapesInStrings25_ES5.js          |  2 +-
 37 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 777968ee68383..295b068758b3d 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2187,9 +2187,12 @@ module ts {
             }
 
             function emitLiteral(node: LiteralExpression) {
-                var text = languageVersion < ScriptTarget.ES6 && isTemplateLiteralKind(node.kind) ? getTemplateLiteralAsStringLiteral(node) :
-                    node.parent ? getSourceTextOfNodeFromSourceFile(currentSourceFile, node) :
-                        node.text;
+                var text = languageVersion < ScriptTarget.ES6 && (isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)
+                    ? getDoubleQuotedStringTextOfLiteral(node)
+                    : node.parent
+                        ? getSourceTextOfNodeFromSourceFile(currentSourceFile, node)
+                        : node.text; // TODO(drosen): Is this correct?
+                
                 if (compilerOptions.sourceMap && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
                     writer.writeLiteral(text);
                 }
@@ -2202,7 +2205,7 @@ module ts {
                 }
             }
             
-            function getTemplateLiteralAsStringLiteral(node: LiteralExpression): string {
+            function getDoubleQuotedStringTextOfLiteral(node: LiteralExpression): string {
                 var result = escapeString(node.text);
                 result = replaceNonAsciiCharacters(result);
                 
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 9dc8a4755276f..21ff1f98e6541 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -2164,6 +2164,10 @@ module ts {
             var text = scanner.getTokenValue();
             node.text = internName ? internIdentifier(text) : text;
 
+            if (scanner.hasExtendedUnicodeEscape()) {
+                node.hasExtendedUnicodeEscape = true;
+            }
+            
             if (scanner.isUnterminated()) {
                 node.isUnterminated = true;
             }
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 5e3a7e3a112c0..604f422eca433 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -14,6 +14,7 @@ module ts {
         getTokenPos(): number;
         getTokenText(): string;
         getTokenValue(): string;
+        hasExtendedUnicodeEscape(): boolean;
         hasPrecedingLineBreak(): boolean;
         isIdentifier(): boolean;
         isReservedWord(): boolean;
@@ -556,6 +557,7 @@ module ts {
         var token: SyntaxKind;
         var tokenValue: string;
         var precedingLineBreak: boolean;
+        var hasExtendedUnicodeEscape: boolean;
         var tokenIsUnterminated: boolean;
 
         function error(message: DiagnosticMessage, length?: number): void {
@@ -776,6 +778,7 @@ module ts {
                     return "\"";
                 case CharacterCodes.u:
                     if (text.charCodeAt(pos) === CharacterCodes.openBrace) {
+                        hasExtendedUnicodeEscape = true;
                         pos++;
                         var escapedValue = scanMinimumNumberOfHexDigits(1);
                         
@@ -926,6 +929,7 @@ module ts {
 
         function scan(): SyntaxKind {
             startPos = pos;
+            hasExtendedUnicodeEscape = false;
             precedingLineBreak = false;
             tokenIsUnterminated = false;
             while (true) {
@@ -1393,6 +1397,7 @@ module ts {
             getTokenPos: () => tokenPos,
             getTokenText: () => text.substring(tokenPos, pos),
             getTokenValue: () => tokenValue,
+            hasExtendedUnicodeEscape: () => hasExtendedUnicodeEscape,
             hasPrecedingLineBreak: () => precedingLineBreak,
             isIdentifier: () => token === SyntaxKind.Identifier || token > SyntaxKind.LastReservedWord,
             isReservedWord: () => token >= SyntaxKind.FirstReservedWord && token <= SyntaxKind.LastReservedWord,
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index d1730ce1f1b0d..82f739de1c8c7 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -655,6 +655,7 @@ module ts {
     export interface LiteralExpression extends PrimaryExpression {
         text: string;
         isUnterminated?: boolean;
+        hasExtendedUnicodeEscape?: boolean;
     }
 
     export interface StringLiteralExpression extends LiteralExpression {
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 5381b327504b4..ebfc288a85f79 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -552,6 +552,7 @@ declare module "typescript" {
     interface LiteralExpression extends PrimaryExpression {
         text: string;
         isUnterminated?: boolean;
+        hasExtendedUnicodeEscape?: boolean;
     }
     interface StringLiteralExpression extends LiteralExpression {
         _stringLiteralExpressionBrand: any;
@@ -1421,6 +1422,7 @@ declare module "typescript" {
         getTokenPos(): number;
         getTokenText(): string;
         getTokenValue(): string;
+        hasExtendedUnicodeEscape(): boolean;
         hasPrecedingLineBreak(): boolean;
         isIdentifier(): boolean;
         isReservedWord(): boolean;
diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types
index 106fa45e42468..3f389dfea8aee 100644
--- a/tests/baselines/reference/APISample_compile.types
+++ b/tests/baselines/reference/APISample_compile.types
@@ -1664,6 +1664,9 @@ declare module "typescript" {
 
         isUnterminated?: boolean;

 >isUnterminated : boolean
+
+        hasExtendedUnicodeEscape?: boolean;

+>hasExtendedUnicodeEscape : boolean
     }

     interface StringLiteralExpression extends LiteralExpression {

 >StringLiteralExpression : StringLiteralExpression
@@ -4481,6 +4484,9 @@ declare module "typescript" {
         getTokenValue(): string;

 >getTokenValue : () => string
 
+        hasExtendedUnicodeEscape(): boolean;

+>hasExtendedUnicodeEscape : () => boolean
+
         hasPrecedingLineBreak(): boolean;

 >hasPrecedingLineBreak : () => boolean
 
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index 47183c920b49f..c4699b98948db 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -583,6 +583,7 @@ declare module "typescript" {
     interface LiteralExpression extends PrimaryExpression {
         text: string;
         isUnterminated?: boolean;
+        hasExtendedUnicodeEscape?: boolean;
     }
     interface StringLiteralExpression extends LiteralExpression {
         _stringLiteralExpressionBrand: any;
@@ -1452,6 +1453,7 @@ declare module "typescript" {
         getTokenPos(): number;
         getTokenText(): string;
         getTokenValue(): string;
+        hasExtendedUnicodeEscape(): boolean;
         hasPrecedingLineBreak(): boolean;
         isIdentifier(): boolean;
         isReservedWord(): boolean;
diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types
index 776e7c0bbc17f..7a3138251e1db 100644
--- a/tests/baselines/reference/APISample_linter.types
+++ b/tests/baselines/reference/APISample_linter.types
@@ -1810,6 +1810,9 @@ declare module "typescript" {
 
         isUnterminated?: boolean;

 >isUnterminated : boolean
+
+        hasExtendedUnicodeEscape?: boolean;

+>hasExtendedUnicodeEscape : boolean
     }

     interface StringLiteralExpression extends LiteralExpression {

 >StringLiteralExpression : StringLiteralExpression
@@ -4627,6 +4630,9 @@ declare module "typescript" {
         getTokenValue(): string;

 >getTokenValue : () => string
 
+        hasExtendedUnicodeEscape(): boolean;

+>hasExtendedUnicodeEscape : () => boolean
+
         hasPrecedingLineBreak(): boolean;

 >hasPrecedingLineBreak : () => boolean
 
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index ea323ba927ff4..273d9110ec96f 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -584,6 +584,7 @@ declare module "typescript" {
     interface LiteralExpression extends PrimaryExpression {
         text: string;
         isUnterminated?: boolean;
+        hasExtendedUnicodeEscape?: boolean;
     }
     interface StringLiteralExpression extends LiteralExpression {
         _stringLiteralExpressionBrand: any;
@@ -1453,6 +1454,7 @@ declare module "typescript" {
         getTokenPos(): number;
         getTokenText(): string;
         getTokenValue(): string;
+        hasExtendedUnicodeEscape(): boolean;
         hasPrecedingLineBreak(): boolean;
         isIdentifier(): boolean;
         isReservedWord(): boolean;
diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types
index 9abc0385d0791..3d478c44aedd1 100644
--- a/tests/baselines/reference/APISample_transform.types
+++ b/tests/baselines/reference/APISample_transform.types
@@ -1760,6 +1760,9 @@ declare module "typescript" {
 
         isUnterminated?: boolean;

 >isUnterminated : boolean
+
+        hasExtendedUnicodeEscape?: boolean;

+>hasExtendedUnicodeEscape : boolean
     }

     interface StringLiteralExpression extends LiteralExpression {

 >StringLiteralExpression : StringLiteralExpression
@@ -4577,6 +4580,9 @@ declare module "typescript" {
         getTokenValue(): string;

 >getTokenValue : () => string
 
+        hasExtendedUnicodeEscape(): boolean;

+>hasExtendedUnicodeEscape : () => boolean
+
         hasPrecedingLineBreak(): boolean;

 >hasPrecedingLineBreak : () => boolean
 
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index 3e80b34ba0ee3..629636b0eea3d 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -621,6 +621,7 @@ declare module "typescript" {
     interface LiteralExpression extends PrimaryExpression {
         text: string;
         isUnterminated?: boolean;
+        hasExtendedUnicodeEscape?: boolean;
     }
     interface StringLiteralExpression extends LiteralExpression {
         _stringLiteralExpressionBrand: any;
@@ -1490,6 +1491,7 @@ declare module "typescript" {
         getTokenPos(): number;
         getTokenText(): string;
         getTokenValue(): string;
+        hasExtendedUnicodeEscape(): boolean;
         hasPrecedingLineBreak(): boolean;
         isIdentifier(): boolean;
         isReservedWord(): boolean;
diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types
index 79c2177ce79be..b01a2915b5b2c 100644
--- a/tests/baselines/reference/APISample_watcher.types
+++ b/tests/baselines/reference/APISample_watcher.types
@@ -1933,6 +1933,9 @@ declare module "typescript" {
 
         isUnterminated?: boolean;

 >isUnterminated : boolean
+
+        hasExtendedUnicodeEscape?: boolean;

+>hasExtendedUnicodeEscape : boolean
     }

     interface StringLiteralExpression extends LiteralExpression {

 >StringLiteralExpression : StringLiteralExpression
@@ -4750,6 +4753,9 @@ declare module "typescript" {
         getTokenValue(): string;

 >getTokenValue : () => string
 
+        hasExtendedUnicodeEscape(): boolean;

+>hasExtendedUnicodeEscape : () => boolean
+
         hasPrecedingLineBreak(): boolean;

 >hasPrecedingLineBreak : () => boolean
 
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.js
index 889695a771608..e1e1a0ef70547 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{0}";
 
 
 //// [unicodeExtendedEscapesInStrings01_ES5.js]
-var x = "\u{0}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.js
index 5e9df9895f63e..f20a321f76687 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{00}";
 
 
 //// [unicodeExtendedEscapesInStrings02_ES5.js]
-var x = "\u{00}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.js
index 38445f149a74f..8ef0ae23371b1 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{0000}";
 
 
 //// [unicodeExtendedEscapesInStrings03_ES5.js]
-var x = "\u{0000}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.js
index 16bd4a7098144..15f91fdbc7e2e 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{00000000}";
 
 
 //// [unicodeExtendedEscapesInStrings04_ES5.js]
-var x = "\u{00000000}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.js
index 6988fbb68a62a..51638c85ef418 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
 
 
 //// [unicodeExtendedEscapesInStrings05_ES5.js]
-var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
+var x = "Hello world";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.js
index f41ff81625ac0..229b04ca7992e 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.js
@@ -8,4 +8,4 @@ var x = "\u{10FFFF}";
 //// [unicodeExtendedEscapesInStrings06_ES5.js]
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-var x = "\u{10FFFF}";
+var x = "\uDBFF\uDFFF";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js
index 48c3bd78bbedd..12bb7974a1d12 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js
@@ -8,4 +8,4 @@ var x = "\u{110000}";
 //// [unicodeExtendedEscapesInStrings07_ES5.js]
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-var x = "\u{110000}";
+var x = "}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.js
index aea5dec2e7dec..5ad677c2da21f 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.js
@@ -10,4 +10,4 @@ var x = "\u{FFFF}";
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  2. If cp ≤ 65535, return cp.
 // (FFFF == 65535)
-var x = "\u{FFFF}";
+var x = "\uFFFF";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.js
index 21d143d9a7995..cebdd770262b6 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.js
@@ -10,4 +10,4 @@ var x = "\u{10000}";
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  2. If cp ≤ 65535, return cp.
 // (10000 == 65536)
-var x = "\u{10000}";
+var x = "\uD800\uDC00";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.js
index f323802d07933..615ce361f0f12 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.js
@@ -12,4 +12,4 @@ var x = "\u{D800}";
 //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
 // Although we should just get back a single code point value of 0xD800,
 // this is a useful edge-case test.
-var x = "\u{D800}";
+var x = "\uD800";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.js
index d1140d966edf2..144ae140d0035 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.js
@@ -12,4 +12,4 @@ var x = "\u{DC00}";
 //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
 // Although we should just get back a single code point value of 0xDC00,
 // this is a useful edge-case test.
-var x = "\u{DC00}";
+var x = "\uDC00";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js
index edd1eb875a213..32da4410b4211 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{FFFFFFFF}";
 
 
 //// [unicodeExtendedEscapesInStrings12_ES5.js]
-var x = "\u{FFFFFFFF}";
+var x = "}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.js
index 1469aa4aaae0f..2a54098d3c13e 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{DDDDD}";
 
 
 //// [unicodeExtendedEscapesInStrings13_ES5.js]
-var x = "\u{DDDDD}";
+var x = "\uDB37\uDDDD";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.js
index 037a176e7e7ff..592030c20aadb 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.js
@@ -6,4 +6,4 @@ var x = "\u{-DDDD}";
 
 //// [unicodeExtendedEscapesInStrings14_ES5.js]
 // Shouldn't work, negatives are not allowed.
-var x = "\u{-DDDD}";
+var x = "-DDDD}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.js
index be647bc543b8f..7811342a6994d 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
 
 
 //// [unicodeExtendedEscapesInStrings15_ES5.js]
-var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
+var x = "\uABCD\uEF12\u3456\u7890";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.js
index fb5c33d814efe..33bbcdbba3b99 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
 
 
 //// [unicodeExtendedEscapesInStrings16_ES5.js]
-var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
+var x = "\uABCD\uEF12\u3456\u7890";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.js
index 3ed04f82268cb..810c129dad15f 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{r}\u{n}\u{t}";
 
 
 //// [unicodeExtendedEscapesInStrings17_ES5.js]
-var x = "\u{r}\u{n}\u{t}";
+var x = "r}n}t}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.js
index 8778b92afff08..0eee224c3079d 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{65}\u{65}";
 
 
 //// [unicodeExtendedEscapesInStrings18_ES5.js]
-var x = "\u{65}\u{65}";
+var x = "ee";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js
index 5ca68cd253385..964dbe17b6c42 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{}";
 
 
 //// [unicodeExtendedEscapesInStrings19_ES5.js]
-var x = "\u{}";
+var x = "}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.js
index 01d06586dd768..74e664ccb9986 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{";
 
 
 //// [unicodeExtendedEscapesInStrings20_ES5.js]
-var x = "\u{";
+var x = "";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js
index 7dfdd1c2dc42e..baa3c2c101e21 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{67";
 
 
 //// [unicodeExtendedEscapesInStrings21_ES5.js]
-var x = "\u{67";
+var x = "g";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js
index b65afc2df979d..c3dcbe2e06251 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{00000000000067";
 
 
 //// [unicodeExtendedEscapesInStrings22_ES5.js]
-var x = "\u{00000000000067";
+var x = "g";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.js
index 2272be7150bdd..fd993a100a4bb 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{00000000000067}";
 
 
 //// [unicodeExtendedEscapesInStrings23_ES5.js]
-var x = "\u{00000000000067}";
+var x = "g";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js
index aaa6375184655..acc9a9f9efa4b 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{00000000000067
 
 
 //// [unicodeExtendedEscapesInStrings24_ES5.js]
-var x = "\u{00000000000067;
+var x = "g";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.js
index 4bd5f06503690..bc84bb4211360 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{00000000000067}
 
 
 //// [unicodeExtendedEscapesInStrings25_ES5.js]
-var x = "\u{00000000000067};
+var x = "g";

From cad8f6b09114ed6322f046a739bc254027aba9ee Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Fri, 27 Feb 2015 15:34:06 -0800
Subject: [PATCH 08/14] Only add an extended Unicode escape when it is entirely
 valid.

---
 src/compiler/scanner.ts                       | 68 +++++++++++--------
 .../unicodeExtendedEscapesInStrings07_ES5.js  |  2 +-
 .../unicodeExtendedEscapesInStrings12_ES5.js  |  2 +-
 .../unicodeExtendedEscapesInStrings19_ES5.js  |  2 +-
 .../unicodeExtendedEscapesInStrings21_ES5.js  |  2 +-
 .../unicodeExtendedEscapesInStrings22_ES5.js  |  2 +-
 .../unicodeExtendedEscapesInStrings24_ES5.js  |  2 +-
 ...unicodeExtendedEscapesInTemplates07_ES5.js |  2 +-
 ...unicodeExtendedEscapesInTemplates12_ES5.js |  2 +-
 ...unicodeExtendedEscapesInTemplates19_ES5.js |  2 +-
 10 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 604f422eca433..b3ed4caf4c180 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -777,39 +777,12 @@ module ts {
                 case CharacterCodes.doubleQuote:
                     return "\"";
                 case CharacterCodes.u:
-                    if (text.charCodeAt(pos) === CharacterCodes.openBrace) {
+                    if (pos < len && text.charCodeAt(pos) === CharacterCodes.openBrace) {
                         hasExtendedUnicodeEscape = true;
                         pos++;
-                        var escapedValue = scanMinimumNumberOfHexDigits(1);
-                        
-                        if (escapedValue < 0) {
-                            // TODO(drosen): give a proper error message for escaped values that are too large.
-                            error(Diagnostics.Hexadecimal_digit_expected)
-                            return "";
-                        }
-                        
-                        if (escapedValue > 0x10FFFF) {
-                            error(Diagnostics.An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive);
-                            return "";
-                        }
-                        
-                        if (pos >= len) {
-                            error(Diagnostics.Unexpected_end_of_text);
-                            return "";
-                        }
-                        
-                        // Only swallow the following character up if it's a '}'.
-                        var escapeTerminator = text.charCodeAt(pos);
-                        if (escapeTerminator == CharacterCodes.closeBrace) {
-                            pos++;
-                        }
-                        else {
-                            // '}' expected.
-                            error(Diagnostics.expected);
-                        }
-                        
-                        return utf16EncodeAsString(escapedValue);
+                        return scanExtendedUnicodeEscape();
                     }
+                    
                     // fall through
                 case CharacterCodes.x:
                     var escapedValue = scanExactNumberOfHexDigits(ch === CharacterCodes.x ? 2 : 4);
@@ -837,6 +810,41 @@ module ts {
             }
         }
         
+        function scanExtendedUnicodeEscape(): string {
+            var hexStartPos = pos;
+            var escapedValue = scanMinimumNumberOfHexDigits(1);
+            var isInvalidExtendedEscape = false;
+
+            // Validate the value of the digit
+            if (escapedValue < 0) {
+                error(Diagnostics.Hexadecimal_digit_expected)
+                isInvalidExtendedEscape = true;
+            }
+            else if (escapedValue > 0x10FFFF) {
+                error(Diagnostics.An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive);
+                isInvalidExtendedEscape = true;
+            }
+
+            if (pos >= len) {
+                error(Diagnostics.Unexpected_end_of_text);
+                isInvalidExtendedEscape = true;
+            }
+            else if (text.charCodeAt(pos) == CharacterCodes.closeBrace) {
+                // Only swallow the following character up if it's a '}'.
+                pos++;
+            }
+            else {
+                error(Diagnostics.expected); // '}' expected.
+                isInvalidExtendedEscape = true;
+            }
+
+            if (isInvalidExtendedEscape) {
+                return "";
+            }
+
+            return utf16EncodeAsString(escapedValue);
+        }
+        
         // Derived from the 10.1.1 UTF16Encoding of the ES6 Spec.
         function utf16EncodeAsString(codePoint: number): string {
             Debug.assert(0x0 <= codePoint && codePoint <= 0x10FFFF);
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js
index 12bb7974a1d12..3deb60da74a3a 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.js
@@ -8,4 +8,4 @@ var x = "\u{110000}";
 //// [unicodeExtendedEscapesInStrings07_ES5.js]
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-var x = "}";
+var x = "";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js
index 32da4410b4211..53880789c26d1 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{FFFFFFFF}";
 
 
 //// [unicodeExtendedEscapesInStrings12_ES5.js]
-var x = "}";
+var x = "";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js
index 964dbe17b6c42..f7841e67463ad 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{}";
 
 
 //// [unicodeExtendedEscapesInStrings19_ES5.js]
-var x = "}";
+var x = "";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js
index baa3c2c101e21..d72651ea7527e 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{67";
 
 
 //// [unicodeExtendedEscapesInStrings21_ES5.js]
-var x = "g";
+var x = "";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js
index c3dcbe2e06251..b1a9ef3ec1908 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{00000000000067";
 
 
 //// [unicodeExtendedEscapesInStrings22_ES5.js]
-var x = "g";
+var x = "";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js
index acc9a9f9efa4b..6656129b4d565 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.js
@@ -4,4 +4,4 @@ var x = "\u{00000000000067
 
 
 //// [unicodeExtendedEscapesInStrings24_ES5.js]
-var x = "g";
+var x = "";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
index 0411061e3eb7f..53ac3eec30c96 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
@@ -8,4 +8,4 @@ var x = `\u{110000}`;
 //// [unicodeExtendedEscapesInTemplates07_ES5.js]
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-var x = "}";
+var x = "";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
index d460573a9f082..2b0bc3a06503d 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{FFFFFFFF}`;
 
 
 //// [unicodeExtendedEscapesInTemplates12_ES5.js]
-var x = "}";
+var x = "";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
index 6656b9f3efea1..03e9f1e405625 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{}`;
 
 
 //// [unicodeExtendedEscapesInTemplates19_ES5.js]
-var x = "}";
+var x = "";

From 5437b3db5a49d543aab6ff4a1af2f9bc99d18dea Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Fri, 27 Feb 2015 16:08:21 -0800
Subject: [PATCH 09/14] Removed unused variable.

---
 src/compiler/scanner.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index b3ed4caf4c180..e3479e27152ea 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -811,7 +811,6 @@ module ts {
         }
         
         function scanExtendedUnicodeEscape(): string {
-            var hexStartPos = pos;
             var escapedValue = scanMinimumNumberOfHexDigits(1);
             var isInvalidExtendedEscape = false;
 

From b1837c827c56278e1a3523ed737fcf77d17b1ede Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Fri, 27 Feb 2015 17:59:20 -0800
Subject: [PATCH 10/14] Addressed some CR feedback.

---
 src/compiler/emitter.ts   |  2 +-
 src/compiler/scanner.ts   | 45 ++++++++++++++++++++++++++-------------
 src/compiler/utilities.ts | 18 +++++++++-------
 3 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 4c3aa8990bd19..ad6a93d2a9623 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2211,7 +2211,7 @@ module ts {
             
             function getDoubleQuotedStringTextOfLiteral(node: LiteralExpression): string {
                 var result = escapeString(node.text);
-                result = replaceNonAsciiCharacters(result);
+                result = escapeNonAsciiCharacters(result);
                 
                 return '"' + result + '"';
             }
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index e3479e27152ea..1f050a0ec5be8 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -609,20 +609,26 @@ module ts {
             return +(text.substring(start, pos));
         }
         
+        /**
+         * Scans the given number of hexadecimal digits in the text,
+         * returning -1 if the given number is unavailable.
+         */
         function scanExactNumberOfHexDigits(count: number): number {
-            return scanHexDigits(/*minCount*/ count, /*maxCount*/ count);
+            return scanHexDigits(/*minCount*/ count, /*scanAsManyAsPossible*/ false);
         }
         
+        /**
+         * Scans as many hexadecimal digits as are available in the text,
+         * returning -1 if the given number of digits was unavailable.
+         */
         function scanMinimumNumberOfHexDigits(count: number): number {
-            return scanHexDigits(/*minCount*/ count, /*maxCount*/ undefined);
+            return scanHexDigits(/*minCount*/ count, /*scanAsManyAsPossible*/ true);
         }
 
-        function scanHexDigits(minCount: number, maxCount?: number): number {
-            var maxCountSpecified = maxCount !== undefined;
-            
+        function scanHexDigits(minCount: number, scanAsManyAsPossible: boolean): number {
             var digits = 0;
             var value = 0;
-            while (!maxCountSpecified || digits < maxCount) {
+            while (digits < minCount || scanAsManyAsPossible) {
                 var ch = text.charCodeAt(pos);
                 if (ch >= CharacterCodes._0 && ch <= CharacterCodes._9) {
                     value = value * 16 + ch - CharacterCodes._0;
@@ -777,22 +783,19 @@ module ts {
                 case CharacterCodes.doubleQuote:
                     return "\"";
                 case CharacterCodes.u:
+                    // '\u{DDDDDDDD}'
                     if (pos < len && text.charCodeAt(pos) === CharacterCodes.openBrace) {
                         hasExtendedUnicodeEscape = true;
                         pos++;
                         return scanExtendedUnicodeEscape();
                     }
                     
-                    // fall through
+                    // '\uDDDD'
+                    return scanHexadecimalEscape(/*numDigits*/ 4)
+                    
                 case CharacterCodes.x:
-                    var escapedValue = scanExactNumberOfHexDigits(ch === CharacterCodes.x ? 2 : 4);
-                    if (escapedValue >= 0) {
-                        return String.fromCharCode(escapedValue);
-                    }
-                    else {
-                        error(Diagnostics.Hexadecimal_digit_expected);
-                        return ""
-                    }
+                    // '\xDD'
+                    return scanHexadecimalEscape(/*numDigits*/ 2)
 
                 // when encountering a LineContinuation (i.e. a backslash and a line terminator sequence),
                 // the line terminator is interpreted to be "the empty code unit sequence".
@@ -810,6 +813,18 @@ module ts {
             }
         }
         
+        function scanHexadecimalEscape(numDigits: number): string {
+            var escapedValue = scanExactNumberOfHexDigits(numDigits);
+            
+            if (escapedValue >= 0) {
+                return String.fromCharCode(escapedValue);
+            }
+            else {
+                error(Diagnostics.Hexadecimal_digit_expected);
+                return ""
+            }
+        }
+        
         function scanExtendedUnicodeEscape(): string {
             var escapedValue = scanMinimumNumberOfHexDigits(1);
             var isInvalidExtendedEscape = false;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 100c753d5f733..30b5a4a23a4db 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1130,7 +1130,7 @@ module ts {
             newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2));
         }
 
-        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), /*newLength: */ newEndN - oldStartN);
+        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), /*newLength*/ newEndN - oldStartN);
     }
 
     // @internal
@@ -1213,8 +1213,12 @@ module ts {
         }
     }
     
-    var backslashOrDoubleQuote = /[\"\\]/g;
-    var escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
+    // This consists of the first 19 unprintable ASCII characters, canonical escapes, lineSeparator,
+    // paragraphSeparator, and nextLine. The latter three are just desirable to suppress new lines in
+    // the language service. These characters should be escaped when printing, and if any characters are added,
+    // the map below must be updated. Note that this regexp *does not* include the 'delete' character.
+    // There is no reason for this other than that JSON.stringify does not handle it either.
+    var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
     var escapedCharsMap: Map<string> = {
         "\0": "\\0",
         "\t": "\\t",
@@ -1231,13 +1235,11 @@ module ts {
     };
 
     /**
-     * Based heavily on the abstract 'Quote'/ 'QuoteJSONString' operation from ECMA-262 (24.3.2.2),
-     * but augmented for a few select characters.
+     * Based heavily on the abstract 'Quote'/'QuoteJSONString' operation from ECMA-262 (24.3.2.2),
+     * but augmented for a few select characters (e.g. lineSeparator, paragraphSeparator, nextLine)
      * Note that this doesn't actually wrap the input in double quotes.
      */
     export function escapeString(s: string): string {
-        // Prioritize '"' and '\'
-        s = backslashOrDoubleQuote.test(s) ? s.replace(backslashOrDoubleQuote, getReplacement) : s;
         s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s;
 
         return s;
@@ -1254,7 +1256,7 @@ module ts {
     }
     
     var nonAsciiCharacters = /[^\u0000-\u007F]/g;
-    export function replaceNonAsciiCharacters(s: string): string {
+    export function escapeNonAsciiCharacters(s: string): string {
         // Replace non-ASCII characters with '\uNNNN' escapes if any exist.
         // Otherwise just return the original string.
         return nonAsciiCharacters.test(s) ?

From 6be13a90b5d3e4afdc25e57db62c5830a435b689 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 2 Mar 2015 12:07:09 -0800
Subject: [PATCH 11/14] Fixed error message.

---
 src/compiler/diagnosticInformationMap.generated.ts            | 2 +-
 src/compiler/diagnosticMessages.json                          | 2 +-
 src/compiler/scanner.ts                                       | 2 +-
 .../unicodeExtendedEscapesInStrings21_ES5.errors.txt          | 4 ++--
 .../unicodeExtendedEscapesInStrings21_ES6.errors.txt          | 4 ++--
 .../unicodeExtendedEscapesInStrings22_ES5.errors.txt          | 4 ++--
 .../unicodeExtendedEscapesInStrings22_ES6.errors.txt          | 4 ++--
 .../unicodeExtendedEscapesInStrings24_ES5.errors.txt          | 4 ++--
 .../unicodeExtendedEscapesInStrings24_ES6.errors.txt          | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index 2fd980ffffa0f..74874ce1cc69f 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -156,7 +156,7 @@ module ts {
         Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: DiagnosticCategory.Error, key: "Catch clause variable cannot have a type annotation." },
         Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: DiagnosticCategory.Error, key: "Catch clause variable cannot have an initializer." },
         An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: DiagnosticCategory.Error, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
-        expected: { code: 1199, category: DiagnosticCategory.Error, key: "'}' expected." },
+        Unterminated_Unicode_escape_sequence: { code: 1199, category: DiagnosticCategory.Error, key: "Unterminated Unicode escape sequence." },
         Duplicate_identifier_0: { code: 2300, category: DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 87632e4089d61..f308c37f69450 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -615,7 +615,7 @@
         "category": "Error",
         "code": 1198
     },
-    "'}' expected.": {
+    "Unterminated Unicode escape sequence.": {
         "category": "Error",
         "code":  1199
     },
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 1f050a0ec5be8..9bb66f10f4182 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -848,7 +848,7 @@ module ts {
                 pos++;
             }
             else {
-                error(Diagnostics.expected); // '}' expected.
+                error(Diagnostics.Unterminated_Unicode_escape_sequence);
                 isInvalidExtendedEscape = true;
             }
 
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
index 9264e7209295d..d722dc8ed067d 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts(2,15): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts(2,15): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts (1 errors) ====
     
     var x = "\u{67";
                   
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
index 09ad97f6b9382..48353fb19e319 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts(2,15): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts(2,15): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts (1 errors) ====
     
     var x = "\u{67";
                   
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
index 4e27d76ddca8e..1b24e491ad714 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts(2,27): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts(2,27): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts (1 errors) ====
     
     var x = "\u{00000000000067";
                               
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
index 647833b6379d1..9627d4aadbcb3 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts(2,27): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts(2,27): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts (1 errors) ====
     
     var x = "\u{00000000000067";
                               
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
index 1a6683b9fb9aa..ef70987871437 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,27): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,27): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts (1 errors) ====
     
     var x = "\u{00000000000067
                               
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
index 88d49f47aab64..8ddc365aa9405 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,27): error TS1199: '}' expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,27): error TS1199: Unterminated Unicode escape sequence.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts (1 errors) ====
     
     var x = "\u{00000000000067
                               
-!!! error TS1199: '}' expected.
+!!! error TS1199: Unterminated Unicode escape sequence.
     
\ No newline at end of file

From 5ec68eb0e454cc70f7e339e4a3d23911c61d5833 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 2 Mar 2015 15:51:23 -0800
Subject: [PATCH 12/14] Harden against trees without parent pointers for
 emitting literals; fix lookahead in text for numeric literal indicators.

---
 src/compiler/emitter.ts | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index ad6a93d2a9623..b4cba8c615d4b 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2178,15 +2178,17 @@ module ts {
                 }
             }
 
-            function isBinaryOrOctalIntegerLiteral(text: string): boolean {
-                if (text.length <= 0) {
-                    return false;
-                }
-
-                if (text.charCodeAt(1) === CharacterCodes.B || text.charCodeAt(1) === CharacterCodes.b ||
-                    text.charCodeAt(1) === CharacterCodes.O || text.charCodeAt(1) === CharacterCodes.o) {
-                    return true;
+            function isBinaryOrOctalIntegerLiteral(node: LiteralExpression, text: string): boolean {
+                if (node.kind === SyntaxKind.NumericLiteral && text.length > 1) {
+                    switch (text.charCodeAt(1)) {
+                        case CharacterCodes.b:
+                        case CharacterCodes.B:
+                        case CharacterCodes.o:
+                        case CharacterCodes.O:
+                            return true;
+                    }
                 }
+                
                 return false;
             }
 
@@ -2195,13 +2197,15 @@ module ts {
                     ? getDoubleQuotedStringTextOfLiteral(node)
                     : node.parent
                         ? getSourceTextOfNodeFromSourceFile(currentSourceFile, node)
-                        : node.text; // TODO(drosen): Is this correct?
+                        : node.kind === SyntaxKind.NumericLiteral
+                            ? node.text
+                            : getDoubleQuotedStringTextOfLiteral(node);
                 
                 if (compilerOptions.sourceMap && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
                     writer.writeLiteral(text);
                 }
-                // For version below ES6, emit binary integer literal and octal integer literal in canonical form
-                else if (languageVersion < ScriptTarget.ES6 && node.kind === SyntaxKind.NumericLiteral && isBinaryOrOctalIntegerLiteral(text)) {
+                // For versions below ES6, emit binary & octal literals in their canonical decimal form.
+                else if (languageVersion < ScriptTarget.ES6 && isBinaryOrOctalIntegerLiteral(node, text)) {
                     write(node.text);
                 }
                 else {

From f9cc01355edae8046348f7548f99515a4c884d9b Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 2 Mar 2015 16:40:00 -0800
Subject: [PATCH 13/14] Addressed CR feedback, also properly accounted for
 template literals.

---
 src/compiler/emitter.ts   | 46 +++++++++++++++++++++++++++++----------
 src/compiler/utilities.ts |  2 +-
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index b4cba8c615d4b..f52f48e56a394 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2193,13 +2193,7 @@ module ts {
             }
 
             function emitLiteral(node: LiteralExpression) {
-                var text = languageVersion < ScriptTarget.ES6 && (isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)
-                    ? getDoubleQuotedStringTextOfLiteral(node)
-                    : node.parent
-                        ? getSourceTextOfNodeFromSourceFile(currentSourceFile, node)
-                        : node.kind === SyntaxKind.NumericLiteral
-                            ? node.text
-                            : getDoubleQuotedStringTextOfLiteral(node);
+                var text = getLiteralText(node);
                 
                 if (compilerOptions.sourceMap && (node.kind === SyntaxKind.StringLiteral || isTemplateLiteralKind(node.kind))) {
                     writer.writeLiteral(text);
@@ -2213,11 +2207,41 @@ module ts {
                 }
             }
             
-            function getDoubleQuotedStringTextOfLiteral(node: LiteralExpression): string {
-                var result = escapeString(node.text);
-                result = escapeNonAsciiCharacters(result);
+            function getLiteralText(node: LiteralExpression) {
+                // Any template literal or string literal with an extended escape
+                // (e.g. "\u{0067}") will need to be downleveled as a escaped string literal.
+                if (languageVersion < ScriptTarget.ES6 && (isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
+                    return getQuotedEscapedLiteralText('"', node.text, '"');
+                }
+                
+                // If we don't need to downlevel, and we can reach the original source text using
+                // the node's parent reference, then simply get the text as it was originally written.
+                if (node.parent) {
+                    return getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+                }
                 
-                return '"' + result + '"';
+                // If we can't reach the original source text, use the canonical form of it's a number,
+                // or a escaped quoted form of the original text if it's string-like.
+                switch (node.kind) {
+                    case SyntaxKind.StringLiteral:
+                        return getQuotedEscapedLiteralText('"', node.text, '"');
+                    case SyntaxKind.NoSubstitutionTemplateLiteral:
+                        return getQuotedEscapedLiteralText('`', node.text, '`');
+                    case SyntaxKind.TemplateHead:
+                        return getQuotedEscapedLiteralText('`', node.text, '${');
+                    case SyntaxKind.TemplateMiddle:
+                        return getQuotedEscapedLiteralText('}', node.text, '${');
+                    case SyntaxKind.TemplateTail:
+                        return getQuotedEscapedLiteralText('}', node.text, '`');
+                    case SyntaxKind.NumericLiteral:
+                        return node.text;
+                }
+                
+                Debug.fail(`Literal kind '${node.kind}' not accounted for.`);
+            }
+            
+            function getQuotedEscapedLiteralText(leftQuote: string, text: string, rightQuote: string) {
+                return leftQuote + escapeNonAsciiCharacters(escapeString(text)) + rightQuote;
             }
             
             function emitDownlevelRawTemplateLiteral(node: LiteralExpression) {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 30b5a4a23a4db..e6d2fffd06a83 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1130,7 +1130,7 @@ module ts {
             newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2));
         }
 
-        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), /*newLength*/ newEndN - oldStartN);
+        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), /*newLength:*/ newEndN - oldStartN);
     }
 
     // @internal

From 5c5a48911a0a77d156743640c2c3063a8c747ddf Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 3 Mar 2015 11:56:03 -0800
Subject: [PATCH 14/14] Words.

---
 src/compiler/emitter.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index f52f48e56a394..cfbab1af5c6ef 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2214,14 +2214,14 @@ module ts {
                     return getQuotedEscapedLiteralText('"', node.text, '"');
                 }
                 
-                // If we don't need to downlevel, and we can reach the original source text using
+                // If we don't need to downlevel and we can reach the original source text using
                 // the node's parent reference, then simply get the text as it was originally written.
                 if (node.parent) {
                     return getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
                 }
                 
-                // If we can't reach the original source text, use the canonical form of it's a number,
-                // or a escaped quoted form of the original text if it's string-like.
+                // If we can't reach the original source text, use the canonical form if it's a number,
+                // or an escaped quoted form of the original text if it's string-like.
                 switch (node.kind) {
                     case SyntaxKind.StringLiteral:
                         return getQuotedEscapedLiteralText('"', node.text, '"');