Merge pull request #34659 from amcasey/FARGlobalThis

Don't assume that all symbols have declarations
microsoft · Oct 22, 2019 · 6f04f52 · 6f04f52
2 parents 479d306 + 590fd3f
commit 6f04f52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
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);