Merge pull request #41314 from weswigham/fix-global-jsx-ns-alias-crashes

Fix crashes when the global JSX namespace is an alias
This commit is contained in:
Wesley Wigham authored and GitHub committed 2020-10-28 18:38:26 -07:00
commit f0f3862cd9
10 files changed
+1580 -2

No files matched your search

+6 -2
View File
@@ -25142,7 +25142,7 @@ namespace ts {
const resolvedNamespace = resolveName(location, namespaceName, SymbolFlags.Namespace, /*diagnosticMessage*/ undefined, namespaceName, /*isUse*/ false);
if (resolvedNamespace) {
const candidate = resolveSymbol(getSymbol(getExportsOfSymbol(resolveSymbol(resolvedNamespace)), JsxNames.JSX, SymbolFlags.Namespace));
if (candidate) {
if (candidate && candidate !== unknownSymbol) {
if (links) {
links.jsxNamespace = candidate;
}
@@ -25154,7 +25154,11 @@ namespace ts {
}
}
// JSX global fallback
return getGlobalSymbol(JsxNames.JSX, SymbolFlags.Namespace, /*diagnosticMessage*/ undefined)!; // TODO: GH#18217
const s = resolveSymbol(getGlobalSymbol(JsxNames.JSX, SymbolFlags.Namespace, /*diagnosticMessage*/ undefined));
if (s === unknownSymbol) {
return undefined!; // TODO: GH#18217
}
return s!; // TODO: GH#18217
}
/**