enclosingDeclaration can be undefined within getAccessibleSymbolChain (microsoft#18400)

weswigham · web-flow · commit 403f58562219 · 2017-09-12T10:43:24.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -2063,7 +2063,7 @@ namespace ts {
             return rightMeaning === SymbolFlags.Value ? SymbolFlags.Value : SymbolFlags.Namespace;
         }
 
-        function getAccessibleSymbolChain(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags, useOnlyExternalAliasing: boolean): Symbol[] | undefined {
+        function getAccessibleSymbolChain(symbol: Symbol, enclosingDeclaration: Node | undefined, meaning: SymbolFlags, useOnlyExternalAliasing: boolean): Symbol[] | undefined {
             if (!(symbol && !isPropertyOrMethodDeclarationSymbol(symbol))) {
                 return undefined;
             }
@@ -2112,7 +2112,7 @@ namespace ts {
                     if (symbolFromSymbolTable.flags & SymbolFlags.Alias
                         && symbolFromSymbolTable.escapedName !== "export="
                         && !getDeclarationOfKind(symbolFromSymbolTable, SyntaxKind.ExportSpecifier)
-                        && !(isUMDExportSymbol(symbolFromSymbolTable) && isExternalModule(getSourceFileOfNode(enclosingDeclaration)))
+                        && !(isUMDExportSymbol(symbolFromSymbolTable) && enclosingDeclaration && isExternalModule(getSourceFileOfNode(enclosingDeclaration)))
                         // If `!useOnlyExternalAliasing`, we can use any type of alias to get the name
                         && (!useOnlyExternalAliasing || some(symbolFromSymbolTable.declarations, isExternalModuleImportEqualsDeclaration))) {
 
@@ -2132,7 +2132,7 @@ namespace ts {
             }
         }
 
-        function needsQualification(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags) {
+        function needsQualification(symbol: Symbol, enclosingDeclaration: Node | undefined, meaning: SymbolFlags) {
             let qualify = false;
             forEachSymbolTableInScope(enclosingDeclaration, symbolTable => {
                 // If symbol of this name is not available in the symbol table we are ok

Original file line number	Diff line number	Diff line change
`@@ -2063,7 +2063,7 @@ namespace ts {`
`2063`	`2063`	`return rightMeaning === SymbolFlags.Value ? SymbolFlags.Value : SymbolFlags.Namespace;`
`2064`	`2064`	`}`
`2065`	`2065`
`2066`		`- function getAccessibleSymbolChain(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags, useOnlyExternalAliasing: boolean): Symbol[] \| undefined {`
	`2066`	`+ function getAccessibleSymbolChain(symbol: Symbol, enclosingDeclaration: Node \| undefined, meaning: SymbolFlags, useOnlyExternalAliasing: boolean): Symbol[] \| undefined {`
`2067`	`2067`	`if (!(symbol && !isPropertyOrMethodDeclarationSymbol(symbol))) {`
`2068`	`2068`	`return undefined;`
`2069`	`2069`	`}`
`@@ -2112,7 +2112,7 @@ namespace ts {`
`2112`	`2112`	`if (symbolFromSymbolTable.flags & SymbolFlags.Alias`
`2113`	`2113`	`&& symbolFromSymbolTable.escapedName !== "export="`
`2114`	`2114`	`&& !getDeclarationOfKind(symbolFromSymbolTable, SyntaxKind.ExportSpecifier)`
`2115`		`- && !(isUMDExportSymbol(symbolFromSymbolTable) && isExternalModule(getSourceFileOfNode(enclosingDeclaration)))`
	`2115`	`+ && !(isUMDExportSymbol(symbolFromSymbolTable) && enclosingDeclaration && isExternalModule(getSourceFileOfNode(enclosingDeclaration)))`
`2116`	`2116`	// If `!useOnlyExternalAliasing`, we can use any type of alias to get the name
`2117`	`2117`	`&& (!useOnlyExternalAliasing \|\| some(symbolFromSymbolTable.declarations, isExternalModuleImportEqualsDeclaration))) {`
`2118`	`2118`
`@@ -2132,7 +2132,7 @@ namespace ts {`
`2132`	`2132`	`}`
`2133`	`2133`	`}`
`2134`	`2134`
`2135`		`- function needsQualification(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags) {`
	`2135`	`+ function needsQualification(symbol: Symbol, enclosingDeclaration: Node \| undefined, meaning: SymbolFlags) {`
`2136`	`2136`	`let qualify = false;`
`2137`	`2137`	`forEachSymbolTableInScope(enclosingDeclaration, symbolTable => {`
`2138`	`2138`	`// If symbol of this name is not available in the symbol table we are ok`