Skip to content

Commit

Permalink
fix forEachChild and update some baselines
Browse files Browse the repository at this point in the history
  • Loading branch information
@jtbandes
jtbandes committed Apr 19, 2020
1 parent cd15560 commit a4322d1
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 5 deletions.
8 changes: 5 additions & 3 deletions src/compiler/parser.ts
View file
Expand Up @@ -227,7 +227,9 @@ namespace ts {
return visitNode(cbNode, (<CallExpression>node).expression) ||
visitNode(cbNode, (<CallExpression>node).questionDotToken) ||
visitNodes(cbNode, cbNodes, (<CallExpression>node).typeArguments) ||
visitNodes(cbNode, cbNodes, (<CallExpression>node).arguments);
visitNode(cbNode, (<CallExpression>node).openParenToken) ||
visitNodes(cbNode, cbNodes, (<CallExpression>node).arguments) ||
visitNode(cbNode, (<CallExpression>node).closeParenToken);
case SyntaxKind.TaggedTemplateExpression:
return visitNode(cbNode, (<TaggedTemplateExpression>node).tag) ||
visitNode(cbNode, (<TaggedTemplateExpression>node).questionDotToken) ||
Expand Down Expand Up @@ -4899,8 +4901,8 @@ namespace ts {
callExpr.typeArguments = typeArguments;
const { openParen, argumentList, closeParen } = parseArgumentList();
callExpr.openParenToken = openParen;
callExpr.closeParenToken = closeParen;
callExpr.arguments = argumentList;
callExpr.closeParenToken = closeParen;
if (questionDotToken || tryReparseOptionalChain(expression)) {
callExpr.flags |= NodeFlags.OptionalChain;
}
Expand Down Expand Up @@ -5229,8 +5231,8 @@ namespace ts {
if (token() === SyntaxKind.OpenParenToken) {
const { openParen, argumentList, closeParen } = parseArgumentList();
node.openParenToken = openParen;
node.closeParenToken = closeParen;
node.arguments = argumentList;
node.closeParenToken = closeParen;
}
else if (node.typeArguments) {
parseErrorAt(fullStart, scanner.getStartPos(), Diagnostics.A_new_expression_with_type_arguments_must_always_be_followed_by_a_parenthesized_argument_list);
Expand Down
4 changes: 2 additions & 2 deletions src/compiler/types.ts
View file
Expand Up @@ -1920,8 +1920,8 @@ namespace ts {
questionDotToken?: QuestionDotToken;
typeArguments?: NodeArray<TypeNode>;
openParenToken: OpenParenToken;
closeParenToken: CloseParenToken;
arguments: NodeArray<Expression>;
closeParenToken: CloseParenToken;
}

export interface CallChain extends CallExpression {
Expand Down Expand Up @@ -2000,8 +2000,8 @@ namespace ts {
kind: SyntaxKind.NewExpression;
expression: LeftHandSideExpression;
typeArguments?: NodeArray<TypeNode>;
arguments?: NodeArray<Expression>;
openParenToken?: OpenParenToken;
arguments?: NodeArray<Expression>;
closeParenToken?: CloseParenToken;
}

Expand Down
6 changes: 6 additions & 0 deletions tests/baselines/reference/api/tsserverlibrary.d.ts
View file
Expand Up @@ -533,6 +533,8 @@ declare namespace ts {
export type PlusToken = Token<SyntaxKind.PlusToken>;
export type MinusToken = Token<SyntaxKind.MinusToken>;
export type AssertsToken = Token<SyntaxKind.AssertsKeyword>;
export type OpenParenToken = Token<SyntaxKind.OpenParenToken>;
export type CloseParenToken = Token<SyntaxKind.CloseParenToken>;
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>;
export type ModifiersArray = NodeArray<Modifier>;
export interface Identifier extends PrimaryExpression, Declaration {
Expand Down Expand Up @@ -1132,6 +1134,8 @@ declare namespace ts {
expression: LeftHandSideExpression;
questionDotToken?: QuestionDotToken;
typeArguments?: NodeArray<TypeNode>;
openParenToken: OpenParenToken;
closeParenToken: CloseParenToken;
arguments: NodeArray<Expression>;
}
export interface CallChain extends CallExpression {
Expand All @@ -1154,6 +1158,8 @@ declare namespace ts {
expression: LeftHandSideExpression;
typeArguments?: NodeArray<TypeNode>;
arguments?: NodeArray<Expression>;
openParenToken?: OpenParenToken;
closeParenToken?: CloseParenToken;
}
export interface TaggedTemplateExpression extends MemberExpression {
kind: SyntaxKind.TaggedTemplateExpression;
Expand Down
6 changes: 6 additions & 0 deletions tests/baselines/reference/api/typescript.d.ts
View file
Expand Up @@ -533,6 +533,8 @@ declare namespace ts {
export type PlusToken = Token<SyntaxKind.PlusToken>;
export type MinusToken = Token<SyntaxKind.MinusToken>;
export type AssertsToken = Token<SyntaxKind.AssertsKeyword>;
export type OpenParenToken = Token<SyntaxKind.OpenParenToken>;
export type CloseParenToken = Token<SyntaxKind.CloseParenToken>;
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>;
export type ModifiersArray = NodeArray<Modifier>;
export interface Identifier extends PrimaryExpression, Declaration {
Expand Down Expand Up @@ -1132,7 +1134,9 @@ declare namespace ts {
expression: LeftHandSideExpression;
questionDotToken?: QuestionDotToken;
typeArguments?: NodeArray<TypeNode>;
openParenToken: OpenParenToken;
arguments: NodeArray<Expression>;
closeParenToken: CloseParenToken;
}
export interface CallChain extends CallExpression {
_optionalChainBrand: any;
Expand All @@ -1153,7 +1157,9 @@ declare namespace ts {
kind: SyntaxKind.NewExpression;
expression: LeftHandSideExpression;
typeArguments?: NodeArray<TypeNode>;
openParenToken?: OpenParenToken;
arguments?: NodeArray<Expression>;
closeParenToken?: CloseParenToken;
}
export interface TaggedTemplateExpression extends MemberExpression {
kind: SyntaxKind.TaggedTemplateExpression;
Expand Down

0 comments on commit a4322d1

Please sign in to comment.