Skip to content

Commit a057475

Browse files
author
Kanchalai Tanglertsampan
committed
Update baselines from merging with master
1 parent 3600ccc commit a057475

39 files changed

+1584
-1623
lines changed

‎tests/baselines/reference/indexedAccessTypeConstraints.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//// [indexedAccessTypeConstraints.ts]
2-
32
// Repro from #14557
43

54
interface IData<T> {
@@ -37,8 +36,8 @@ function foo<C, T extends { content: C }>(x: C, y: T['content']) {
3736

3837

3938
//// [indexedAccessTypeConstraints.js]
40-
// Repro from #14557
4139
"use strict";
40+
// Repro from #14557
4241
var __extends = (this && this.__extends) || (function () {
4342
var extendStatics = Object.setPrototypeOf ||
4443
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||

‎tests/baselines/reference/indexedAccessTypeConstraints.symbols

Lines changed: 58 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,108 @@
11
=== tests/cases/compiler/indexedAccessTypeConstraints.ts ===
2-
32
// Repro from #14557
43

54
interface IData<T> {
65
>IData : Symbol(IData, Decl(indexedAccessTypeConstraints.ts, 0, 0))
7-
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 3, 16))
6+
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 2, 16))
87

98
content: T;
10-
>content : Symbol(IData.content, Decl(indexedAccessTypeConstraints.ts, 3, 20))
11-
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 3, 16))
9+
>content : Symbol(IData.content, Decl(indexedAccessTypeConstraints.ts, 2, 20))
10+
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 2, 16))
1211
}
1312

1413
type Data<T> = {
15-
>Data : Symbol(Data, Decl(indexedAccessTypeConstraints.ts, 5, 1))
16-
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 7, 10))
14+
>Data : Symbol(Data, Decl(indexedAccessTypeConstraints.ts, 4, 1))
15+
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 6, 10))
1716

1817
get: <K extends keyof T>(prop: K) => T[K];
19-
>get : Symbol(get, Decl(indexedAccessTypeConstraints.ts, 7, 16))
20-
>K : Symbol(K, Decl(indexedAccessTypeConstraints.ts, 8, 10))
21-
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 7, 10))
22-
>prop : Symbol(prop, Decl(indexedAccessTypeConstraints.ts, 8, 29))
23-
>K : Symbol(K, Decl(indexedAccessTypeConstraints.ts, 8, 10))
24-
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 7, 10))
25-
>K : Symbol(K, Decl(indexedAccessTypeConstraints.ts, 8, 10))
18+
>get : Symbol(get, Decl(indexedAccessTypeConstraints.ts, 6, 16))
19+
>K : Symbol(K, Decl(indexedAccessTypeConstraints.ts, 7, 10))
20+
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 6, 10))
21+
>prop : Symbol(prop, Decl(indexedAccessTypeConstraints.ts, 7, 29))
22+
>K : Symbol(K, Decl(indexedAccessTypeConstraints.ts, 7, 10))
23+
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 6, 10))
24+
>K : Symbol(K, Decl(indexedAccessTypeConstraints.ts, 7, 10))
2625

2726
};
2827

