Address minor PR comment

Yui T · Yui T · commit e50667e49e82 · 2017-04-26T15:02:54.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17134,10 +17134,11 @@ namespace ts {
                 case SyntaxKind.ElementAccessExpression:
                     return checkIndexedAccess(<ElementAccessExpression>node);
                 case SyntaxKind.CallExpression:
-                case SyntaxKind.NewExpression:
                     if ((<CallExpression>node).expression.kind === SyntaxKind.ImportKeyword) {
                         return checkImportCallExpression(<ImportCall>node);
                     }
+                    // Fall through
+                case SyntaxKind.NewExpression:
                     return checkCallExpression(<CallExpression>node);
                 case SyntaxKind.TaggedTemplateExpression:
                     return checkTaggedTemplateExpression(<TaggedTemplateExpression>node);
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -2416,7 +2416,7 @@ namespace ts {
             if (token() === SyntaxKind.OpenParenToken || token() === SyntaxKind.LessThanToken) {
                 return parseSignatureMember(SyntaxKind.CallSignature);
             }
-            if (token() === SyntaxKind.NewKeyword && lookAhead(isStartOfConstructSignature)) {
+            if (token() === SyntaxKind.NewKeyword && lookAhead(nextTokenIsOpenParenOrLessThan)) {
                 return parseSignatureMember(SyntaxKind.ConstructSignature);
             }
             const fullStart = getNodePos();
@@ -2427,7 +2427,7 @@ namespace ts {
             return parsePropertyOrMethodSignature(fullStart, modifiers);
         }
 
-        function isStartOfConstructSignature() {
+        function nextTokenIsOpenParenOrLessThan() {
             nextToken();
             return token() === SyntaxKind.OpenParenToken || token() === SyntaxKind.LessThanToken;
         }
@@ -5619,11 +5619,6 @@ namespace ts {
             return nextToken() === SyntaxKind.OpenParenToken;
         }
 
-        function nextTokenIsOpenParenOrLessThan() {
-            const next = nextToken();
-            return next === SyntaxKind.OpenParenToken || next === SyntaxKind.LessThanToken;
-        }
-
         function nextTokenIsSlash() {
             return nextToken() === SyntaxKind.SlashToken;
         }
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1199,6 +1199,10 @@ namespace ts {
         }
 
         function collectExternalModuleReferences(file: SourceFile): void {
+            if (file.imports) {
+                return;
+            }
+
             const isJavaScriptFile = isSourceFileJavaScript(file);
             const isExternalModuleFile = isExternalModule(file);
             const isDtsFile = isDeclarationFile(file);

Original file line number	Diff line number	Diff line change
`@@ -2416,7 +2416,7 @@ namespace ts {`
`2416`	`2416`	`if (token() === SyntaxKind.OpenParenToken \|\| token() === SyntaxKind.LessThanToken) {`
`2417`	`2417`	`return parseSignatureMember(SyntaxKind.CallSignature);`
`2418`	`2418`	`}`
`2419`		`- if (token() === SyntaxKind.NewKeyword && lookAhead(isStartOfConstructSignature)) {`
	`2419`	`+ if (token() === SyntaxKind.NewKeyword && lookAhead(nextTokenIsOpenParenOrLessThan)) {`
`2420`	`2420`	`return parseSignatureMember(SyntaxKind.ConstructSignature);`
`2421`	`2421`	`}`
`2422`	`2422`	`const fullStart = getNodePos();`
`@@ -2427,7 +2427,7 @@ namespace ts {`
`2427`	`2427`	`return parsePropertyOrMethodSignature(fullStart, modifiers);`
`2428`	`2428`	`}`
`2429`	`2429`
`2430`		`- function isStartOfConstructSignature() {`
	`2430`	`+ function nextTokenIsOpenParenOrLessThan() {`
`2431`	`2431`	`nextToken();`
`2432`	`2432`	`return token() === SyntaxKind.OpenParenToken \|\| token() === SyntaxKind.LessThanToken;`
`2433`	`2433`	`}`
`@@ -5619,11 +5619,6 @@ namespace ts {`
`5619`	`5619`	`return nextToken() === SyntaxKind.OpenParenToken;`
`5620`	`5620`	`}`
`5621`	`5621`
`5622`		`- function nextTokenIsOpenParenOrLessThan() {`
`5623`		`- const next = nextToken();`
`5624`		`- return next === SyntaxKind.OpenParenToken \|\| next === SyntaxKind.LessThanToken;`
`5625`		`- }`
`5626`		`-`
`5627`	`5622`	`function nextTokenIsSlash() {`
`5628`	`5623`	`return nextToken() === SyntaxKind.SlashToken;`
`5629`	`5624`	`}`