Accepting new baselines

tests/baselines/reference/2dArrays.types

@@ -28,7 +28,7 @@ class Board {
 >this.ships.every(function (val) { return val.isSunk; }) : boolean
 >this.ships.every : (callbackfn: (value: Ship, index: number, array: Ship[]) => boolean, thisArg?: any) => boolean
 >this.ships : Ship[]
->this : Board
+>this : this
 >ships : Ship[]
 >every : (callbackfn: (value: Ship, index: number, array: Ship[]) => boolean, thisArg?: any) => boolean
 >function (val) { return val.isSunk; } : (val: Ship) => boolean

tests/baselines/reference/accessOverriddenBaseClassMember1.types

@@ -15,11 +15,11 @@ class Point {
 >"x=" + this.x : string
 >"x=" : string
 >this.x : number
->this : Point
+>this : this
 >x : number
 >" y=" : string
 >this.y : number
->this : Point
+>this : this
 >y : number
     }
 }
@@ -50,7 +50,7 @@ class ColoredPoint extends Point {
 >toString : () => string
 >" color=" : string
 >this.color : string
->this : ColoredPoint
+>this : this
 >color : string
     }
 }

tests/baselines/reference/aliasUsageInAccessorsOfClass.types

@@ -26,7 +26,7 @@ class C2 {
 
         return this.x;
 >this.x : IHasVisualizationModel
->this : C2
+>this : this
 >x : IHasVisualizationModel
     }
     set A(x) {

tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.types

@@ -31,7 +31,7 @@ class TestClass {
         this.bar(x); // should not error
 >this.bar(x) : void
 >this.bar : { (x: string): void; (x: string[]): void; }
->this : TestClass
+>this : this
 >bar : { (x: string): void; (x: string[]): void; }
 >x : any
     }
@@ -71,7 +71,7 @@ class TestClass2 {
         return this.bar(x); // should not error
 >this.bar(x) : number
 >this.bar : { (x: string): number; (x: string[]): number; }
->this : TestClass2
+>this : this
 >bar : { (x: string): number; (x: string[]): number; }
 >x : any
     }

tests/baselines/reference/amdModuleName1.types

@@ -10,7 +10,7 @@ class Foo {
         this.x = 5;
 >this.x = 5 : number
 >this.x : number
->this : Foo
+>this : this
 >x : number
 >5 : number
     }

tests/baselines/reference/arityAndOrderCompatibility01.errors.txt

@@ -34,6 +34,8 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(25,5): error
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(26,5): error TS2322: Type 'StrNum' is not assignable to type '[string]'.
   Types of property 'pop' are incompatible.
     Type '() => string | number' is not assignable to type '() => string'.
+      Type 'string | number' is not assignable to type 'string'.
+        Type 'number' is not assignable to type 'string'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(27,5): error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string]'.
   Property 'length' is missing in type '{ 0: string; 1: number; }'.
 tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(28,5): error TS2322: Type '[string, number]' is not assignable to type '[number, string]'.
@@ -125,6 +127,8 @@ tests/cases/conformance/types/tuple/arityAndOrderCompatibility01.ts(30,5): error
 !!! error TS2322: Type 'StrNum' is not assignable to type '[string]'.
 !!! error TS2322:   Types of property 'pop' are incompatible.
 !!! error TS2322:     Type '() => string | number' is not assignable to type '() => string'.
+!!! error TS2322:       Type 'string | number' is not assignable to type 'string'.
+!!! error TS2322:         Type 'number' is not assignable to type 'string'.
     var m3: [string] = z;
         ~~
 !!! error TS2322: Type '{ 0: string; 1: number; }' is not assignable to type '[string]'.

tests/baselines/reference/arrayBestCommonTypes.types

