Skip to content

Commit

Permalink
feat(31388): allow binding elements starting with an underscore
Browse files Browse the repository at this point in the history
  • Loading branch information
@a-tarasyuk
a-tarasyuk committed Dec 11, 2020
1 parent 9871b5f commit 5dc5f07
Show file tree
Hide file tree
Showing 17 changed files with 1,135 additions and 119 deletions.
8 changes: 1 addition & 7 deletions src/compiler/checker.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33362,14 +33362,8 @@ namespace ts {
}

function isValidUnusedLocalDeclaration(declaration: Declaration): boolean {
if (isBindingElement(declaration) && isIdentifierThatStartsWithUnderscore(declaration.name)) {
return !!findAncestor(declaration.parent, ancestor =>
isArrayBindingPattern(ancestor) || isVariableDeclaration(ancestor) || isVariableDeclarationList(ancestor) ? false :
isForOfStatement(ancestor) ? true : "quit"
);
}

return isAmbientModule(declaration) ||
(isBindingElement(declaration) && isIdentifierThatStartsWithUnderscore(declaration.name)) ||
(isVariableDeclaration(declaration) && isForInOrOfStatement(declaration.parent.parent) || isImportedDeclaration(declaration)) && isIdentifierThatStartsWithUnderscore(declaration.name!);
}

Expand Down
5 changes: 1 addition & 4 deletions tests/baselines/reference/unusedParametersWithUnderscore.errors.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ tests/cases/compiler/unusedParametersWithUnderscore.ts(1,12): error TS6133: 'a'
tests/cases/compiler/unusedParametersWithUnderscore.ts(1,19): error TS6133: 'c' is declared but its value is never read.
tests/cases/compiler/unusedParametersWithUnderscore.ts(1,27): error TS6133: 'd' is declared but its value is never read.
tests/cases/compiler/unusedParametersWithUnderscore.ts(1,29): error TS6133: 'e___' is declared but its value is never read.
tests/cases/compiler/unusedParametersWithUnderscore.ts(5,13): error TS6198: All destructured elements are unused.
tests/cases/compiler/unusedParametersWithUnderscore.ts(11,16): error TS6133: 'arg' is declared but its value is never read.
tests/cases/compiler/unusedParametersWithUnderscore.ts(17,13): error TS6133: 'arg' is declared but its value is never read.


