apply armano's suggested node type change

bradzacher · bradzacher · commit d42ecff5073a · 2022-06-26T13:24:37.000-07:00
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -801,12 +801,11 @@ export class Converter {
 
       case SyntaxKind.Identifier: {
         if (isThisInTypeQuery(node)) {
-          return this.createNode<TSESTree.ThisExpression>(
-            node as unknown as ts.ThisExpression,
-            {
-              type: AST_NODE_TYPES.ThisExpression,
-            },
-          );
+          // special case for `typeof this.foo` - TS emits an Identifier for `this`
+          // but we want to treat it as a ThisExpression for consistency
+          return this.createNode<TSESTree.ThisExpression>(node, {
+            type: AST_NODE_TYPES.ThisExpression,
+          });
         }
         return this.createNode<TSESTree.Identifier>(node, {
           type: AST_NODE_TYPES.Identifier,
diff --git a/packages/typescript-estree/src/ts-estree/estree-to-ts-node-types.ts b/packages/typescript-estree/src/ts-estree/estree-to-ts-node-types.ts
@@ -149,7 +149,10 @@ export interface EstreeToTsNodeTypes {
   [AST_NODE_TYPES.TemplateLiteral]:
     | ts.NoSubstitutionTemplateLiteral
     | ts.TemplateExpression;
-  [AST_NODE_TYPES.ThisExpression]: ts.ThisExpression | ts.KeywordTypeNode;
+  [AST_NODE_TYPES.ThisExpression]:
+    | ts.ThisExpression
+    | ts.KeywordTypeNode
+    | ts.Identifier;
   [AST_NODE_TYPES.ThrowStatement]: ts.ThrowStatement;
   [AST_NODE_TYPES.TryStatement]: ts.TryStatement;
   [AST_NODE_TYPES.TSAbstractPropertyDefinition]: ts.PropertyDeclaration;
