[Release 2.1] fix11754 global augmentation

src/compiler/parser.ts

@@ -5418,6 +5418,8 @@ namespace ts {
                 // parse 'global' as name of global scope augmentation
                 node.name = parseIdentifier();
                 node.flags |= NodeFlags.GlobalAugmentation;
+                // We need to store flags at the name as well so we can use it to filter out global augmentation from going through module resolution.
+                node.name.flags |= NodeFlags.GlobalAugmentation;
             }
             else {
                 node.name = parseLiteralNode(/*internName*/ true);

src/compiler/program.ts

@@ -526,7 +526,8 @@ namespace ts {
 
                     const newSourceFilePath = getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
                     if (resolveModuleNamesWorker) {
-                        const moduleNames = map(concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
+                        const nonGlobalAugmentation = filter(newSourceFile.moduleAugmentations, (moduleAugmentation) => !(moduleAugmentation.flags & NodeFlags.GlobalAugmentation));
+                        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 +1291,8 @@ namespace ts {
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 file.resolvedModules = createMap<ResolvedModule>();
-                const moduleNames = map(concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
+                const nonGlobalAugmentation = filter(file.moduleAugmentations, (moduleAugmentation) => !(moduleAugmentation.flags & NodeFlags.GlobalAugmentation));
+                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];

tests/baselines/reference/globalAugmentationModuleResolution.js

@@ -0,0 +1,10 @@
+//// [a.ts]
+
+export { };
+
+declare global {
+  var x: number;
+}
+
+//// [a.js]
+"use strict";

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))
+}

tests/baselines/reference/globalAugmentationModuleResolution.trace.json

@@ -0,0 +1 @@
+[]

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
+}

tests/cases/conformance/externalModules/globalAugmentationModuleResolution.ts

@@ -0,0 +1,8 @@
+// @traceResolution: true
+
+// @fileName: a.ts
+export { };
+
+declare global {
+  var x: number;
+}