cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not use lookahead when parsing construct signature declarations (#9995)

Browse Source
This commit is contained in:
Daniel Tschinder 2019-05-20 23:27:41 -07:00 committed by GitHub
parent 0430a48775
commit f5b8140580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/babel-parser/src/plugins/typescript/index.js
View File

@ -397,13 +397,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
tsParseSignatureMember( tsParseSignatureMember(
kind: "TSCallSignatureDeclaration" | "TSConstructSignatureDeclaration", kind: "TSCallSignatureDeclaration" | "TSConstructSignatureDeclaration",
node: N.TsCallSignatureDeclaration | N.TsConstructSignatureDeclaration,
): N.TsCallSignatureDeclaration | N.TsConstructSignatureDeclaration { ): N.TsCallSignatureDeclaration | N.TsConstructSignatureDeclaration {
const node:
| N.TsCallSignatureDeclaration
| N.TsConstructSignatureDeclaration = this.startNode();
if (kind === "TSConstructSignatureDeclaration") {
this.expect(tt._new);
}
this.tsFillSignature(tt.colon, node); this.tsFillSignature(tt.colon, node);
this.tsParseTypeMemberSemicolon(); this.tsParseTypeMemberSemicolon();
return this.finishNode(node, kind); return this.finishNode(node, kind);
@ -442,7 +437,6 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node: N.TsPropertySignature | N.TsMethodSignature, node: N.TsPropertySignature | N.TsMethodSignature,
readonly: boolean, readonly: boolean,
): N.TsPropertySignature | N.TsMethodSignature { ): N.TsPropertySignature | N.TsMethodSignature {
this.parsePropertyName(node);
if (this.eat(tt.question)) node.optional = true; if (this.eat(tt.question)) node.optional = true;
const nodeAny: any = node; const nodeAny: any = node;
@ -462,17 +456,26 @@ export default (superClass: Class<Parser>): Class<Parser> =>
} }
tsParseTypeMember(): N.TsTypeElement { tsParseTypeMember(): N.TsTypeElement {
if (this.match(tt.parenL) || this.isRelational("<")) {
return this.tsParseSignatureMember("TSCallSignatureDeclaration");
}
if (
this.match(tt._new) &&
this.tsLookAhead(this.tsIsStartOfConstructSignature.bind(this))
) {
return this.tsParseSignatureMember("TSConstructSignatureDeclaration");
}
// Instead of fullStart, we create a node here.
const node: any = this.startNode(); const node: any = this.startNode();
if (this.match(tt.parenL) || this.isRelational("<")) {
return this.tsParseSignatureMember("TSCallSignatureDeclaration", node);
}
if (this.match(tt._new)) {
const id: N.Identifier = this.startNode();
this.next();
if (this.match(tt.parenL) || this.isRelational("<")) {
return this.tsParseSignatureMember(
"TSConstructSignatureDeclaration",
node,
);
} else {
node.key = this.createIdentifier(id, "new");
return this.tsParsePropertyOrMethodSignature(node, false);
}
}
const readonly = !!this.tsParseModifier(["readonly"]); const readonly = !!this.tsParseModifier(["readonly"]);
const idx = this.tsTryParseIndexSignature(node); const idx = this.tsTryParseIndexSignature(node);
@ -480,12 +483,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
if (readonly) node.readonly = true; if (readonly) node.readonly = true;
return idx; return idx;
} }
return this.tsParsePropertyOrMethodSignature(node, readonly);
}
tsIsStartOfConstructSignature() { this.parsePropertyName(node);
this.next(); return this.tsParsePropertyOrMethodSignature(node, readonly);
return this.match(tt.parenL) || this.isRelational("<");
} }
tsParseTypeLiteral(): N.TsTypeLiteral { tsParseTypeLiteral(): N.TsTypeLiteral {