Skip to content

Commit 41e7790

Browse files
DanielRosenwasserDanielRosenwasser
committed
Accepted baselines.
1 parent 35f3b9f commit 41e7790

File tree

2 files changed

+41
-6
lines changed

2 files changed

+41
-6
lines changed

‎tests/baselines/reference/enumAssignmentCompat3.errors.txt

+20-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
enumAssignmentCompat3.ts(68,1): error TS2322: Type 'Abcd.E' is not assignable to type 'First.E'.
22
Property 'd' is missing in type 'First.E'.
33
enumAssignmentCompat3.ts(70,1): error TS2322: Type 'Cd.E' is not assignable to type 'First.E'.
4-
Property 'd' is missing in type 'First.E'.
4+
The values of 'E.c' differ in their declarations, where '2' was expected but '0' was given.
55
enumAssignmentCompat3.ts(71,1): error TS2322: Type 'Nope' is not assignable to type 'E'.
6+
enumAssignmentCompat3.ts(72,1): error TS2322: Type 'Decl.E' is not assignable to type 'First.E'.
7+
The values of 'E.c' differ in their declarations, where '2' was expected but '3' was given.
68
enumAssignmentCompat3.ts(75,1): error TS2322: Type 'First.E' is not assignable to type 'Ab.E'.
79
Property 'c' is missing in type 'Ab.E'.
810
enumAssignmentCompat3.ts(76,1): error TS2322: Type 'First.E' is not assignable to type 'Cd.E'.
911
Property 'a' is missing in type 'Cd.E'.
1012
enumAssignmentCompat3.ts(77,1): error TS2322: Type 'E' is not assignable to type 'Nope'.
13+
enumAssignmentCompat3.ts(78,1): error TS2322: Type 'First.E' is not assignable to type 'Decl.E'.
14+
The values of 'E.c' differ in their declarations, where '3' was expected but '2' was given.
1115
enumAssignmentCompat3.ts(82,1): error TS2322: Type 'Const.E' is not assignable to type 'First.E'.
1216
enumAssignmentCompat3.ts(83,1): error TS2322: Type 'First.E' is not assignable to type 'Const.E'.
1317
enumAssignmentCompat3.ts(86,1): error TS2322: Type 'Merged.E' is not assignable to type 'First.E'.
14-
Property 'd' is missing in type 'First.E'.
18+
The values of 'E.c' differ in their declarations, where '2' was expected but '3' was given.
19+
enumAssignmentCompat3.ts(87,1): error TS2322: Type 'First.E' is not assignable to type 'Merged.E'.
20+
The values of 'E.c' differ in their declarations, where '3' was expected but '2' was given.
1521

1622

