From d43e2e0fbbabd9e4eceeb819b88ee3d01be6de3e Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 25 Feb 2015 18:01:23 -0800
Subject: [PATCH] Fixed character escaping for characters with values below
 0x20 and '9'.

---
 src/compiler/core.ts                                          | 4 ++--
 ...edTemplateStringsPlainCharactersThatArePartsOfEscapes01.js | 2 +-
 ...edTemplateStringsPlainCharactersThatArePartsOfEscapes02.js | 2 +-
 .../reference/templateStringControlCharacterEscapes02.js      | 2 +-
 .../reference/templateStringControlCharacterEscapes03.js      | 2 +-
 .../templateStringPlainCharactersThatArePartsOfEscapes01.js   | 2 +-
 .../templateStringPlainCharactersThatArePartsOfEscapes02.js   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index d527b62005..e27d3cb520 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -607,7 +607,7 @@ module ts {
     }
 
     var backslashOrDoubleQuote = /[\"\\]/g;
-    var escapedCharsRegExp = /[\0-\19\t\v\f\b\0\r\n\u2028\u2029\u0085]/g;
+    var escapedCharsRegExp = /[\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
     var escapedCharsMap: Map<string> = {
         "\0": "\\0",
         "\t": "\\t",
@@ -624,7 +624,7 @@ module ts {
     };
 
     /**
-     * Based heavily on the abstract 'Quote' operation from ECMA-262 (24.3.2.2),
+     * 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.
      */
diff --git a/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js b/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js
index 44eeeed4df..5e5feac077 100644
--- a/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js
+++ b/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes01.js
@@ -14,4 +14,4 @@ function f() {
         x[_i - 0] = arguments[_i];
     }
 }
-f "0 1 2 3 4 5 6 7 8 \u0039 10 11 12 13 14 15 16 17 18 1\u0039 20 2028 202\u0039 0085 t v f b r n";
+f "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2028 2029 0085 t v f b r n";
diff --git a/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02.js b/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02.js
index 6b087cc2df..ca192ef98d 100644
--- a/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02.js
+++ b/tests/baselines/reference/taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02.js
@@ -4,4 +4,4 @@
 `0${ " " }1${ " " }2${ " " }3${ " " }4${ " " }5${ " " }6${ " " }7${ " " }8${ " " }9${ " " }10${ " " }11${ " " }12${ " " }13${ " " }14${ " " }15${ " " }16${ " " }17${ " " }18${ " " }19${ " " }20${ " " }2028${ " " }2029${ " " }0085${ " " }t${ " " }v${ " " }f${ " " }b${ " " }r${ " " }n`
 
 //// [taggedTemplateStringsPlainCharactersThatArePartsOfEscapes02.js]
-"0" + " " + "1" + " " + "2" + " " + "3" + " " + "4" + " " + "5" + " " + "6" + " " + "7" + " " + "8" + " " + "\u0039" + " " + "10" + " " + "11" + " " + "12" + " " + "13" + " " + "14" + " " + "15" + " " + "16" + " " + "17" + " " + "18" + " " + "1\u0039" + " " + "20" + " " + "2028" + " " + "202\u0039" + " " + "0085" + " " + "t" + " " + "v" + " " + "f" + " " + "b" + " " + "r" + " " + "n";
+"0" + " " + "1" + " " + "2" + " " + "3" + " " + "4" + " " + "5" + " " + "6" + " " + "7" + " " + "8" + " " + "9" + " " + "10" + " " + "11" + " " + "12" + " " + "13" + " " + "14" + " " + "15" + " " + "16" + " " + "17" + " " + "18" + " " + "19" + " " + "20" + " " + "2028" + " " + "2029" + " " + "0085" + " " + "t" + " " + "v" + " " + "f" + " " + "b" + " " + "r" + " " + "n";
diff --git a/tests/baselines/reference/templateStringControlCharacterEscapes02.js b/tests/baselines/reference/templateStringControlCharacterEscapes02.js
index eec39954b0..5b5d34dae0 100644
--- a/tests/baselines/reference/templateStringControlCharacterEscapes02.js
+++ b/tests/baselines/reference/templateStringControlCharacterEscapes02.js
@@ -4,4 +4,4 @@
 var x = `\x19\u0019 19`;
 
 //// [templateStringControlCharacterEscapes02.js]
-var x = " 1\u0039";
+var x = "\u0019\u0019 19";
diff --git a/tests/baselines/reference/templateStringControlCharacterEscapes03.js b/tests/baselines/reference/templateStringControlCharacterEscapes03.js
index 1be2852214..ae9774d952 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 = " 1F 1f";
+var x = "\u001f\u001f 1F 1f";
diff --git a/tests/baselines/reference/templateStringPlainCharactersThatArePartsOfEscapes01.js b/tests/baselines/reference/templateStringPlainCharactersThatArePartsOfEscapes01.js
index 580a5179a9..62629f3284 100644
--- a/tests/baselines/reference/templateStringPlainCharactersThatArePartsOfEscapes01.js
+++ b/tests/baselines/reference/templateStringPlainCharactersThatArePartsOfEscapes01.js
@@ -3,4 +3,4 @@
 `0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2028 2029 0085 t v f b r n`
 
 //// [templateStringPlainCharactersThatArePartsOfEscapes01.js]
-"0 1 2 3 4 5 6 7 8 \u0039 10 11 12 13 14 15 16 17 18 1\u0039 20 2028 202\u0039 0085 t v f b r n";
+"0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 2028 2029 0085 t v f b r n";
diff --git a/tests/baselines/reference/templateStringPlainCharactersThatArePartsOfEscapes02.js b/tests/baselines/reference/templateStringPlainCharactersThatArePartsOfEscapes02.js
index 79c1d350eb..27090032ab 100644
--- a/tests/baselines/reference/templateStringPlainCharactersThatArePartsOfEscapes02.js
+++ b/tests/baselines/reference/templateStringPlainCharactersThatArePartsOfEscapes02.js
@@ -4,4 +4,4 @@
 `0${ " " }1${ " " }2${ " " }3${ " " }4${ " " }5${ " " }6${ " " }7${ " " }8${ " " }9${ " " }10${ " " }11${ " " }12${ " " }13${ " " }14${ " " }15${ " " }16${ " " }17${ " " }18${ " " }19${ " " }20${ " " }2028${ " " }2029${ " " }0085${ " " }t${ " " }v${ " " }f${ " " }b${ " " }r${ " " }n`
 
 //// [templateStringPlainCharactersThatArePartsOfEscapes02.js]
-"0" + " " + "1" + " " + "2" + " " + "3" + " " + "4" + " " + "5" + " " + "6" + " " + "7" + " " + "8" + " " + "\u0039" + " " + "10" + " " + "11" + " " + "12" + " " + "13" + " " + "14" + " " + "15" + " " + "16" + " " + "17" + " " + "18" + " " + "1\u0039" + " " + "20" + " " + "2028" + " " + "202\u0039" + " " + "0085" + " " + "t" + " " + "v" + " " + "f" + " " + "b" + " " + "r" + " " + "n";
+"0" + " " + "1" + " " + "2" + " " + "3" + " " + "4" + " " + "5" + " " + "6" + " " + "7" + " " + "8" + " " + "9" + " " + "10" + " " + "11" + " " + "12" + " " + "13" + " " + "14" + " " + "15" + " " + "16" + " " + "17" + " " + "18" + " " + "19" + " " + "20" + " " + "2028" + " " + "2029" + " " + "0085" + " " + "t" + " " + "v" + " " + "f" + " " + "b" + " " + "r" + " " + "n";