Skip to content

Commit db230a2

Browse files
committed
Accept new baselines
1 parent 4b9b90a commit db230a2

File tree

53 files changed

+193
-193
lines changed

Some content is hidden

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

53 files changed

+193
-193
lines changed

tests/baselines/reference/abstractProperty.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class C extends B {
5151
>"edge" : "edge"
5252

5353
readonly ro = "readonly please";
54-
>ro : string
54+
>ro : "readonly please"
5555
>"readonly please" : "readonly please"
5656

5757
readonlyProp: string; // don't have to give a value, in fact

tests/baselines/reference/assignmentCompatBug2.errors.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ tests/cases/compiler/assignmentCompatBug2.ts(3,8): error TS2322: Type '{ a: numb
44
Object literal may only specify known properties, and 'a' does not exist in type '{ b: number; }'.
55
tests/cases/compiler/assignmentCompatBug2.ts(5,13): error TS2322: Type '{ b: number; a: number; }' is not assignable to type '{ b: number; }'.
66
Object literal may only specify known properties, and 'a' does not exist in type '{ b: number; }'.
7-
tests/cases/compiler/assignmentCompatBug2.ts(15,1): error TS2322: Type '{ f: (n: number) => 0; g: (s: string) => 0; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
8-
Property 'm' is missing in type '{ f: (n: number) => 0; g: (s: string) => 0; }'.
9-
tests/cases/compiler/assignmentCompatBug2.ts(20,1): error TS2322: Type '{ f: (n: number) => 0; m: number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
10-
Property 'g' is missing in type '{ f: (n: number) => 0; m: number; }'.
11-
tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n: number) => 0; g: (s: string) => 0; n: number; k: (a: any) => any; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
12-
Property 'm' is missing in type '{ f: (n: number) => 0; g: (s: string) => 0; n: number; k: (a: any) => any; }'.
7+
tests/cases/compiler/assignmentCompatBug2.ts(15,1): error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
8+
Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }'.
9+
tests/cases/compiler/assignmentCompatBug2.ts(20,1): error TS2322: Type '{ f: (n: number) => number; m: number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
10+
Property 'g' is missing in type '{ f: (n: number) => number; m: number; }'.
11+
tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
12+
Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }'.
1313

1414

1515
==== tests/cases/compiler/assignmentCompatBug2.ts (6 errors) ====
@@ -38,16 +38,16 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n:
3838

3939
b3 = {
4040
~~
41-
!!! error TS2322: Type '{ f: (n: number) => 0; g: (s: string) => 0; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
42-
!!! error TS2322: Property 'm' is missing in type '{ f: (n: number) => 0; g: (s: string) => 0; }'.
41+
!!! error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
42+
!!! error TS2322: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }'.
4343
f: (n) => { return 0; },
4444
g: (s) => { return 0; },
4545
}; // error
4646

4747
b3 = {
4848
~~
49-
!!! error TS2322: Type '{ f: (n: number) => 0; m: number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
50-
!!! error TS2322: Property 'g' is missing in type '{ f: (n: number) => 0; m: number; }'.
49+
!!! error TS2322: Type '{ f: (n: number) => number; m: number; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
50+
!!! error TS2322: Property 'g' is missing in type '{ f: (n: number) => number; m: number; }'.
5151
f: (n) => { return 0; },
5252
m: 0,
5353
}; // error
@@ -62,8 +62,8 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2322: Type '{ f: (n:
6262

6363
b3 = {
6464
~~
65-
!!! error TS2322: Type '{ f: (n: number) => 0; g: (s: string) => 0; n: number; k: (a: any) => any; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
66-
!!! error TS2322: Property 'm' is missing in type '{ f: (n: number) => 0; g: (s: string) => 0; n: number; k: (a: any) => any; }'.
65+
!!! error TS2322: Type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' is not assignable to type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
66+
!!! error TS2322: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }'.
6767
f: (n) => { return 0; },
6868
g: (s) => { return 0; },
6969
n: 0,

tests/baselines/reference/assignmentCompatWithCallSignatures.errors.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
44
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(36,1): error TS2322: Type '(x: string) => void' is not assignable to type 'T'.
55
Types of parameters 'x' and 'x' are incompatible.
66
Type 'number' is not assignable to type 'string'.
7-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(37,1): error TS2322: Type '(x: string) => 1' is not assignable to type 'T'.
7+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(37,1): error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
88
Types of parameters 'x' and 'x' are incompatible.
99
Type 'number' is not assignable to type 'string'.
10-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(38,1): error TS2322: Type '(x: string) => ""' is not assignable to type 'T'.
10+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(38,1): error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
1111
Types of parameters 'x' and 'x' are incompatible.
1212
Type 'number' is not assignable to type 'string'.
1313
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(39,1): error TS2322: Type 'S2' is not assignable to type '(x: number) => void'.
@@ -16,10 +16,10 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
1616
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(40,1): error TS2322: Type '(x: string) => void' is not assignable to type '(x: number) => void'.
1717
Types of parameters 'x' and 'x' are incompatible.
1818
Type 'number' is not assignable to type 'string'.
19-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(41,1): error TS2322: Type '(x: string) => 1' is not assignable to type '(x: number) => void'.
19+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(41,1): error TS2322: Type '(x: string) => number' is not assignable to type '(x: number) => void'.
2020
Types of parameters 'x' and 'x' are incompatible.
2121
Type 'number' is not assignable to type 'string'.
22-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(42,1): error TS2322: Type '(x: string) => ""' is not assignable to type '(x: number) => void'.
22+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignatures.ts(42,1): error TS2322: Type '(x: string) => string' is not assignable to type '(x: number) => void'.
2323
Types of parameters 'x' and 'x' are incompatible.
2424
Type 'number' is not assignable to type 'string'.
2525

