Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly parse import()

Browse Source
This commit is contained in:
Kanchalai Tanglertsampan
2017-03-09 15:55:09 -08:00
parent ca0816710a
commit 330f7bf96c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/parser.ts
+9 -5
View File
@@ -3686,11 +3686,15 @@ namespace ts {
// the last two CallExpression productions. 2) We see 'import' which must start import call.
// 3)we have a MemberExpression which either completes the LeftHandSideExpression,
// or starts the beginning of the first four CallExpression productions.
let expression: MemberExpression;
let expression: LeftHandSideExpression;
if (token() === SyntaxKind.SuperKeyword) {
expression = parseSuperExpression();
}
else if (token() === SyntaxKind.ImportKeyword) {
else if (token() === SyntaxKind.ImportKeyword && lookAhead(nextTokenIsOpenParen)) {
// We don't want to eagerly consume all import keyword as import call expression.
// For example:
// var foo3 = require("subfolder//*require0*/
// import * as foo1 from "module-from-node//*import_as1*/ -> we want this import to be a statement rather than import call expression
expression = parseImportExpression();
}
else {
@@ -3769,12 +3773,12 @@ namespace ts {
return finishNode(node);
}
function parseImportExpression(): MemberExpression {
function parseImportExpression(): LeftHandSideExpression {
const expression = parseTokenNode<PrimaryExpression>();
if (token() === SyntaxKind.OpenParenToken) {
return expression;
}
// (TODO(yuisu): Error Handling here
Debug.assert(token() === SyntaxKind.OpenParenToken, "Parsing import expression expects open parenthesis after import keyword");
}
function tagNamesAreEquivalent(lhs: JsxTagNameExpression, rhs: JsxTagNameExpression): boolean {
@@ -4792,11 +4796,11 @@ namespace ts {
// however, we say they are here so that we may gracefully parse them and error later.
case SyntaxKind.CatchKeyword:
case SyntaxKind.FinallyKeyword:
case SyntaxKind.ImportKeyword:
return true;
case SyntaxKind.ConstKeyword:
case SyntaxKind.ExportKeyword:
case SyntaxKind.ImportKeyword:
return isStartOfDeclaration();
case SyntaxKind.AsyncKeyword: