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

Fix handling newline with TypeScript declare and abstract classes (#9328)

Browse Source
This commit is contained in:
Brian Ng
2019-01-15 06:56:52 -06:00
committed by GitHub
parent 34c9890f41
commit aaec2cd51d
29 changed files with 1829 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1187,6 +1187,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}
tsTryParseDeclare(nany: any): ?N.Declaration {
if (this.isLineTerminator()) {
return;
}
switch (this.state.type) {
case tt._function:
this.next();
@@ -1263,7 +1267,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
): ?N.Declaration {
switch (value) {
case "abstract":
if (next || this.match(tt._class)) {
if (this.tsCheckLineTerminatorAndMatch(tt._class, next)) {
const cls: N.ClassDeclaration = node;
cls.abstract = true;
if (next) this.next();
@@ -1283,7 +1287,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
break;
case "interface":
if (next || this.match(tt.name)) {
if (this.tsCheckLineTerminatorAndMatch(tt.name, next)) {
if (next) this.next();
return this.tsParseInterfaceDeclaration(node);
}
@@ -1293,20 +1297,20 @@ export default (superClass: Class<Parser>): Class<Parser> =>
if (next) this.next();
if (this.match(tt.string)) {
return this.tsParseAmbientExternalModuleDeclaration(node);
} else if (next || this.match(tt.name)) {
} else if (this.tsCheckLineTerminatorAndMatch(tt.name, next)) {
return this.tsParseModuleOrNamespaceDeclaration(node);
}
break;
case "namespace":
if (next || this.match(tt.name)) {
if (this.tsCheckLineTerminatorAndMatch(tt.name, next)) {
if (next) this.next();
return this.tsParseModuleOrNamespaceDeclaration(node);
}
break;
case "type":
if (next || this.match(tt.name)) {
if (this.tsCheckLineTerminatorAndMatch(tt.name, next)) {
if (next) this.next();
return this.tsParseTypeAliasDeclaration(node);
}
@@ -1314,6 +1318,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}
}
tsCheckLineTerminatorAndMatch(tokenType: TokenType, next: boolean) {
return !this.isLineTerminator() && (next || this.match(tokenType));
}
tsTryParseGenericAsyncArrowFunction(
startPos: number,
startLoc: Position,