Skip to content

Commit f72ceab

Browse files
committed
Accept recent changes in typeWriter baselines
1 parent 27bf9b7 commit f72ceab

23 files changed

+1185
-1852
lines changed

tests/baselines/reference/aliasInaccessibleModule.types

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/baselines/reference/aliasInaccessibleModule2.types

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
=== tests/cases/compiler/aliasUsage1_main.ts ===
2+
import Backbone = require("aliasUsage1_backbone");
3+
>Backbone : typeof "tests/cases/compiler/aliasUsage1_backbone"
4+
5+
import moduleA = require("aliasUsage1_moduleA");
6+
>moduleA : typeof "tests/cases/compiler/aliasUsage1_moduleA"
7+
8+
interface IHasVisualizationModel {
9+
>IHasVisualizationModel : IHasVisualizationModel
10+
11+
VisualizationModel: typeof Backbone.Model;
12+
>VisualizationModel : typeof Model
13+
>Backbone : typeof "tests/cases/compiler/aliasUsage1_backbone"
14+
>Model : typeof Model
15+
}
16+
class C2 {
17+
>C2 : C2
18+
19+
x: IHasVisualizationModel;
20+
>x : IHasVisualizationModel
21+
>IHasVisualizationModel : IHasVisualizationModel
22+
23+
get A() {
24+
>A : IHasVisualizationModel
25+
26+
return this.x;
27+
>this.x : IHasVisualizationModel
28+
>this : C2
29+
>x : IHasVisualizationModel
30+
}
31+
set A(x) {
32+
>A : IHasVisualizationModel
33+
>x : IHasVisualizationModel
34+
35+
x = moduleA;
36+
>x = moduleA : typeof "tests/cases/compiler/aliasUsage1_moduleA"
37+
>x : IHasVisualizationModel
38+
>moduleA : typeof "tests/cases/compiler/aliasUsage1_moduleA"
39+
}
40+
}
41+
=== tests/cases/compiler/aliasUsage1_backbone.ts ===
42+
export class Model {
43+
>Model : Model
44+
45+
public someData: string;
46+
>someData : string
47+
}
48+
49+
=== tests/cases/compiler/aliasUsage1_moduleA.ts ===
50+
import Backbone = require("aliasUsage1_backbone");
51+
>Backbone : typeof "tests/cases/compiler/aliasUsage1_backbone"
52+
53+
export class VisualizationModel extends Backbone.Model {
54+
>VisualizationModel : VisualizationModel
55+
>Backbone : Backbone
56+
>Model : Model
57+
58+
// interesting stuff here
59+
}
60+
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
=== tests/cases/compiler/declFileImportChainInExportAssignment.ts ===
2+
module m {
3+
>m : typeof m
4+
5+
export module c {
6+
>c : typeof c
7+
8+
export class c {
9+
>c : c
10+
}
11+
}
12+
}
13+
import a = m.c;
14+
>a : typeof c
15+
>m : typeof c
16+
>c : typeof c
17+
18+
import b = a;
19+
>b : typeof c
20+
>a : typeof c
21+
22+
export = b;
23+
>b : typeof c
24+

tests/baselines/reference/declInput-2.types

Lines changed: 0 additions & 74 deletions
This file was deleted.

tests/baselines/reference/declarationEmit_nameConflicts.types

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ export module M.P {
6565
>P : () => void
6666
>f : () => void
6767

68-
// Bug 887180: Invalid .d.ts when an aliased entity is referenced, and a different entity is closer in scope
6968
export var a = M.a; // emitted incorrectly as typeof f
7069
>a : () => void
7170
>M.a : () => void

tests/baselines/reference/declarationEmit_nameConflicts2.types

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ module X.Y.base.Z {
2626
>base : typeof base
2727
>Z : typeof Z
2828

29-
// Bug 887180
3029
export var f = X.Y.base.f; // Should be base.f
3130
>f : () => void
3231
>X.Y.base.f : () => void

tests/baselines/reference/declarationEmit_nameConflicts3.types

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ module M.P {
4545
f
4646
>f : D
4747
}
48-
// Bug 887180
4948
export var v: M.D; // ok
5049
>v : D
5150
>M : M

tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
=== tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts ===
2-
// Bug 887180
32
export module C { export interface I { } }
43
>C : C
54
>I : I
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/compiler/functionExpressionReturningItself.ts ===
22
var x = function somefn() { return somefn; };
3-
>x : () => typeof somefn
4-
>function somefn() { return somefn; } : () => typeof somefn
5-
>somefn : () => typeof somefn
6-
>somefn : () => typeof somefn
3+
>x : () => any
4+
>function somefn() { return somefn; } : () => any
5+
>somefn : () => any
6+
>somefn : () => any
77

0 commit comments

Comments
 (0)