microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-18 23:36:04 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Move check for module kind is ES2015 into grammar check; Use checkNonNullExpression and add tests

Browse Source
This commit is contained in:
Yui T
2017-04-26 14:16:44 -07:00
parent 2f61d472ed
commit a10e668c34
7 changed files with 166 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/checker.ts
View File

@@ -15580,12 +15580,8 @@ namespace ts {
return createPromiseReturnType(node, anyType);
}
if (modulekind === ModuleKind.ES2015) {
grammarErrorOnNode(node, Diagnostics.Dynamic_import_cannot_be_used_when_targeting_ECMAScript_2015_modules);
}
const specifier = node.arguments[0];
const specifierType = checkExpression(specifier);
const specifierType = checkNonNullExpression(specifier);
if (!isTypeAssignableTo(specifierType, stringType)) {
error(specifier, Diagnostics.Dynamic_import_s_specifier_must_be_of_type_string_but_here_has_type_0, typeToString(specifierType));
}
@@ -24081,6 +24077,10 @@ namespace ts {
if (isSpreadExpression(arguments[0])) {
return grammarErrorOnNode(arguments[0], Diagnostics.Specifier_of_dynamic_import_cannot_be_spread_element);
}
if (modulekind === ModuleKind.ES2015) {
grammarErrorOnNode(node, Diagnostics.Dynamic_import_cannot_be_used_when_targeting_ECMAScript_2015_modules);
}
}
}
}