From bec45722dfed8aeb49189d151252b83d4a34239c Mon Sep 17 00:00:00 2001
From: Armano <armano2@users.noreply.github.com>
Date: Wed, 29 Jan 2020 21:59:40 +0100
Subject: [PATCH] fix(typescript-estree): fix regression introduced in #1525
 (#1543)

---
 packages/typescript-estree/src/convert.ts       | 5 +----
 packages/typescript-estree/tests/lib/convert.ts | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
index 9a9be6bcd33..cc38171caf1 100644
--- a/packages/typescript-estree/src/convert.ts
+++ b/packages/typescript-estree/src/convert.ts
@@ -379,10 +379,7 @@ export class Converter {
    * property instead of a kind property. Recursively copies all children.
    */
   private deeplyCopy(node: TSNode): any {
-    if (
-      node.kind >= SyntaxKind.FirstJSDocNode &&
-      node.kind <= SyntaxKind.LastJSDocNode
-    ) {
+    if (node.kind === ts.SyntaxKind.JSDocFunctionType) {
       throw createError(
         this.ast,
         node.pos,
diff --git a/packages/typescript-estree/tests/lib/convert.ts b/packages/typescript-estree/tests/lib/convert.ts
index 208513d1aed..749f26737f0 100644
--- a/packages/typescript-estree/tests/lib/convert.ts
+++ b/packages/typescript-estree/tests/lib/convert.ts
@@ -239,8 +239,9 @@ describe('convert', () => {
 
   it('should throw error on jsDoc node', () => {
     const jsDocCode = [
-      'type foo = ?foo<T> | ?(() => void)?',
-      'var a: function(b): c;',
+      'const x: function(new: number, string);',
+      'const x: function(this: number, string);',
+      'var g: function(number, number): number;',
     ];
 
     for (const code of jsDocCode) {