Accept new baselines

This commit is contained in:
Anders Hejlsberg 2018-02-15 13:57:05 -08:00
parent a8c0be344b
commit 67c7fe6680
4 changed files with 39 additions and 11 deletions

View File

@ -2187,11 +2187,25 @@ declare namespace ts {
interface IndexType extends InstantiableType {
type: InstantiableType | UnionOrIntersectionType;
}
interface ConditionalType extends InstantiableType {
interface ConditionalRoot {
node: ConditionalTypeNode;
checkType: Type;
extendsType: Type;
trueType: Type;
falseType: Type;
isDistributive: boolean;
inferTypeParameters: TypeParameter[];
outerTypeParameters?: TypeParameter[];
instantiations?: Map<Type>;
aliasSymbol: Symbol;
aliasTypeArguments: Type[];
resolvedTrueType?: Type;
resolvedFalseType?: Type;
}
interface ConditionalType extends InstantiableType {
root: ConditionalRoot;
checkType: Type;
extendsType: Type;
resolvedTrueType?: Type;
resolvedFalseType?: Type;
}
interface SubstitutionType extends InstantiableType {
typeParameter: TypeParameter;

View File

@ -2187,11 +2187,25 @@ declare namespace ts {
interface IndexType extends InstantiableType {
type: InstantiableType | UnionOrIntersectionType;
}
interface ConditionalType extends InstantiableType {
interface ConditionalRoot {
node: ConditionalTypeNode;
checkType: Type;
extendsType: Type;
trueType: Type;
falseType: Type;
isDistributive: boolean;
inferTypeParameters: TypeParameter[];
outerTypeParameters?: TypeParameter[];
instantiations?: Map<Type>;
aliasSymbol: Symbol;
aliasTypeArguments: Type[];
resolvedTrueType?: Type;
resolvedFalseType?: Type;
}
interface ConditionalType extends InstantiableType {
root: ConditionalRoot;
checkType: Type;
extendsType: Type;
resolvedTrueType?: Type;
resolvedFalseType?: Type;
}
interface SubstitutionType extends InstantiableType {
typeParameter: TypeParameter;

View File

@ -542,7 +542,7 @@ declare type T82 = Eq2<false, true>;
declare type T83 = Eq2<false, false>;
declare type Foo<T> = T extends string ? boolean : number;
declare type Bar<T> = T extends string ? boolean : number;
declare const convert: <U>(value: Foo<U>) => Foo<U>;
declare const convert: <U>(value: Foo<U>) => Bar<U>;
declare type Baz<T> = Foo<T>;
declare const convert2: <T>(value: Foo<T>) => Foo<T>;
declare function f31<T>(): void;

View File

@ -1010,8 +1010,8 @@ type Bar<T> = T extends string ? boolean : number;
>T : T
const convert = <U>(value: Foo<U>): Bar<U> => value;
>convert : <U>(value: Foo<U>) => Foo<U>
><U>(value: Foo<U>): Bar<U> => value : <U>(value: Foo<U>) => Foo<U>
>convert : <U>(value: Foo<U>) => Bar<U>
><U>(value: Foo<U>): Bar<U> => value : <U>(value: Foo<U>) => Bar<U>
>U : U
>value : Foo<U>
>Foo : Foo<T>
@ -1095,7 +1095,7 @@ function f33<T, U>() {
>U : U
type T2 = Bar<T & U>;
>T2 : Foo<T & U>
>T2 : Bar<T & U>
>Bar : Bar<T>
>T : T
>U : U
@ -1106,7 +1106,7 @@ function f33<T, U>() {
var z: T2;
>z : Foo<T & U>
>T2 : Foo<T & U>
>T2 : Bar<T & U>
}
// Repro from #21823