Skip to content

Commit be0fc3b

Browse files
committed
Accept new baselines
1 parent 1f1af27 commit be0fc3b

File tree

2 files changed

+46
-7
lines changed

2 files changed

+46
-7
lines changed

tests/baselines/reference/enumErrors.errors.txt

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@ tests/cases/conformance/enums/enumErrors.ts(3,6): error TS2431: Enum name cannot
33
tests/cases/conformance/enums/enumErrors.ts(4,6): error TS2431: Enum name cannot be 'string'.
44
tests/cases/conformance/enums/enumErrors.ts(5,6): error TS2431: Enum name cannot be 'boolean'.
55
tests/cases/conformance/enums/enumErrors.ts(9,9): error TS2322: Type 'Number' is not assignable to type 'E5'.
6-
tests/cases/conformance/enums/enumErrors.ts(26,9): error TS2322: Type '""' is not assignable to type 'E11'.
6+
tests/cases/conformance/enums/enumErrors.ts(26,9): error TS2322: Type 'true' is not assignable to type 'E11'.
77
tests/cases/conformance/enums/enumErrors.ts(27,9): error TS2322: Type 'Date' is not assignable to type 'E11'.
88
tests/cases/conformance/enums/enumErrors.ts(28,9): error TS2304: Cannot find name 'window'.
99
tests/cases/conformance/enums/enumErrors.ts(29,9): error TS2322: Type '{}' is not assignable to type 'E11'.
10+
tests/cases/conformance/enums/enumErrors.ts(35,9): error TS2551: Computed values are not permitted in an enum with string valued members.
11+
tests/cases/conformance/enums/enumErrors.ts(36,9): error TS2551: Computed values are not permitted in an enum with string valued members.
12+
tests/cases/conformance/enums/enumErrors.ts(37,9): error TS2551: Computed values are not permitted in an enum with string valued members.
13+
tests/cases/conformance/enums/enumErrors.ts(38,9): error TS2551: Computed values are not permitted in an enum with string valued members.
1014

1115

12-
==== tests/cases/conformance/enums/enumErrors.ts (9 errors) ====
16+
==== tests/cases/conformance/enums/enumErrors.ts (13 errors) ====
1317
// Enum named with PredefinedTypes
1418
enum any { }
1519
~~~
@@ -45,9 +49,9 @@ tests/cases/conformance/enums/enumErrors.ts(29,9): error TS2322: Type '{}' is no
4549

4650
// Enum with computed member intializer of other types
4751
enum E11 {
48-
A = '',
49-
~~
50-
!!! error TS2322: Type '""' is not assignable to type 'E11'.
52+
A = true,
53+
~~~~
54+
!!! error TS2322: Type 'true' is not assignable to type 'E11'.
5155
B = new Date(),
5256
~~~~~~~~~~
5357
!!! error TS2322: Type 'Date' is not assignable to type 'E11'.
@@ -58,4 +62,21 @@ tests/cases/conformance/enums/enumErrors.ts(29,9): error TS2322: Type '{}' is no
5862
~~
5963
!!! error TS2322: Type '{}' is not assignable to type 'E11'.
6064
}
65+
66+
// Enum with string valued member and computed member initializers
67+
enum E12 {
68+
A = '',
69+
B = new Date(),
70+
~~~~~~~~~~
71+
!!! error TS2551: Computed values are not permitted in an enum with string valued members.
72+
C = window,
73+
~~~~~~
74+
!!! error TS2551: Computed values are not permitted in an enum with string valued members.
75+
D = {},
76+
~~
77+
!!! error TS2551: Computed values are not permitted in an enum with string valued members.
78+
E = 1 + 1,
79+
~~~~~
80+
!!! error TS2551: Computed values are not permitted in an enum with string valued members.
81+
}
6182

tests/baselines/reference/enumErrors.js

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,20 @@ enum E10 {
2424

2525
// Enum with computed member intializer of other types
2626
enum E11 {
27-
A = '',
27+
A = true,
2828
B = new Date(),
2929
C = window,
3030
D = {}
3131
}
32+
33+
// Enum with string valued member and computed member initializers
34+
enum E12 {
35+
A = '',
36+
B = new Date(),
37+
C = window,
38+
D = {},
39+
E = 1 + 1,
40+
}
3241

3342

3443
//// [enumErrors.js]
@@ -65,8 +74,17 @@ var E10;
6574
// Enum with computed member intializer of other types
6675
var E11;
6776
(function (E11) {
68-
E11[E11["A"] = ''] = "A";
77+
E11[E11["A"] = true] = "A";
6978
E11[E11["B"] = new Date()] = "B";
7079
E11[E11["C"] = window] = "C";
7180
E11[E11["D"] = {}] = "D";
7281
})(E11 || (E11 = {}));
82+
// Enum with string valued member and computed member initializers
83+
var E12;
84+
(function (E12) {
85+
E12["A"] = "";
86+
E12[E12["B"] = 0] = "B";
87+
E12[E12["C"] = 0] = "C";
88+
E12[E12["D"] = 0] = "D";
89+
E12[E12["E"] = 0] = "E";
90+
})(E12 || (E12 = {}));

0 commit comments

Comments
 (0)