Ensure type/namespaceish statics are included in the list of namespace merge members (#38920)

* Ensure type/namespaceish statics are included in the list of namespace merge members

* Simplit into two lines

* Update baseline post-merge
This commit is contained in:
Wesley Wigham authored and GitHub committed 2020-07-07 16:28:09 -07:00
1 parent 2d6d5db33a
commit d2b32b422f
5 files changed
+75 -1

No files matched your search

+2 -1
View File
@@ -6510,7 +6510,8 @@ namespace ts {
}
function isNamespaceMember(p: Symbol) {
return !(p.flags & SymbolFlags.Prototype || p.escapedName === "prototype" || p.valueDeclaration && isClassLike(p.valueDeclaration.parent));
return !!(p.flags & (SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias)) ||
!(p.flags & SymbolFlags.Prototype || p.escapedName === "prototype" || p.valueDeclaration && isClassLike(p.valueDeclaration.parent));
}
function serializeAsClass(symbol: Symbol, localName: string, modifierFlags: ModifierFlags) {