From 14646964f6a87d469f040f84e94de73e91e0ef04 Mon Sep 17 00:00:00 2001
From: Armano <armano2@users.noreply.github.com>
Date: Thu, 14 Feb 2019 21:36:28 +0100
Subject: [PATCH] refactor(ts-estree): simply convertToken and remove dead code
 (#273)

---
 packages/typescript-estree/src/node-utils.ts    | 17 +++++------------
 .../src/ts-estree/ast-node-types.ts             |  1 -
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/packages/typescript-estree/src/node-utils.ts b/packages/typescript-estree/src/node-utils.ts
index 8d0db4d74b3..9ff8a5c29c1 100644
--- a/packages/typescript-estree/src/node-utils.ts
+++ b/packages/typescript-estree/src/node-utils.ts
@@ -579,24 +579,17 @@ export function getTokenType(token: any): AST_TOKEN_TYPES {
   }
 
   // Some JSX tokens have to be determined based on their parent
-  if (token.parent) {
+  if (token.parent && token.kind === SyntaxKind.Identifier) {
+    if (isJSXToken(token.parent)) {
+      return AST_TOKEN_TYPES.JSXIdentifier;
+    }
+
     if (
-      token.kind === SyntaxKind.Identifier &&
       token.parent.kind === SyntaxKind.PropertyAccessExpression &&
       hasJSXAncestor(token)
     ) {
       return AST_TOKEN_TYPES.JSXIdentifier;
     }
-
-    if (isJSXToken(token.parent)) {
-      if (token.kind === SyntaxKind.PropertyAccessExpression) {
-        return AST_TOKEN_TYPES.JSXMemberExpression;
-      }
-
-      if (token.kind === SyntaxKind.Identifier) {
-        return AST_TOKEN_TYPES.JSXIdentifier;
-      }
-    }
   }
 
   return AST_TOKEN_TYPES.Identifier;
diff --git a/packages/typescript-estree/src/ts-estree/ast-node-types.ts b/packages/typescript-estree/src/ts-estree/ast-node-types.ts
index 2bb83192035..1cf49aaaf93 100644
--- a/packages/typescript-estree/src/ts-estree/ast-node-types.ts
+++ b/packages/typescript-estree/src/ts-estree/ast-node-types.ts
@@ -174,7 +174,6 @@ export enum AST_TOKEN_TYPES {
   Boolean = 'Boolean',
   Identifier = 'Identifier',
   JSXIdentifier = 'JSXIdentifier',
-  JSXMemberExpression = 'JSXMemberExpression',
   JSXText = 'JSXText',
   Keyword = 'Keyword',
   Null = 'Null',