Skip to content

Commit 7d931bb

Browse files
author
Andy Hanson
committed
Move new parameter to end of parameters
1 parent 9815359 commit 7d931bb

File tree

5 files changed

+9
-34
lines changed

5 files changed

+9
-34
lines changed

src/compiler/factory.ts

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,40 +1016,15 @@ namespace ts {
10161016
return node;
10171017
}
10181018

1019-
/* @deprecated */ export function updateArrowFunction(
1020-
node: ArrowFunction,
1021-
modifiers: ReadonlyArray<Modifier> | undefined,
1022-
typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined,
1023-
parameters: ReadonlyArray<ParameterDeclaration>,
1024-
type: TypeNode | undefined,
1025-
body: ConciseBody): ArrowFunction;
1026-
export function updateArrowFunction(
1027-
node: ArrowFunction,
1028-
modifiers: ReadonlyArray<Modifier> | undefined,
1029-
typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined,
1030-
parameters: ReadonlyArray<ParameterDeclaration>,
1031-
type: TypeNode | undefined,
1032-
equalsGreaterThanToken: Token<SyntaxKind.EqualsGreaterThanToken>,
1033-
body: ConciseBody): ArrowFunction;
10341019
export function updateArrowFunction(
10351020
node: ArrowFunction,
10361021
modifiers: ReadonlyArray<Modifier> | undefined,
10371022
typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined,
10381023
parameters: ReadonlyArray<ParameterDeclaration>,
10391024
type: TypeNode | undefined,
1040-
equalsGreaterThanTokenOrBody: Token<SyntaxKind.EqualsGreaterThanToken> | ConciseBody,
1041-
bodyOrUndefined?: ConciseBody): ArrowFunction {
1042-
let equalsGreaterThanToken: Token<SyntaxKind.EqualsGreaterThanToken>;
1043-
let body: ConciseBody;
1044-
if (bodyOrUndefined === undefined) {
1045-
equalsGreaterThanToken = node.equalsGreaterThanToken;
1046-
body = cast(equalsGreaterThanTokenOrBody, isConciseBody);
1047-
}
1048-
else {
1049-
equalsGreaterThanToken = cast(equalsGreaterThanTokenOrBody, (n): n is Token<SyntaxKind.EqualsGreaterThanToken> =>
1050-
n.kind === SyntaxKind.EqualsGreaterThanToken);
1051-
body = bodyOrUndefined;
1052-
}
1025+
body: ConciseBody,
1026+
// Optional for backwards-compatibility only -- should always provide this.
1027+
equalsGreaterThanToken: Token<SyntaxKind.EqualsGreaterThanToken> = node.equalsGreaterThanToken): ArrowFunction {
10531028

10541029
return node.modifiers !== modifiers
10551030
|| node.typeParameters !== typeParameters

src/compiler/transformers/es2017.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ namespace ts {
197197
/*typeParameters*/ undefined,
198198
visitParameterList(node.parameters, visitor, context),
199199
/*type*/ undefined,
200-
node.equalsGreaterThanToken,
201200
getFunctionFlags(node) & FunctionFlags.Async
202201
? transformAsyncFunctionBody(node)
203-
: visitFunctionBody(node.body, visitor, context)
202+
: visitFunctionBody(node.body, visitor, context),
203+
node.equalsGreaterThanToken,
204204
);
205205
}
206206

src/compiler/transformers/esnext.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,8 +595,8 @@ namespace ts {
595595
/*typeParameters*/ undefined,
596596
visitParameterList(node.parameters, visitor, context),
597597
/*type*/ undefined,
598+
transformFunctionBody(node),
598599
node.equalsGreaterThanToken,
599-
transformFunctionBody(node)
600600
);
601601
enclosingFunctionFlags = savedEnclosingFunctionFlags;
602602
return updated;

src/compiler/transformers/ts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2291,8 +2291,8 @@ namespace ts {
22912291
/*typeParameters*/ undefined,
22922292
visitParameterList(node.parameters, visitor, context),
22932293
/*type*/ undefined,
2294+
visitFunctionBody(node.body, visitor, context),
22942295
node.equalsGreaterThanToken,
2295-
visitFunctionBody(node.body, visitor, context)
22962296
);
22972297
return updated;
22982298
}

src/compiler/visitor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,8 @@ namespace ts {
488488
nodesVisitor((<ArrowFunction>node).typeParameters, visitor, isTypeParameterDeclaration),
489489
visitParameterList((<ArrowFunction>node).parameters, visitor, context, nodesVisitor),
490490
visitNode((<ArrowFunction>node).type, visitor, isTypeNode),
491-
visitNode((<ArrowFunction>node).equalsGreaterThanToken, visitor, n => n.kind === SyntaxKind.EqualsGreaterThanToken),
492-
visitFunctionBody((<ArrowFunction>node).body, visitor, context));
491+
visitFunctionBody((<ArrowFunction>node).body, visitor, context),
492+
visitNode((<ArrowFunction>node).equalsGreaterThanToken, visitor, n => n.kind === SyntaxKind.EqualsGreaterThanToken));
493493

494494
case SyntaxKind.DeleteExpression:
495495
return updateDelete(<DeleteExpression>node,

0 commit comments

Comments
 (0)