Skip to content

Commit

Permalink
Accept new baselines
Browse files Browse the repository at this point in the history
  • Loading branch information
ahejlsberg committed Apr 14, 2020
1 parent 6e0274a commit df98d9c
Show file tree
Hide file tree
Showing 15 changed files with 56 additions and 51 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ function Person(name) {

this.name = name;
>this.name = name : string
>this.name : string
>this.name : any
>this : this
>name : string
>name : any
>name : string
}
Person.prototype.describe = function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ function Wagon(numberOxen) {

this.numberOxen = numberOxen
>this.numberOxen = numberOxen : number
>this.numberOxen : number
>this.numberOxen : any
>this : this
>numberOxen : number
>numberOxen : any
>numberOxen : number
}
/** @param {Wagon[]=} wagons */
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/constructorFunctions.types
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ function C6() {

this.functions = [x => x, x => x + 1, x => x - 1]
>this.functions = [x => x, x => x + 1, x => x - 1] : ((x: any) => any)[]
>this.functions : ((x: any) => any)[]
>this.functions : any
>this : this
>functions : ((x: any) => any)[]
>functions : any
>[x => x, x => x + 1, x => x - 1] : ((x: any) => any)[]
>x => x : (x: any) => any
>x : any
Expand Down
8 changes: 4 additions & 4 deletions tests/baselines/reference/constructorFunctionsStrict.types
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ var j = new A(2)

k.x === j.x
>k.x === j.x : boolean
>k.x : number
>k.x : number | undefined
>k : A
>x : number
>j.x : number
>x : number | undefined
>j.x : number | undefined
>j : A
>x : number
>x : number | undefined

Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ module.exports.MyClass = function() {

this.x = 1
>this.x = 1 : 1
>this.x : number
>this.x : any
>this : this
>x : number
>x : any
>1 : 1
}
module.exports.MyClass.prototype = {
Expand Down
8 changes: 4 additions & 4 deletions tests/baselines/reference/jsdocFunctionType.types
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ function D(n) {

this.length = n;
>this.length = n : number
>this.length : number
>this.length : any
>this : this
>length : number
>length : any
>n : number
}

Expand Down Expand Up @@ -151,9 +151,9 @@ var E = function(n) {

this.not_length_on_purpose = n;
>this.not_length_on_purpose = n : number
>this.not_length_on_purpose : number
>this.not_length_on_purpose : any
>this : this
>not_length_on_purpose : number
>not_length_on_purpose : any
>n : number

};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,16 @@ function Cp(t) {

this.x = 1
>this.x = 1 : 1
>this.x : number
>this.x : any
>this : this
>x : number
>x : any
>1 : 1

this.y = t
>this.y = t : T
>this.y : T
>this.y : any
>this : this
>y : T
>y : any
>t : T
}
Cp.prototype = {
Expand Down
6 changes: 3 additions & 3 deletions tests/baselines/reference/thisPropertyAssignment.types
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ function F() {

this.a = {};
>this.a = {} : {}
>this.a : {}
>this.a : any
>this : this
>a : {}
>a : any
>{} : {}

this.a.b = {};
Expand All @@ -60,7 +60,7 @@ function F() {

this["b"] = {};
>this["b"] = {} : {}
>this["b"] : {}
>this["b"] : any
>this : this
>"b" : "b"
>{} : {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ function C() {
>this.x : Symbol(C.x, Decl(thisPropertyAssignmentCircular.js, 13, 14), Decl(thisPropertyAssignmentCircular.js, 14, 15))
>this : Symbol(C, Decl(thisPropertyAssignmentCircular.js, 10, 1))
>x : Symbol(C.x, Decl(thisPropertyAssignmentCircular.js, 13, 14), Decl(thisPropertyAssignmentCircular.js, 14, 15))
>this.x.toString : Symbol(Function.toString, Decl(lib.es5.d.ts, --, --))
>this.x : Symbol(C.x, Decl(thisPropertyAssignmentCircular.js, 13, 14), Decl(thisPropertyAssignmentCircular.js, 14, 15))
>this : Symbol(C, Decl(thisPropertyAssignmentCircular.js, 10, 1))
>x : Symbol(C.x, Decl(thisPropertyAssignmentCircular.js, 13, 14), Decl(thisPropertyAssignmentCircular.js, 14, 15))
>toString : Symbol(Function.toString, Decl(lib.es5.d.ts, --, --))
}

10 changes: 5 additions & 5 deletions tests/baselines/reference/thisPropertyAssignmentCircular.types
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ function C() {
>this : this
>x : any
>function() { this.x.toString(); } : () => void
>this.x.toString() : any
>this.x.toString : any
>this.x : any
>this.x.toString() : string
>this.x.toString : () => string
>this.x : () => void
>this : this
>x : any
>toString : any
>x : () => void
>toString : () => string
}

12 changes: 6 additions & 6 deletions tests/baselines/reference/thisTypeOfConstructorFunctions.types
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ function Cp(t) {

this.y = t
>this.y = t : T
>this.y : T
>this.y : any
>this : this
>y : T
>y : any
>t : T

/** @return {this} */
this.m3 = () => this
>this.m3 = () => this : () => this
>this.m3 : () => this
>this.m3 : any
>this : this
>m3 : () => this
>m3 : any
>() => this : () => this
>this : this
}
Expand Down Expand Up @@ -67,9 +67,9 @@ function Cpp(t) {

this.y = t
>this.y = t : T
>this.y : T
>this.y : any
>this : this
>y : T
>y : any
>t : T
}
/** @return {this} */
Expand Down
13 changes: 8 additions & 5 deletions tests/baselines/reference/typeFromJSConstructor.errors.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
tests/cases/conformance/salsa/a.js(10,5): error TS7008: Member 'twices' implicitly has an 'any[]' type.
tests/cases/conformance/salsa/a.js(14,5): error TS2322: Type '"hi"' is not assignable to type 'number'.
tests/cases/conformance/salsa/a.js(17,5): error TS2322: Type 'undefined' is not assignable to type 'string'.
tests/cases/conformance/salsa/a.js(21,5): error TS2322: Type 'false' is not assignable to type 'number'.
tests/cases/conformance/salsa/a.js(24,5): error TS2322: Type 'null' is not assignable to type 'string | undefined'.
tests/cases/conformance/salsa/a.js(25,5): error TS2322: Type 'false' is not assignable to type 'string | undefined'.
tests/cases/conformance/salsa/a.js(24,5): error TS2322: Type 'null' is not assignable to type 'string'.
tests/cases/conformance/salsa/a.js(25,5): error TS2322: Type 'false' is not assignable to type 'string'.
tests/cases/conformance/salsa/a.js(26,5): error TS2531: Object is possibly 'null'.


==== tests/cases/conformance/salsa/a.js (6 errors) ====
==== tests/cases/conformance/salsa/a.js (7 errors) ====
function Installer () {
// arg: number
this.arg = 0
Expand All @@ -28,6 +29,8 @@ tests/cases/conformance/salsa/a.js(26,5): error TS2531: Object is possibly 'null
this.unknown = 'hi' // ok
this.newProperty = 1 // ok: number | boolean
this.twice = undefined // ok
~~~~~~~~~~
!!! error TS2322: Type 'undefined' is not assignable to type 'string'.
this.twice = 'hi' // ok
}
Installer.prototype.second = function () {
Expand All @@ -38,10 +41,10 @@ tests/cases/conformance/salsa/a.js(26,5): error TS2531: Object is possibly 'null
this.newProperty = false // ok
this.twice = null // error
~~~~~~~~~~
!!! error TS2322: Type 'null' is not assignable to type 'string | undefined'.
!!! error TS2322: Type 'null' is not assignable to type 'string'.
this.twice = false // error
~~~~~~~~~~
!!! error TS2322: Type 'false' is not assignable to type 'string | undefined'.
!!! error TS2322: Type 'false' is not assignable to type 'string'.
this.twices.push(1) // error: Object is possibly null
~~~~~~~~~~~
!!! error TS2531: Object is possibly 'null'.
Expand Down
16 changes: 8 additions & 8 deletions tests/baselines/reference/typeFromJSConstructor.types
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ Installer.prototype.first = function () {

this.twice = undefined // ok
>this.twice = undefined : undefined
>this.twice : string | undefined
>this.twice : string
>this : this
>twice : string | undefined
>twice : string
>undefined : undefined

this.twice = 'hi' // ok
>this.twice = 'hi' : "hi"
>this.twice : string | undefined
>this.twice : string
>this : this
>twice : string | undefined
>twice : string
>'hi' : "hi"
}
Installer.prototype.second = function () {
Expand Down Expand Up @@ -124,16 +124,16 @@ Installer.prototype.second = function () {

this.twice = null // error
>this.twice = null : null
>this.twice : string | undefined
>this.twice : string
>this : this
>twice : string | undefined
>twice : string
>null : null

this.twice = false // error
>this.twice = false : false
>this.twice : string | undefined
>this.twice : string
>this : this
>twice : string | undefined
>twice : string
>false : false

this.twices.push(1) // error: Object is possibly null
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/typeFromPrototypeAssignment.types
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ var Multimap = function() {

this._map = {};
>this._map = {} : {}
>this._map : {}
>this._map : any
>this : this
>_map : {}
>_map : any
>{} : {}

this._map
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/typeFromPrototypeAssignment2.types
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

this._map = {};
>this._map = {} : {}
>this._map : {}
>this._map : any
>this : this
>_map : {}
>_map : any
>{} : {}

this._map
Expand Down

0 comments on commit df98d9c

Please sign in to comment.