Address PR: error message, fix capitalization, only allow functionLikeDeclaration and ImportCall for create Promise, use fall through comment

Yui T · Yui T · commit e6d7327c3f29 · 2017-06-01T23:21:59.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -16332,11 +16332,11 @@ namespace ts {
             return emptyObjectType;
         }
 
-        function createPromiseReturnType(func: FunctionLikeDeclaration | CallExpression, promisedType: Type) {
+        function createPromiseReturnType(func: FunctionLikeDeclaration | ImportCall, promisedType: Type) {
             const promiseType = createPromiseType(promisedType);
             if (promiseType === emptyObjectType) {
                 error(func, isImportCall(func) ?
-                    Diagnostics.A_dynamic_import_call_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option :
+                    Diagnostics.A_dynamic_import_call_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option :
                     Diagnostics.An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option);
                 return unknownType;
             }
@@ -17705,7 +17705,7 @@ namespace ts {
                     if ((<CallExpression>node).expression.kind === SyntaxKind.ImportKeyword) {
                         return checkImportCallExpression(<ImportCall>node);
                     }
-                    /* tslint:disable: no-switch-case-fall-through */
+                    /* falls through */
                 case SyntaxKind.NewExpression:
                     return checkCallExpression(<CallExpression>node);
                 case SyntaxKind.TaggedTemplateExpression:
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -2172,7 +2172,7 @@
         "category": "Error",
         "code": 2710
     },
-    "A dynamic import call must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option.": {
+    "A dynamic import call return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option.": {
         "category": "Error",
         "code": 2711
     },
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -3700,7 +3700,7 @@ namespace ts {
                 // For example:
                 //      var foo3 = require("subfolder
                 //      import * as foo1 from "module-from-node  -> we want this import to be a statement rather than import call expression
-                sourceFile.flags |= NodeFlags.possiblyContainDynamicImport;
+                sourceFile.flags |= NodeFlags.PossiblyContainDynamicImport;
                 expression = parseTokenNode<PrimaryExpression>();
             }
             else {
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1383,7 +1383,7 @@ namespace ts {
 
             for (const node of file.statements) {
                 collectModuleReferences(node, /*inAmbientModule*/ false);
-                if ((file.flags & NodeFlags.possiblyContainDynamicImport) || isJavaScriptFile) {
+                if ((file.flags & NodeFlags.PossiblyContainDynamicImport) || isJavaScriptFile) {
                     collectDynamicImportOrRequireCalls(node);
                 }
             }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -456,7 +456,7 @@ namespace ts {
         // During editing, if dynamic import is remove, incremental parsing will *NOT* update this flag. This will then causes walking of the tree during module resolution.
         // However, the removal operation should not occur often and in the case of the removal, it is likely that users will add back the import anyway.
         // The advantage of this approach is its simplicity. For the case of batch compilation, we garuntee that users won't have to pay the price of walking the tree if dynamic import isn't used.
-        possiblyContainDynamicImport = 1 << 19,
+        PossiblyContainDynamicImport = 1 << 19,
 
         BlockScoped = Let | Const,
 

Original file line number	Diff line number	Diff line change
`@@ -3700,7 +3700,7 @@ namespace ts {`
`3700`	`3700`	`// For example:`
`3701`	`3701`	`// var foo3 = require("subfolder`
`3702`	`3702`	`// import * as foo1 from "module-from-node -> we want this import to be a statement rather than import call expression`
`3703`		`- sourceFile.flags \|= NodeFlags.possiblyContainDynamicImport;`
	`3703`	`+ sourceFile.flags \|= NodeFlags.PossiblyContainDynamicImport;`
`3704`	`3704`	`expression = parseTokenNode<PrimaryExpression>();`
`3705`	`3705`	`}`
`3706`	`3706`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -1383,7 +1383,7 @@ namespace ts {`
`1383`	`1383`
`1384`	`1384`	`for (const node of file.statements) {`
`1385`	`1385`	`collectModuleReferences(node, /inAmbientModule/ false);`
`1386`		`- if ((file.flags & NodeFlags.possiblyContainDynamicImport) \|\| isJavaScriptFile) {`
	`1386`	`+ if ((file.flags & NodeFlags.PossiblyContainDynamicImport) \|\| isJavaScriptFile) {`
`1387`	`1387`	`collectDynamicImportOrRequireCalls(node);`
`1388`	`1388`	`}`
`1389`	`1389`	`}`