Fix bug: Get merged module symbol in forEachExternalModule (microsoft#24295)

Andy · web-flow · commit 440291e316ce · 2018-05-21T10:48:50.000-07:00
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -498,7 +498,7 @@ namespace ts.codefix {
         }
         for (const sourceFile of allSourceFiles) {
             if (isExternalOrCommonJsModule(sourceFile)) {
-                cb(sourceFile.symbol, sourceFile);
+                cb(checker.getMergedSymbol(sourceFile.symbol), sourceFile);
             }
         }
     }
diff --git a/tests/cases/fourslash/completionsImport_augmentation.ts b/tests/cases/fourslash/completionsImport_augmentation.ts
@@ -0,0 +1,36 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /a.ts
+////export const foo = 0;
+
+// @Filename: /bar.ts
+////export {};
+////declare module "./a" {
+////    export const bar = 0;
+////}
+
+// @Filename: /user.ts
+/////**/
+
+verify.completions({
+    marker: "",
+    includes: [
+        {
+            name: "foo",
+            text: "const foo: 0",
+            source: "/a",
+            sourceDisplay: "./a",
+            hasAction: true,
+        },
+        {
+            name: "bar",
+            text: "const bar: 0",
+            source: "/a",
+            sourceDisplay: "./a",
+            hasAction: true,
+        },
+    ],
+    preferences: {
+        includeCompletionsForModuleExports: true,
+    },
+});

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ namespace ts.codefix {`
`498`	`498`	`}`
`499`	`499`	`for (const sourceFile of allSourceFiles) {`
`500`	`500`	`if (isExternalOrCommonJsModule(sourceFile)) {`
`501`		`- cb(sourceFile.symbol, sourceFile);`
	`501`	`+ cb(checker.getMergedSymbol(sourceFile.symbol), sourceFile);`
`502`	`502`	`}`
`503`	`503`	`}`
`504`	`504`	`}`