Skip to content

Commit c4d7992

Browse files
mhegazymhegazy
authored
Merge pull request microsoft#25963 from ajafff/cleanup-factory
minor cleanup in factory.ts
2 parents aaf14f4 + c4f9a8c commit c4d7992

3 files changed

Lines changed: 14 additions & 58 deletions

File tree

‎src/compiler/factory.ts‎

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ namespace ts {
10581058
: node;
10591059
}
10601060

1061-
export function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
1061+
/** @deprecated */ export function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
10621062
export function createTaggedTemplate(tag: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, template: TemplateLiteral): TaggedTemplateExpression;
10631063
/** @internal */
10641064
export function createTaggedTemplate(tag: Expression, typeArgumentsOrTemplate: ReadonlyArray<TypeNode> | TemplateLiteral | undefined, template?: TemplateLiteral): TaggedTemplateExpression;
@@ -1076,7 +1076,7 @@ namespace ts {
10761076
return node;
10771077
}
10781078

1079-
export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
1079+
/** @deprecated */ export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
10801080
export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, template: TemplateLiteral): TaggedTemplateExpression;
10811081
export function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, typeArgumentsOrTemplate: ReadonlyArray<TypeNode> | TemplateLiteral | undefined, template?: TemplateLiteral) {
10821082
return node.tag !== tag
@@ -1168,43 +1168,15 @@ namespace ts {
11681168
node.body = parenthesizeConciseBody(body);
11691169
return node;
11701170
}
1171-
1172-
/** @deprecated */ export function updateArrowFunction(
1173-
node: ArrowFunction,
1174-
modifiers: ReadonlyArray<Modifier> | undefined,
1175-
typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined,
1176-
parameters: ReadonlyArray<ParameterDeclaration>,
1177-
type: TypeNode | undefined,
1178-
body: ConciseBody): ArrowFunction;
11791171
export function updateArrowFunction(
11801172
node: ArrowFunction,
11811173
modifiers: ReadonlyArray<Modifier> | undefined,
11821174
typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined,
11831175
parameters: ReadonlyArray<ParameterDeclaration>,
11841176
type: TypeNode | undefined,
11851177
equalsGreaterThanToken: Token<SyntaxKind.EqualsGreaterThanToken>,
1186-
body: ConciseBody): ArrowFunction;
1187-
export function updateArrowFunction(
1188-
node: ArrowFunction,
1189-
modifiers: ReadonlyArray<Modifier> | undefined,
1190-
typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined,
1191-
parameters: ReadonlyArray<ParameterDeclaration>,
1192-
type: TypeNode | undefined,
1193-
equalsGreaterThanTokenOrBody: Token<SyntaxKind.EqualsGreaterThanToken> | ConciseBody,
1194-
bodyOrUndefined?: ConciseBody,
1178+
body: ConciseBody
11951179
): ArrowFunction {
1196-
let equalsGreaterThanToken: Token<SyntaxKind.EqualsGreaterThanToken>;
1197-
let body: ConciseBody;
1198-
if (bodyOrUndefined === undefined) {
1199-
equalsGreaterThanToken = node.equalsGreaterThanToken;
1200-
body = cast(equalsGreaterThanTokenOrBody, isConciseBody);
1201-
}
1202-
else {
1203-
equalsGreaterThanToken = cast(equalsGreaterThanTokenOrBody, (n): n is Token<SyntaxKind.EqualsGreaterThanToken> =>
1204-
n.kind === SyntaxKind.EqualsGreaterThanToken);
1205-
body = bodyOrUndefined;
1206-
}
1207-
12081180
return node.modifiers !== modifiers
12091181
|| node.typeParameters !== typeParameters
12101182
|| node.parameters !== parameters
@@ -1306,7 +1278,7 @@ namespace ts {
13061278
: node;
13071279
}
13081280

1309-
export function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
1281+
/** @deprecated */ export function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
13101282
export function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression): ConditionalExpression;
13111283
export function createConditional(condition: Expression, questionTokenOrWhenTrue: QuestionToken | Expression, whenTrueOrWhenFalse: Expression, colonToken?: ColonToken, whenFalse?: Expression) {
13121284
const node = <ConditionalExpression>createSynthesizedNode(SyntaxKind.ConditionalExpression);
@@ -1317,26 +1289,14 @@ namespace ts {
13171289
node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenFalse : whenTrueOrWhenFalse);
13181290
return node;
13191291
}
1320-
1321-
/** @deprecated */ export function updateConditional(
1322-
node: ConditionalExpression,
1323-
condition: Expression,
1324-
whenTrue: Expression,
1325-
whenFalse: Expression): ConditionalExpression;
13261292
export function updateConditional(
13271293
node: ConditionalExpression,
13281294
condition: Expression,
13291295
questionToken: Token<SyntaxKind.QuestionToken>,
13301296
whenTrue: Expression,
13311297
colonToken: Token<SyntaxKind.ColonToken>,
1332-
whenFalse: Expression): ConditionalExpression;
1333-
export function updateConditional(node: ConditionalExpression, condition: Expression, ...args: any[]) {
1334-
if (args.length === 2) {
1335-
const [whenTrue, whenFalse] = args;
1336-
return updateConditional(node, condition, node.questionToken, whenTrue, node.colonToken, whenFalse);
1337-
}
1338-
Debug.assert(args.length === 4);
1339-
const [questionToken, whenTrue, colonToken, whenFalse] = args;
1298+
whenFalse: Expression
1299+
): ConditionalExpression {
13401300
return node.condition !== condition
13411301
|| node.questionToken !== questionToken
13421302
|| node.whenTrue !== whenTrue
@@ -2231,7 +2191,7 @@ namespace ts {
22312191
export function createJsxSelfClosingElement(tagName: JsxTagNameExpression, typeArguments: ReadonlyArray<TypeNode> | undefined, attributes: JsxAttributes) {
22322192
const node = <JsxSelfClosingElement>createSynthesizedNode(SyntaxKind.JsxSelfClosingElement);
22332193
node.tagName = tagName;
2234-
node.typeArguments = typeArguments && createNodeArray(typeArguments);
2194+
node.typeArguments = asNodeArray(typeArguments);
22352195
node.attributes = attributes;
22362196
return node;
22372197
}
@@ -2247,7 +2207,7 @@ namespace ts {
22472207
export function createJsxOpeningElement(tagName: JsxTagNameExpression, typeArguments: ReadonlyArray<TypeNode> | undefined, attributes: JsxAttributes) {
22482208
const node = <JsxOpeningElement>createSynthesizedNode(SyntaxKind.JsxOpeningElement);
22492209
node.tagName = tagName;
2250-
node.typeArguments = typeArguments && createNodeArray(typeArguments);
2210+
node.typeArguments = asNodeArray(typeArguments);
22512211
node.attributes = attributes;
22522212
return node;
22532213
}

‎tests/baselines/reference/api/tsserverlibrary.d.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3746,9 +3746,9 @@ declare namespace ts {
37463746
function updateCall(node: CallExpression, expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression>): CallExpression;
37473747
function createNew(expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): NewExpression;
37483748
function updateNew(node: NewExpression, expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): NewExpression;
3749-
function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
3749+
/** @deprecated */ function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
37503750
function createTaggedTemplate(tag: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, template: TemplateLiteral): TaggedTemplateExpression;
3751-
function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
3751+
/** @deprecated */ function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
37523752
function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, template: TemplateLiteral): TaggedTemplateExpression;
37533753
function createTypeAssertion(type: TypeNode, expression: Expression): TypeAssertion;
37543754
function updateTypeAssertion(node: TypeAssertion, type: TypeNode, expression: Expression): TypeAssertion;
@@ -3757,7 +3757,6 @@ declare namespace ts {
37573757
function createFunctionExpression(modifiers: ReadonlyArray<Modifier> | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration> | undefined, type: TypeNode | undefined, body: Block): FunctionExpression;
37583758
function updateFunctionExpression(node: FunctionExpression, modifiers: ReadonlyArray<Modifier> | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: Block): FunctionExpression;
37593759
function createArrowFunction(modifiers: ReadonlyArray<Modifier> | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, equalsGreaterThanToken: EqualsGreaterThanToken | undefined, body: ConciseBody): ArrowFunction;
3760-
/** @deprecated */ function updateArrowFunction(node: ArrowFunction, modifiers: ReadonlyArray<Modifier> | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: ConciseBody): ArrowFunction;
37613760
function updateArrowFunction(node: ArrowFunction, modifiers: ReadonlyArray<Modifier> | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, equalsGreaterThanToken: Token<SyntaxKind.EqualsGreaterThanToken>, body: ConciseBody): ArrowFunction;
37623761
function createDelete(expression: Expression): DeleteExpression;
37633762
function updateDelete(node: DeleteExpression, expression: Expression): DeleteExpression;
@@ -3773,9 +3772,8 @@ declare namespace ts {
37733772
function updatePostfix(node: PostfixUnaryExpression, operand: Expression): PostfixUnaryExpression;
37743773
function createBinary(left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression): BinaryExpression;
37753774
function updateBinary(node: BinaryExpression, left: Expression, right: Expression, operator?: BinaryOperator | BinaryOperatorToken): BinaryExpression;
3776-
function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
3775+
/** @deprecated */ function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
37773776
function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression): ConditionalExpression;
3778-
/** @deprecated */ function updateConditional(node: ConditionalExpression, condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
37793777
function updateConditional(node: ConditionalExpression, condition: Expression, questionToken: Token<SyntaxKind.QuestionToken>, whenTrue: Expression, colonToken: Token<SyntaxKind.ColonToken>, whenFalse: Expression): ConditionalExpression;
37803778
function createTemplateExpression(head: TemplateHead, templateSpans: ReadonlyArray<TemplateSpan>): TemplateExpression;
37813779
function updateTemplateExpression(node: TemplateExpression, head: TemplateHead, templateSpans: ReadonlyArray<TemplateSpan>): TemplateExpression;

‎tests/baselines/reference/api/typescript.d.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3746,9 +3746,9 @@ declare namespace ts {
37463746
function updateCall(node: CallExpression, expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression>): CallExpression;
37473747
function createNew(expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): NewExpression;
37483748
function updateNew(node: NewExpression, expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): NewExpression;
3749-
function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
3749+
/** @deprecated */ function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
37503750
function createTaggedTemplate(tag: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, template: TemplateLiteral): TaggedTemplateExpression;
3751-
function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
3751+
/** @deprecated */ function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
37523752
function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, template: TemplateLiteral): TaggedTemplateExpression;
37533753
function createTypeAssertion(type: TypeNode, expression: Expression): TypeAssertion;
37543754
function updateTypeAssertion(node: TypeAssertion, type: TypeNode, expression: Expression): TypeAssertion;
@@ -3757,7 +3757,6 @@ declare namespace ts {
37573757
function createFunctionExpression(modifiers: ReadonlyArray<Modifier> | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration> | undefined, type: TypeNode | undefined, body: Block): FunctionExpression;
37583758
function updateFunctionExpression(node: FunctionExpression, modifiers: ReadonlyArray<Modifier> | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: Block): FunctionExpression;
37593759
function createArrowFunction(modifiers: ReadonlyArray<Modifier> | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, equalsGreaterThanToken: EqualsGreaterThanToken | undefined, body: ConciseBody): ArrowFunction;
3760-
/** @deprecated */ function updateArrowFunction(node: ArrowFunction, modifiers: ReadonlyArray<Modifier> | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: ConciseBody): ArrowFunction;
37613760
function updateArrowFunction(node: ArrowFunction, modifiers: ReadonlyArray<Modifier> | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, equalsGreaterThanToken: Token<SyntaxKind.EqualsGreaterThanToken>, body: ConciseBody): ArrowFunction;
37623761
function createDelete(expression: Expression): DeleteExpression;
37633762
function updateDelete(node: DeleteExpression, expression: Expression): DeleteExpression;
@@ -3773,9 +3772,8 @@ declare namespace ts {
37733772
function updatePostfix(node: PostfixUnaryExpression, operand: Expression): PostfixUnaryExpression;
37743773
function createBinary(left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression): BinaryExpression;
37753774
function updateBinary(node: BinaryExpression, left: Expression, right: Expression, operator?: BinaryOperator | BinaryOperatorToken): BinaryExpression;
3776-
function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
3775+
/** @deprecated */ function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
37773776
function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression): ConditionalExpression;
3778-
/** @deprecated */ function updateConditional(node: ConditionalExpression, condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
37793777
function updateConditional(node: ConditionalExpression, condition: Expression, questionToken: Token<SyntaxKind.QuestionToken>, whenTrue: Expression, colonToken: Token<SyntaxKind.ColonToken>, whenFalse: Expression): ConditionalExpression;
37803778
function createTemplateExpression(head: TemplateHead, templateSpans: ReadonlyArray<TemplateSpan>): TemplateExpression;
37813779
function updateTemplateExpression(node: TemplateExpression, head: TemplateHead, templateSpans: ReadonlyArray<TemplateSpan>): TemplateExpression;

0 commit comments

Comments
 (0)