@@ -71,12 +71,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
7171
!!! error TS2322: Type 'number' is not assignable to type 'string'.
7272
t = (x: string) => 1;
7373
~
74-
!!! error TS2322: Type '(x: string) => 1' is not assignable to type 'T'.
74+
!!! error TS2322: Type '(x: string) => number' is not assignable to type 'T'.
7575
!!! error TS2322: Types of parameters 'x' and 'x' are incompatible.
7676
!!! error TS2322: Type 'number' is not assignable to type 'string'.
7777
t = function (x: string) { return ''; }
7878
~
79-
!!! error TS2322: Type '(x: string) => ""' is not assignable to type 'T'.
79+
!!! error TS2322: Type '(x: string) => string' is not assignable to type 'T'.
8080
!!! error TS2322: Types of parameters 'x' and 'x' are incompatible.
8181
!!! error TS2322: Type 'number' is not assignable to type 'string'.
8282
a = s2;
@@ -91,12 +91,12 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
9191
!!! error TS2322: Type 'number' is not assignable to type 'string'.
9292
a = (x: string) => 1;
9393
~
94-
!!! error TS2322: Type '(x: string) => 1' is not assignable to type '(x: number) => void'.
94+
!!! error TS2322: Type '(x: string) => number' is not assignable to type '(x: number) => void'.
9595
!!! error TS2322: Types of parameters 'x' and 'x' are incompatible.
9696
!!! error TS2322: Type 'number' is not assignable to type 'string'.
9797
a = function (x: string) { return ''; }
9898
~
99-
!!! error TS2322: Type '(x: string) => ""' is not assignable to type '(x: number) => void'.
99+
!!! error TS2322: Type '(x: string) => string' is not assignable to type '(x: number) => void'.
100100
!!! error TS2322: Types of parameters 'x' and 'x' are incompatible.
101101
!!! error TS2322: Type 'number' is not assignable to type 'string'.
102102

tests/baselines/reference/assignmentCompatWithCallSignaturesWithOptionalParameters.errors.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts(16,5): error TS2322: Type '(x: number) => 1' is not assignable to type '() => number'.
1+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts(16,5): error TS2322: Type '(x: number) => number' is not assignable to type '() => number'.
22
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts(19,5): error TS2322: Type '(x: number) => number' is not assignable to type '() => number'.
33
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts(20,5): error TS2322: Type '(x: number, y?: number) => number' is not assignable to type '() => number'.
44
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts(22,5): error TS2322: Type '(x: number, y: number) => number' is not assignable to type '() => number'.
55
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts(33,5): error TS2322: Type '(x: number, y: number) => number' is not assignable to type '(x?: number) => number'.
6-
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts(39,5): error TS2322: Type '(x: number, y: number) => 1' is not assignable to type '(x: number) => number'.
6+
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts(39,5): error TS2322: Type '(x: number, y: number) => number' is not assignable to type '(x: number) => number'.
77
tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithCallSignaturesWithOptionalParameters.ts(45,5): error TS2322: Type '(x: number, y: number) => number' is not assignable to type '(x: number) => number'.
88

99

@@ -25,7 +25,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
2525
a = (x?: number) => 1; // ok, same number of required params
2626
a = (x: number) => 1; // error, too many required params
2727
~
28-
!!! error TS2322: Type '(x: number) => 1' is not assignable to type '() => number'.
28+
!!! error TS2322: Type '(x: number) => number' is not assignable to type '() => number'.
2929
a = b.a; // ok
3030
a = b.a2; // ok
3131
a = b.a3; // error
@@ -58,7 +58,7 @@ tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignme
5858
a3 = (x: number) => 1; // ok, same number of required params
5959
a3 = (x: number, y: number) => 1; // error, too many required params
6060
~~
61-
!!! error TS2322: Type '(x: number, y: number) => 1' is not assignable to type '(x: number) => number'.
61+
!!! error TS2322: Type '(x: number, y: number) => number' is not assignable to type '(x: number) => number'.
6262
a3 = b.a; // ok
6363
a3 = b.a2; // ok
6464
a3 = b.a3; // ok

0 commit comments

Comments
 (0)