==== tests/cases/compiler/unusedParametersWithUnderscore.ts (7 errors) ====
==== tests/cases/compiler/unusedParametersWithUnderscore.ts (6 errors) ====
function f(a, _b, c, ___, d,e___, _f) {
~
!!! error TS6133: 'a' is declared but its value is never read.
Expand All @@ -21,8 +20,6 @@ tests/cases/compiler/unusedParametersWithUnderscore.ts(17,13): error TS6133: 'ar


function f2({_a, __b}) {
~~~~~~~~~
!!! error TS6198: All destructured elements are unused.
}

function f3([_a, ,__b]) {
Expand Down
131 changes: 131 additions & 0 deletions tests/baselines/reference/unusedVariablesWithUnderscoreInBindingElement.errors.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(12,17): error TS6133: 'b1' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(13,12): error TS6133: 'a2' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(14,12): error TS6133: 'a3' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(14,16): error TS6133: 'b3' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(23,12): error TS6133: 'a3' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(23,18): error TS6133: 'b3' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(23,22): error TS6133: 'c3' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(23,28): error TS6133: 'd3' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(23,32): error TS6133: 'e3' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(37,22): error TS6133: 'b1' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(38,13): error TS6133: 'a2' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(39,11): error TS6198: All destructured elements are unused.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(68,9): error TS6133: 'a3' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(70,18): error TS6198: All destructured elements are unused.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(74,9): error TS6133: 'c3' is declared but its value is never read.
tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts(75,9): error TS6133: 'd3' is declared but its value is never read.


==== tests/cases/compiler/unusedVariablesWithUnderscoreInBindingElement.ts (16 errors) ====
function t1() {
const [_a1, b1] = [1, 2];
console.log(b1);

const [a2, _b2] = [1, 2];
console.log(a2);

const [_a3, _b3] = [1, 2];
}

function t2() {
const [_a1, b1] = [1, 2];
~~
!!! error TS6133: 'b1' is declared but its value is never read.
const [a2, _b2] = [1, 2];
~~
!!! error TS6133: 'a2' is declared but its value is never read.
const [a3, b3] = [1, 2];
~~
!!! error TS6133: 'a3' is declared but its value is never read.
~~
!!! error TS6133: 'b3' is declared but its value is never read.
}

function t3() {
const [_a1, [[_b1, c1]], d1, _e1] = [1, [[2, 3]], 4, 5];
console.log(c1, d1);

const [_a2, [[_b2, _c2]], _d2, _e2] = [1, [[2, 3]], 4, 5];

const [a3, [[b3, c3]], d3, e3] = [1, [[2, 3]], 4, 5];
~~
!!! error TS6133: 'a3' is declared but its value is never read.
~~
!!! error TS6133: 'b3' is declared but its value is never read.
~~
!!! error TS6133: 'c3' is declared but its value is never read.
~~
!!! error TS6133: 'd3' is declared but its value is never read.
~~
!!! error TS6133: 'e3' is declared but its value is never read.
}

function t4() {
const { a1: _a1, b1 } = { a1: 1, b1: 1 };
console.log(b1);

const { a2, b2: _b2 } = { a2: 1, b2: 1 };
console.log(a2);

const { a3: _a3, b3: _b3 } = { a3: 1, b3: 1 };
}

function t5() {
const { a1: _a1, b1 } = { a1: 1, b1: 1 };
~~
!!! error TS6133: 'b1' is declared but its value is never read.
const { a2, b2: _b2 } = { a2: 1, b2: 1 };
~~
!!! error TS6133: 'a2' is declared but its value is never read.
const { a3, b3 } = { a3: 1, b3: 1 };
~~~~~~~~~~
!!! error TS6198: All destructured elements are unused.
}

function t6() {
const {
a1: _a1,
b1: {
b11: {
b111: _b111,
b112
}
},
c1,
d1: _d1
} = { a1: 1, b1: { b11: { b111: 1, b112: 1 } }, c1: 1, d1: 1 };
console.log(b112, c1);

const {
a2: _a2,
b2: {
b21: {
b211: _b211, b212: _b212
}
},
c2: _c2,
d2: _d2
} = { a2: 1, b2: { b21: { b211: 1, b212: 1 } }, c2: 1, d2: 1 };

const {
a3,
~~
!!! error TS6133: 'a3' is declared but its value is never read.
b3: {
b31: {
~
b311, b312
~~~~~~~~~~~~~~~~~~~~~~~~~~
}
~~~~~~~~~~~~~
!!! error TS6198: All destructured elements are unused.
},
c3,
~~
!!! error TS6133: 'c3' is declared but its value is never read.
d3
~~
!!! error TS6133: 'd3' is declared but its value is never read.
} = { a3: 1, b3: { b31: { b311: 1, b312: 1 } }, c3: 1, d3: 1 };
}

117 changes: 117 additions & 0 deletions tests/baselines/reference/unusedVariablesWithUnderscoreInBindingElement.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
//// [unusedVariablesWithUnderscoreInBindingElement.ts]
function t1() {
const [_a1, b1] = [1, 2];
console.log(b1);

const [a2, _b2] = [1, 2];
console.log(a2);

const [_a3, _b3] = [1, 2];
}

function t2() {
const [_a1, b1] = [1, 2];
const [a2, _b2] = [1, 2];
const [a3, b3] = [1, 2];
}

function t3() {
const [_a1, [[_b1, c1]], d1, _e1] = [1, [[2, 3]], 4, 5];
console.log(c1, d1);

const [_a2, [[_b2, _c2]], _d2, _e2] = [1, [[2, 3]], 4, 5];

const [a3, [[b3, c3]], d3, e3] = [1, [[2, 3]], 4, 5];
}

function t4() {
const { a1: _a1, b1 } = { a1: 1, b1: 1 };
console.log(b1);

const { a2, b2: _b2 } = { a2: 1, b2: 1 };
console.log(a2);

const { a3: _a3, b3: _b3 } = { a3: 1, b3: 1 };
}

function t5() {
const { a1: _a1, b1 } = { a1: 1, b1: 1 };
const { a2, b2: _b2 } = { a2: 1, b2: 1 };
const { a3, b3 } = { a3: 1, b3: 1 };
}

function t6() {
const {
a1: _a1,
b1: {
b11: {
b111: _b111,
b112
}
},
c1,
d1: _d1
} = { a1: 1, b1: { b11: { b111: 1, b112: 1 } }, c1: 1, d1: 1 };
console.log(b112, c1);

const {
a2: _a2,
b2: {
b21: {
b211: _b211, b212: _b212
}
},
c2: _c2,
d2: _d2
} = { a2: 1, b2: { b21: { b211: 1, b212: 1 } }, c2: 1, d2: 1 };

const {
a3,
b3: {
b31: {
b311, b312
}
},
c3,
d3
} = { a3: 1, b3: { b31: { b311: 1, b312: 1 } }, c3: 1, d3: 1 };
}


//// [unusedVariablesWithUnderscoreInBindingElement.js]
function t1() {
var _a = [1, 2], _a1 = _a[0], b1 = _a[1];
console.log(b1);
var _b = [1, 2], a2 = _b[0], _b2 = _b[1];
console.log(a2);
var _c = [1, 2], _a3 = _c[0], _b3 = _c[1];
}
function t2() {
var _a = [1, 2], _a1 = _a[0], b1 = _a[1];
var _b = [1, 2], a2 = _b[0], _b2 = _b[1];
var _c = [1, 2], a3 = _c[0], b3 = _c[1];
}
function t3() {
var _a = [1, [[2, 3]], 4, 5], _a1 = _a[0], _b = _a[1][0], _b1 = _b[0], c1 = _b[1], d1 = _a[2], _e1 = _a[3];
console.log(c1, d1);
var _c = [1, [[2, 3]], 4, 5], _a2 = _c[0], _d = _c[1][0], _b2 = _d[0], _c2 = _d[1], _d2 = _c[2], _e2 = _c[3];
var _e = [1, [[2, 3]], 4, 5], a3 = _e[0], _f = _e[1][0], b3 = _f[0], c3 = _f[1], d3 = _e[2], e3 = _e[3];
}
function t4() {
var _a = { a1: 1, b1: 1 }, _a1 = _a.a1, b1 = _a.b1;
console.log(b1);
var _b = { a2: 1, b2: 1 }, a2 = _b.a2, _b2 = _b.b2;
console.log(a2);
var _c = { a3: 1, b3: 1 }, _a3 = _c.a3, _b3 = _c.b3;
}
function t5() {
var _a = { a1: 1, b1: 1 }, _a1 = _a.a1, b1 = _a.b1;
var _b = { a2: 1, b2: 1 }, a2 = _b.a2, _b2 = _b.b2;
var _c = { a3: 1, b3: 1 }, a3 = _c.a3, b3 = _c.b3;
}
function t6() {
var _a = { a1: 1, b1: { b11: { b111: 1, b112: 1 } }, c1: 1, d1: 1 }, _a1 = _a.a1, _b = _a.b1.b11, _b111 = _b.b111, b112 = _b.b112, c1 = _a.c1, _d1 = _a.d1;
console.log(b112, c1);
var _c = { a2: 1, b2: { b21: { b211: 1, b212: 1 } }, c2: 1, d2: 1 }, _a2 = _c.a2, _d = _c.b2.b21, _b211 = _d.b211, _b212 = _d.b212, _c2 = _c.c2, _d2 = _c.d2;
var _e = { a3: 1, b3: { b31: { b311: 1, b312: 1 } }, c3: 1, d3: 1 }, a3 = _e.a3, _f = _e.b3.b31, b311 = _f.b311, b312 = _f.b312, c3 = _e.c3, d3 = _e.d3;
}
Loading

0 comments on commit 5dc5f07

Please sign in to comment.