@@ -51,7 +51,7 @@ module EmptyTypes {
 >(this.voidIfAny([4, 2][0])) : number
 >this.voidIfAny([4, 2][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[4, 2][0] : number
 >[4, 2] : number[]
@@ -64,7 +64,7 @@ module EmptyTypes {
 >(this.voidIfAny([4, 2, undefined][0])) : number
 >this.voidIfAny([4, 2, undefined][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[4, 2, undefined][0] : number
 >[4, 2, undefined] : number[]
@@ -78,7 +78,7 @@ module EmptyTypes {
 >(this.voidIfAny([undefined, 2, 4][0])) : number
 >this.voidIfAny([undefined, 2, 4][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, 2, 4][0] : number
 >[undefined, 2, 4] : number[]
@@ -92,7 +92,7 @@ module EmptyTypes {
 >(this.voidIfAny([null, 2, 4][0])) : number
 >this.voidIfAny([null, 2, 4][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[null, 2, 4][0] : number
 >[null, 2, 4] : number[]
@@ -106,7 +106,7 @@ module EmptyTypes {
 >(this.voidIfAny([2, 4, null][0])) : number
 >this.voidIfAny([2, 4, null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[2, 4, null][0] : number
 >[2, 4, null] : number[]
@@ -120,7 +120,7 @@ module EmptyTypes {
 >(this.voidIfAny([undefined, 4, null][0])) : number
 >this.voidIfAny([undefined, 4, null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, 4, null][0] : number
 >[undefined, 4, null] : number[]
@@ -134,7 +134,7 @@ module EmptyTypes {
 >(this.voidIfAny(['', "q"][0])) : number
 >this.voidIfAny(['', "q"][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >['', "q"][0] : string
 >['', "q"] : string[]
@@ -147,7 +147,7 @@ module EmptyTypes {
 >(this.voidIfAny(['', "q", undefined][0])) : number
 >this.voidIfAny(['', "q", undefined][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >['', "q", undefined][0] : string
 >['', "q", undefined] : string[]
@@ -161,7 +161,7 @@ module EmptyTypes {
 >(this.voidIfAny([undefined, "q", ''][0])) : number
 >this.voidIfAny([undefined, "q", ''][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, "q", ''][0] : string
 >[undefined, "q", ''] : string[]
@@ -175,7 +175,7 @@ module EmptyTypes {
 >(this.voidIfAny([null, "q", ''][0])) : number
 >this.voidIfAny([null, "q", ''][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[null, "q", ''][0] : string
 >[null, "q", ''] : string[]
@@ -189,7 +189,7 @@ module EmptyTypes {
 >(this.voidIfAny(["q", '', null][0])) : number
 >this.voidIfAny(["q", '', null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >["q", '', null][0] : string
 >["q", '', null] : string[]
@@ -203,7 +203,7 @@ module EmptyTypes {
 >(this.voidIfAny([undefined, '', null][0])) : number
 >this.voidIfAny([undefined, '', null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, '', null][0] : string
 >[undefined, '', null] : string[]
@@ -217,7 +217,7 @@ module EmptyTypes {
 >(this.voidIfAny([[3, 4], [null]][0][0])) : number
 >this.voidIfAny([[3, 4], [null]][0][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[[3, 4], [null]][0][0] : number
 >[[3, 4], [null]][0] : number[]
@@ -454,7 +454,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([4, 2][0])) : number
 >this.voidIfAny([4, 2][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[4, 2][0] : number
 >[4, 2] : number[]
@@ -467,7 +467,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([4, 2, undefined][0])) : number
 >this.voidIfAny([4, 2, undefined][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[4, 2, undefined][0] : number
 >[4, 2, undefined] : number[]
@@ -481,7 +481,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([undefined, 2, 4][0])) : number
 >this.voidIfAny([undefined, 2, 4][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, 2, 4][0] : number
 >[undefined, 2, 4] : number[]
@@ -495,7 +495,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([null, 2, 4][0])) : number
 >this.voidIfAny([null, 2, 4][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[null, 2, 4][0] : number
 >[null, 2, 4] : number[]
@@ -509,7 +509,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([2, 4, null][0])) : number
 >this.voidIfAny([2, 4, null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[2, 4, null][0] : number
 >[2, 4, null] : number[]
@@ -523,7 +523,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([undefined, 4, null][0])) : number
 >this.voidIfAny([undefined, 4, null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, 4, null][0] : number
 >[undefined, 4, null] : number[]
@@ -537,7 +537,7 @@ module NonEmptyTypes {
 >(this.voidIfAny(['', "q"][0])) : number
 >this.voidIfAny(['', "q"][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >['', "q"][0] : string
 >['', "q"] : string[]
@@ -550,7 +550,7 @@ module NonEmptyTypes {
 >(this.voidIfAny(['', "q", undefined][0])) : number
 >this.voidIfAny(['', "q", undefined][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >['', "q", undefined][0] : string
 >['', "q", undefined] : string[]
@@ -564,7 +564,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([undefined, "q", ''][0])) : number
 >this.voidIfAny([undefined, "q", ''][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, "q", ''][0] : string
 >[undefined, "q", ''] : string[]
@@ -578,7 +578,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([null, "q", ''][0])) : number
 >this.voidIfAny([null, "q", ''][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[null, "q", ''][0] : string
 >[null, "q", ''] : string[]
@@ -592,7 +592,7 @@ module NonEmptyTypes {
 >(this.voidIfAny(["q", '', null][0])) : number
 >this.voidIfAny(["q", '', null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >["q", '', null][0] : string
 >["q", '', null] : string[]
@@ -606,7 +606,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([undefined, '', null][0])) : number
 >this.voidIfAny([undefined, '', null][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[undefined, '', null][0] : string
 >[undefined, '', null] : string[]
@@ -620,7 +620,7 @@ module NonEmptyTypes {
 >(this.voidIfAny([[3, 4], [null]][0][0])) : number
 >this.voidIfAny([[3, 4], [null]][0][0]) : number
 >this.voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
->this : f
+>this : this
 >voidIfAny : { (x: boolean, y?: boolean): number; (x: string, y?: boolean): number; (x: number, y?: boolean): number; }
 >[[3, 4], [null]][0][0] : number
 >[[3, 4], [null]][0] : number[]

tests/baselines/reference/arrayOfExportedClass.types

@@ -18,7 +18,7 @@ class Road {
         this.cars = cars;
 >this.cars = cars : Car[]
 >this.cars : Car[]
->this : Road
+>this : this
 >cars : Car[]
 >cars : Car[]
     }

tests/baselines/reference/arrayconcat.types

@@ -38,12 +38,12 @@ class parser {
 		this.options = this.options.sort(function(a, b) {
 >this.options = this.options.sort(function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        }) : IOptions[]
 >this.options : IOptions[]
->this : parser
+>this : this
 >options : IOptions[]
 >this.options.sort(function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        }) : IOptions[]
 >this.options.sort : (compareFn?: (a: IOptions, b: IOptions) => number) => IOptions[]
 >this.options : IOptions[]
->this : parser
+>this : this
 >options : IOptions[]
 >sort : (compareFn?: (a: IOptions, b: IOptions) => number) => IOptions[]
 >function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        } : (a: IOptions, b: IOptions) => number

tests/baselines/reference/arrowFunctionExpressions.types

@@ -129,12 +129,12 @@ class MyClass {
 >1 : number
 
     p = (n) => n && this;
->p : (n: any) => MyClass
->(n) => n && this : (n: any) => MyClass
+>p : (n: any) => this
+>(n) => n && this : (n: any) => this
 >n : any
->n && this : MyClass
+>n && this : this
 >n : any
->this : MyClass
+>this : this
 
     fn() {
 >fn : () => void
@@ -148,12 +148,12 @@ class MyClass {
 >1 : number
 
         var p = (n) => n && this;
->p : (n: any) => MyClass
->(n) => n && this : (n: any) => MyClass
+>p : (n: any) => this
+>(n) => n && this : (n: any) => this
 >n : any
->n && this : MyClass
+>n && this : this
 >n : any
->this : MyClass
+>this : this
     }
 }
 

tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.types

@@ -15,7 +15,7 @@ class C {
 >other.apply : (thisArg: any, argArray?: any) => any
 >other : () => void
 >apply : (thisArg: any, argArray?: any) => any
->this : C
+>this : this
 >arguments : IArguments
    }
 }

tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.types

@@ -6,9 +6,9 @@ class C {
 >method : () => void
 
       var fn = async () => await this;      
->fn : () => Promise<C>
->async () => await this : () => Promise<C>
->this : C
+>fn : () => Promise<this>
+>async () => await this : () => Promise<this>
+>this : this
    }
 }
 

tests/baselines/reference/badThisBinding.types

@@ -22,8 +22,8 @@ class Greeter {
 >() => {                var x = this;			} : () => void
 
                 var x = this;
->x : Greeter
->this : Greeter
+>x : this
+>this : this
 
 			});
 		});

tests/baselines/reference/baseTypeWrappingInstantiationChain.types

@@ -13,7 +13,7 @@ class C<T1> extends CBase<T1> {
 >CBaseBase : typeof CBaseBase
 >Wrapper : Wrapper<T5>
 >T1 : T1
->this : C<T1>
+>this : this
     }
     public alsoWorks() {
 >alsoWorks : () => void
@@ -22,7 +22,7 @@ class C<T1> extends CBase<T1> {
 >new CBase<T1>(this) : CBase<T1>
 >CBase : typeof CBase
 >T1 : T1
->this : C<T1>
+>this : this
     }
 
     public method(t: Wrapper<T1>) { }

tests/baselines/reference/binopAssignmentShouldHaveType.types

@@ -32,7 +32,7 @@ module Test {
 >name : string
 >this.getName() : string
 >this.getName : () => string
->this : Bug
+>this : this
 >getName : () => string
 >length : number
 >0 : number

tests/baselines/reference/callWithSpread.types

@@ -180,7 +180,7 @@ class C {
         this.foo(x, y);
 >this.foo(x, y) : void
 >this.foo : (x: number, y: number, ...z: string[]) => void
->this : C
+>this : this
 >foo : (x: number, y: number, ...z: string[]) => void
 >x : number
 >y : number
@@ -188,7 +188,7 @@ class C {
         this.foo(x, y, ...z);
 >this.foo(x, y, ...z) : void
 >this.foo : (x: number, y: number, ...z: string[]) => void
->this : C
+>this : this
 >foo : (x: number, y: number, ...z: string[]) => void
 >x : number
 >y : number

tests/baselines/reference/callWithSpreadES6.types

@@ -181,7 +181,7 @@ class C {
         this.foo(x, y);
 >this.foo(x, y) : void
 >this.foo : (x: number, y: number, ...z: string[]) => void
->this : C
+>this : this
 >foo : (x: number, y: number, ...z: string[]) => void
 >x : number
 >y : number
@@ -189,7 +189,7 @@ class C {
         this.foo(x, y, ...z);
 >this.foo(x, y, ...z) : void
 >this.foo : (x: number, y: number, ...z: string[]) => void
->this : C
+>this : this
 >foo : (x: number, y: number, ...z: string[]) => void
 >x : number
 >y : number

tests/baselines/reference/captureThisInSuperCall.types

@@ -18,7 +18,7 @@ class B extends A {
 >() => this.someMethod() : () => void
 >this.someMethod() : void
 >this.someMethod : () => void
->this : B
+>this : this
 >someMethod : () => void
 
     someMethod() {}

tests/baselines/reference/classConstructorParametersAccessibility3.types

@@ -20,7 +20,7 @@ class Derived extends Base {
 
         this.p; // OK
 >this.p : number
->this : Derived
+>this : this
 >p : number
     }
 }

tests/baselines/reference/classOrder2.types

@@ -8,7 +8,7 @@ class A extends B {
 >foo : () => void
 >this.bar() : void
 >this.bar : () => void
->this : A
+>this : this
 >bar : () => void
 
 }

tests/baselines/reference/classOrderBug.types

@@ -11,7 +11,7 @@ class bar {
         this.baz = new foo();
 >this.baz = new foo() : foo
 >this.baz : foo
->this : bar
+>this : this
 >baz : foo
 >new foo() : foo
 >foo : typeof foo

tests/baselines/reference/classSideInheritance2.types

@@ -41,7 +41,7 @@ class TextBase implements IText {
             return new SubText(this, span);
 >new SubText(this, span) : SubText
 >SubText : typeof SubText
->this : TextBase
+>this : this
 >span : TextSpan
         }
 }

tests/baselines/reference/commentsClassMembers.types

@@ -16,7 +16,7 @@ class c1 {
         return this.p1 + b;
 >this.p1 + b : number
 >this.p1 : number
->this : c1
+>this : this
 >p1 : number
 >b : number
 
@@ -28,10 +28,10 @@ class c1 {
         return this.p2(this.p1);
 >this.p2(this.p1) : number
 >this.p2 : (b: number) => number
->this : c1
+>this : this
 >p2 : (b: number) => number
 >this.p1 : number
->this : c1
+>this : this
 >p1 : number
 
     }// trailing comment Getter
@@ -43,11 +43,11 @@ class c1 {
         this.p1 = this.p2(value);
 >this.p1 = this.p2(value) : number
 >this.p1 : number
->this : c1
+>this : this
 >p1 : number
 >this.p2(value) : number
 >this.p2 : (b: number) => number
->this : c1
+>this : this
 >p2 : (b: number) => number
 >value : number
 
@@ -64,7 +64,7 @@ class c1 {
         return this.p1 + b;
 >this.p1 + b : number
 >this.p1 : number
->this : c1
+>this : this
 >p1 : number
 >b : number
 
@@ -76,10 +76,10 @@ class c1 {
         return this.pp2(this.pp1);
 >this.pp2(this.pp1) : number
 >this.pp2 : (b: number) => number
->this : c1
+>this : this
 >pp2 : (b: number) => number
 >this.pp1 : number
->this : c1
+>this : this
 >pp1 : number
     }
     /** setter property*/
@@ -90,11 +90,11 @@ class c1 {
         this.pp1 = this.pp2(value);
 >this.pp1 = this.pp2(value) : number
 >this.pp1 : number
->this : c1
+>this : this
 >pp1 : number
 >this.pp2(value) : number
 >this.pp2 : (b: number) => number
->this : c1
+>this : this
 >pp2 : (b: number) => number
 >value : number
     }
@@ -158,7 +158,7 @@ class c1 {
         return this.nc_p1 + b;
 >this.nc_p1 + b : number
 >this.nc_p1 : number
->this : c1
+>this : this
 >nc_p1 : number
 >b : number
     }
@@ -168,10 +168,10 @@ class c1 {
         return this.nc_p2(this.nc_p1);
 >this.nc_p2(this.nc_p1) : number
 >this.nc_p2 : (b: number) => number
->this : c1
+>this : this
 >nc_p2 : (b: number) => number
 >this.nc_p1 : number
->this : c1
+>this : this
 >nc_p1 : number
     }
     public set nc_p3(value: number) {
@@ -181,11 +181,11 @@ class c1 {
         this.nc_p1 = this.nc_p2(value);
 >this.nc_p1 = this.nc_p2(value) : number
 >this.nc_p1 : number
->this : c1
+>this : this
 >nc_p1 : number
 >this.nc_p2(value) : number
 >this.nc_p2 : (b: number) => number
->this : c1
+>this : this
 >nc_p2 : (b: number) => number
 >value : number
     }
@@ -199,7 +199,7 @@ class c1 {
         return this.nc_pp1 + b;
 >this.nc_pp1 + b : number
 >this.nc_pp1 : number
->this : c1
+>this : this
 >nc_pp1 : number
 >b : number
     }
@@ -209,10 +209,10 @@ class c1 {
         return this.nc_pp2(this.nc_pp1);
 >this.nc_pp2(this.nc_pp1) : number
 >this.nc_pp2 : (b: number) => number
->this : c1
+>this : this
 >nc_pp2 : (b: number) => number
 >this.nc_pp1 : number
->this : c1
+>this : this
 >nc_pp1 : number
     }
     private set nc_pp3(value: number) {
@@ -222,11 +222,11 @@ class c1 {
         this.nc_pp1 = this.nc_pp2(value);
 >this.nc_pp1 = this.nc_pp2(value) : number
 >this.nc_pp1 : number
->this : c1
+>this : this
 >nc_pp1 : number
 >this.nc_pp2(value) : number
 >this.nc_pp2 : (b: number) => number
->this : c1
+>this : this
 >nc_pp2 : (b: number) => number
 >value : number
     }
@@ -284,7 +284,7 @@ class c1 {
         return this.a_p1 + b;
 >this.a_p1 + b : number
 >this.a_p1 : number
->this : c1
+>this : this
 >a_p1 : number
 >b : number
     }
@@ -295,10 +295,10 @@ class c1 {
         return this.a_p2(this.a_p1);
 >this.a_p2(this.a_p1) : number
 >this.a_p2 : (b: number) => number
->this : c1
+>this : this
 >a_p2 : (b: number) => number
 >this.a_p1 : number
->this : c1
+>this : this
 >a_p1 : number
     }
     // setter property
@@ -309,11 +309,11 @@ class c1 {
         this.a_p1 = this.a_p2(value);
 >this.a_p1 = this.a_p2(value) : number
 >this.a_p1 : number
->this : c1
+>this : this
 >a_p1 : number
 >this.a_p2(value) : number
 >this.a_p2 : (b: number) => number
->this : c1
+>this : this
 >a_p2 : (b: number) => number
 >value : number
     }
@@ -329,7 +329,7 @@ class c1 {
         return this.a_p1 + b;
 >this.a_p1 + b : number
 >this.a_p1 : number
->this : c1
+>this : this
 >a_p1 : number
 >b : number
     }
@@ -340,10 +340,10 @@ class c1 {
         return this.a_pp2(this.a_pp1);
 >this.a_pp2(this.a_pp1) : number
 >this.a_pp2 : (b: number) => number
->this : c1
+>this : this
 >a_pp2 : (b: number) => number
 >this.a_pp1 : number
->this : c1
+>this : this
 >a_pp1 : number
     }
     // setter property
@@ -354,11 +354,11 @@ class c1 {
         this.a_pp1 = this.a_pp2(value);
 >this.a_pp1 = this.a_pp2(value) : number
 >this.a_pp1 : number
->this : c1
+>this : this
 >a_pp1 : number
 >this.a_pp2(value) : number
 >this.a_pp2 : (b: number) => number
->this : c1
+>this : this
 >a_pp2 : (b: number) => number
 >value : number
     }
@@ -422,7 +422,7 @@ class c1 {
         return this.b_p1 + b;
 >this.b_p1 + b : number
 >this.b_p1 : number
->this : c1
+>this : this
 >b_p1 : number
 >b : number
     }
@@ -433,10 +433,10 @@ class c1 {
         return this.b_p2(this.b_p1);
 >this.b_p2(this.b_p1) : number
 >this.b_p2 : (b: number) => number
->this : c1
+>this : this
 >b_p2 : (b: number) => number
 >this.b_p1 : number
->this : c1
+>this : this
 >b_p1 : number
     }
     /** setter property */
@@ -447,11 +447,11 @@ class c1 {
         this.b_p1 = this.b_p2(value);
 >this.b_p1 = this.b_p2(value) : number
 >this.b_p1 : number
->this : c1
+>this : this
 >b_p1 : number
 >this.b_p2(value) : number
 >this.b_p2 : (b: number) => number
->this : c1
+>this : this
 >b_p2 : (b: number) => number
 >value : number
     }
@@ -467,7 +467,7 @@ class c1 {
         return this.b_p1 + b;
 >this.b_p1 + b : number
 >this.b_p1 : number
->this : c1
+>this : this
 >b_p1 : number
 >b : number
     }
@@ -478,10 +478,10 @@ class c1 {
         return this.b_pp2(this.b_pp1);
 >this.b_pp2(this.b_pp1) : number
 >this.b_pp2 : (b: number) => number
->this : c1
+>this : this
 >b_pp2 : (b: number) => number
 >this.b_pp1 : number
->this : c1
+>this : this
 >b_pp1 : number
     }
     /** setter property */
@@ -492,11 +492,11 @@ class c1 {
         this.b_pp1 = this.b_pp2(value);
 >this.b_pp1 = this.b_pp2(value) : number
 >this.b_pp1 : number
->this : c1
+>this : this
 >b_pp1 : number
 >this.b_pp2(value) : number
 >this.b_pp2 : (b: number) => number
->this : c1
+>this : this
 >b_pp2 : (b: number) => number
 >value : number
     }
@@ -704,7 +704,7 @@ class cProperties {
 
         return this.val;
 >this.val : number
->this : cProperties
+>this : this
 >val : number
 
     } // trailing comment of only getter
@@ -713,7 +713,7 @@ class cProperties {
 
         return this.val;
 >this.val : number
->this : cProperties
+>this : this
 >val : number
     }
     /**setter only property*/
@@ -724,7 +724,7 @@ class cProperties {
         this.val = value;
 >this.val = value : number
 >this.val : number
->this : cProperties
+>this : this
 >val : number
 >value : number
     }
@@ -735,7 +735,7 @@ class cProperties {
         this.val = value;
 >this.val = value : number
 >this.val : number
->this : cProperties
+>this : this
 >val : number
 >value : number
 

tests/baselines/reference/commentsInheritance.types

@@ -170,7 +170,7 @@ class c2 {
         this.c2_p1 = a;
 >this.c2_p1 = a : number
 >this.c2_p1 : number
->this : c2
+>this : this
 >c2_p1 : number
 >a : number
     }

tests/baselines/reference/commentsdoNotEmitComments.types

@@ -43,7 +43,7 @@ class c {
 
         return this.b;
 >this.b : number
->this : c
+>this : this
 >b : number
     }
 
@@ -53,7 +53,7 @@ class c {
 
         return this.b;
 >this.b : number
->this : c
+>this : this
 >b : number
     }
 
@@ -65,7 +65,7 @@ class c {
         this.b = val;
 >this.b = val : number
 >this.b : number
->this : c
+>this : this
 >b : number
 >val : number
     }

tests/baselines/reference/commentsemitComments.types

@@ -43,7 +43,7 @@ class c {
 
         return this.b;
 >this.b : number
->this : c
+>this : this
 >b : number
     }
 
@@ -53,7 +53,7 @@ class c {
 
         return this.b;
 >this.b : number
->this : c
+>this : this
 >b : number
     }
 
@@ -65,7 +65,7 @@ class c {
         this.b = val;
 >this.b = val : number
 >this.b : number
->this : c
+>this : this
 >b : number
 >val : number
     }

tests/baselines/reference/complexClassRelationships.types

@@ -79,14 +79,14 @@ class Foo {
         return new GenericType<string>(this);
 >new GenericType<string>(this) : GenericType<string>
 >GenericType : typeof GenericType
->this : Foo
+>this : this
     }
     public populate() {
 >populate : () => void
 
         this.prop2;
 >this.prop2 : BaseCollection<Derived>
->this : Foo
+>this : this
 >prop2 : BaseCollection<Derived>
     }
     public get prop2(): BaseCollection<Derived> {

tests/baselines/reference/computedPropertyNames22_ES5.types

@@ -12,7 +12,7 @@ class C {
             [this.bar()]() { }
 >this.bar() : number
 >this.bar : () => number
->this : C
+>this : this
 >bar : () => number
 
         };

tests/baselines/reference/computedPropertyNames22_ES6.types

@@ -12,7 +12,7 @@ class C {
             [this.bar()]() { }
 >this.bar() : number
 >this.bar : () => number
->this : C
+>this : this
 >bar : () => number
 
         };

tests/baselines/reference/computedPropertyNames29_ES5.types

@@ -15,7 +15,7 @@ class C {
                 [this.bar()]() { } // needs capture
 >this.bar() : number
 >this.bar : () => number
->this : C
+>this : this
 >bar : () => number
 
             };

tests/baselines/reference/computedPropertyNames29_ES6.types

@@ -15,7 +15,7 @@ class C {
                 [this.bar()]() { } // needs capture
 >this.bar() : number
 >this.bar : () => number
->this : C
+>this : this
 >bar : () => number
 
             };

tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.types

@@ -20,7 +20,7 @@ class Rule {
         this.name = name;
 >this.name = name : string
 >this.name : string
->this : Rule
+>this : this
 >name : string
 >name : string
     }

tests/baselines/reference/contextualTypeAppliedToVarArgs.types

@@ -21,7 +21,7 @@ class Foo{
         delegate(this, function (source, args2)
 >delegate(this, function (source, args2)        {            var a = source.node;            var b = args2.node;        } ) : (...args: any[]) => any
 >delegate : (instance: any, method: (...args: any[]) => any, data?: any) => (...args: any[]) => any
->this : Foo
+>this : this
 >function (source, args2)        {            var a = source.node;            var b = args2.node;        } : (source: any, args2: any) => void
 >source : any
 >args2 : any

tests/baselines/reference/declFileForTypeParameters.types

@@ -16,7 +16,7 @@ class C<T> {
 
         return this.x;
 >this.x : T
->this : C<T>
+>this : this
 >x : T
     }
 }

tests/baselines/reference/declFileGenericType2.types

@@ -142,7 +142,7 @@ module templa.dom.mvc.composite {
             this._controllers = [];
 >this._controllers = [] : undefined[]
 >this._controllers : templa.mvc.IController<templa.mvc.IModel>[]
->this : AbstractCompositeElementController<ModelType>
+>this : this
 >_controllers : templa.mvc.IController<templa.mvc.IModel>[]
 >[] : undefined[]
         }

tests/baselines/reference/declarationEmit_protectedMembers.types

@@ -12,7 +12,7 @@ class C1 {
 
         return this.x;
 >this.x : number
->this : C1
+>this : this
 >x : number
     }
 
@@ -60,7 +60,7 @@ class C2 extends C1 {
 >super : C1
 >f : () => number
 >this.x : number
->this : C2
+>this : this
 >x : number
     }
     protected static sf() {

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.types

@@ -35,7 +35,7 @@ class MyClass {
         this.db = db;
 >this.db = db : db
 >this.db : db
->this : MyClass
+>this : this
 >db : db
 >db : db
 
@@ -43,7 +43,7 @@ class MyClass {
 >this.db.doSomething() : void
 >this.db.doSomething : () => void
 >this.db : db
->this : MyClass
+>this : this
 >db : db
 >doSomething : () => void
     }

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.types

@@ -36,7 +36,7 @@ class MyClass {
         this.db = db;
 >this.db = db : Database
 >this.db : Database
->this : MyClass
+>this : this
 >db : Database
 >db : Database
 
@@ -44,7 +44,7 @@ class MyClass {
 >this.db.doSomething() : void
 >this.db.doSomething : () => void
 >this.db : Database
->this : MyClass
+>this : this
 >db : Database
 >doSomething : () => void
     }

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.types

@@ -28,7 +28,7 @@ class MyClass {
         this.db = db;
 >this.db = db : db.db
 >this.db : db.db
->this : MyClass
+>this : this
 >db : db.db
 >db : db.db
 
@@ -36,7 +36,7 @@ class MyClass {
 >this.db.doSomething() : void
 >this.db.doSomething : () => void
 >this.db : db.db
->this : MyClass
+>this : this
 >db : db.db
 >doSomething : () => void
     }

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.types

@@ -35,7 +35,7 @@ class MyClass {
         this.db = db;
 >this.db = db : db
 >this.db : db
->this : MyClass
+>this : this
 >db : db
 >db : db
 
@@ -43,7 +43,7 @@ class MyClass {
 >this.db.doSomething() : void
 >this.db.doSomething : () => void
 >this.db : db
->this : MyClass
+>this : this
 >db : db
 >doSomething : () => void
     }

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.types

@@ -35,7 +35,7 @@ class MyClass {
         this.db = db;
 >this.db = db : database
 >this.db : database
->this : MyClass
+>this : this
 >db : database
 >db : database
 
@@ -43,7 +43,7 @@ class MyClass {
 >this.db.doSomething() : void
 >this.db.doSomething : () => void
 >this.db : database
->this : MyClass
+>this : this
 >db : database
 >doSomething : () => void
     }

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.types

@@ -28,7 +28,7 @@ class MyClass {
         this.db = db;
 >this.db = db : database.db
 >this.db : database.db
->this : MyClass
+>this : this
 >db : database.db
 >db : database.db
 
@@ -36,7 +36,7 @@ class MyClass {
 >this.db.doSomething() : void
 >this.db.doSomething : () => void
 >this.db : database.db
->this : MyClass
+>this : this
 >db : database.db
 >doSomething : () => void
     }

tests/baselines/reference/derivedClasses.types

@@ -11,7 +11,7 @@ class Red extends Color {
 >() => { return this.hue(); } : () => string
 >this.hue() : string
 >this.hue : () => string
->this : Red
+>this : this
 >hue : () => string
 
     	return getHue() + " red"; 
@@ -46,7 +46,7 @@ class Blue extends Color {
 >() => { return this.hue(); } : () => string
 >this.hue() : string
 >this.hue : () => string
->this : Blue
+>this : this
 >hue : () => string
 
     	return getHue() + " blue"; 

tests/baselines/reference/detachedCommentAtStartOfConstructor1.types

@@ -19,13 +19,13 @@ class TestFile {
 >message + this.name : string
 >message : string
 >this.name : any
->this : TestFile
+>this : this
 >name : any
 
         this.message = getMessage();
 >this.message = getMessage() : string
 >this.message : string
->this : TestFile
+>this : this
 >message : string
 >getMessage() : string
 >getMessage : () => string

tests/baselines/reference/detachedCommentAtStartOfConstructor2.types

@@ -20,13 +20,13 @@ class TestFile {
 >message + this.name : string
 >message : string
 >this.name : string
->this : TestFile
+>this : this
 >name : string
 
         this.message = getMessage();
 >this.message = getMessage() : string
 >this.message : string
->this : TestFile
+>this : this
 >message : string
 >getMessage() : string
 >getMessage : () => string

tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types

@@ -20,7 +20,7 @@ class TestFile {
 >message + this.name : string
 >message : string
 >this.name : string
->this : TestFile
+>this : this
 >name : string
     }
 }

tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types

@@ -21,7 +21,7 @@ class TestFile {
 >message + this.name : string
 >message : string
 >this.name : string
->this : TestFile
+>this : this
 >name : string
     }
 }

tests/baselines/reference/emitClassDeclarationWithConstructorInES6.types

@@ -38,7 +38,7 @@ class B {
         this.y = 10;
 >this.y = 10 : number
 >this.y : number
->this : B
+>this : this
 >y : number
 >10 : number
     }
@@ -53,7 +53,7 @@ class B {
 
         return this._bar;
 >this._bar : string
->this : B
+>this : this
 >_bar : string
     } 
 }

tests/baselines/reference/emitClassDeclarationWithGetterSetterInES6.types

@@ -10,7 +10,7 @@ class C {
 
         return this._name;
 >this._name : string
->this : C
+>this : this
 >_name : string
     }
     static get name2(): string {

tests/baselines/reference/emitClassDeclarationWithMethodInES6.types

@@ -25,7 +25,7 @@ class D {
 
         return this._bar;
 >this._bar : string
->this : D
+>this : this
 >_bar : string
     } 
     baz(a: any, x: string): string {

tests/baselines/reference/emitClassDeclarationWithPropertyAssignmentInES6.types

@@ -21,7 +21,7 @@ class D {
         this.y = 10;
 >this.y = 10 : number
 >this.y : number
->this : D
+>this : this
 >y : number
 >10 : number
     }
@@ -55,7 +55,7 @@ class F extends D{
         this.j = "HI";
 >this.j = "HI" : string
 >this.j : string
->this : F
+>this : this
 >j : string
 >"HI" : string
     }

tests/baselines/reference/emitClassDeclarationWithThisKeywordInES6.types

@@ -10,7 +10,7 @@ class B {
         this.x = 10;
 >this.x = 10 : number
 >this.x : number
->this : B
+>this : this
 >x : number
 >10 : number
     }
@@ -27,7 +27,7 @@ class B {
 >B : typeof B
 >log : (a: number) => void
 >this.x : number
->this : B
+>this : this
 >x : number
     }
 
@@ -36,7 +36,7 @@ class B {
 
         return this.x;
 >this.x : number
->this : B
+>this : this
 >x : number
     }
 
@@ -47,7 +47,7 @@ class B {
         this.x = y;
 >this.x = y : number
 >this.x : number
->this : B
+>this : this
 >x : number
 >y : number
     }

tests/baselines/reference/emitClassDeclarationWithTypeArgumentAndOverloadInES6.types

@@ -24,7 +24,7 @@ class B<T> {
 >T : T
 >this.B = a : T
 >this.B : T
->this : B<T>
+>this : this
 >B : T
 >a : T
 
@@ -47,7 +47,7 @@ class B<T> {
 
         return this.x;
 >this.x : T
->this : B<T>
+>this : this
 >x : T
     }
 
@@ -57,7 +57,7 @@ class B<T> {
 
         return this.B;
 >this.B : T
->this : B<T>
+>this : this
 >B : T
     }
     set BBWith(c: T) {
@@ -68,7 +68,7 @@ class B<T> {
         this.B = c;
 >this.B = c : T
 >this.B : T
->this : B<T>
+>this : this
 >B : T
 >c : T
     }

tests/baselines/reference/emitClassDeclarationWithTypeArgumentInES6.types

@@ -16,7 +16,7 @@ class B<T> {
 >T : T
 >this.B = a : T
 >this.B : T
->this : B<T>
+>this : this
 >B : T
 >a : T
 
@@ -26,7 +26,7 @@ class B<T> {
 
         return this.x;
 >this.x : T
->this : B<T>
+>this : this
 >x : T
     }
     get BB(): T {
@@ -35,7 +35,7 @@ class B<T> {
 
         return this.B;
 >this.B : T
->this : B<T>
+>this : this
 >B : T
     }
     set BBWith(c: T) {
@@ -46,7 +46,7 @@ class B<T> {
         this.B = c;
 >this.B = c : T
 >this.B : T
->this : B<T>
+>this : this
 >B : T
 >c : T
     }

tests/baselines/reference/es6ClassTest3.types

@@ -24,14 +24,14 @@ module M {
 	        this.x = 1;
 >this.x = 1 : number
 >this.x : number
->this : Visibility
+>this : this
 >x : number
 >1 : number
 
 	        this.y = 2;
 >this.y = 2 : number
 >this.y : number
->this : Visibility
+>this : this
 >y : number
 >2 : number
 	    }

tests/baselines/reference/es6ClassTest8.types

@@ -119,7 +119,7 @@ class Camera {
         this.forward = Vector.norm(Vector.minus(lookAt,this.pos));
 >this.forward = Vector.norm(Vector.minus(lookAt,this.pos)) : Vector
 >this.forward : Vector
->this : Camera
+>this : this
 >forward : Vector
 >Vector.norm(Vector.minus(lookAt,this.pos)) : Vector
 >Vector.norm : (v: Vector) => Vector
@@ -131,13 +131,13 @@ class Camera {
 >minus : (v1: Vector, v2: Vector) => Vector
 >lookAt : Vector
 >this.pos : Vector
->this : Camera
+>this : this
 >pos : Vector
 
         this.right = Vector.times(down, Vector.norm(Vector.cross(this.forward, down)));
 >this.right = Vector.times(down, Vector.norm(Vector.cross(this.forward, down))) : Vector
 >this.right : Vector
->this : Camera
+>this : this
 >right : Vector
 >Vector.times(down, Vector.norm(Vector.cross(this.forward, down))) : Vector
 >Vector.times : (v1: Vector, v2: Vector) => Vector
@@ -153,14 +153,14 @@ class Camera {
 >Vector : typeof Vector
 >cross : (v1: Vector, v2: Vector) => Vector
 >this.forward : Vector
->this : Camera
+>this : this
 >forward : Vector
 >down : Vector
 
         this.up = Vector.times(down, Vector.norm(Vector.cross(this.forward, this.right)));    
 >this.up = Vector.times(down, Vector.norm(Vector.cross(this.forward, this.right))) : Vector
 >this.up : Vector
->this : Camera
+>this : this
 >up : Vector
 >Vector.times(down, Vector.norm(Vector.cross(this.forward, this.right))) : Vector
 >Vector.times : (v1: Vector, v2: Vector) => Vector
@@ -176,10 +176,10 @@ class Camera {
 >Vector : typeof Vector
 >cross : (v1: Vector, v2: Vector) => Vector
 >this.forward : Vector
->this : Camera
+>this : this
 >forward : Vector
 >this.right : Vector
->this : Camera
+>this : this
 >right : Vector
     }
 }

tests/baselines/reference/fatArrowSelf.types

@@ -38,7 +38,7 @@ module Consumer {
 >this.emitter.addListener('change', (e) => {                this.changed();            }) : void
 >this.emitter.addListener : (type: string, listener: Events.ListenerCallback) => void
 >this.emitter : Events.EventEmitter
->this : EventEmitterConsummer
+>this : this
 >emitter : Events.EventEmitter
 >addListener : (type: string, listener: Events.ListenerCallback) => void
 >'change' : string
@@ -48,7 +48,7 @@ module Consumer {
                 this.changed();
 >this.changed() : void
 >this.changed : () => void
->this : EventEmitterConsummer
+>this : this
 >changed : () => void
 
             });

tests/baselines/reference/for-of18.types

@@ -32,6 +32,6 @@ class StringIterator {
 >iterator : symbol
 
         return this;
->this : StringIterator
+>this : this
     }
 }

tests/baselines/reference/for-of19.types

@@ -37,6 +37,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/for-of20.types

@@ -37,6 +37,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/for-of21.types

@@ -37,6 +37,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/for-of22.types

@@ -38,6 +38,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/for-of23.types

@@ -38,6 +38,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/for-of26.types

@@ -22,6 +22,6 @@ class StringIterator {
 >iterator : symbol
 
         return this;
->this : StringIterator
+>this : this
     }
 }

tests/baselines/reference/for-of28.types

@@ -16,6 +16,6 @@ class StringIterator {
 >iterator : symbol
 
         return this;
->this : StringIterator
+>this : this
     }
 }

tests/baselines/reference/functionOverloads7.types

@@ -21,7 +21,7 @@ class foo {
 >foo : any
 >this.bar() : any
 >this.bar : { (): any; (foo: string): any; }
->this : foo
+>this : this
 >bar : { (): any; (foo: string): any; }
 
      foo = this.bar("test");
@@ -29,7 +29,7 @@ class foo {
 >foo : any
 >this.bar("test") : any
 >this.bar : { (): any; (foo: string): any; }
->this : foo
+>this : this
 >bar : { (): any; (foo: string): any; }
 >"test" : string
    }

tests/baselines/reference/functionSubtypingOfVarArgs.types

@@ -15,7 +15,7 @@ class EventBase {
 >this._listeners.push(listener) : number
 >this._listeners.push : (...items: any[]) => number
 >this._listeners : any[]
->this : EventBase
+>this : this
 >_listeners : any[]
 >push : (...items: any[]) => number
 >listener : (...args: any[]) => void

tests/baselines/reference/functionSubtypingOfVarArgs2.types

@@ -16,7 +16,7 @@ class EventBase {
 >this._listeners.push(listener) : number
 >this._listeners.push : (...items: ((...args: any[]) => void)[]) => number
 >this._listeners : ((...args: any[]) => void)[]
->this : EventBase
+>this : this
 >_listeners : ((...args: any[]) => void)[]
 >push : (...items: ((...args: any[]) => void)[]) => number
 >listener : (...args: any[]) => void

tests/baselines/reference/fuzzy.errors.txt

@@ -1,10 +1,11 @@
 tests/cases/compiler/fuzzy.ts(13,18): error TS2420: Class 'C' incorrectly implements interface 'I'.
   Property 'alsoWorks' is missing in type 'C'.
-tests/cases/compiler/fuzzy.ts(21,20): error TS2322: Type '{ anything: number; oneI: C; }' is not assignable to type 'R'.
+tests/cases/compiler/fuzzy.ts(21,20): error TS2322: Type '{ anything: number; oneI: this; }' is not assignable to type 'R'.
   Types of property 'oneI' are incompatible.
-    Type 'C' is not assignable to type 'I'.
-tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Neither type '{ oneI: C; }' nor type 'R' is assignable to the other.
-  Property 'anything' is missing in type '{ oneI: C; }'.
+    Type 'this' is not assignable to type 'I'.
+      Type 'C' is not assignable to type 'I'.
+tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Neither type '{ oneI: this; }' nor type 'R' is assignable to the other.
+  Property 'anything' is missing in type '{ oneI: this; }'.
 
 
 ==== tests/cases/compiler/fuzzy.ts (3 errors) ====
@@ -33,16 +34,17 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Neither type '{ oneI: C; }'
             doesntWork():R {
                 return { anything:1, oneI:this };
                        ~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2322: Type '{ anything: number; oneI: C; }' is not assignable to type 'R'.
+!!! error TS2322: Type '{ anything: number; oneI: this; }' is not assignable to type 'R'.
 !!! error TS2322:   Types of property 'oneI' are incompatible.
-!!! error TS2322:     Type 'C' is not assignable to type 'I'.
+!!! error TS2322:     Type 'this' is not assignable to type 'I'.
+!!! error TS2322:       Type 'C' is not assignable to type 'I'.
             }
     
             worksToo():R {
                 return <R>({ oneI: this });
                        ~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Neither type '{ oneI: C; }' nor type 'R' is assignable to the other.
-!!! error TS2352:   Property 'anything' is missing in type '{ oneI: C; }'.
+!!! error TS2352: Neither type '{ oneI: this; }' nor type 'R' is assignable to the other.
+!!! error TS2352:   Property 'anything' is missing in type '{ oneI: this; }'.
             }
         }
     }

tests/baselines/reference/genericBaseClassLiteralProperty.types

@@ -23,14 +23,14 @@ class SubClass extends BaseClass<number> {
 >x : number
 >this._getValue1() : number
 >this._getValue1 : () => number
->this : SubClass
+>this : this
 >_getValue1 : () => number
 
         var y : number = this._getValue2();
 >y : number
 >this._getValue2() : number
 >this._getValue2 : () => number
->this : SubClass
+>this : this
 >_getValue2 : () => number
     }
 }

tests/baselines/reference/genericBaseClassLiteralProperty2.types

@@ -16,7 +16,7 @@ class BaseCollection2<TItem extends CollectionItem2> {
         this._itemsByKey = {};
 >this._itemsByKey = {} : { [x: string]: undefined; }
 >this._itemsByKey : { [key: string]: TItem; }
->this : BaseCollection2<TItem>
+>this : this
 >_itemsByKey : { [key: string]: TItem; }
 >{} : { [x: string]: undefined; }
     }
@@ -36,7 +36,7 @@ class DataView2 extends BaseCollection2<CollectionItem2> {
 >this._itemsByKey['dummy'] = item : CollectionItem2
 >this._itemsByKey['dummy'] : CollectionItem2
 >this._itemsByKey : { [key: string]: CollectionItem2; }
->this : DataView2
+>this : this
 >_itemsByKey : { [key: string]: CollectionItem2; }
 >'dummy' : string
 >item : CollectionItem2

tests/baselines/reference/genericClassWithStaticFactory.symbols

@@ -52,23 +52,23 @@ module Editor {
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 12, 19))
             
             this.prev.next = entry;
->this.prev.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.prev.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15))
 
             entry.next = this;
->entry.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 
             entry.prev = this.prev;
->entry.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 13, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
@@ -102,16 +102,16 @@ module Editor {
 
             for (i = 0; !(entry.isHead); i++) {
 >i : Symbol(i, Decl(genericClassWithStaticFactory.ts, 24, 15))
->entry.isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>entry.isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 23, 15))
->isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 >i : Symbol(i, Decl(genericClassWithStaticFactory.ts, 24, 15))
 
                 entry = entry.next;
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 23, 15))
->entry.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 23, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
             }
 
             return (i);
@@ -138,11 +138,11 @@ module Editor {
 >isEmpty : Symbol(isEmpty, Decl(genericClassWithStaticFactory.ts, 32, 9))
             {
                 return this.next.data;
->this.next.data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 7, 43))
+>this.next.data : Symbol(List.data, Decl(genericClassWithStaticFactory.ts, 7, 43))
 >this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 7, 43))
+>data : Symbol(List.data, Decl(genericClassWithStaticFactory.ts, 7, 43))
             }
             else {
                 return null;
@@ -156,22 +156,22 @@ module Editor {
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
             entry.isHead = false;
->entry.isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>entry.isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25))
->isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 
             entry.next = this.next;
->entry.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 
             entry.prev = this;
->entry.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 
             this.next = entry;
@@ -181,11 +181,11 @@ module Editor {
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25))
 
             entry.next.prev = entry; // entry.next.prev does not show intellisense, but entry.prev.prev does
->entry.next.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
->entry.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>entry.next.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 48, 25))
         }
 
@@ -204,28 +204,28 @@ module Editor {
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 56, 20))
 
             entry.data = data;
->entry.data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 7, 43))
+>entry.data : Symbol(List.data, Decl(genericClassWithStaticFactory.ts, 7, 43))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15))
->data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 7, 43))
+>data : Symbol(List.data, Decl(genericClassWithStaticFactory.ts, 7, 43))
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 56, 20))
 
             entry.isHead = false;
->entry.isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>entry.isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15))
->isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 
             entry.next = this.next;
->entry.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 
             entry.prev = this;
->entry.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 
             this.next = entry;
@@ -235,11 +235,11 @@ module Editor {
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15))
 
             entry.next.prev = entry;  // entry.next.prev does not show intellisense, but entry.prev.prev does
->entry.next.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
->entry.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>entry.next.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 57, 15))
         }
 
@@ -252,11 +252,11 @@ module Editor {
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
             if (this.next.isHead) {
->this.next.isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>this.next.isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 >this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 
                 return null;
             }
@@ -282,28 +282,28 @@ module Editor {
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
             entry.isHead = false;
->entry.isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>entry.isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27))
->isHead : Symbol(isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
+>isHead : Symbol(List.isHead, Decl(genericClassWithStaticFactory.ts, 7, 20))
 
             this.prev.next = entry;
->this.prev.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.prev.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27))
 
             entry.next = this;
->entry.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 
             entry.prev = this.prev;
->entry.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 75, 27))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
@@ -337,17 +337,17 @@ module Editor {
 >data : Symbol(data, Decl(genericClassWithStaticFactory.ts, 84, 27))
 
             entry.next = this.next;
->entry.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 
             entry.prev = this;
->entry.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 
             this.next = entry;
@@ -357,11 +357,11 @@ module Editor {
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15))
 
             entry.next.prev = entry;// entry.next.prev does not show intellisense, but entry.prev.prev does
->entry.next.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
->entry.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>entry.next.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 85, 15))
 
             return entry;
@@ -377,23 +377,23 @@ module Editor {
 >T : Symbol(T, Decl(genericClassWithStaticFactory.ts, 2, 22))
 
             this.prev.next = entry;
->this.prev.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>this.prev.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33))
 
             entry.next = this;
->entry.next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>entry.next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33))
->next : Symbol(next, Decl(genericClassWithStaticFactory.ts, 2, 26))
+>next : Symbol(List.next, Decl(genericClassWithStaticFactory.ts, 2, 26))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 
             entry.prev = this.prev;
->entry.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>entry.prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >entry : Symbol(entry, Decl(genericClassWithStaticFactory.ts, 93, 33))
->prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
+>prev : Symbol(List.prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this.prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))
 >this : Symbol(List, Decl(genericClassWithStaticFactory.ts, 0, 15))
 >prev : Symbol(prev, Decl(genericClassWithStaticFactory.ts, 3, 29))

tests/baselines/reference/genericClassWithStaticFactory.types

@@ -29,7 +29,7 @@ module Editor {
             this.listFactory = new ListFactory<T>();
 >this.listFactory = new ListFactory<T>() : ListFactory<T>
 >this.listFactory : ListFactory<T>
->this : List<T>
+>this : this
 >listFactory : ListFactory<T>
 >new ListFactory<T>() : ListFactory<T>
 >ListFactory : typeof ListFactory
@@ -49,7 +49,7 @@ module Editor {
 >this.listFactory.MakeEntry(data) : List<T>
 >this.listFactory.MakeEntry : <T>(data: T) => List<T>
 >this.listFactory : ListFactory<T>
->this : List<T>
+>this : this
 >listFactory : ListFactory<T>
 >MakeEntry : <T>(data: T) => List<T>
 >data : T
@@ -58,17 +58,17 @@ module Editor {
 >this.prev.next = entry : List<T>
 >this.prev.next : List<T>
 >this.prev : List<T>
->this : List<T>
+>this : this
 >prev : List<T>
 >next : List<T>
 >entry : List<T>
 
             entry.next = this;
->entry.next = this : List<T>
+>entry.next = this : this
 >entry.next : List<T>
 >entry : List<T>
 >next : List<T>
->this : List<T>
+>this : this
 
             entry.prev = this.prev;
 >entry.prev = this.prev : List<T>
@@ -76,13 +76,13 @@ module Editor {
 >entry : List<T>
 >prev : List<T>
 >this.prev : List<T>
->this : List<T>
+>this : this
 >prev : List<T>
 
             this.prev = entry;
 >this.prev = entry : List<T>
 >this.prev : List<T>
->this : List<T>
+>this : this
 >prev : List<T>
 >entry : List<T>
 
@@ -105,7 +105,7 @@ module Editor {
 >entry = this.next : List<T>
 >entry : List<T>
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
 
             for (i = 0; !(entry.isHead); i++) {
@@ -140,9 +140,9 @@ module Editor {
 >(this.next == this) : boolean
 >this.next == this : boolean
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
->this : List<T>
+>this : this
         }
 
         public first(): T {
@@ -152,13 +152,13 @@ module Editor {
             if (this.isEmpty())
 >this.isEmpty() : boolean
 >this.isEmpty : () => boolean
->this : List<T>
+>this : this
 >isEmpty : () => boolean
             {
                 return this.next.data;
 >this.next.data : T
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
 >data : T
             }
@@ -187,20 +187,20 @@ module Editor {
 >entry : List<T>
 >next : List<T>
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
 
             entry.prev = this;
->entry.prev = this : List<T>
+>entry.prev = this : this
 >entry.prev : List<T>
 >entry : List<T>
 >prev : List<T>
->this : List<T>
+>this : this
 
             this.next = entry;
 >this.next = entry : List<T>
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
 >entry : List<T>
 
@@ -224,7 +224,7 @@ module Editor {
 >this.listFactory.MakeEntry(data) : List<T>
 >this.listFactory.MakeEntry : <T>(data: T) => List<T>
 >this.listFactory : ListFactory<T>
->this : List<T>
+>this : this
 >listFactory : ListFactory<T>
 >MakeEntry : <T>(data: T) => List<T>
 >data : T
@@ -249,20 +249,20 @@ module Editor {
 >entry : List<T>
 >next : List<T>
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
 
             entry.prev = this;
->entry.prev = this : List<T>
+>entry.prev = this : this
 >entry.prev : List<T>
 >entry : List<T>
 >prev : List<T>
->this : List<T>
+>this : this
 
             this.next = entry;
 >this.next = entry : List<T>
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
 >entry : List<T>
 
@@ -287,7 +287,7 @@ module Editor {
             if (this.next.isHead) {
 >this.next.isHead : boolean
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
 >isHead : boolean
 
@@ -299,11 +299,11 @@ module Editor {
 >this.listFactory.RemoveEntry(this.next) : List<T>
 >this.listFactory.RemoveEntry : <T>(entry: List<T>) => List<T>
 >this.listFactory : ListFactory<T>
->this : List<T>
+>this : this
 >listFactory : ListFactory<T>
 >RemoveEntry : <T>(entry: List<T>) => List<T>
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
             }
         }
@@ -327,17 +327,17 @@ module Editor {
 >this.prev.next = entry : List<T>
 >this.prev.next : List<T>
 >this.prev : List<T>
->this : List<T>
+>this : this
 >prev : List<T>
 >next : List<T>
 >entry : List<T>
 
             entry.next = this;
->entry.next = this : List<T>
+>entry.next = this : this
 >entry.next : List<T>
 >entry : List<T>
 >next : List<T>
->this : List<T>
+>this : this
 
             entry.prev = this.prev;
 >entry.prev = this.prev : List<T>
@@ -345,13 +345,13 @@ module Editor {
 >entry : List<T>
 >prev : List<T>
 >this.prev : List<T>
->this : List<T>
+>this : this
 >prev : List<T>
 
             this.prev = entry;
 >this.prev = entry : List<T>
 >this.prev : List<T>
->this : List<T>
+>this : this
 >prev : List<T>
 >entry : List<T>
 
@@ -373,7 +373,7 @@ module Editor {
 >this.listFactory.MakeEntry(data) : List<T>
 >this.listFactory.MakeEntry : <T>(data: T) => List<T>
 >this.listFactory : ListFactory<T>
->this : List<T>
+>this : this
 >listFactory : ListFactory<T>
 >MakeEntry : <T>(data: T) => List<T>
 >data : T
@@ -384,20 +384,20 @@ module Editor {
 >entry : List<T>
 >next : List<T>
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
 
             entry.prev = this;
->entry.prev = this : List<T>
+>entry.prev = this : this
 >entry.prev : List<T>
 >entry : List<T>
 >prev : List<T>
->this : List<T>
+>this : this
 
             this.next = entry;
 >this.next = entry : List<T>
 >this.next : List<T>
->this : List<T>
+>this : this
 >next : List<T>
 >entry : List<T>
 
@@ -426,17 +426,17 @@ module Editor {
 >this.prev.next = entry : List<T>
 >this.prev.next : List<T>
 >this.prev : List<T>
->this : List<T>
+>this : this
 >prev : List<T>
 >next : List<T>
 >entry : List<T>
 
             entry.next = this;
->entry.next = this : List<T>
+>entry.next = this : this
 >entry.next : List<T>
 >entry : List<T>
 >next : List<T>
->this : List<T>
+>this : this
 
             entry.prev = this.prev;
 >entry.prev = this.prev : List<T>
@@ -444,13 +444,13 @@ module Editor {
 >entry : List<T>
 >prev : List<T>
 >this.prev : List<T>
->this : List<T>
+>this : this
 >prev : List<T>
 
             this.prev = entry;
 >this.prev = entry : List<T>
 >this.prev : List<T>
->this : List<T>
+>this : this
 >prev : List<T>
 >entry : List<T>
 
@@ -470,7 +470,7 @@ module Editor {
 >this.listFactory.MakeEntry(data) : List<T>
 >this.listFactory.MakeEntry : <T>(data: T) => List<T>
 >this.listFactory : ListFactory<T>
->this : List<T>
+>this : this
 >listFactory : ListFactory<T>
 >MakeEntry : <T>(data: T) => List<T>
 >data : T
@@ -478,7 +478,7 @@ module Editor {
             return this.insertEntryBefore(entry);
 >this.insertEntryBefore(entry) : List<T>
 >this.insertEntryBefore : (entry: List<T>) => List<T>
->this : List<T>
+>this : this
 >insertEntryBefore : (entry: List<T>) => List<T>
 >entry : List<T>
         }

tests/baselines/reference/genericClasses4.types

@@ -26,7 +26,7 @@ class Vec2_T<A>
 >f(this.x) : B
 >f : (a: A) => B
 >this.x : A
->this : Vec2_T<A>
+>this : this
 >x : A
 
         var y:B = f(this.y);
@@ -35,7 +35,7 @@ class Vec2_T<A>
 >f(this.y) : B
 >f : (a: A) => B
 >this.y : A
->this : Vec2_T<A>
+>this : this
 >y : A
 
         var retval: Vec2_T<B> = new Vec2_T(x, y);
@@ -69,7 +69,7 @@ class Vec2_T<A>
 >f : Vec2_T<(a: A) => B>
 >x : (a: A) => B
 >this.x : A
->this : Vec2_T<A>
+>this : this
 >x : A
 
         var y:B = f.y(this.y);
@@ -80,7 +80,7 @@ class Vec2_T<A>
 >f : Vec2_T<(a: A) => B>
 >y : (a: A) => B
 >this.y : A
->this : Vec2_T<A>
+>this : this
 >y : A
 
         var retval: Vec2_T<B> = new Vec2_T(x, y);

tests/baselines/reference/genericClassesInModule2.types

@@ -10,10 +10,10 @@ export class A<T1>{
 >T1 : T1
 
         var child = new B(this);
->child : B<A<T1>>
->new B(this) : B<A<T1>>
+>child : B<this>
+>new B(this) : B<this>
 >B : typeof B
->this : A<T1>
+>this : this
     }
     AAA( callback: (self: A<T1>) => void) {
 >AAA : (callback: (self: A<T1>) => void) => void
@@ -23,10 +23,10 @@ export class A<T1>{
 >T1 : T1
 
         var child = new B(this);
->child : B<A<T1>>
->new B(this) : B<A<T1>>
+>child : B<this>
+>new B(this) : B<this>
 >B : typeof B
->this : A<T1>
+>this : this
     }
 }
 

tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types

@@ -37,7 +37,7 @@ module EndGate.Tweening {
             this._from = from.Clone();
 >this._from = from.Clone() : any
 >this._from : T
->this : Tween<T>
+>this : this
 >_from : T
 >from.Clone() : any
 >from.Clone : () => any

tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types

@@ -36,7 +36,7 @@ module EndGate.Tweening {
             this._from = from.Clone();
 >this._from = from.Clone() : any
 >this._from : T
->this : Tween<T>
+>this : this
 >_from : T
 >from.Clone() : any
 >from.Clone : () => any

tests/baselines/reference/genericInstanceOf.types

@@ -21,10 +21,10 @@ class C<T> {
         if (this.a instanceof this.b) {
 >this.a instanceof this.b : boolean
 >this.a : T
->this : C<T>
+>this : this
 >a : T
 >this.b : F
->this : C<T>
+>this : this
 >b : F
         }
     }

tests/baselines/reference/genericTypeWithCallableMembers.types

@@ -24,14 +24,14 @@ class C<T extends Constructable> {
 >x : Constructable
 >new this.data() : Constructable
 >this.data : T
->this : C<T>
+>this : this
 >data : T
 
         var x2 = new this.data2(); // was error, shouldn't be
 >x2 : Constructable
 >new this.data2() : Constructable
 >this.data2 : Constructable
->this : C<T>
+>this : this
 >data2 : Constructable
     }
 }

tests/baselines/reference/genericWithCallSignatures1.types

@@ -15,7 +15,7 @@ class MyClass {
 ><string> this.callableThing() : string
 >this.callableThing() : string
 >this.callableThing : CallableExtention<string>
->this : MyClass
+>this : this
 >callableThing : CallableExtention<string>
     }
 }

tests/baselines/reference/genericWithIndexerOfTypeParameterType1.types

@@ -15,7 +15,7 @@ class LazyArray<T> {
 
         return this.objects;
 >this.objects : { [objectId: string]: T; }
->this : LazyArray<T>
+>this : this
 >objects : { [objectId: string]: T; }
     }
 }

tests/baselines/reference/implicitAnyInCatch.types

@@ -23,7 +23,7 @@ class C {
 
         for (var x in this) {
 >x : any
->this : C
+>this : this
         }
     }
 }

tests/baselines/reference/indexersInClassType.types

@@ -16,10 +16,10 @@ class C {
     'a': {}
 
     fn() {
->fn : () => C
+>fn : () => this
 
         return this;
->this : C
+>this : this
     }
 }
 

tests/baselines/reference/inheritance1.errors.txt

@@ -7,9 +7,11 @@ tests/cases/compiler/inheritance1.ts(31,1): error TS2322: Type 'Control' is not
 tests/cases/compiler/inheritance1.ts(37,1): error TS2322: Type 'Control' is not assignable to type 'TextBox'.
   Property 'select' is missing in type 'Control'.
 tests/cases/compiler/inheritance1.ts(40,1): error TS2322: Type 'ImageBase' is not assignable to type 'SelectableControl'.
+  Property 'select' is missing in type 'ImageBase'.
 tests/cases/compiler/inheritance1.ts(46,1): error TS2322: Type 'Image1' is not assignable to type 'SelectableControl'.
   Property 'select' is missing in type 'Image1'.
 tests/cases/compiler/inheritance1.ts(52,1): error TS2322: Type 'Locations' is not assignable to type 'SelectableControl'.
+  Property 'state' is missing in type 'Locations'.
 tests/cases/compiler/inheritance1.ts(53,1): error TS2322: Type 'Locations' is not assignable to type 'Control'.
   Property 'state' is missing in type 'Locations'.
 tests/cases/compiler/inheritance1.ts(55,1): error TS2322: Type 'Control' is not assignable to type 'Locations'.
@@ -77,6 +79,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     sc = i;
     ~~
 !!! error TS2322: Type 'ImageBase' is not assignable to type 'SelectableControl'.
+!!! error TS2322:   Property 'select' is missing in type 'ImageBase'.
     c = i;
     i = sc;
     i = c;
@@ -94,6 +97,7 @@ tests/cases/compiler/inheritance1.ts(61,1): error TS2322: Type 'Control' is not
     sc = l;
     ~~
 !!! error TS2322: Type 'Locations' is not assignable to type 'SelectableControl'.
+!!! error TS2322:   Property 'state' is missing in type 'Locations'.
     c = l;
     ~
 !!! error TS2322: Type 'Locations' is not assignable to type 'Control'.

tests/baselines/reference/instanceAndStaticDeclarations1.symbols

@@ -18,18 +18,18 @@ class Point {
 >this.x : Symbol(x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
 >this : Symbol(Point, Decl(instanceAndStaticDeclarations1.ts, 0, 0))
 >x : Symbol(x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
->p.x : Symbol(x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
+>p.x : Symbol(Point.x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
 >p : Symbol(p, Decl(instanceAndStaticDeclarations1.ts, 4, 20))
->x : Symbol(x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
+>x : Symbol(Point.x, Decl(instanceAndStaticDeclarations1.ts, 3, 16))
 
         var dy = this.y - p.y;
 >dy : Symbol(dy, Decl(instanceAndStaticDeclarations1.ts, 6, 11))
 >this.y : Symbol(y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
 >this : Symbol(Point, Decl(instanceAndStaticDeclarations1.ts, 0, 0))
 >y : Symbol(y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
->p.y : Symbol(y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
+>p.y : Symbol(Point.y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
 >p : Symbol(p, Decl(instanceAndStaticDeclarations1.ts, 4, 20))
->y : Symbol(y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
+>y : Symbol(Point.y, Decl(instanceAndStaticDeclarations1.ts, 3, 33))
 
         return Math.sqrt(dx * dx + dy * dy);
 >Math.sqrt : Symbol(Math.sqrt, Decl(lib.d.ts, 620, 27))
@@ -50,8 +50,8 @@ class Point {
 >Point : Symbol(Point, Decl(instanceAndStaticDeclarations1.ts, 0, 0))
 >p2 : Symbol(p2, Decl(instanceAndStaticDeclarations1.ts, 10, 30))
 >Point : Symbol(Point, Decl(instanceAndStaticDeclarations1.ts, 0, 0))
->p1.distance : Symbol(distance, Decl(instanceAndStaticDeclarations1.ts, 3, 55))
+>p1.distance : Symbol(Point.distance, Decl(instanceAndStaticDeclarations1.ts, 3, 55))
 >p1 : Symbol(p1, Decl(instanceAndStaticDeclarations1.ts, 10, 20))
->distance : Symbol(distance, Decl(instanceAndStaticDeclarations1.ts, 3, 55))
+>distance : Symbol(Point.distance, Decl(instanceAndStaticDeclarations1.ts, 3, 55))
 >p2 : Symbol(p2, Decl(instanceAndStaticDeclarations1.ts, 10, 30))
 }

tests/baselines/reference/instanceAndStaticDeclarations1.types

@@ -17,7 +17,7 @@ class Point {
 >dx : number
 >this.x - p.x : number
 >this.x : number
->this : Point
+>this : this
 >x : number
 >p.x : number
 >p : Point
@@ -27,7 +27,7 @@ class Point {
 >dy : number
 >this.y - p.y : number
 >this.y : number
->this : Point
+>this : this
 >y : number
 >p.y : number
 >p : Point

tests/baselines/reference/interfaceContextualType.types

@@ -29,7 +29,7 @@ class Bug {
         this.values = {};
 >this.values = {} : { [x: string]: undefined; }
 >this.values : IMap
->this : Bug
+>this : this
 >values : IMap
 >{} : { [x: string]: undefined; }
 
@@ -37,7 +37,7 @@ class Bug {
 >this.values['comments'] = { italic: true } : { italic: boolean; }
 >this.values['comments'] : IOptions
 >this.values : IMap
->this : Bug
+>this : this
 >values : IMap
 >'comments' : string
 >{ italic: true } : { italic: boolean; }
@@ -50,7 +50,7 @@ class Bug {
         this.values = {
 >this.values = {            comments: { italic: true }        } : { [x: string]: { italic: boolean; }; comments: { italic: boolean; }; }
 >this.values : IMap
->this : Bug
+>this : this
 >values : IMap
 >{            comments: { italic: true }        } : { [x: string]: { italic: boolean; }; comments: { italic: boolean; }; }
 

tests/baselines/reference/iterableArrayPattern1.types

@@ -32,6 +32,6 @@ class SymbolIterator {
 >iterator : symbol
 
         return this;
->this : SymbolIterator
+>this : this
     }
 }

tests/baselines/reference/iterableArrayPattern11.types

@@ -48,6 +48,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/iterableArrayPattern12.types

@@ -48,6 +48,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/iterableArrayPattern13.types

@@ -46,6 +46,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/iterableArrayPattern2.types

@@ -32,6 +32,6 @@ class SymbolIterator {
 >iterator : symbol
 
         return this;
->this : SymbolIterator
+>this : this
     }
 }

tests/baselines/reference/iterableArrayPattern3.types

@@ -49,6 +49,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/iterableArrayPattern4.types

@@ -50,6 +50,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/iterableArrayPattern9.types

@@ -42,6 +42,6 @@ class FooIterator {
 >iterator : symbol
 
         return this;
->this : FooIterator
+>this : this
     }
 }

tests/baselines/reference/iteratorSpreadInArray.types

@@ -33,6 +33,6 @@ class SymbolIterator {
 >iterator : symbol
 
         return this;
->this : SymbolIterator
+>this : this
     }
 }

tests/baselines/reference/iteratorSpreadInArray2.types

@@ -36,7 +36,7 @@ class SymbolIterator {
 >iterator : symbol
 
         return this;
->this : SymbolIterator
+>this : this
     }
 }
 
@@ -66,6 +66,6 @@ class NumberIterator {
 >iterator : symbol
 
         return this;
->this : NumberIterator
+>this : this
     }
 }

tests/baselines/reference/iteratorSpreadInArray3.types

@@ -37,6 +37,6 @@ class SymbolIterator {
 >iterator : symbol
 
         return this;
->this : SymbolIterator
+>this : this
     }
 }

tests/baselines/reference/iteratorSpreadInArray4.types

@@ -35,6 +35,6 @@ class SymbolIterator {
 >iterator : symbol
 
         return this;
->this : SymbolIterator
+>this : this
     }
 }

tests/baselines/reference/iteratorSpreadInArray7.types

@@ -39,6 +39,6 @@ class SymbolIterator {
 >iterator : symbol
 
         return this;
->this : SymbolIterator
+>this : this
     }
 }