Merge pull request microsoft#3990 from Microsoft/getBaseTypes

JsonFreeman · JsonFreeman · commit d3d3333da6de · 2015-07-23T13:06:19.000-07:00
Add getBaseTypes on TypeObject in services
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -68,6 +68,7 @@ namespace ts {
             getPropertyOfType,
             getSignaturesOfType,
             getIndexTypeOfType,
+            getBaseTypes,
             getReturnTypeOfSignature,
             getSymbolsInScope,
             getSymbolAtLocation,
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1404,6 +1404,7 @@ namespace ts {
         getPropertyOfType(type: Type, propertyName: string): Symbol;
         getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
         getIndexTypeOfType(type: Type, kind: IndexKind): Type;
+        getBaseTypes(type: InterfaceType): ObjectType[];
         getReturnTypeOfSignature(signature: Signature): Type;
 
         getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
@@ -1808,7 +1809,9 @@ namespace ts {
         typeParameters: TypeParameter[];           // Type parameters (undefined if non-generic)
         outerTypeParameters: TypeParameter[];      // Outer type parameters (undefined if none)
         localTypeParameters: TypeParameter[];      // Local type parameters (undefined if none)
+        /* @internal */
         resolvedBaseConstructorType?: Type;        // Resolved base constructor type of class
+        /* @internal */
         resolvedBaseTypes: ObjectType[];           // Resolved base types
     }
 
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -48,6 +48,7 @@ namespace ts {
         getConstructSignatures(): Signature[];
         getStringIndexType(): Type;
         getNumberIndexType(): Type;
+        getBaseTypes(): ObjectType[]
     }
 
     export interface Signature {
@@ -682,6 +683,11 @@ namespace ts {
         getNumberIndexType(): Type {
             return this.checker.getIndexTypeOfType(this, IndexKind.Number);
         }
+        getBaseTypes(): ObjectType[] {
+            return this.flags & (TypeFlags.Class | TypeFlags.Interface)
+                ? this.checker.getBaseTypes(<TypeObject & InterfaceType>this)
+                : undefined;
+        }
     }
 
     class SignatureObject implements Signature {

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ namespace ts {`
`48`	`48`	`getConstructSignatures(): Signature[];`
`49`	`49`	`getStringIndexType(): Type;`
`50`	`50`	`getNumberIndexType(): Type;`
	`51`	`+ getBaseTypes(): ObjectType[]`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`export interface Signature {`
`@@ -682,6 +683,11 @@ namespace ts {`
`682`	`683`	`getNumberIndexType(): Type {`
`683`	`684`	`return this.checker.getIndexTypeOfType(this, IndexKind.Number);`
`684`	`685`	`}`
	`686`	`+ getBaseTypes(): ObjectType[] {`
	`687`	`+ return this.flags & (TypeFlags.Class \| TypeFlags.Interface)`
	`688`	`+ ? this.checker.getBaseTypes(<TypeObject & InterfaceType>this)`
	`689`	`+ : undefined;`
	`690`	`+ }`
`685`	`691`	`}`
`686`	`692`
`687`	`693`	`class SignatureObject implements Signature {`