Skip to content

Commit a4322d1

Browse files
committed
fix forEachChild and update some baselines
1 parent cd15560 commit a4322d1

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

src/compiler/parser.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,9 @@ namespace ts {
227227
return visitNode(cbNode, (<CallExpression>node).expression) ||
228228
visitNode(cbNode, (<CallExpression>node).questionDotToken) ||
229229
visitNodes(cbNode, cbNodes, (<CallExpression>node).typeArguments) ||
230-
visitNodes(cbNode, cbNodes, (<CallExpression>node).arguments);
230+
visitNode(cbNode, (<CallExpression>node).openParenToken) ||
231+
visitNodes(cbNode, cbNodes, (<CallExpression>node).arguments) ||
232+
visitNode(cbNode, (<CallExpression>node).closeParenToken);
231233
case SyntaxKind.TaggedTemplateExpression:
232234
return visitNode(cbNode, (<TaggedTemplateExpression>node).tag) ||
233235
visitNode(cbNode, (<TaggedTemplateExpression>node).questionDotToken) ||
@@ -4899,8 +4901,8 @@ namespace ts {
48994901
callExpr.typeArguments = typeArguments;
49004902
const { openParen, argumentList, closeParen } = parseArgumentList();
49014903
callExpr.openParenToken = openParen;
4902-
callExpr.closeParenToken = closeParen;
49034904
callExpr.arguments = argumentList;
4905+
callExpr.closeParenToken = closeParen;
49044906
if (questionDotToken || tryReparseOptionalChain(expression)) {
49054907
callExpr.flags |= NodeFlags.OptionalChain;
49064908
}
@@ -5229,8 +5231,8 @@ namespace ts {
52295231
if (token() === SyntaxKind.OpenParenToken) {
52305232
const { openParen, argumentList, closeParen } = parseArgumentList();
52315233
node.openParenToken = openParen;
5232-
node.closeParenToken = closeParen;
52335234
node.arguments = argumentList;
5235+
node.closeParenToken = closeParen;
52345236
}
52355237
else if (node.typeArguments) {
52365238
parseErrorAt(fullStart, scanner.getStartPos(), Diagnostics.A_new_expression_with_type_arguments_must_always_be_followed_by_a_parenthesized_argument_list);

src/compiler/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,8 +1920,8 @@ namespace ts {
19201920
questionDotToken?: QuestionDotToken;
19211921
typeArguments?: NodeArray<TypeNode>;
19221922
openParenToken: OpenParenToken;
1923-
closeParenToken: CloseParenToken;
19241923
arguments: NodeArray<Expression>;
1924+
closeParenToken: CloseParenToken;
19251925
}
19261926

19271927
export interface CallChain extends CallExpression {
@@ -2000,8 +2000,8 @@ namespace ts {
20002000
kind: SyntaxKind.NewExpression;
20012001
expression: LeftHandSideExpression;
20022002
typeArguments?: NodeArray<TypeNode>;
2003-
arguments?: NodeArray<Expression>;
20042003
openParenToken?: OpenParenToken;
2004+
arguments?: NodeArray<Expression>;
20052005
closeParenToken?: CloseParenToken;
20062006
}
20072007

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,8 @@ declare namespace ts {
533533
export type PlusToken = Token<SyntaxKind.PlusToken>;
534534
export type MinusToken = Token<SyntaxKind.MinusToken>;
535535
export type AssertsToken = Token<SyntaxKind.AssertsKeyword>;
536+
export type OpenParenToken = Token<SyntaxKind.OpenParenToken>;
537+
export type CloseParenToken = Token<SyntaxKind.CloseParenToken>;
536538
export type Modifier = Token<SyntaxKind.AbstractKeyword> | Token<SyntaxKind.AsyncKeyword> | Token<SyntaxKind.ConstKeyword> | Token<SyntaxKind.DeclareKeyword> | Token<SyntaxKind.DefaultKeyword> | Token<SyntaxKind.ExportKeyword> | Token<SyntaxKind.PublicKeyword> | Token<SyntaxKind.PrivateKeyword> | Token<SyntaxKind.ProtectedKeyword> | Token<SyntaxKind.ReadonlyKeyword> | Token<SyntaxKind.StaticKeyword>;
537539
export type ModifiersArray = NodeArray<Modifier>;
538540
export interface Identifier extends PrimaryExpression, Declaration {
@@ -1132,6 +1134,8 @@ declare namespace ts {
11321134
expression: LeftHandSideExpression;
11331135
questionDotToken?: QuestionDotToken;
11341136
typeArguments?: NodeArray<TypeNode>;
1137+
openParenToken: OpenParenToken;
1138+
closeParenToken: CloseParenToken;
11351139
arguments: NodeArray<Expression>;
11361140
}
11371141
export interface CallChain extends CallExpression {
@@ -1154,6 +1158,8 @@ declare namespace ts {
11541158
expression: LeftHandSideExpression;
11551159
typeArguments?: NodeArray<TypeNode>;
11561160
arguments?: NodeArray<Expression>;
1161+
openParenToken?: OpenParenToken;
1162+
closeParenToken?: CloseParenToken;
11571163
}
11581164
export interface TaggedTemplateExpression extends MemberExpression {
11591165
kind: SyntaxKind.TaggedTemplateExpression;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,8 @@ declare namespace ts {
533533
export type PlusToken = Token<SyntaxKind.PlusToken>;
534534
export type MinusToken = Token<SyntaxKind.MinusToken>;
535535
export type AssertsToken = Token<SyntaxKind.AssertsKeyword>;
536+
export type OpenParenToken = Token<SyntaxKind.OpenParenToken>;
537+
export type CloseParenToken = Token<SyntaxKind.CloseParenToken>;
536538
export type Modifier = Token<SyntaxKind.AbstractKeyword> | Token<SyntaxKind.AsyncKeyword> | Token<SyntaxKind.ConstKeyword> | Token<SyntaxKind.DeclareKeyword> | Token<SyntaxKind.DefaultKeyword> | Token<SyntaxKind.ExportKeyword> | Token<SyntaxKind.PublicKeyword> | Token<SyntaxKind.PrivateKeyword> | Token<SyntaxKind.ProtectedKeyword> | Token<SyntaxKind.ReadonlyKeyword> | Token<SyntaxKind.StaticKeyword>;
537539
export type ModifiersArray = NodeArray<Modifier>;
538540
export interface Identifier extends PrimaryExpression, Declaration {
@@ -1132,7 +1134,9 @@ declare namespace ts {
11321134
expression: LeftHandSideExpression;
11331135
questionDotToken?: QuestionDotToken;
11341136
typeArguments?: NodeArray<TypeNode>;
1137+
openParenToken: OpenParenToken;
11351138
arguments: NodeArray<Expression>;
1139+
closeParenToken: CloseParenToken;
11361140
}
11371141
export interface CallChain extends CallExpression {
11381142
_optionalChainBrand: any;
@@ -1153,7 +1157,9 @@ declare namespace ts {
11531157
kind: SyntaxKind.NewExpression;
11541158
expression: LeftHandSideExpression;
11551159
typeArguments?: NodeArray<TypeNode>;
1160+
openParenToken?: OpenParenToken;
11561161
arguments?: NodeArray<Expression>;
1162+
closeParenToken?: CloseParenToken;
11571163
}
11581164
export interface TaggedTemplateExpression extends MemberExpression {
11591165
kind: SyntaxKind.TaggedTemplateExpression;

0 commit comments

Comments
 (0)