Skip to content

Commit 4fcccc8

Browse files
author
Yui T
committed
Merge branch 'master' into master-refactorJsDocTest
2 parents 7815ccf + 3eda9c6 commit 4fcccc8

File tree

11 files changed

+1612
-1068
lines changed

11 files changed

+1612
-1068
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ branches:
2121
- release-2.3
2222

2323
install:
24-
- npm uninstall typescript
25-
- npm uninstall tslint
24+
- npm uninstall typescript --no-save
25+
- npm uninstall tslint --no-save
2626
- npm install
2727

2828
cache:

jenkins.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
# Set up NVM
44
export NVM_DIR="/home/dotnet-bot/.nvm"
5-
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
5+
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
66

77
nvm install $1
88

9-
npm uninstall typescript
10-
npm uninstall tslint
9+
npm uninstall typescript --no-save
10+
npm uninstall tslint --no-save
1111
npm install
1212
npm update
1313
npm test

src/compiler/checker.ts

Lines changed: 61 additions & 69 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
@@ -3908,7 +3908,7 @@ namespace ts {
39083908
return bindingElement.right;
39093909
}
39103910

3911-
if (isSpreadExpression(bindingElement)) {
3911+
if (isSpreadElement(bindingElement)) {
39123912
// Recovery consistent with existing emit.
39133913
return getInitializerOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.expression);
39143914
}
@@ -3976,7 +3976,7 @@ namespace ts {
39763976
return getTargetOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.left);
39773977
}
39783978

3979-
if (isSpreadExpression(bindingElement)) {
3979+
if (isSpreadElement(bindingElement)) {
39803980
// `a` in `[...a] = ...`
39813981
return getTargetOfBindingOrAssignmentElement(<BindingOrAssignmentElement>bindingElement.expression);
39823982
}

src/compiler/transformers/es2015.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3396,7 +3396,7 @@ namespace ts {
33963396
else {
33973397
if (segments.length === 1) {
33983398
const firstElement = elements[0];
3399-
return needsUniqueCopy && isSpreadExpression(firstElement) && firstElement.expression.kind !== SyntaxKind.ArrayLiteralExpression
3399+
return needsUniqueCopy && isSpreadElement(firstElement) && firstElement.expression.kind !== SyntaxKind.ArrayLiteralExpression
34003400
? createArraySlice(segments[0])
34013401
: segments[0];
34023402
}
@@ -3407,7 +3407,7 @@ namespace ts {
34073407
}
34083408

34093409
function partitionSpread(node: Expression) {
3410-
return isSpreadExpression(node)
3410+
return isSpreadElement(node)
34113411
? visitSpanOfSpreads
34123412
: visitSpanOfNonSpreads;
34133413
}

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)