From 187f856116d596d9386da9fc4d7b406bef7d27bb Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Wed, 1 Jun 2016 14:31:14 -0700 Subject: [PATCH] update baselines from merging with master --- ...omputedPropertyNamesContextualType7_ES5.js | 36 +++++++++---------- .../reference/decoratorOnClass5.es6.js | 4 +-- .../reference/decoratorOnClass6.es6.js | 20 +++++------ .../reference/decoratorOnClass7.es6.js | 4 +-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js index 2eddbbed14c..14165302d3b 100644 --- a/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js +++ b/tests/baselines/reference/computedPropertyNamesContextualType7_ES5.js @@ -1,22 +1,22 @@ //// [computedPropertyNamesContextualType7_ES5.ts] -interface I { - [n: number]: T; -} -interface J { - [s: string]: T; -} - -declare function foo(obj: I): T; -declare function g(obj: J): T; - -foo({ - 0: () => { }, - ["hi" + "bye"]: true, - [0 + 1]: 0, - [+"hi"]: [0] -}); - -g({ p: "" }); +interface I { + [n: number]: T; +} +interface J { + [s: string]: T; +} + +declare function foo(obj: I): T; +declare function g(obj: J): T; + +foo({ + 0: () => { }, + ["hi" + "bye"]: true, + [0 + 1]: 0, + [+"hi"]: [0] +}); + +g({ p: "" }); //// [computedPropertyNamesContextualType7_ES5.js] diff --git a/tests/baselines/reference/decoratorOnClass5.es6.js b/tests/baselines/reference/decoratorOnClass5.es6.js index e34740d6517..58c5f0d4f29 100644 --- a/tests/baselines/reference/decoratorOnClass5.es6.js +++ b/tests/baselines/reference/decoratorOnClass5.es6.js @@ -16,10 +16,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; -let C_1 = class C { +let C_1; +let C = C_1 = class C { static x() { return C_1.y; } }; -let C = C_1; C.y = 1; C = C_1 = __decorate([ dec diff --git a/tests/baselines/reference/decoratorOnClass6.es6.js b/tests/baselines/reference/decoratorOnClass6.es6.js index 4e4197bb601..d8330a57ef6 100644 --- a/tests/baselines/reference/decoratorOnClass6.es6.js +++ b/tests/baselines/reference/decoratorOnClass6.es6.js @@ -1,12 +1,12 @@ //// [decoratorOnClass6.es6.ts] -declare function dec(target: T): T; - -@dec -export class C { - static x() { return C.y; } - static y = 1; -} - +declare function dec(target: T): T; + +@dec +export class C { + static x() { return C.y; } + static y = 1; +} + let c = new C(); //// [decoratorOnClass6.es6.js] @@ -16,10 +16,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; -let C_1 = class C { +let C_1; +let C = C_1 = class C { static x() { return C_1.y; } }; -let C = C_1; C.y = 1; C = C_1 = __decorate([ dec diff --git a/tests/baselines/reference/decoratorOnClass7.es6.js b/tests/baselines/reference/decoratorOnClass7.es6.js index 7f111ea4abf..3ffd0f1574f 100644 --- a/tests/baselines/reference/decoratorOnClass7.es6.js +++ b/tests/baselines/reference/decoratorOnClass7.es6.js @@ -16,10 +16,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; return c > 3 && r && Object.defineProperty(target, key, r), r; }; -let C_1 = class C { +let C_1; +let C = C_1 = class C { static x() { return C_1.y; } }; -let C = C_1; C.y = 1; C = C_1 = __decorate([ dec