Skip to content

Commit 3ddbfca

Browse files
rbucktonrbuckton
committed
Merge branch 'master' into fix15857
2 parents d876fcc + b8d39d7 commit 3ddbfca

14 files changed

Lines changed: 1667 additions & 1146 deletions

‎src/compiler/checker.ts‎

Lines changed: 62 additions & 70 deletions
Large diffs are not rendered by default.

‎src/compiler/factory.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3966,7 +3966,7 @@ namespace ts {
39663966
return bindingElement.right;
39673967
}
39683968

3969-
if (isSpreadExpression(bindingElement)) {
3969+
if (isSpreadElement(bindingElement)) {
39703970
// Recovery consistent with existing emit.
39713971
return getInitializerOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.expression);
39723972
}
@@ -4034,7 +4034,7 @@ namespace ts {
40344034
return getTargetOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.left);
40354035
}
40364036

4037-
if (isSpreadExpression(bindingElement)) {
4037+
if (isSpreadElement(bindingElement)) {
40384038
// `a` in `[...a] = ...`
40394039
return getTargetOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.expression);
40404040
}

‎src/compiler/transformers/es2015.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3610,7 +3610,7 @@ namespace ts {
36103610
else {
36113611
if (segments.length === 1) {
36123612
const firstElement = elements[0];
3613-
return needsUniqueCopy && isSpreadExpression(firstElement) && firstElement.expression.kind !== SyntaxKind.ArrayLiteralExpression
3613+
return needsUniqueCopy && isSpreadElement(firstElement) && firstElement.expression.kind !== SyntaxKind.ArrayLiteralExpression
36143614
? createArraySlice(segments[0])
36153615
: segments[0];
36163616
}
@@ -3621,7 +3621,7 @@ namespace ts {
36213621
}
36223622

36233623
function partitionSpread(node: Expression) {
3624-
return isSpreadExpression(node)
3624+
return isSpreadElement(node)
36253625
? visitSpanOfSpreads
36263626
: visitSpanOfNonSpreads;
36273627
}

‎src/compiler/transformers/module/system.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ namespace ts {
15021502
if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
15031503
return hasExportedReferenceInDestructuringTarget(node.left);
15041504
}
1505-
else if (isSpreadExpression(node)) {
1505+
else if (isSpreadElement(node)) {
15061506
return hasExportedReferenceInDestructuringTarget(node.expression);
15071507
}
15081508
else if (isObjectLiteralExpression(node)) {

0 commit comments

Comments
 (0)