From 5b7da99446cb7df0e03b8c93960ad5b49e92b2dc Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Wed, 27 Aug 2014 17:19:43 -0700 Subject: [PATCH] Update type baselines --- .../reference/aliasUsageInGenericFunction.types | 2 +- .../reference/aliasUsageInObjectLiteral.types | 6 +++--- .../reference/aliasUsageInOrExpression.types | 4 ++-- tests/baselines/reference/arrayBestCommonTypes.types | 6 +++--- .../bestCommonTypeWithContextualTyping.types | 2 +- ...gnatureWithoutReturnTypeAnnotationInference.types | 2 +- tests/baselines/reference/contextualTypeAny.types | 2 +- tests/baselines/reference/covariance1.types | 4 ++-- ...FileModuleAssignmentInObjectLiteralProperty.types | 2 +- .../reference/declFileTypeofInAnonymousType.types | 6 +++--- .../extendingClassFromAliasAndUsageInIndexer.types | 4 ++-- .../reference/genericCallWithObjectLiteralArgs.types | 4 ++-- .../reference/genericObjectLitReturnType.types | 2 +- .../reference/getterSetterNonAccessor.types | 4 ++-- .../reference/heterogeneousArrayLiterals.types | 12 ++++++------ .../inferentialTypingWithFunctionTypeNested.types | 2 +- ...ialTypingWithFunctionTypeSyntacticScenarios.types | 2 +- .../reference/interfaceWithPropertyOfEveryType.types | 4 ++-- tests/baselines/reference/mergedDeclarations1.types | 4 ++-- tests/baselines/reference/multiImportExport.types | 2 +- .../baselines/reference/objectLiteralIndexers.types | 12 ++++++------ .../objectTypeWithStringNamedNumericProperty.types | 2 +- .../reference/prespecializedGenericMembers1.types | 2 +- .../baselines/reference/recursiveObjectLiteral.types | 2 +- ...FunctionParameterReferencedInObjectLiteral1.types | 2 +- .../reference/targetTypeObjectLiteralToAny.types | 2 +- tests/baselines/reference/underscoreTest1.types | 2 +- 27 files changed, 50 insertions(+), 50 deletions(-) diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.types b/tests/baselines/reference/aliasUsageInGenericFunction.types index 2d357d58ce..b0af020e25 100644 --- a/tests/baselines/reference/aliasUsageInGenericFunction.types +++ b/tests/baselines/reference/aliasUsageInGenericFunction.types @@ -30,7 +30,7 @@ var r = foo({ a: moduleA }); >foo : (x: T) => T >{ a: moduleA } : { a: typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA"; } >a : typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA" ->moduleA : moduleA +>moduleA : typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA" var r2 = foo({ a: null }); >r2 : { a: IHasVisualizationModel; } diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.types b/tests/baselines/reference/aliasUsageInObjectLiteral.types index 4fccdbf0c1..399639cee7 100644 --- a/tests/baselines/reference/aliasUsageInObjectLiteral.types +++ b/tests/baselines/reference/aliasUsageInObjectLiteral.types @@ -19,7 +19,7 @@ var a: { x: typeof moduleA } = { x: moduleA }; >moduleA : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA" >{ x: moduleA } : { x: typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"; } >x : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA" ->moduleA : moduleA +>moduleA : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA" var b: { x: IHasVisualizationModel } = { x: moduleA }; >b : { x: IHasVisualizationModel; } @@ -27,7 +27,7 @@ var b: { x: IHasVisualizationModel } = { x: moduleA }; >IHasVisualizationModel : IHasVisualizationModel >{ x: moduleA } : { x: typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"; } >x : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA" ->moduleA : moduleA +>moduleA : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA" var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } }; >c : { y: { z: IHasVisualizationModel; }; } @@ -38,7 +38,7 @@ var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } }; >y : { z: typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"; } >{ z: moduleA } : { z: typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"; } >z : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA" ->moduleA : moduleA +>moduleA : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA" === tests/cases/compiler/aliasUsageInObjectLiteral_backbone.ts === export class Model { diff --git a/tests/baselines/reference/aliasUsageInOrExpression.types b/tests/baselines/reference/aliasUsageInOrExpression.types index 45f1fc5030..cf039cbc62 100644 --- a/tests/baselines/reference/aliasUsageInOrExpression.types +++ b/tests/baselines/reference/aliasUsageInOrExpression.types @@ -47,7 +47,7 @@ var e: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null || { >IHasVisualizationModel : IHasVisualizationModel >{ x: moduleA } : { x: typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA"; } >x : typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA" ->moduleA : moduleA +>moduleA : typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA" var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x: moduleA } : null; >f : { x: IHasVisualizationModel; } @@ -59,7 +59,7 @@ var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x >IHasVisualizationModel : IHasVisualizationModel >{ x: moduleA } : { x: typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA"; } >x : typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA" ->moduleA : moduleA +>moduleA : typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA" === tests/cases/compiler/aliasUsageInOrExpression_backbone.ts === export class Model { diff --git a/tests/baselines/reference/arrayBestCommonTypes.types b/tests/baselines/reference/arrayBestCommonTypes.types index d3381315aa..40f74350fe 100644 --- a/tests/baselines/reference/arrayBestCommonTypes.types +++ b/tests/baselines/reference/arrayBestCommonTypes.types @@ -248,7 +248,7 @@ class f { >y : string >{x: anyObj, y: 'a'} : { x: any; y: string; } >x : any ->anyObj : anyObj +>anyObj : any >y : string var a2 = [ {x: anyObj, y: 'a'}, {x: 0, y: 'a'}, {x: 'a', y: 'a'} ]; @@ -256,7 +256,7 @@ class f { >[ {x: anyObj, y: 'a'}, {x: 0, y: 'a'}, {x: 'a', y: 'a'} ] : { x: any; y: string; }[] >{x: anyObj, y: 'a'} : { x: any; y: string; } >x : any ->anyObj : anyObj +>anyObj : any >y : string >{x: 0, y: 'a'} : { x: number; y: string; } >x : number @@ -273,7 +273,7 @@ class f { >y : string >{x: anyObj, y: 'a'} : { x: any; y: string; } >x : any ->anyObj : anyObj +>anyObj : any >y : string >{x: 'a', y: 'a'} : { x: string; y: string; } >x : string diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types index 5ee96dad66..937339d8cb 100644 --- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types +++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types @@ -38,7 +38,7 @@ var obj: { [s: string]: Contextual } = { s: e }; // { s: Ellement; [s: string]: >Contextual : Contextual >{ s: e } : { [x: string]: Ellement; s: Ellement; } >s : Ellement ->e : e +>e : Ellement var conditional: Contextual = null ? e : e; // Ellement >conditional : Contextual diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types index 2bb38c096f..dc6a72cf89 100644 --- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types +++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types @@ -111,7 +111,7 @@ function foo8(x: number) { return { x: x }; >{ x: x } : { x: number; } >x : number ->x : x +>x : number } var r8 = foo8(1); >r8 : { x: number; } diff --git a/tests/baselines/reference/contextualTypeAny.types b/tests/baselines/reference/contextualTypeAny.types index 9ea4c5c213..c95bfd70ec 100644 --- a/tests/baselines/reference/contextualTypeAny.types +++ b/tests/baselines/reference/contextualTypeAny.types @@ -8,7 +8,7 @@ var obj: { [s: string]: number } = { p: "", q: x }; >{ p: "", q: x } : { [x: string]: any; p: string; q: any; } >p : string >q : any ->x : x +>x : any var arr: number[] = ["", x]; >arr : number[] diff --git a/tests/baselines/reference/covariance1.types b/tests/baselines/reference/covariance1.types index 44cdf018fe..d9167095d4 100644 --- a/tests/baselines/reference/covariance1.types +++ b/tests/baselines/reference/covariance1.types @@ -30,7 +30,7 @@ module M { >f : (y: Y) => void >{x:a} : { x: X; } >x : X ->a : a +>a : X var b:XX; >b : XX @@ -41,7 +41,7 @@ module M { >f : (y: Y) => void >{x:b} : { x: XX; } >x : XX ->b : b +>b : XX } diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types index f13397b180..db24dc1080 100644 --- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types +++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types @@ -18,7 +18,7 @@ var d = { >m1 : { m: typeof m1; } >{ m: m1 } : { m: typeof m1; } >m : typeof m1 ->m1 : m1 +>m1 : typeof m1 m2: { c: m1.c }, >m2 : { c: typeof c; } diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.types b/tests/baselines/reference/declFileTypeofInAnonymousType.types index f029dc2204..49fc00e981 100644 --- a/tests/baselines/reference/declFileTypeofInAnonymousType.types +++ b/tests/baselines/reference/declFileTypeofInAnonymousType.types @@ -40,14 +40,14 @@ var b = { m1: m1 >m1 : typeof m1 ->m1 : m1 +>m1 : typeof m1 }; var c = { m1: m1 }; >c : { m1: typeof m1; } >{ m1: m1 } : { m1: typeof m1; } >m1 : typeof m1 ->m1 : m1 +>m1 : typeof m1 var d = { >d : { m: { mod: typeof m1; }; mc: { cl: typeof c; }; me: { en: typeof e; }; mh: e; } @@ -62,7 +62,7 @@ var d = { >m : { mod: typeof m1; } >{ mod: m1 } : { mod: typeof m1; } >mod : typeof m1 ->m1 : m1 +>m1 : typeof m1 mc: { cl: m1.c }, >mc : { cl: typeof c; } diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types index 20a683c596..f4382fac5d 100644 --- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types +++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types @@ -31,10 +31,10 @@ var moduleMap: { [key: string]: IHasVisualizationModel } = { } : { [x: string]: IHasVisualizationModel; "moduleA": typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA"; "moduleB": typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleB"; } "moduleA": moduleA, ->moduleA : moduleA +>moduleA : typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA" "moduleB": moduleB ->moduleB : moduleB +>moduleB : typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleB" }; var moduleName: string; diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types index 5cf8f12164..20b7075824 100644 --- a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types +++ b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types @@ -35,9 +35,9 @@ var r3 = foo({ bar: foo, baz: foo }); // T = any >foo : (x: { bar: T; baz: T; }) => { bar: T; baz: T; } >{ bar: foo, baz: foo } : { bar: (x: { bar: T; baz: T; }) => { bar: T; baz: T; }; baz: (x: { bar: T; baz: T; }) => { bar: T; baz: T; }; } >bar : (x: { bar: T; baz: T; }) => { bar: T; baz: T; } ->foo : foo +>foo : (x: { bar: T; baz: T; }) => { bar: T; baz: T; } >baz : (x: { bar: T; baz: T; }) => { bar: T; baz: T; } ->foo : foo +>foo : (x: { bar: T; baz: T; }) => { bar: T; baz: T; } var r4 = foo({ bar: 1, baz: '' }); // T = Object >r4 : { bar: Object; baz: Object; } diff --git a/tests/baselines/reference/genericObjectLitReturnType.types b/tests/baselines/reference/genericObjectLitReturnType.types index 2241002646..3ecb570668 100644 --- a/tests/baselines/reference/genericObjectLitReturnType.types +++ b/tests/baselines/reference/genericObjectLitReturnType.types @@ -9,7 +9,7 @@ class X >T : T >{ a: t } : { a: T; } >a : T ->t : t +>t : T } diff --git a/tests/baselines/reference/getterSetterNonAccessor.types b/tests/baselines/reference/getterSetterNonAccessor.types index 9bbf3298ff..6b62dc8bd9 100644 --- a/tests/baselines/reference/getterSetterNonAccessor.types +++ b/tests/baselines/reference/getterSetterNonAccessor.types @@ -35,11 +35,11 @@ Object.defineProperty({}, "0", ({ get: getFunc, >get : () => any ->getFunc : getFunc +>getFunc : () => any set: setFunc, >set : (v: any) => void ->setFunc : setFunc +>setFunc : (v: any) => void configurable: true >configurable : boolean diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.types b/tests/baselines/reference/heterogeneousArrayLiterals.types index f81f1b2d24..8177073163 100644 --- a/tests/baselines/reference/heterogeneousArrayLiterals.types +++ b/tests/baselines/reference/heterogeneousArrayLiterals.types @@ -121,24 +121,24 @@ module Derived { >[{ foo: base, basear: derived }, { foo: base }] : { foo: Base; }[] >{ foo: base, basear: derived } : { foo: Base; basear: Derived; } >foo : Base ->base : base +>base : Base >basear : Derived ->derived : derived +>derived : Derived >{ foo: base } : { foo: Base; } >foo : Base ->base : base +>base : Base var i = [{ foo: base, basear: derived }, { foo: derived }]; // {foo: Derived}[] >i : {}[] >[{ foo: base, basear: derived }, { foo: derived }] : {}[] >{ foo: base, basear: derived } : { foo: Base; basear: Derived; } >foo : Base ->base : base +>base : Base >basear : Derived ->derived : derived +>derived : Derived >{ foo: derived } : { foo: Derived; } >foo : Derived ->derived : derived +>derived : Derived var j = [() => base, () => derived]; // { {}: Base } >j : { (): Base; }[] diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types index 7628e9c4a9..0596081ade 100644 --- a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types +++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types @@ -26,5 +26,5 @@ var s = map("", () => { return { x: identity }; }); >() => { return { x: identity }; } : () => { x: (y: V) => V; } >{ x: identity } : { x: (y: V) => V; } >x : (y: V) => V ->identity : identity +>identity : (y: V) => V diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types index ac3d69b9b7..115da50176 100644 --- a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types +++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types @@ -26,7 +26,7 @@ var dottedIdentity = { x: identity }; >dottedIdentity : { x: (y: V) => V; } >{ x: identity } : { x: (y: V) => V; } >x : (y: V) => V ->identity : identity +>identity : (y: V) => V s = map("", dottedIdentity.x); >s = map("", dottedIdentity.x) : string diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types index be340c7014..557ca4f965 100644 --- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types +++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types @@ -146,11 +146,11 @@ var a: Foo = { l: f1, >l : () => void ->f1 : f1 +>f1 : () => void m: M, >m : typeof M ->M : M +>M : typeof M n: {}, >n : {} diff --git a/tests/baselines/reference/mergedDeclarations1.types b/tests/baselines/reference/mergedDeclarations1.types index d2b5cca642..20249ab94e 100644 --- a/tests/baselines/reference/mergedDeclarations1.types +++ b/tests/baselines/reference/mergedDeclarations1.types @@ -17,9 +17,9 @@ function point(x: number, y: number): Point { return { x: x, y: y }; >{ x: x, y: y } : { x: number; y: number; } >x : number ->x : x +>x : number +>y : number >y : number ->y : y } module point { >point : typeof point diff --git a/tests/baselines/reference/multiImportExport.types b/tests/baselines/reference/multiImportExport.types index 1504fda69d..2970151bd9 100644 --- a/tests/baselines/reference/multiImportExport.types +++ b/tests/baselines/reference/multiImportExport.types @@ -27,7 +27,7 @@ var Math = { Adder:Adder >Adder : typeof Adder ->Adder : Adder +>Adder : typeof Adder }; diff --git a/tests/baselines/reference/objectLiteralIndexers.types b/tests/baselines/reference/objectLiteralIndexers.types index 9010778432..1dce9b94ad 100644 --- a/tests/baselines/reference/objectLiteralIndexers.types +++ b/tests/baselines/reference/objectLiteralIndexers.types @@ -33,22 +33,22 @@ var o1: { [s: string]: A;[n: number]: B; } = { x: a, 0: b }; // string indexer i >B : B >{ x: a, 0: b } : { [x: string]: A; [x: number]: B; 0: B; x: A; } >x : A ->a : a ->b : b +>a : A +>b : B o1 = { x: b, 0: c }; // both indexers are any >o1 = { x: b, 0: c } : { [x: string]: any; [x: number]: any; 0: any; x: B; } >o1 : { [x: string]: A; [x: number]: B; } >{ x: b, 0: c } : { [x: string]: any; [x: number]: any; 0: any; x: B; } >x : B ->b : b ->c : c +>b : B +>c : any o1 = { x: c, 0: b }; // string indexer is any, number indexer is B >o1 = { x: c, 0: b } : { [x: string]: any; [x: number]: B; 0: B; x: any; } >o1 : { [x: string]: A; [x: number]: B; } >{ x: c, 0: b } : { [x: string]: any; [x: number]: B; 0: B; x: any; } >x : any ->c : c ->b : b +>c : any +>b : B diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types index 8f44592302..943d552044 100644 --- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types +++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types @@ -373,7 +373,7 @@ var b = { >/123/ : RegExp "-1": Date ->Date : Date +>Date : { (): string; new (): Date; new (value: number): Date; new (value: string): Date; new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date; prototype: Date; parse(s: string): number; UTC(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number; now(): number; } }; diff --git a/tests/baselines/reference/prespecializedGenericMembers1.types b/tests/baselines/reference/prespecializedGenericMembers1.types index 09578f323c..0f7de50359 100644 --- a/tests/baselines/reference/prespecializedGenericMembers1.types +++ b/tests/baselines/reference/prespecializedGenericMembers1.types @@ -39,7 +39,7 @@ var catThing = { barry: cat >barry : Cat ->cat : cat +>cat : Cat }; var catBag = new CatBag(catThing); diff --git a/tests/baselines/reference/recursiveObjectLiteral.types b/tests/baselines/reference/recursiveObjectLiteral.types index 011532a005..0dcc467977 100644 --- a/tests/baselines/reference/recursiveObjectLiteral.types +++ b/tests/baselines/reference/recursiveObjectLiteral.types @@ -3,5 +3,5 @@ var a = { f: a }; >a : any >{ f: a } : { f: any; } >f : any ->a : a +>a : any diff --git a/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.types b/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.types index 7011f8826a..417a51ac4b 100644 --- a/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.types +++ b/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.types @@ -14,5 +14,5 @@ >({ X: p }) : { X: any; } >{ X: p } : { X: any; } >X : any ->p : p +>p : any diff --git a/tests/baselines/reference/targetTypeObjectLiteralToAny.types b/tests/baselines/reference/targetTypeObjectLiteralToAny.types index 280f3cfc49..8d5e2b0b47 100644 --- a/tests/baselines/reference/targetTypeObjectLiteralToAny.types +++ b/tests/baselines/reference/targetTypeObjectLiteralToAny.types @@ -27,7 +27,7 @@ function suggest(){ >push : any >{text:keyword, type:"keyword"} : { text: string; type: string; } >text : string ->keyword : keyword +>keyword : string >type : string }); diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types index c32162b95a..70549013dd 100644 --- a/tests/baselines/reference/underscoreTest1.types +++ b/tests/baselines/reference/underscoreTest1.types @@ -761,7 +761,7 @@ _.each(notes, (note) => note.asyncSave({ success: renderNotes })); >asyncSave : any >{ success: renderNotes } : { success: () => void; } >success : () => void ->renderNotes : renderNotes +>renderNotes : () => void var hello = function (name) { return "hello: " + name; }; >hello : (name: any) => string