Skip to content

Commit 3568beb

Browse files
committed
Accept new baselines
1 parent 3258424 commit 3568beb

File tree

6 files changed

+21
-11
lines changed

6 files changed

+21
-11
lines changed

tests/baselines/reference/api/tsserverlibrary.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2303,6 +2303,7 @@ declare namespace ts {
23032303
MarkerType = 8192,
23042304
JSLiteral = 16384,
23052305
FreshLiteral = 32768,
2306+
ArrayLiteral = 65536,
23062307
ClassOrInterface = 3,
23072308
}
23082309
interface ObjectType extends Type {

tests/baselines/reference/api/typescript.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2303,6 +2303,7 @@ declare namespace ts {
23032303
MarkerType = 8192,
23042304
JSLiteral = 16384,
23052305
FreshLiteral = 32768,
2306+
ArrayLiteral = 65536,
23062307
ClassOrInterface = 3,
23072308
}
23082309
interface ObjectType extends Type {

tests/baselines/reference/contextualTypeWithTuple.errors.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(3,5): error TS232
22
Types of property 'length' are incompatible.
33
Type '3' is not assignable to type '2'.
44
tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(15,1): error TS2322: Type '[number, string, boolean]' is not assignable to type '[number, string]'.
5+
Types of property 'length' are incompatible.
6+
Type '3' is not assignable to type '2'.
57
tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(18,17): error TS2741: Property 'a' is missing in type '{}' but required in type '{ a: string; }'.
68
tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(19,1): error TS2741: Property '2' is missing in type '[number, string]' but required in type '[number, string, boolean]'.
79
tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(20,5): error TS2322: Type '[string, string, number]' is not assignable to type '[string, string]'.
@@ -38,6 +40,8 @@ tests/cases/conformance/types/tuple/contextualTypeWithTuple.ts(25,1): error TS23
3840
numStrTuple = numStrBoolTuple;
3941
~~~~~~~~~~~
4042
!!! error TS2322: Type '[number, string, boolean]' is not assignable to type '[number, string]'.
43+
!!! error TS2322: Types of property 'length' are incompatible.
44+
!!! error TS2322: Type '3' is not assignable to type '2'.
4145

4246
// error
4347
objNumTuple = [ {}, 5];

tests/baselines/reference/objectLiteralNormalization.errors.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
99
Type 'string' is not assignable to type 'undefined'.
1010
tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(18,1): error TS2322: Type '{ a: number; }' is not assignable to type '{ a: number; b: number; } | { a: string; b?: undefined; } | { a?: undefined; b?: undefined; }'.
1111
Property 'b' is missing in type '{ a: number; }' but required in type '{ a: number; b: number; }'.
12+
tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(48,20): error TS2322: Type '2' is not assignable to type '1'.
13+
tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts(49,14): error TS2322: Type '2' is not assignable to type '1'.
1214

1315

14-
==== tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts (5 errors) ====
16+
==== tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts (7 errors) ====
1517
// Object literals in unions are normalized upon widening
1618
let a1 = [{ a: 0 }, { a: 1, b: "x" }, { a: 2, b: "y", c: true }][0];
1719
a1.a; // number
@@ -78,5 +80,11 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts
7880
let e1 = f({ a: 1, b: 2 }, { a: "abc" }, {});
7981
let e2 = f({}, { a: "abc" }, { a: 1, b: 2 });
8082
let e3 = f(data, { a: 2 });
83+
~
84+
!!! error TS2322: Type '2' is not assignable to type '1'.
85+
!!! related TS6500 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts:43:21: The expected type comes from property 'a' which is declared here on type '{ a: 1; b: "abc"; c: true; }'
8186
let e4 = f({ a: 2 }, data);
87+
~
88+
!!! error TS2322: Type '2' is not assignable to type '1'.
89+
!!! related TS6500 tests/cases/conformance/expressions/objectLiterals/objectLiteralNormalization.ts:43:21: The expected type comes from property 'a' which is declared here on type '{ a: 1; b: "abc"; c: true; }'
8290

tests/baselines/reference/objectLiteralNormalization.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,5 @@ declare let e2: {
227227
a: number;
228228
b: number;
229229
};
230-
declare let e3: {
231-
a: number;
232-
};
233-
declare let e4: {
234-
a: number;
235-
};
230+
declare let e3: any;
231+
declare let e4: any;

tests/baselines/reference/objectLiteralNormalization.types

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,17 +304,17 @@ let e2 = f({}, { a: "abc" }, { a: 1, b: 2 });
304304
>2 : 2
305305

306306
let e3 = f(data, { a: 2 });
307-
>e3 : { a: number; }
308-
>f(data, { a: 2 }) : { a: number; }
307+
>e3 : any
308+
>f(data, { a: 2 }) : any
309309
>f : <T>(...items: T[]) => T
310310
>data : { a: 1; b: "abc"; c: true; }
311311
>{ a: 2 } : { a: number; }
312312
>a : number
313313
>2 : 2
314314

315315
let e4 = f({ a: 2 }, data);
316-
>e4 : { a: number; }
317-
>f({ a: 2 }, data) : { a: number; }
316+
>e4 : any
317+
>f({ a: 2 }, data) : any
318318
>f : <T>(...items: T[]) => T
319319
>{ a: 2 } : { a: number; }
320320
>a : number

0 commit comments

Comments
 (0)