Merge pull request #13959 from Microsoft/fix-assigned-type-of-assignment-nested-in-literals
Fix assigned type of assignment nested in literals
This commit is contained in:
commit
270c0b80d9
|
@ -9472,11 +9472,19 @@ namespace ts {
|
|||
}
|
||||
|
||||
function getAssignedTypeOfBinaryExpression(node: BinaryExpression): Type {
|
||||
return node.parent.kind === SyntaxKind.ArrayLiteralExpression || node.parent.kind === SyntaxKind.PropertyAssignment ?
|
||||
const isDestructuringDefaultAssignment =
|
||||
node.parent.kind === SyntaxKind.ArrayLiteralExpression && isDestructuringAssignmentTarget(node.parent) ||
|
||||
node.parent.kind === SyntaxKind.PropertyAssignment && isDestructuringAssignmentTarget(node.parent.parent);
|
||||
return isDestructuringDefaultAssignment ?
|
||||
getTypeWithDefault(getAssignedType(node), node.right) :
|
||||
getTypeOfExpression(node.right);
|
||||
}
|
||||
|
||||
function isDestructuringAssignmentTarget(parent: Node) {
|
||||
return parent.parent.kind === SyntaxKind.BinaryExpression && (parent.parent as BinaryExpression).left === parent ||
|
||||
parent.parent.kind === SyntaxKind.ForOfStatement && (parent.parent as ForOfStatement).initializer === parent;
|
||||
}
|
||||
|
||||
function getAssignedTypeOfArrayLiteralElement(node: ArrayLiteralExpression, element: Expression): Type {
|
||||
return getTypeOfDestructuredArrayElement(getAssignedType(node), indexOf(node.elements, element));
|
||||
}
|
||||
|
|
21
tests/baselines/reference/assignmentNestedInLiterals.js
Normal file
21
tests/baselines/reference/assignmentNestedInLiterals.js
Normal file
|
@ -0,0 +1,21 @@
|
|||
//// [assignmentNestedInLiterals.ts]
|
||||
var target, x, y;
|
||||
target = [x = 1, y = x];
|
||||
|
||||
var aegis, a, b;
|
||||
aegis = { x: a = 1, y: b = a };
|
||||
|
||||
var kowloona, c, d;
|
||||
for (kowloona of [c = 1, d = c]) {
|
||||
}
|
||||
|
||||
|
||||
//// [assignmentNestedInLiterals.js]
|
||||
var target, x, y;
|
||||
target = [x = 1, y = x];
|
||||
var aegis, a, b;
|
||||
aegis = { x: a = 1, y: b = a };
|
||||
var kowloona, c, d;
|
||||
for (var _i = 0, _a = [c = 1, d = c]; _i < _a.length; _i++) {
|
||||
kowloona = _a[_i];
|
||||
}
|
37
tests/baselines/reference/assignmentNestedInLiterals.symbols
Normal file
37
tests/baselines/reference/assignmentNestedInLiterals.symbols
Normal file
|
@ -0,0 +1,37 @@
|
|||
=== tests/cases/compiler/assignmentNestedInLiterals.ts ===
|
||||
var target, x, y;
|
||||
>target : Symbol(target, Decl(assignmentNestedInLiterals.ts, 0, 3))
|
||||
>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 0, 11))
|
||||
>y : Symbol(y, Decl(assignmentNestedInLiterals.ts, 0, 14))
|
||||
|
||||
target = [x = 1, y = x];
|
||||
>target : Symbol(target, Decl(assignmentNestedInLiterals.ts, 0, 3))
|
||||
>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 0, 11))
|
||||
>y : Symbol(y, Decl(assignmentNestedInLiterals.ts, 0, 14))
|
||||
>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 0, 11))
|
||||
|
||||
var aegis, a, b;
|
||||
>aegis : Symbol(aegis, Decl(assignmentNestedInLiterals.ts, 3, 3))
|
||||
>a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10))
|
||||
>b : Symbol(b, Decl(assignmentNestedInLiterals.ts, 3, 13))
|
||||
|
||||
aegis = { x: a = 1, y: b = a };
|
||||
>aegis : Symbol(aegis, Decl(assignmentNestedInLiterals.ts, 3, 3))
|
||||
>x : Symbol(x, Decl(assignmentNestedInLiterals.ts, 4, 9))
|
||||
>a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10))
|
||||
>y : Symbol(y, Decl(assignmentNestedInLiterals.ts, 4, 19))
|
||||
>b : Symbol(b, Decl(assignmentNestedInLiterals.ts, 3, 13))
|
||||
>a : Symbol(a, Decl(assignmentNestedInLiterals.ts, 3, 10))
|
||||
|
||||
var kowloona, c, d;
|
||||
>kowloona : Symbol(kowloona, Decl(assignmentNestedInLiterals.ts, 6, 3))
|
||||
>c : Symbol(c, Decl(assignmentNestedInLiterals.ts, 6, 13))
|
||||
>d : Symbol(d, Decl(assignmentNestedInLiterals.ts, 6, 16))
|
||||
|
||||
for (kowloona of [c = 1, d = c]) {
|
||||
>kowloona : Symbol(kowloona, Decl(assignmentNestedInLiterals.ts, 6, 3))
|
||||
>c : Symbol(c, Decl(assignmentNestedInLiterals.ts, 6, 13))
|
||||
>d : Symbol(d, Decl(assignmentNestedInLiterals.ts, 6, 16))
|
||||
>c : Symbol(c, Decl(assignmentNestedInLiterals.ts, 6, 13))
|
||||
}
|
||||
|
51
tests/baselines/reference/assignmentNestedInLiterals.types
Normal file
51
tests/baselines/reference/assignmentNestedInLiterals.types
Normal file
|
@ -0,0 +1,51 @@
|
|||
=== tests/cases/compiler/assignmentNestedInLiterals.ts ===
|
||||
var target, x, y;
|
||||
>target : any
|
||||
>x : any
|
||||
>y : any
|
||||
|
||||
target = [x = 1, y = x];
|
||||
>target = [x = 1, y = x] : number[]
|
||||
>target : any
|
||||
>[x = 1, y = x] : number[]
|
||||
>x = 1 : 1
|
||||
>x : any
|
||||
>1 : 1
|
||||
>y = x : number
|
||||
>y : any
|
||||
>x : number
|
||||
|
||||
var aegis, a, b;
|
||||
>aegis : any
|
||||
>a : any
|
||||
>b : any
|
||||
|
||||
aegis = { x: a = 1, y: b = a };
|
||||
>aegis = { x: a = 1, y: b = a } : { x: number; y: number; }
|
||||
>aegis : any
|
||||
>{ x: a = 1, y: b = a } : { x: number; y: number; }
|
||||
>x : number
|
||||
>a = 1 : 1
|
||||
>a : any
|
||||
>1 : 1
|
||||
>y : number
|
||||
>b = a : number
|
||||
>b : any
|
||||
>a : number
|
||||
|
||||
var kowloona, c, d;
|
||||
>kowloona : any
|
||||
>c : any
|
||||
>d : any
|
||||
|
||||
for (kowloona of [c = 1, d = c]) {
|
||||
>kowloona : any
|
||||
>[c = 1, d = c] : number[]
|
||||
>c = 1 : 1
|
||||
>c : any
|
||||
>1 : 1
|
||||
>d = c : number
|
||||
>d : any
|
||||
>c : number
|
||||
}
|
||||
|
10
tests/cases/compiler/assignmentNestedInLiterals.ts
Normal file
10
tests/cases/compiler/assignmentNestedInLiterals.ts
Normal file
|
@ -0,0 +1,10 @@
|
|||
// @noImplicitAny: true
|
||||
var target, x, y;
|
||||
target = [x = 1, y = x];
|
||||
|
||||
var aegis, a, b;
|
||||
aegis = { x: a = 1, y: b = a };
|
||||
|
||||
var kowloona, c, d;
|
||||
for (kowloona of [c = 1, d = c]) {
|
||||
}
|
Loading…
Reference in a new issue