17-
==== enumAssignmentCompat3.ts (9 errors) ====
23+
==== enumAssignmentCompat3.ts (12 errors) ====
1824
namespace First {
1925
export enum E {
2026
a, b, c,
@@ -90,11 +96,14 @@ enumAssignmentCompat3.ts(86,1): error TS2322: Type 'Merged.E' is not assignable
9096
abc = secondCd; // missing 'd'
9197
~~~
9298
!!! error TS2322: Type 'Cd.E' is not assignable to type 'First.E'.
93-
!!! error TS2322: Property 'd' is missing in type 'First.E'.
99+
!!! error TS2322: The values of 'E.c' differ in their declarations, where '2' was expected but '0' was given.
94100
abc = nope; // nope!
95101
~~~
96102
!!! error TS2322: Type 'Nope' is not assignable to type 'E'.
97103
abc = decl; // ok
104+
~~~
105+
!!! error TS2322: Type 'Decl.E' is not assignable to type 'First.E'.
106+
!!! error TS2322: The values of 'E.c' differ in their declarations, where '2' was expected but '3' was given.
98107
secondAbc = abc; // ok
99108
secondAbcd = abc; // ok
100109
secondAb = abc; // missing 'c'
@@ -109,6 +118,9 @@ enumAssignmentCompat3.ts(86,1): error TS2322: Type 'Merged.E' is not assignable
109118
~~~~
110119
!!! error TS2322: Type 'E' is not assignable to type 'Nope'.
111120
decl = abc; // ok
121+
~~~~
122+
!!! error TS2322: Type 'First.E' is not assignable to type 'Decl.E'.
123+
!!! error TS2322: The values of 'E.c' differ in their declarations, where '3' was expected but '2' was given.
112124

113125
// const is only assignable to itself
114126
k = k;
@@ -123,7 +135,10 @@ enumAssignmentCompat3.ts(86,1): error TS2322: Type 'Merged.E' is not assignable
123135
abc = merged; // missing 'd'
124136
~~~
125137
!!! error TS2322: Type 'Merged.E' is not assignable to type 'First.E'.
126-
!!! error TS2322: Property 'd' is missing in type 'First.E'.
138+
!!! error TS2322: The values of 'E.c' differ in their declarations, where '2' was expected but '3' was given.
127139
merged = abc; // ok
140+
~~~~~~
141+
!!! error TS2322: Type 'First.E' is not assignable to type 'Merged.E'.
142+
!!! error TS2322: The values of 'E.c' differ in their declarations, where '3' was expected but '2' was given.
128143
abc = merged2; // ok
129144
merged2 = abc; // ok

‎tests/baselines/reference/enumAssignmentCompat6.errors.txt

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1+
f.ts(28,5): error TS2322: Type 'b.DiagnosticCategory' is not assignable to type 'a.DiagnosticCategory'.
2+
The values of 'DiagnosticCategory.Warning' differ in their declarations, where '0' was expected but '"Warning"' was given.
3+
f.ts(29,5): error TS2322: Type 'a.DiagnosticCategory' is not assignable to type 'b.DiagnosticCategory'.
4+
The values of 'DiagnosticCategory.Warning' differ in their declarations, where '"Warning"' was expected but '0' was given.
15
f.ts(33,5): error TS2322: Type 'DiagnosticCategory' is not assignable to type 'DiagnosticCategory2'.
26
f.ts(34,5): error TS2322: Type 'DiagnosticCategory2' is not assignable to type 'DiagnosticCategory'.
37
f.ts(54,14): error TS1252: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Modules are automatically in strict mode.
8+
f.ts(55,9): error TS2322: Type 'DiagnosticCategory' is not assignable to type 'import("f").DiagnosticCategory'.
9+
The values of 'DiagnosticCategory.Warning' differ in their declarations, where '0' was expected but '"Warning"' was given.
10+
f.ts(56,9): error TS2322: Type 'import("f").DiagnosticCategory' is not assignable to type 'DiagnosticCategory'.
11+
The values of 'DiagnosticCategory.Warning' differ in their declarations, where '"Warning"' was expected but '0' was given.
412

513

6-
==== f.ts (3 errors) ====
14+
==== f.ts (7 errors) ====
715
// @filename a.ts
816
namespace a {
917
export enum DiagnosticCategory {
@@ -32,7 +40,13 @@ f.ts(54,14): error TS1252: Function declarations are not allowed inside blocks i
3240

3341
function f(x: a.DiagnosticCategory, y: b.DiagnosticCategory) {
3442
x = y;
43+
~
44+
!!! error TS2322: Type 'b.DiagnosticCategory' is not assignable to type 'a.DiagnosticCategory'.
45+
!!! error TS2322: The values of 'DiagnosticCategory.Warning' differ in their declarations, where '0' was expected but '"Warning"' was given.
3546
y = x;
47+
~
48+
!!! error TS2322: Type 'a.DiagnosticCategory' is not assignable to type 'b.DiagnosticCategory'.
49+
!!! error TS2322: The values of 'DiagnosticCategory.Warning' differ in their declarations, where '"Warning"' was expected but '0' was given.
3650
}
3751

3852
function g(x: a.DiagnosticCategory2, y: b.DiagnosticCategory) {
@@ -65,6 +79,12 @@ f.ts(54,14): error TS1252: Function declarations are not allowed inside blocks i
6579
~
6680
!!! error TS1252: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Modules are automatically in strict mode.
6781
x = y;
82+
~
83+
!!! error TS2322: Type 'DiagnosticCategory' is not assignable to type 'import("f").DiagnosticCategory'.
84+
!!! error TS2322: The values of 'DiagnosticCategory.Warning' differ in their declarations, where '0' was expected but '"Warning"' was given.
6885
y = x;
86+
~
87+
!!! error TS2322: Type 'import("f").DiagnosticCategory' is not assignable to type 'DiagnosticCategory'.
88+
!!! error TS2322: The values of 'DiagnosticCategory.Warning' differ in their declarations, where '"Warning"' was expected but '0' was given.
6989
}
7090
}

0 commit comments

Comments
 (0)