Skip to content

Commit 27bf9b7

Browse files
committed
Accept type baselines
1 parent 91c1a81 commit 27bf9b7

File tree

1,702 files changed

+143213
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,702 files changed

+143213
-0
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
=== tests/cases/compiler/2dArrays.ts ===
2+
class Cell {
3+
>Cell : Cell
4+
}
5+
6+
class Ship {
7+
>Ship : Ship
8+
9+
isSunk: boolean;
10+
>isSunk : boolean
11+
}
12+
13+
class Board {
14+
>Board : Board
15+
16+
ships: Ship[];
17+
>ships : Ship[]
18+
>Ship : Ship
19+
20+
cells: Cell[];
21+
>cells : Cell[]
22+
>Cell : Cell
23+
24+
private allShipsSunk() {
25+
>allShipsSunk : () => boolean
26+
27+
return this.ships.every(function (val) { return val.isSunk; });
28+
>this.ships.every(function (val) { return val.isSunk; }) : boolean
29+
>this.ships.every : (callbackfn: (value: Ship, index: number, array: Ship[]) => boolean, thisArg?: any) => boolean
30+
>this.ships : Ship[]
31+
>this : Board
32+
>ships : Ship[]
33+
>every : (callbackfn: (value: Ship, index: number, array: Ship[]) => boolean, thisArg?: any) => boolean
34+
>function (val) { return val.isSunk; } : (val: Ship) => boolean
35+
>val : Ship
36+
>val.isSunk : boolean
37+
>val : Ship
38+
>isSunk : boolean
39+
}
40+
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
=== tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
2+
declare module Point {
3+
>Point : typeof Point
4+
5+
export var Origin: { x: number; y: number; }
6+
>Origin : { x: number; y: number; }
7+
>x : number
8+
>y : number
9+
}
10+
11+
=== tests/cases/conformance/internalModules/DeclarationMerging/function.d.ts ===
12+
declare function Point(): { x: number; y: number; }
13+
>Point : typeof Point
14+
>x : number
15+
>y : number
16+
17+
=== tests/cases/conformance/internalModules/DeclarationMerging/test.ts ===
18+
var cl: { x: number; y: number; }
19+
>cl : { x: number; y: number; }
20+
>x : number
21+
>y : number
22+
23+
var cl = Point();
24+
>cl : { x: number; y: number; }
25+
>Point() : { x: number; y: number; }
26+
>Point : typeof Point
27+
28+
var cl = Point.Origin;
29+
>cl : { x: number; y: number; }
30+
>Point.Origin : { x: number; y: number; }
31+
>Point : typeof Point
32+
>Origin : { x: number; y: number; }
33+
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
=== tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
2+
declare module A {
3+
>A : typeof A
4+
5+
export module Point {
6+
>Point : typeof Point
7+
8+
export var Origin: {
9+
>Origin : { x: number; y: number; }
10+
11+
x: number;
12+
>x : number
13+
14+
y: number;
15+
>y : number
16+
}
17+
}
18+
}
19+
20+
=== tests/cases/conformance/internalModules/DeclarationMerging/class.d.ts ===
21+
declare module A {
22+
>A : typeof A
23+
24+
export class Point {
25+
>Point : Point
26+
27+
constructor(x: number, y: number);
28+
>x : number
29+
>y : number
30+
31+
x: number;
32+
>x : number
33+
34+
y: number;
35+
>y : number
36+
}
37+
}
38+
39+
=== tests/cases/conformance/internalModules/DeclarationMerging/test.ts ===
40+
var p: { x: number; y: number; }
41+
>p : { x: number; y: number; }
42+
>x : number
43+
>y : number
44+
45+
var p = A.Point.Origin;
46+
>p : { x: number; y: number; }
47+
>A.Point.Origin : { x: number; y: number; }
48+
>A.Point : typeof Point
49+
>A : typeof A
50+
>Point : typeof Point
51+
>Origin : { x: number; y: number; }
52+
53+
var p = new A.Point(0, 0); // unexpected error here, bug 840000
54+
>p : { x: number; y: number; }
55+
>new A.Point(0, 0) : Point
56+
>A.Point : typeof Point
57+
>A : typeof A
58+
>Point : typeof Point
59+
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
=== tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
2+
declare module A {
3+
>A : typeof A
4+
5+
export module Point {
6+
>Point : typeof Point
7+
8+
export var Origin: {
9+
>Origin : { x: number; y: number; }
10+
11+
x: number;
12+
>x : number
13+
14+
y: number;
15+
>y : number
16+
}
17+
}
18+
}
19+
20+
=== tests/cases/conformance/internalModules/DeclarationMerging/classPoint.ts ===
21+
module A {
22+
>A : typeof A
23+
24+
export class Point {
25+
>Point : Point
26+
27+
constructor(public x: number, public y: number) { }
28+
>x : number
29+
>y : number
30+
}
31+
}
32+
33+
=== tests/cases/conformance/internalModules/DeclarationMerging/test.ts ===
34+
var p: { x: number; y: number; }
35+
>p : { x: number; y: number; }
36+
>x : number
37+
>y : number
38+
39+
var p = A.Point.Origin;
40+
>p : { x: number; y: number; }
41+
>A.Point.Origin : { x: number; y: number; }
42+
>A.Point : typeof Point
43+
>A : typeof A
44+
>Point : typeof Point
45+
>Origin : { x: number; y: number; }
46+
47+
var p = new A.Point(0, 0); // unexpected error here, bug 840000
48+
>p : { x: number; y: number; }
49+
>new A.Point(0, 0) : Point
50+
>A.Point : typeof Point
51+
>A : typeof A
52+
>Point : typeof Point
53+
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
=== tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
2+
declare module Point {
3+
>Point : typeof Point
4+
5+
export var Origin: { x: number; y: number; }
6+
>Origin : { x: number; y: number; }
7+
>x : number
8+
>y : number
9+
}
10+
11+
=== tests/cases/conformance/internalModules/DeclarationMerging/function.ts ===
12+
function Point() {
13+
>Point : typeof Point
14+
15+
return { x: 0, y: 0 };
16+
>{ x: 0, y: 0 } : { x: number; y: number; }
17+
>x : number
18+
>y : number
19+
}
20+
21+
=== tests/cases/conformance/internalModules/DeclarationMerging/test.ts ===
22+
var cl: { x: number; y: number; }
23+
>cl : { x: number; y: number; }
24+
>x : number
25+
>y : number
26+
27+
var cl = Point();
28+
>cl : { x: number; y: number; }
29+
>Point() : { x: number; y: number; }
30+
>Point : typeof Point
31+
32+
var cl = Point.Origin;
33+
>cl : { x: number; y: number; }
34+
>Point.Origin : { x: number; y: number; }
35+
>Point : typeof Point
36+
>Origin : { x: number; y: number; }
37+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
=== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.ts ===
2+
class Point {
3+
>Point : Point
4+
5+
constructor(public x: number, public y: number) { }
6+
>x : number
7+
>y : number
8+
9+
static Origin(): Point { return { x: 0, y: 0 }; }
10+
>Origin : () => Point
11+
>Point : Point
12+
>{ x: 0, y: 0 } : { x: number; y: number; }
13+
>x : number
14+
>y : number
15+
}
16+
17+
module Point {
18+
>Point : typeof Point
19+
20+
function Origin() { return ""; }// not an error, since not exported
21+
>Origin : () => string
22+
}
23+
24+
25+
module A {
26+
>A : typeof A
27+
28+
export class Point {
29+
>Point : Point
30+
31+
constructor(public x: number, public y: number) { }
32+
>x : number
33+
>y : number
34+
35+
static Origin(): Point { return { x: 0, y: 0 }; }
36+
>Origin : () => Point
37+
>Point : Point
38+
>{ x: 0, y: 0 } : { x: number; y: number; }
39+
>x : number
40+
>y : number
41+
}
42+
43+
export module Point {
44+
>Point : typeof Point
45+
46+
function Origin() { return ""; }// not an error since not exported
47+
>Origin : () => string
48+
}
49+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
=== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.ts ===
2+
class Point {
3+
>Point : Point
4+
5+
constructor(public x: number, public y: number) { }
6+
>x : number
7+
>y : number
8+
9+
static Origin: Point = { x: 0, y: 0 };
10+
>Origin : Point
11+
>Point : Point
12+
>{ x: 0, y: 0 } : { x: number; y: number; }
13+
>x : number
14+
>y : number
15+
}
16+
17+
module Point {
18+
>Point : typeof Point
19+
20+
var Origin = ""; // not an error, since not exported
21+
>Origin : string
22+
}
23+
24+
25+
module A {
26+
>A : typeof A
27+
28+
export class Point {
29+
>Point : Point
30+
31+
constructor(public x: number, public y: number) { }
32+
>x : number
33+
>y : number
34+
35+
static Origin: Point = { x: 0, y: 0 };
36+
>Origin : Point
37+
>Point : Point
38+
>{ x: 0, y: 0 } : { x: number; y: number; }
39+
>x : number
40+
>y : number
41+
}
42+
43+
export module Point {
44+
>Point : typeof Point
45+
46+
var Origin = ""; // not an error since not exported
47+
>Origin : string
48+
}
49+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
=== tests/cases/conformance/internalModules/DeclarationMerging/ClassAndModuleThatMergeWithStringIndexerAndExportedFunctionWithTypeIncompatibleWithIndexer.ts ===
2+
3+
No type information for this code.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
=== tests/cases/conformance/internalModules/DeclarationMerging/EnumAndModuleWithSameNameAndCommonRoot.ts ===
2+
enum enumdule {
3+
>enumdule : enumdule
4+
5+
Red, Blue
6+
>Red : enumdule
7+
>Blue : enumdule
8+
}
9+
10+
module enumdule {
11+
>enumdule : typeof enumdule
12+
13+
export class Point {
14+
>Point : Point
15+
16+
constructor(public x: number, public y: number) { }
17+
>x : number
18+
>y : number
19+
}
20+
}
21+
22+
var x: enumdule;
23+
>x : enumdule
24+
>enumdule : enumdule
25+
26+
var x = enumdule.Red;
27+
>x : enumdule
28+
>enumdule.Red : enumdule
29+
>enumdule : typeof enumdule
30+
>Red : enumdule
31+
32+
var y: { x: number; y: number };
33+
>y : { x: number; y: number; }
34+
>x : number
35+
>y : number
36+
37+
var y = new enumdule.Point(0, 0);
38+
>y : { x: number; y: number; }
39+
>new enumdule.Point(0, 0) : Point
40+
>enumdule.Point : typeof Point
41+
>enumdule : typeof enumdule
42+
>Point : typeof Point
43+

0 commit comments

Comments
 (0)