microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 11:24:29 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Harden findAllReferences.ts against symbol.declarations = undefined cases (#37088)

Browse Source 
Fixes #37086
This commit is contained in:
Ryan Cavanaugh
2020-02-27 14:55:49 -08:00
committed by GitHub
parent 241b3b942a
commit f4e371c731
3 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/services/findAllReferences.ts
View File

@@ -700,19 +700,21 @@ namespace ts.FindAllReferences {
}
});
for (const decl of symbol.declarations) {
switch (decl.kind) {
case SyntaxKind.SourceFile:
// Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.)
break;
case SyntaxKind.ModuleDeclaration:
if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
references.push(nodeEntry((decl as ModuleDeclaration).name));
}
break;
default:
// This may be merged with something.
Debug.assert(!!(symbol.flags & SymbolFlags.Transient), "Expected a module symbol to be declared by a SourceFile or ModuleDeclaration.");
if (symbol.declarations) {
for (const decl of symbol.declarations) {
switch (decl.kind) {
case SyntaxKind.SourceFile:
// Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.)
break;
case SyntaxKind.ModuleDeclaration:
if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
references.push(nodeEntry((decl as ModuleDeclaration).name));
}
break;
default:
// This may be merged with something.
Debug.assert(!!(symbol.flags & SymbolFlags.Transient), "Expected a module symbol to be declared by a SourceFile or ModuleDeclaration.");
}
}
}
@@ -1075,6 +1077,8 @@ namespace ts.FindAllReferences {
// Go to the symbol we imported from and find references for it.
function searchForImportedSymbol(symbol: Symbol, state: State): void {
if (!symbol.declarations) return;
for (const declaration of symbol.declarations) {
const exportingFile = declaration.getSourceFile();
// Need to search in the file even if it's not in the search-file set, because it might export the symbol.
@@ -1554,7 +1558,7 @@ namespace ts.FindAllReferences {
*/
function findOwnConstructorReferences(classSymbol: Symbol, sourceFile: SourceFile, addNode: (node: Node) => void): void {
const constructorSymbol = getClassConstructorSymbol(classSymbol);
if (constructorSymbol) {
if (constructorSymbol && constructorSymbol.declarations) {
for (const decl of constructorSymbol.declarations) {
const ctrKeyword = findChildOfKind(decl, SyntaxKind.ConstructorKeyword, sourceFile)!;
Debug.assert(decl.kind === SyntaxKind.Constructor && !!ctrKeyword);
@@ -1586,7 +1590,7 @@ namespace ts.FindAllReferences {
/** Find references to `super` in the constructor of an extending class. */
function findSuperConstructorAccesses(classDeclaration: ClassLikeDeclaration, addNode: (node: Node) => void): void {
const constructor = getClassConstructorSymbol(classDeclaration.symbol);
if (!constructor) {
if (!(constructor && constructor.declarations)) {
return;
}
@@ -1722,7 +1726,7 @@ namespace ts.FindAllReferences {
// Set the key so that we don't infinitely recurse
cachedResults.set(key, false);
const inherits = symbol.declarations.some(declaration =>
const inherits = !!symbol.declarations && symbol.declarations.some(declaration =>
getAllSuperTypeNodes(declaration).some(typeReference => {
const type = checker.getTypeAtLocation(typeReference);
return !!type && !!type.symbol && explicitlyInheritsFrom(type.symbol, parent, cachedResults, checker);