Skip to content

Commit 39029f2

Browse files
fix: special handling of identifiers no longer required
1 parent d29371e commit 39029f2

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

src/utils/rule.ts

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ export function getTypeOfNode<Context extends RuleContext<string, BaseOptions>>(
196196
const { esTreeNodeToTSNodeMap } = getParserServices(context);
197197

198198
const tsNode = esTreeNodeToTSNodeMap.get(node);
199-
const typedNode = ts.isIdentifier(tsNode) ? tsNode.parent : tsNode;
200-
return getTypeOfTSNode(typedNode, context);
199+
return getTypeOfTSNode(tsNode, context);
201200
}
202201

203202
/**
@@ -210,11 +209,10 @@ export function getTypeNodeOfNode<
210209

211210
const { esTreeNodeToTSNodeMap } = getParserServices(context);
212211

213-
const tsNode = esTreeNodeToTSNodeMap.get(node);
214-
const typedNode = (
215-
ts.isIdentifier(tsNode) ? tsNode.parent : tsNode
216-
) as TSNode & { type?: TypeNode };
217-
return typedNode.type ?? null;
212+
const tsNode = esTreeNodeToTSNodeMap.get(node) as TSNode & {
213+
type?: TypeNode;
214+
};
215+
return tsNode.type ?? null;
218216
}
219217

220218
/**
@@ -227,13 +225,10 @@ export function getTypeDataOfNode<
227225

228226
const { esTreeNodeToTSNodeMap } = getParserServices(context);
229227

230-
const tsNode = esTreeNodeToTSNodeMap.get(node);
231-
const typedNode = (
232-
ts.isIdentifier(tsNode) ? tsNode.parent : tsNode
233-
) as TSNode & {
228+
const tsNode = esTreeNodeToTSNodeMap.get(node) as TSNode & {
234229
type?: TypeNode;
235230
};
236-
return [getTypeOfTSNode(typedNode, context), typedNode.type ?? null];
231+
return [getTypeOfTSNode(tsNode, context), tsNode.type ?? null];
237232
}
238233

239234
/**
@@ -306,10 +301,9 @@ export function getTypeImmutabilityOfNode<
306301
const overrides =
307302
explicitOverrides ?? getImmutabilityOverrides(context.settings);
308303
const tsNode = parserServices.esTreeNodeToTSNodeMap.get(node);
309-
const typedNode = ts.isIdentifier(tsNode) ? tsNode.parent : tsNode;
310304
const typeLike =
311-
(typedNode as { type?: TypeNode }).type ??
312-
getTypeOfNode(parserServices.tsNodeToESTreeNodeMap.get(typedNode), context);
305+
(tsNode as { type?: TypeNode }).type ??
306+
getTypeOfNode(parserServices.tsNodeToESTreeNodeMap.get(tsNode), context);
313307

314308
return getTypeImmutability(
315309
parserServices.program,

0 commit comments

Comments
 (0)