2928
class Parent<M> {
30-
>Parent : Symbol(Parent, Decl(indexedAccessTypeConstraints.ts, 9, 2))
31-
>M : Symbol(M, Decl(indexedAccessTypeConstraints.ts, 11, 13))
29+
>Parent : Symbol(Parent, Decl(indexedAccessTypeConstraints.ts, 8, 2))
30+
>M : Symbol(M, Decl(indexedAccessTypeConstraints.ts, 10, 13))
3231

3332
private data: Data<M>;
34-
>data : Symbol(Parent.data, Decl(indexedAccessTypeConstraints.ts, 11, 17))
35-
>Data : Symbol(Data, Decl(indexedAccessTypeConstraints.ts, 5, 1))
36-
>M : Symbol(M, Decl(indexedAccessTypeConstraints.ts, 11, 13))
33+
>data : Symbol(Parent.data, Decl(indexedAccessTypeConstraints.ts, 10, 17))
34+
>Data : Symbol(Data, Decl(indexedAccessTypeConstraints.ts, 4, 1))
35+
>M : Symbol(M, Decl(indexedAccessTypeConstraints.ts, 10, 13))
3736

3837
getData(): Data<M> {
39-
>getData : Symbol(Parent.getData, Decl(indexedAccessTypeConstraints.ts, 12, 26))
40-
>Data : Symbol(Data, Decl(indexedAccessTypeConstraints.ts, 5, 1))
41-
>M : Symbol(M, Decl(indexedAccessTypeConstraints.ts, 11, 13))
38+
>getData : Symbol(Parent.getData, Decl(indexedAccessTypeConstraints.ts, 11, 26))
39+
>Data : Symbol(Data, Decl(indexedAccessTypeConstraints.ts, 4, 1))
40+
>M : Symbol(M, Decl(indexedAccessTypeConstraints.ts, 10, 13))
4241

4342
return this.data;
44-
>this.data : Symbol(Parent.data, Decl(indexedAccessTypeConstraints.ts, 11, 17))
45-
>this : Symbol(Parent, Decl(indexedAccessTypeConstraints.ts, 9, 2))
46-
>data : Symbol(Parent.data, Decl(indexedAccessTypeConstraints.ts, 11, 17))
43+
>this.data : Symbol(Parent.data, Decl(indexedAccessTypeConstraints.ts, 10, 17))
44+
>this : Symbol(Parent, Decl(indexedAccessTypeConstraints.ts, 8, 2))
45+
>data : Symbol(Parent.data, Decl(indexedAccessTypeConstraints.ts, 10, 17))
4746
}
4847
}
4948

5049
export class Foo<C> extends Parent<IData<C>> {
51-
>Foo : Symbol(Foo, Decl(indexedAccessTypeConstraints.ts, 16, 1))
52-
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 18, 17))
53-
>Parent : Symbol(Parent, Decl(indexedAccessTypeConstraints.ts, 9, 2))
50+
>Foo : Symbol(Foo, Decl(indexedAccessTypeConstraints.ts, 15, 1))
51+
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 17, 17))
52+
>Parent : Symbol(Parent, Decl(indexedAccessTypeConstraints.ts, 8, 2))
5453
>IData : Symbol(IData, Decl(indexedAccessTypeConstraints.ts, 0, 0))
55-
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 18, 17))
54+
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 17, 17))
5655

5756
getContent(): C {
58-
>getContent : Symbol(Foo.getContent, Decl(indexedAccessTypeConstraints.ts, 18, 46))
59-
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 18, 17))
57+
>getContent : Symbol(Foo.getContent, Decl(indexedAccessTypeConstraints.ts, 17, 46))
58+
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 17, 17))
6059

6160
return this.getData().get('content');
62-
>this.getData().get : Symbol(get, Decl(indexedAccessTypeConstraints.ts, 7, 16))
63-
>this.getData : Symbol(Parent.getData, Decl(indexedAccessTypeConstraints.ts, 12, 26))
64-
>this : Symbol(Foo, Decl(indexedAccessTypeConstraints.ts, 16, 1))
65-
>getData : Symbol(Parent.getData, Decl(indexedAccessTypeConstraints.ts, 12, 26))
66-
>get : Symbol(get, Decl(indexedAccessTypeConstraints.ts, 7, 16))
61+
>this.getData().get : Symbol(get, Decl(indexedAccessTypeConstraints.ts, 6, 16))
62+
>this.getData : Symbol(Parent.getData, Decl(indexedAccessTypeConstraints.ts, 11, 26))
63+
>this : Symbol(Foo, Decl(indexedAccessTypeConstraints.ts, 15, 1))
64+
>getData : Symbol(Parent.getData, Decl(indexedAccessTypeConstraints.ts, 11, 26))
65+
>get : Symbol(get, Decl(indexedAccessTypeConstraints.ts, 6, 16))
6766
}
6867
}
6968

