findAllRefs: Fix bug for export not at top-level of a module/namespace (microsoft#21846)

Andy · web-flow · commit 49e78f68d2b4 · 2018-02-09T15:10:34.000-08:00
diff --git a/src/services/importTracker.ts b/src/services/importTracker.ts
@@ -606,7 +606,9 @@ namespace ts.FindAllReferences {
     }
 
     export function getExportInfo(exportSymbol: Symbol, exportKind: ExportKind, checker: TypeChecker): ExportInfo | undefined {
-        const exportingModuleSymbol = checker.getMergedSymbol(exportSymbol.parent); // Need to get merged symbol in case there's an augmentation.
+        const moduleSymbol = exportSymbol.parent;
+        if (!moduleSymbol) return undefined; // This can happen if an `export` is not at the top-level (which is a compile error).
+        const exportingModuleSymbol = checker.getMergedSymbol(moduleSymbol); // Need to get merged symbol in case there's an augmentation.
         // `export` may appear in a namespace. In that case, just rely on global search.
         return isExternalModuleSymbol(exportingModuleSymbol) ? { exportingModuleSymbol, exportKind } : undefined;
     }
diff --git a/tests/cases/fourslash/findAllRefsExportNotAtTopLevel.ts b/tests/cases/fourslash/findAllRefsExportNotAtTopLevel.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+////{
+////    export const [|{| "isWriteAccess": true, "isDefinition": true |}x|] = 0;
+////    [|x|];
+////}
+
+verify.singleReferenceGroup("const x: 0");

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,9 @@ namespace ts.FindAllReferences {`
`606`	`606`	`}`
`607`	`607`
`608`	`608`	`export function getExportInfo(exportSymbol: Symbol, exportKind: ExportKind, checker: TypeChecker): ExportInfo \| undefined {`
`609`		`- const exportingModuleSymbol = checker.getMergedSymbol(exportSymbol.parent); // Need to get merged symbol in case there's an augmentation.`
	`609`	`+ const moduleSymbol = exportSymbol.parent;`
	`610`	+ if (!moduleSymbol) return undefined; // This can happen if an `export` is not at the top-level (which is a compile error).
	`611`	`+ const exportingModuleSymbol = checker.getMergedSymbol(moduleSymbol); // Need to get merged symbol in case there's an augmentation.`
`610`	`612`	// `export` may appear in a namespace. In that case, just rely on global search.
`611`	`613`	`return isExternalModuleSymbol(exportingModuleSymbol) ? { exportingModuleSymbol, exportKind } : undefined;`
`612`	`614`	`}`