Merge pull request microsoft#34659 from amcasey/FARGlobalThis

amcasey · web-flow · commit 6f04f526d480 · 2019-10-22T16:26:19.000-07:00
Don't assume that all symbols have declarations
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
@@ -584,7 +584,7 @@ namespace ts.FindAllReferences.Core {
     }
 
     function getReferencedSymbolsForModuleIfDeclaredBySourceFile(symbol: Symbol, program: Program, sourceFiles: readonly SourceFile[], cancellationToken: CancellationToken, options: Options, sourceFilesSet: ReadonlyMap<true>) {
-        const moduleSourceFile = symbol.flags & SymbolFlags.Module ? find(symbol.declarations, isSourceFile) : undefined;
+        const moduleSourceFile = (symbol.flags & SymbolFlags.Module) && symbol.declarations && find(symbol.declarations, isSourceFile);
         if (!moduleSourceFile) return undefined;
         const exportEquals = symbol.exports!.get(InternalSymbolName.ExportEquals);
         // If !!exportEquals, we're about to add references to `import("mod")` anyway, so don't double-count them.
diff --git a/tests/cases/fourslash/findAllRefsGlobalThisKeywordInModule.ts b/tests/cases/fourslash/findAllRefsGlobalThisKeywordInModule.ts
@@ -0,0 +1,8 @@
+/// <reference path='fourslash.ts' />
+// @noLib: true
+
+////[|this|];
+////export const c = 1;
+
+const [glob] = test.ranges();
+verify.referenceGroups(glob, undefined);

Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ namespace ts.FindAllReferences.Core {`
`584`	`584`	`}`
`585`	`585`
`586`	`586`	`function getReferencedSymbolsForModuleIfDeclaredBySourceFile(symbol: Symbol, program: Program, sourceFiles: readonly SourceFile[], cancellationToken: CancellationToken, options: Options, sourceFilesSet: ReadonlyMap<true>) {`
`587`		`- const moduleSourceFile = symbol.flags & SymbolFlags.Module ? find(symbol.declarations, isSourceFile) : undefined;`
	`587`	`+ const moduleSourceFile = (symbol.flags & SymbolFlags.Module) && symbol.declarations && find(symbol.declarations, isSourceFile);`
`588`	`588`	`if (!moduleSourceFile) return undefined;`
`589`	`589`	`const exportEquals = symbol.exports!.get(InternalSymbolName.ExportEquals);`
`590`	`590`	// If !!exportEquals, we're about to add references to `import("mod")` anyway, so don't double-count them.