microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-11 19:27:35 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix several test failures.

Browse Source
This commit is contained in:
Ron Buckton 2016-07-20 17:55:55 -07:00
parent d119167653
commit b087526b8c
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/core.ts
View File

@ -355,7 +355,9 @@ namespace ts {
export function addRange<T>(to: T[], from: T[]): void {
if (to && from) {
for (const v of from) {
to.push(v);
if (v !== undefined) {
to.push(v);
}
}
}
}

4
src/compiler/factory.ts
View File

@ -2635,8 +2635,8 @@ namespace ts {
return node;
}
export function startOnNewLine<T extends Node>(node: T, startsOnNewLine?: boolean): T {
node.startsOnNewLine = startsOnNewLine !== false;
export function startOnNewLine<T extends Node>(node: T): T {
node.startsOnNewLine = true;
return node;
}

27
src/compiler/transformers/es6.ts
View File

@ -1899,28 +1899,27 @@ namespace ts {
// Write out the first non-computed properties, then emit the rest through indexing on the temp variable.
const expressions: Expression[] = [];
expressions.push(
startOnNewLine(
createAssignment(
temp,
setNodeEmitFlags(
createObjectLiteral(
visitNodes(properties, visitor, isObjectLiteralElement, 0, numInitialProperties),
/*location*/ undefined,
node.multiLine
),
NodeEmitFlags.Indented
)
const assignment = createAssignment(
temp,
setNodeEmitFlags(
createObjectLiteral(
visitNodes(properties, visitor, isObjectLiteralElement, 0, numInitialProperties),
/*location*/ undefined,
node.multiLine
),
node.multiLine
NodeEmitFlags.Indented
)
);
if (node.multiLine) {
assignment.startsOnNewLine = true;
}
expressions.push(assignment);
addObjectLiteralMembers(expressions, node, temp, numInitialProperties);
// We need to clone the temporary identifier so that we can write it on a
// new line
expressions.push(startOnNewLine(getMutableClone(temp), node.multiLine));
expressions.push(node.multiLine ? startOnNewLine(getMutableClone(temp)) : temp);
return inlineExpressions(expressions);
}

8
src/compiler/visitor.ts
View File

@ -827,19 +827,19 @@ namespace ts {
case SyntaxKind.DeleteExpression:
return updateDelete(<DeleteExpression>node,
visitNode((<DeleteExpression>node).expression, visitor, isUnaryExpression));
visitNode((<DeleteExpression>node).expression, visitor, isExpression));
case SyntaxKind.TypeOfExpression:
return updateTypeOf(<TypeOfExpression>node,
visitNode((<TypeOfExpression>node).expression, visitor, isUnaryExpression));
visitNode((<TypeOfExpression>node).expression, visitor, isExpression));
case SyntaxKind.VoidExpression:
return updateVoid(<VoidExpression>node,
visitNode((<VoidExpression>node).expression, visitor, isUnaryExpression));
visitNode((<VoidExpression>node).expression, visitor, isExpression));
case SyntaxKind.AwaitExpression:
return updateAwait(<AwaitExpression>node,
visitNode((<AwaitExpression>node).expression, visitor, isUnaryExpression));
visitNode((<AwaitExpression>node).expression, visitor, isExpression));
case SyntaxKind.BinaryExpression:
return updateBinary(<BinaryExpression>node,