Skip to content

Commit e9b467a

Browse files
Accepted baselines.
1 parent 8f45d23 commit e9b467a

File tree

45 files changed

+358
-337
lines changed

Some content is hidden

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

45 files changed

+358
-337
lines changed

tests/baselines/reference/assignmentCompatBug2.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(5,13): error TS2322: Type '{ b: num
66
Object literal may only specify known properties, and 'a' does not exist in type '{ b: number; }'.
77
tests/cases/compiler/assignmentCompatBug2.ts(15,1): error TS2741: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
88
tests/cases/compiler/assignmentCompatBug2.ts(20,1): error TS2741: Property 'g' is missing in type '{ f: (n: number) => number; m: number; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
9-
tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2741: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
9+
tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2741: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => null; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
1010

1111

1212
==== tests/cases/compiler/assignmentCompatBug2.ts (6 errors) ====
@@ -59,7 +59,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2741: Property 'm' i
5959

6060
b3 = {
6161
~~
62-
!!! error TS2741: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
62+
!!! error TS2741: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => null; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
6363
!!! related TS2728 tests/cases/compiler/assignmentCompatBug2.ts:7:55: 'm' is declared here.
6464
f: (n) => { return 0; },
6565
g: (s) => { return 0; },

tests/baselines/reference/assignmentCompatBug2.types

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ b3 = {
9393
}; // error
9494

9595
b3 = {
96-
>b3 = { f: (n) => { return 0; }, g: (s) => { return 0; }, m: 0, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; m: number; n: number; k: (a: any) => any; }
96+
>b3 = { f: (n) => { return 0; }, g: (s) => { return 0; }, m: 0, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; m: number; n: number; k: (a: any) => null; }
9797
>b3 : { f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }
98-
>{ f: (n) => { return 0; }, g: (s) => { return 0; }, m: 0, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; m: number; n: number; k: (a: any) => any; }
98+
>{ f: (n) => { return 0; }, g: (s) => { return 0; }, m: 0, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; m: number; n: number; k: (a: any) => null; }
9999

100100
f: (n) => { return 0; },
101101
>f : (n: number) => number
@@ -118,17 +118,17 @@ b3 = {
118118
>0 : 0
119119

120120
k: (a) =>{ return null; },
121-
>k : (a: any) => any
122-
>(a) =>{ return null; } : (a: any) => any
121+
>k : (a: any) => null
122+
>(a) =>{ return null; } : (a: any) => null
123123
>a : any
124124
>null : null
125125

126126
}; // ok
127127

128128
b3 = {
129-
>b3 = { f: (n) => { return 0; }, g: (s) => { return 0; }, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }
129+
>b3 = { f: (n) => { return 0; }, g: (s) => { return 0; }, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => null; }
130130
>b3 : { f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }
131-
>{ f: (n) => { return 0; }, g: (s) => { return 0; }, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }
131+
>{ f: (n) => { return 0; }, g: (s) => { return 0; }, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => null; }
132132

133133
f: (n) => { return 0; },
134134
>f : (n: number) => number
@@ -147,8 +147,8 @@ b3 = {
147147
>0 : 0
148148

149149
k: (a) =>{ return null; },
150-
>k : (a: any) => any
151-
>(a) =>{ return null; } : (a: any) => any
150+
>k : (a: any) => null
151+
>(a) =>{ return null; } : (a: any) => null
152152
>a : any
153153
>null : null
154154

0 commit comments

Comments
 (0)