Fix bug: get merged symbol of symbol.parent before checking against module symbol (microsoft#21147)

Andy · web-flow · commit 269867f5e830 · 2018-01-11T13:42:08.000-08:00
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -1200,7 +1200,7 @@ namespace ts.Completions {
                     // Don't add a completion for a re-export, only for the original.
                     // If `symbol.parent !== ...`, this comes from an `export * from "foo"` re-export. Those don't create new symbols.
                     // If `some(...)`, this comes from an `export { foo } from "foo"` re-export, which creates a new symbol (thus isn't caught by the first check).
-                    if (symbol.parent !== typeChecker.resolveExternalModuleSymbol(moduleSymbol)
+                    if (typeChecker.getMergedSymbol(symbol.parent) !== typeChecker.resolveExternalModuleSymbol(moduleSymbol)
                         || some(symbol.declarations, d => isExportSpecifier(d) && !!d.parent.parent.moduleSpecifier)) {
                         continue;
                     }
diff --git a/tests/cases/fourslash/completionsImport_named_exportEqualsNamespace_merged.ts b/tests/cases/fourslash/completionsImport_named_exportEqualsNamespace_merged.ts
@@ -0,0 +1,21 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /b.d.ts
+////declare namespace N {
+////    export const foo: number;
+////}
+////declare module "n" {
+////    export = N;
+////}
+
+// @Filename: /c.d.ts
+////declare namespace N {}
+
+// @Filename: /a.ts
+////fo/**/
+
+goTo.marker("");
+verify.completionListContains({ name: "foo", source: "n" }, "const N.foo: number", "", "const", undefined, /*hasAction*/ true, {
+    includeExternalModuleExports: true,
+    sourceDisplay: "n",
+});

Original file line number	Diff line number	Diff line change
`@@ -1200,7 +1200,7 @@ namespace ts.Completions {`
`1200`	`1200`	`// Don't add a completion for a re-export, only for the original.`
`1201`	`1201`	// If `symbol.parent !== ...`, this comes from an `export * from "foo"` re-export. Those don't create new symbols.
`1202`	`1202`	// If `some(...)`, this comes from an `export { foo } from "foo"` re-export, which creates a new symbol (thus isn't caught by the first check).
`1203`		`- if (symbol.parent !== typeChecker.resolveExternalModuleSymbol(moduleSymbol)`
	`1203`	`+ if (typeChecker.getMergedSymbol(symbol.parent) !== typeChecker.resolveExternalModuleSymbol(moduleSymbol)`
`1204`	`1204`	`\|\| some(symbol.declarations, d => isExportSpecifier(d) && !!d.parent.parent.moduleSpecifier)) {`
`1205`	`1205`	`continue;`
`1206`	`1206`	`}`