From 3ec2c45f5fa68ed53b723bb9d20bd3e2bd607d95 Mon Sep 17 00:00:00 2001
From: Nathan Day <rnathanday@yahoo.com>
Date: Wed, 15 Aug 2018 01:08:13 -0400
Subject: [PATCH] include leading non-ASCII horizontal whitespace in
 SyntaxKind.WhitespaceTrivia token

---
 src/compiler/scanner.ts                        | 18 ++++++++++++++++++
 .../scannerNonAsciiHorizontalWhitespace.js     | 14 ++++++++++++++
 ...scannerNonAsciiHorizontalWhitespace.symbols |  9 +++++++++
 .../scannerNonAsciiHorizontalWhitespace.types  | 10 ++++++++++
 .../scannerNonAsciiHorizontalWhitespace.ts     |  6 ++++++
 5 files changed, 57 insertions(+)
 create mode 100644 tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.js
 create mode 100644 tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.symbols
 create mode 100644 tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.types
 create mode 100644 tests/cases/conformance/scanner/ecmascript5/scannerNonAsciiHorizontalWhitespace.ts

diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index af74d69ceef..376c18b7205 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -1390,6 +1390,24 @@ namespace ts {
                     case CharacterCodes.verticalTab:
                     case CharacterCodes.formFeed:
                     case CharacterCodes.space:
+                    case CharacterCodes.nonBreakingSpace:
+                    case CharacterCodes.ogham:
+                    case CharacterCodes.enQuad:
+                    case CharacterCodes.emQuad:
+                    case CharacterCodes.enSpace:
+                    case CharacterCodes.emSpace:
+                    case CharacterCodes.threePerEmSpace:
+                    case CharacterCodes.fourPerEmSpace:
+                    case CharacterCodes.sixPerEmSpace:
+                    case CharacterCodes.figureSpace:
+                    case CharacterCodes.punctuationSpace:
+                    case CharacterCodes.thinSpace:
+                    case CharacterCodes.hairSpace:
+                    case CharacterCodes.zeroWidthSpace:
+                    case CharacterCodes.narrowNoBreakSpace:
+                    case CharacterCodes.mathematicalSpace:
+                    case CharacterCodes.ideographicSpace:
+                    case CharacterCodes.byteOrderMark:
                         if (skipTrivia) {
                             pos++;
                             continue;
diff --git a/tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.js b/tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.js
new file mode 100644
index 00000000000..b9ae124f1ef
--- /dev/null
+++ b/tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.js
@@ -0,0 +1,14 @@
+//// [scannerNonAsciiHorizontalWhitespace.ts]
+//// [scannerNonAsciiHorizontalWhitespace.ts]
+"  function f() {}"
+
+//// [scannerNonAsciiHorizontalWhitespace.js]
+"  function f() {}"
+
+
+
+//// [scannerNonAsciiHorizontalWhitespace.js]
+//// [scannerNonAsciiHorizontalWhitespace.ts]
+"  function f() {}";
+//// [scannerNonAsciiHorizontalWhitespace.js]
+"  function f() {}";
diff --git a/tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.symbols b/tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.symbols
new file mode 100644
index 00000000000..8a7fdec1d33
--- /dev/null
+++ b/tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.symbols
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/scanner/ecmascript5/scannerNonAsciiHorizontalWhitespace.ts ===
+//// [scannerNonAsciiHorizontalWhitespace.ts]
+No type information for this code."  function f() {}"
+No type information for this code.
+No type information for this code.//// [scannerNonAsciiHorizontalWhitespace.js]
+No type information for this code."  function f() {}"
+No type information for this code.
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.types b/tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.types
new file mode 100644
index 00000000000..5d68e59d73b
--- /dev/null
+++ b/tests/baselines/reference/scannerNonAsciiHorizontalWhitespace.types
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/scanner/ecmascript5/scannerNonAsciiHorizontalWhitespace.ts ===
+//// [scannerNonAsciiHorizontalWhitespace.ts]
+"  function f() {}"
+>"  function f() {}" : "  function f() {}"
+
+//// [scannerNonAsciiHorizontalWhitespace.js]
+"  function f() {}"
+>"  function f() {}" : "  function f() {}"
+
+
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNonAsciiHorizontalWhitespace.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNonAsciiHorizontalWhitespace.ts
new file mode 100644
index 00000000000..447cad65684
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNonAsciiHorizontalWhitespace.ts
@@ -0,0 +1,6 @@
+//// [scannerNonAsciiHorizontalWhitespace.ts]
+"  function f() {}"
+
+//// [scannerNonAsciiHorizontalWhitespace.js]
+"  function f() {}"
+