Skip to content

Commit 42d275c

Browse files
fix(scope-manager): fix asserted increments not being marked as write references (typescript-eslint#10271)
* fix(scope-manager): fix asserted increments not being marked as write references * visitExpressionTarget --------- Co-authored-by: Josh Goldberg <git@joshuakgoldberg.com>
1 parent d27a9ac commit 42d275c

File tree

8 files changed

+224
-13
lines changed

8 files changed

+224
-13
lines changed

packages/eslint-plugin/tests/eslint-rules/prefer-const.test.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,17 @@ let x: number | undefined = 1;
2121
let x: number | undefined = 1;
2222
(x as number) += 1;
2323
`,
24+
`
25+
let x: number | undefined = 1;
26+
x!++;
27+
`,
28+
`
29+
let x: number | undefined = 1;
30+
(<number>x)++;
31+
`,
32+
`
33+
let x: number | undefined = 1;
34+
(x as number)++;
35+
`,
2436
],
2537
});

packages/scope-manager/src/referencer/Referencer.ts

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -325,17 +325,7 @@ class Referencer extends Visitor {
325325
}
326326

327327
protected AssignmentExpression(node: TSESTree.AssignmentExpression): void {
328-
let left = node.left;
329-
switch (left.type) {
330-
case AST_NODE_TYPES.TSAsExpression:
331-
case AST_NODE_TYPES.TSTypeAssertion:
332-
// explicitly visit the type annotation
333-
this.visitType(left.typeAnnotation);
334-
// intentional fallthrough
335-
case AST_NODE_TYPES.TSNonNullExpression:
336-
// unwrap the expression
337-
left = left.expression;
338-
}
328+
const left = this.visitExpressionTarget(node.left);
339329

340330
if (PatternVisitor.isPattern(left)) {
341331
if (node.operator === '=') {
@@ -752,8 +742,10 @@ class Referencer extends Visitor {
752742
}
753743

754744
protected UpdateExpression(node: TSESTree.UpdateExpression): void {
755-
if (PatternVisitor.isPattern(node.argument)) {
756-
this.visitPattern(node.argument, pattern => {
745+
const argument = this.visitExpressionTarget(node.argument);
746+
747+
if (PatternVisitor.isPattern(argument)) {
748+
this.visitPattern(argument, pattern => {
757749
this.currentScope().referenceValue(
758750
pattern,
759751
ReferenceFlag.ReadWrite,
@@ -811,6 +803,21 @@ class Referencer extends Visitor {
811803

812804
this.close(node);
813805
}
806+
807+
private visitExpressionTarget(left: TSESTree.Node) {
808+
switch (left.type) {
809+
case AST_NODE_TYPES.TSAsExpression:
810+
case AST_NODE_TYPES.TSTypeAssertion:
811+
// explicitly visit the type annotation
812+
this.visitType(left.typeAnnotation);
813+
// intentional fallthrough
814+
case AST_NODE_TYPES.TSNonNullExpression:
815+
// unwrap the expression
816+
left = left.expression;
817+
}
818+
819+
return left;
820+
}
814821
}
815822

816823
export { Referencer, type ReferencerOptions };
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
let x: number | undefined = 1;
2+
(<number>x)++;

packages/scope-manager/tests/fixtures/type-assertion/increment/angle-bracket-increment.ts.shot

Lines changed: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
let x: number | undefined = 1;
2+
(x as number)++;

packages/scope-manager/tests/fixtures/type-assertion/increment/as-increment.ts.shot

Lines changed: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
let x: number | undefined = 1;
2+
x!++;

packages/scope-manager/tests/fixtures/type-assertion/increment/non-null-increment.ts.shot

Lines changed: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy