[Release 2.1] fix11754 global augmentation (microsoft#12133)

yuit · mhegazy · commit f7c40d3d6127 · 2016-11-10T10:24:20.000-08:00
* Exclude global augmentation from module resolution logic

* Address PR: check using string literal instead of NodeFlags.globalAugmentation
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -526,7 +526,9 @@ namespace ts {
 
                     const newSourceFilePath = getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
                     if (resolveModuleNamesWorker) {
-                        const moduleNames = map(concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
+                        // Because global augmentation doesn't have string literal name, we can check for global augmentation as such.
+                        const nonGlobalAugmentation = filter(newSourceFile.moduleAugmentations, (moduleAugmentation) => moduleAugmentation.kind === SyntaxKind.StringLiteral);
+                        const moduleNames = map(concatenate(newSourceFile.imports, nonGlobalAugmentation), getTextOfLiteral);
                         const resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
                         // ensure that module resolution results are still correct
                         const resolutionsChanged = hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, moduleResolutionIsEqualTo);
@@ -1290,7 +1292,9 @@ namespace ts {
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = createMap<ResolvedModule>();
-                const moduleNames = map(concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
+                // Because global augmentation doesn't have string literal name, we can check for global augmentation as such.
+                const nonGlobalAugmentation = filter(file.moduleAugmentations, (moduleAugmentation) => moduleAugmentation.kind === SyntaxKind.StringLiteral);
+                const moduleNames = map(concatenate(file.imports, nonGlobalAugmentation), getTextOfLiteral);
                 const resolutions = resolveModuleNamesWorker(moduleNames, getNormalizedAbsolutePath(file.fileName, currentDirectory));
                 for (let i = 0; i < moduleNames.length; i++) {
                     const resolution = resolutions[i];
diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.js b/tests/baselines/reference/globalAugmentationModuleResolution.js
@@ -0,0 +1,10 @@
+//// [a.ts]
+
+export { };
+
+declare global {
+  var x: number;
+}
+
+//// [a.js]
+"use strict";
diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.symbols b/tests/baselines/reference/globalAugmentationModuleResolution.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+
+export { };
+
+declare global {
+>global : Symbol(global, Decl(a.ts, 1, 11))
+
+  var x: number;
+>x : Symbol(x, Decl(a.ts, 4, 5))
+}
diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.trace.json b/tests/baselines/reference/globalAugmentationModuleResolution.trace.json
@@ -0,0 +1 @@
+[]
diff --git a/tests/baselines/reference/globalAugmentationModuleResolution.types b/tests/baselines/reference/globalAugmentationModuleResolution.types
@@ -0,0 +1,10 @@
+=== tests/cases/conformance/externalModules/a.ts ===
+
+export { };
+
+declare global {
+>global : any
+
+  var x: number;
+>x : number
+}
diff --git a/tests/cases/conformance/externalModules/globalAugmentationModuleResolution.ts b/tests/cases/conformance/externalModules/globalAugmentationModuleResolution.ts
@@ -0,0 +1,8 @@
+﻿// @traceResolution: true
+
+// @fileName: a.ts
+export { };
+
+declare global {
+  var x: number;
+}