7069
export class Bar<C, T extends IData<C>> extends Parent<T> {
71-
>Bar : Symbol(Bar, Decl(indexedAccessTypeConstraints.ts, 22, 1))
72-
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 24, 17))
73-
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 24, 19))
70+
>Bar : Symbol(Bar, Decl(indexedAccessTypeConstraints.ts, 21, 1))
71+
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 23, 17))
72+
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 23, 19))
7473
>IData : Symbol(IData, Decl(indexedAccessTypeConstraints.ts, 0, 0))
75-
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 24, 17))
76-
>Parent : Symbol(Parent, Decl(indexedAccessTypeConstraints.ts, 9, 2))
77-
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 24, 19))
74+
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 23, 17))
75+
>Parent : Symbol(Parent, Decl(indexedAccessTypeConstraints.ts, 8, 2))
76+
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 23, 19))
7877

7978
getContent(): C {
80-
>getContent : Symbol(Bar.getContent, Decl(indexedAccessTypeConstraints.ts, 24, 59))
81-
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 24, 17))
79+
>getContent : Symbol(Bar.getContent, Decl(indexedAccessTypeConstraints.ts, 23, 59))
80+
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 23, 17))
8281

8382
return this.getData().get('content');
84-
>this.getData().get : Symbol(get, Decl(indexedAccessTypeConstraints.ts, 7, 16))
85-
>this.getData : Symbol(Parent.getData, Decl(indexedAccessTypeConstraints.ts, 12, 26))
86-
>this : Symbol(Bar, Decl(indexedAccessTypeConstraints.ts, 22, 1))
87-
>getData : Symbol(Parent.getData, Decl(indexedAccessTypeConstraints.ts, 12, 26))
88-
>get : Symbol(get, Decl(indexedAccessTypeConstraints.ts, 7, 16))
83+
>this.getData().get : Symbol(get, Decl(indexedAccessTypeConstraints.ts, 6, 16))
84+
>this.getData : Symbol(Parent.getData, Decl(indexedAccessTypeConstraints.ts, 11, 26))
85+
>this : Symbol(Bar, Decl(indexedAccessTypeConstraints.ts, 21, 1))
86+
>getData : Symbol(Parent.getData, Decl(indexedAccessTypeConstraints.ts, 11, 26))
87+
>get : Symbol(get, Decl(indexedAccessTypeConstraints.ts, 6, 16))
8988
}
9089
}
9190

9291
// Repro from #14557
9392

9493
function foo<C, T extends { content: C }>(x: C, y: T['content']) {
95-
>foo : Symbol(foo, Decl(indexedAccessTypeConstraints.ts, 28, 1))
96-
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 32, 13))
97-
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 32, 15))
98-
>content : Symbol(content, Decl(indexedAccessTypeConstraints.ts, 32, 27))
99-
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 32, 13))
100-
>x : Symbol(x, Decl(indexedAccessTypeConstraints.ts, 32, 42))
101-
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 32, 13))
102-
>y : Symbol(y, Decl(indexedAccessTypeConstraints.ts, 32, 47))
103-
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 32, 15))
94+
>foo : Symbol(foo, Decl(indexedAccessTypeConstraints.ts, 27, 1))
95+
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 31, 13))
96+
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 31, 15))
97+
>content : Symbol(content, Decl(indexedAccessTypeConstraints.ts, 31, 27))
98+
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 31, 13))
99+
>x : Symbol(x, Decl(indexedAccessTypeConstraints.ts, 31, 42))
100+
>C : Symbol(C, Decl(indexedAccessTypeConstraints.ts, 31, 13))
101+
>y : Symbol(y, Decl(indexedAccessTypeConstraints.ts, 31, 47))
102+
>T : Symbol(T, Decl(indexedAccessTypeConstraints.ts, 31, 15))
104103

105104
x = y;
106-
>x : Symbol(x, Decl(indexedAccessTypeConstraints.ts, 32, 42))
107-
>y : Symbol(y, Decl(indexedAccessTypeConstraints.ts, 32, 47))
105+
>x : Symbol(x, Decl(indexedAccessTypeConstraints.ts, 31, 42))
106+
>y : Symbol(y, Decl(indexedAccessTypeConstraints.ts, 31, 47))
108107
}
109108

‎tests/baselines/reference/indexedAccessTypeConstraints.types

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
=== tests/cases/compiler/indexedAccessTypeConstraints.ts ===
2-
32
// Repro from #14557
43

54
interface IData<T> {

0 commit comments

Comments
 (0)