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

Merge pull request #13604 from Microsoft/intersectionBaseTypes

Browse Source 
Allow deriving from object and intersection types
This commit is contained in:
Anders Hejlsberg
2017-01-21 11:38:24 -10:00
committed by GitHub
parent 6c90e3fc01 3a34cb3088
commit 5b9004e1bc
17 changed files with 1474 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/services.ts
View File

@@ -382,7 +382,7 @@ namespace ts {
getNumberIndexType(): Type {
return this.checker.getIndexTypeOfType(this, IndexKind.Number);
}
getBaseTypes(): ObjectType[] {
getBaseTypes(): BaseType[] {
return this.flags & TypeFlags.Object && this.objectFlags & (ObjectFlags.Class | ObjectFlags.Interface)
? this.checker.getBaseTypes(<InterfaceType><Type>this)
: undefined;

2
src/services/types.ts
View File

@@ -33,7 +33,7 @@ namespace ts {
getConstructSignatures(): Signature[];
getStringIndexType(): Type;
getNumberIndexType(): Type;
getBaseTypes(): ObjectType[];
getBaseTypes(): BaseType[];
getNonNullableType(): Type;
}