From 39029f24ae6241123b8458e1a9ac773a4de8ea40 Mon Sep 17 00:00:00 2001
From: Rebecca Stevens <rebecca.stevens@outlook.co.nz>
Date: Fri, 3 May 2024 20:05:57 +1200
Subject: [PATCH] fix: special handling of identifiers no longer required

---
 src/utils/rule.ts | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/utils/rule.ts b/src/utils/rule.ts
index d3d2dbd77..7d3f068a4 100644
--- a/src/utils/rule.ts
+++ b/src/utils/rule.ts
@@ -196,8 +196,7 @@ export function getTypeOfNode<Context extends RuleContext<string, BaseOptions>>(
   const { esTreeNodeToTSNodeMap } = getParserServices(context);
 
   const tsNode = esTreeNodeToTSNodeMap.get(node);
-  const typedNode = ts.isIdentifier(tsNode) ? tsNode.parent : tsNode;
-  return getTypeOfTSNode(typedNode, context);
+  return getTypeOfTSNode(tsNode, context);
 }
 
 /**
@@ -210,11 +209,10 @@ export function getTypeNodeOfNode<
 
   const { esTreeNodeToTSNodeMap } = getParserServices(context);
 
-  const tsNode = esTreeNodeToTSNodeMap.get(node);
-  const typedNode = (
-    ts.isIdentifier(tsNode) ? tsNode.parent : tsNode
-  ) as TSNode & { type?: TypeNode };
-  return typedNode.type ?? null;
+  const tsNode = esTreeNodeToTSNodeMap.get(node) as TSNode & {
+    type?: TypeNode;
+  };
+  return tsNode.type ?? null;
 }
 
 /**
@@ -227,13 +225,10 @@ export function getTypeDataOfNode<
 
   const { esTreeNodeToTSNodeMap } = getParserServices(context);
 
-  const tsNode = esTreeNodeToTSNodeMap.get(node);
-  const typedNode = (
-    ts.isIdentifier(tsNode) ? tsNode.parent : tsNode
-  ) as TSNode & {
+  const tsNode = esTreeNodeToTSNodeMap.get(node) as TSNode & {
     type?: TypeNode;
   };
-  return [getTypeOfTSNode(typedNode, context), typedNode.type ?? null];
+  return [getTypeOfTSNode(tsNode, context), tsNode.type ?? null];
 }
 
 /**
@@ -306,10 +301,9 @@ export function getTypeImmutabilityOfNode<
   const overrides =
     explicitOverrides ?? getImmutabilityOverrides(context.settings);
   const tsNode = parserServices.esTreeNodeToTSNodeMap.get(node);
-  const typedNode = ts.isIdentifier(tsNode) ? tsNode.parent : tsNode;
   const typeLike =
-    (typedNode as { type?: TypeNode }).type ??
-    getTypeOfNode(parserServices.tsNodeToESTreeNodeMap.get(typedNode), context);
+    (tsNode as { type?: TypeNode }).type ??
+    getTypeOfNode(parserServices.tsNodeToESTreeNodeMap.get(tsNode), context);
 
   return getTypeImmutability(
     parserServices.program,