From 9c4ec68afdd7b0bc06322263e1f190ac2db4fab5 Mon Sep 17 00:00:00 2001
From: James Henry <james@henry.sc>
Date: Tue, 5 Sep 2017 19:37:22 +0100
Subject: [PATCH] Fix: TypeScript never keyword (fixes #2718) (#2756)

---
 package.json                                       |  2 +-
 .../__snapshots__/jsfmt.spec.js.snap               |  8 ++++++++
 tests/typescript_never/jsfmt.spec.js               |  1 +
 tests/typescript_never/type-argument.src.ts        |  1 +
 yarn.lock                                          | 14 +++++++++-----
 5 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 tests/typescript_never/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/typescript_never/jsfmt.spec.js
 create mode 100644 tests/typescript_never/type-argument.src.ts

diff --git a/package.json b/package.json
index d7732d2bf13d..305b4f870f2f 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "postcss-values-parser": "git://github.com/lydell/postcss-values-parser.git#af2c80b2bb558a6e7d61540d97f068f9fa162b38",
     "strip-bom": "3.0.0",
     "typescript": "2.5.1",
-    "typescript-eslint-parser": "git://github.com/eslint/typescript-eslint-parser.git#801d65585af6995a223136862944095b48f5c567"
+    "typescript-eslint-parser": "git://github.com/eslint/typescript-eslint-parser.git#5576fb48c89165967557e867b9462d43431dcb10"
   },
   "devDependencies": {
     "babel-cli": "6.24.1",
diff --git a/tests/typescript_never/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_never/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000000..11402a0cbee7
--- /dev/null
+++ b/tests/typescript_never/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,8 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`type-argument.src.ts 1`] = `
+Observable.empty<never>();
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Observable.empty<never>();
+
+`;
diff --git a/tests/typescript_never/jsfmt.spec.js b/tests/typescript_never/jsfmt.spec.js
new file mode 100644
index 000000000000..bc085c48c8a4
--- /dev/null
+++ b/tests/typescript_never/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, { parser: "typescript" });
diff --git a/tests/typescript_never/type-argument.src.ts b/tests/typescript_never/type-argument.src.ts
new file mode 100644
index 000000000000..3bf49e338299
--- /dev/null
+++ b/tests/typescript_never/type-argument.src.ts
@@ -0,0 +1 @@
+Observable.empty<never>();
diff --git a/yarn.lock b/yarn.lock
index a93c974556db..fbdccb6d77a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3578,10 +3578,14 @@ sax@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
 
-"semver@2 || 3 || 4 || 5", semver@5.3.0, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
+semver@5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+
 serviceworker-cache-polyfill@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz#de19ee73bef21ab3c0740a37b33db62464babdeb"
@@ -3949,12 +3953,12 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-"typescript-eslint-parser@git://github.com/eslint/typescript-eslint-parser.git#801d65585af6995a223136862944095b48f5c567":
-  version "6.0.1"
-  resolved "git://github.com/eslint/typescript-eslint-parser.git#801d65585af6995a223136862944095b48f5c567"
+"typescript-eslint-parser@git://github.com/eslint/typescript-eslint-parser.git#5576fb48c89165967557e867b9462d43431dcb10":
+  version "8.0.0"
+  resolved "git://github.com/eslint/typescript-eslint-parser.git#5576fb48c89165967557e867b9462d43431dcb10"
   dependencies:
     lodash.unescape "4.0.1"
-    semver "5.3.0"
+    semver "5.4.1"
 
 typescript@2.5.1:
   version "2.5.1"