microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-23 18:48:40 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Allow functions and ambient classes to merge (#32584)

Browse Source
This commit is contained in:
Wesley Wigham
2019-08-09 16:10:10 -07:00
committed by GitHub
parent b84e65db4e
commit f2719f95b4
78 changed files with 488 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/types.ts
View File

@@ -3678,8 +3678,8 @@ namespace ts {
ParameterExcludes = Value,
PropertyExcludes = None,
EnumMemberExcludes = Value | Type,
FunctionExcludes = Value & ~(Function | ValueModule),
ClassExcludes = (Value | Type) & ~(ValueModule | Interface), // class-interface mergability done in checker.ts
FunctionExcludes = Value & ~(Function | ValueModule | Class),
ClassExcludes = (Value | Type) & ~(ValueModule | Interface | Function), // class-interface mergability done in checker.ts
InterfaceExcludes = Type & ~(Interface | Class),
RegularEnumExcludes = (Value | Type) & ~(RegularEnum | ValueModule), // regular enums merge only with regular enums and modules
ConstEnumExcludes = (Value | Type) & ~ConstEnum, // const enums merge only with const enums