Skip to content

Commit 81452c5

Browse files
committed
Do not report unused local error on locals that are intended for removing properties with object spread
Fixes #12766
1 parent 9505a18 commit 81452c5

File tree

4 files changed

+69
-7
lines changed

4 files changed

+69
-7
lines changed

src/compiler/checker.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16702,6 +16702,14 @@ namespace ts {
1670216702
}
1670316703
}
1670416704

16705+
function isRemovedPropertyFromObjectSpread(node: Node) {
16706+
if (isBindingElement(node) && isObjectBindingPattern(node.parent)) {
16707+
const lastElement = lastOrUndefined(node.parent.elements);
16708+
return lastElement !== node && !!lastElement.dotDotDotToken;
16709+
}
16710+
return false;
16711+
}
16712+
1670516713
function errorUnusedLocal(node: Node, name: string) {
1670616714
if (isIdentifierThatStartsWithUnderScore(node)) {
1670716715
const declaration = getRootDeclaration(node.parent);
@@ -16711,7 +16719,10 @@ namespace ts {
1671116719
return;
1671216720
}
1671316721
}
16714-
error(node, Diagnostics._0_is_declared_but_never_used, name);
16722+
16723+
if (!isRemovedPropertyFromObjectSpread(node.kind === SyntaxKind.Identifier ? node.parent : node)) {
16724+
error(node, Diagnostics._0_is_declared_but_never_used, name);
16725+
}
1671516726
}
1671616727

1671716728
function parameterNameStartsWithUnderscore(parameterName: DeclarationName) {
Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tests/cases/compiler/unusedLocalsAndObjectSpread.ts(7,12): error TS6133: 'a' is declared but never used.
2-
tests/cases/compiler/unusedLocalsAndObjectSpread.ts(14,15): error TS6133: '_' is declared but never used.
1+
tests/cases/compiler/unusedLocalsAndObjectSpread.ts(21,18): error TS6133: 'bar' is declared but never used.
2+
tests/cases/compiler/unusedLocalsAndObjectSpread.ts(28,21): error TS6133: 'bar' is declared but never used.
33

44

55
==== tests/cases/compiler/unusedLocalsAndObjectSpread.ts (2 errors) ====
@@ -10,18 +10,31 @@ tests/cases/compiler/unusedLocalsAndObjectSpread.ts(14,15): error TS6133: '_' is
1010
const foo = { a: 1, b: 2 };
1111
// 'a' is declared but never used
1212
const {a, ...bar} = foo;
13-
~
14-
!!! error TS6133: 'a' is declared but never used.
1513
console.log(bar);
1614
}
1715

1816
function two() {
1917
const foo = { a: 1, b: 2 };
2018
// '_' is declared but never used
2119
const {a: _, ...bar} = foo;
22-
~
23-
!!! error TS6133: '_' is declared but never used.
2420
console.log(bar);
2521
}
2622

23+
function three() {
24+
const foo = { a: 1, b: 2 };
25+
// 'a' is declared but never used
26+
const {a, ...bar} = foo; // bar should be unused
27+
~~~
28+
!!! error TS6133: 'bar' is declared but never used.
29+
//console.log(bar);
30+
}
31+
32+
function four() {
33+
const foo = { a: 1, b: 2 };
34+
// '_' is declared but never used
35+
const {a: _, ...bar} = foo; // bar should be unused
36+
~~~
37+
!!! error TS6133: 'bar' is declared but never used.
38+
//console.log(bar);
39+
}
2740

tests/baselines/reference/unusedLocalsAndObjectSpread.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,19 @@ function two() {
1616
console.log(bar);
1717
}
1818

19+
function three() {
20+
const foo = { a: 1, b: 2 };
21+
// 'a' is declared but never used
22+
const {a, ...bar} = foo; // bar should be unused
23+
//console.log(bar);
24+
}
25+
26+
function four() {
27+
const foo = { a: 1, b: 2 };
28+
// '_' is declared but never used
29+
const {a: _, ...bar} = foo; // bar should be unused
30+
//console.log(bar);
31+
}
1932

2033

2134
//// [unusedLocalsAndObjectSpread.js]
@@ -40,3 +53,15 @@ function two() {
4053
var _ = foo.a, bar = __rest(foo, ["a"]);
4154
console.log(bar);
4255
}
56+
function three() {
57+
var foo = { a: 1, b: 2 };
58+
// 'a' is declared but never used
59+
var a = foo.a, bar = __rest(foo, ["a"]); // bar should be unused
60+
//console.log(bar);
61+
}
62+
function four() {
63+
var foo = { a: 1, b: 2 };
64+
// '_' is declared but never used
65+
var _ = foo.a, bar = __rest(foo, ["a"]); // bar should be unused
66+
//console.log(bar);
67+
}

tests/cases/compiler/unusedLocalsAndObjectSpread.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,16 @@ function two() {
1616
console.log(bar);
1717
}
1818

19+
function three() {
20+
const foo = { a: 1, b: 2 };
21+
// 'a' is declared but never used
22+
const {a, ...bar} = foo; // bar should be unused
23+
//console.log(bar);
24+
}
25+
26+
function four() {
27+
const foo = { a: 1, b: 2 };
28+
// '_' is declared but never used
29+
const {a: _, ...bar} = foo; // bar should be unused
30+
//console.log(bar);
31+
}

0 commit comments

Comments
 (0)