Skip to content

Commit f64110a

Browse files
sandersnsandersn
committed
Update baselines after merging from master
1 parent 9e5f260 commit f64110a

2 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎tests/baselines/reference/thisTypeInFunctions.symbols‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@ class B {
44
>B : Symbol(B, Decl(thisTypeInFunctions.ts, 0, 0))
55

66
n: number;
7-
>n : Symbol(n, Decl(thisTypeInFunctions.ts, 1, 9))
7+
>n : Symbol(B.n, Decl(thisTypeInFunctions.ts, 1, 9))
88
}
99
class C {
1010
>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
1111

1212
n: number;
13-
>n : Symbol(n, Decl(thisTypeInFunctions.ts, 4, 9))
13+
>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
1414

1515
explicitThis(this: this, m: number): number {
16-
>explicitThis : Symbol(explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
16+
>explicitThis : Symbol(C.explicitThis, Decl(thisTypeInFunctions.ts, 5, 14))
1717
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 6, 17))
1818
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 6, 28))
1919

2020
return this.n + m;
21-
>this.n : Symbol(n, Decl(thisTypeInFunctions.ts, 4, 9))
21+
>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
2222
>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
23-
>n : Symbol(n, Decl(thisTypeInFunctions.ts, 4, 9))
23+
>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
2424
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 6, 28))
2525
}
2626
explicitC(this: C, m: number): number {
27-
>explicitC : Symbol(explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
27+
>explicitC : Symbol(C.explicitC, Decl(thisTypeInFunctions.ts, 8, 5))
2828
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 9, 14))
2929
>C : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
3030
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 9, 22))
3131

3232
return this.n + m;
33-
>this.n : Symbol(n, Decl(thisTypeInFunctions.ts, 4, 9))
33+
>this.n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
3434
>this : Symbol(C, Decl(thisTypeInFunctions.ts, 3, 1))
35-
>n : Symbol(n, Decl(thisTypeInFunctions.ts, 4, 9))
35+
>n : Symbol(C.n, Decl(thisTypeInFunctions.ts, 4, 9))
3636
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 9, 22))
3737
}
3838
explicitProperty(this: {n: number}, m: number): number {
39-
>explicitProperty : Symbol(explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
39+
>explicitProperty : Symbol(C.explicitProperty, Decl(thisTypeInFunctions.ts, 11, 5))
4040
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 12, 21))
4141
>n : Symbol(n, Decl(thisTypeInFunctions.ts, 12, 28))
4242
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 12, 39))
@@ -48,7 +48,7 @@ class C {
4848
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 12, 39))
4949
}
5050
explicitVoid(this: void, m: number): number {
51-
>explicitVoid : Symbol(explicitVoid, Decl(thisTypeInFunctions.ts, 14, 5))
51+
>explicitVoid : Symbol(C.explicitVoid, Decl(thisTypeInFunctions.ts, 14, 5))
5252
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 15, 17))
5353
>m : Symbol(m, Decl(thisTypeInFunctions.ts, 15, 28))
5454

@@ -64,28 +64,28 @@ interface I {
6464
>I : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
6565

6666
a: number;
67-
>a : Symbol(a, Decl(thisTypeInFunctions.ts, 20, 13))
67+
>a : Symbol(I.a, Decl(thisTypeInFunctions.ts, 20, 13))
6868

6969
explicitVoid1(this: void): number;
70-
>explicitVoid1 : Symbol(explicitVoid1, Decl(thisTypeInFunctions.ts, 21, 14))
70+
>explicitVoid1 : Symbol(I.explicitVoid1, Decl(thisTypeInFunctions.ts, 21, 14))
7171
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 22, 18))
7272

7373
explicitVoid2(this: void): number;
74-
>explicitVoid2 : Symbol(explicitVoid2, Decl(thisTypeInFunctions.ts, 22, 38))
74+
>explicitVoid2 : Symbol(I.explicitVoid2, Decl(thisTypeInFunctions.ts, 22, 38))
7575
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 23, 18))
7676

7777
explicitStructural(this: {a: number}): number;
78-
>explicitStructural : Symbol(explicitStructural, Decl(thisTypeInFunctions.ts, 23, 38))
78+
>explicitStructural : Symbol(I.explicitStructural, Decl(thisTypeInFunctions.ts, 23, 38))
7979
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 24, 23))
8080
>a : Symbol(a, Decl(thisTypeInFunctions.ts, 24, 30))
8181

8282
explicitInterface(this: I): number;
83-
>explicitInterface : Symbol(explicitInterface, Decl(thisTypeInFunctions.ts, 24, 50))
83+
>explicitInterface : Symbol(I.explicitInterface, Decl(thisTypeInFunctions.ts, 24, 50))
8484
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 25, 22))
8585
>I : Symbol(I, Decl(thisTypeInFunctions.ts, 19, 21))
8686

8787
explicitThis(this: this): number;
88-
>explicitThis : Symbol(explicitThis, Decl(thisTypeInFunctions.ts, 25, 39))
88+
>explicitThis : Symbol(I.explicitThis, Decl(thisTypeInFunctions.ts, 25, 39))
8989
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 26, 17))
9090
}
9191
function explicitStructural(this: { y: number }, x: number): number {
@@ -585,22 +585,22 @@ class Base1 {
585585
>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
586586

587587
x: number;
588-
>x : Symbol(x, Decl(thisTypeInFunctions.ts, 136, 13))
588+
>x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
589589

590590
public polymorphic(this: this): number { return this.x; }
591-
>polymorphic : Symbol(polymorphic, Decl(thisTypeInFunctions.ts, 137, 14))
591+
>polymorphic : Symbol(Base1.polymorphic, Decl(thisTypeInFunctions.ts, 137, 14))
592592
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 138, 23))
593-
>this.x : Symbol(x, Decl(thisTypeInFunctions.ts, 136, 13))
593+
>this.x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
594594
>this : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
595-
>x : Symbol(x, Decl(thisTypeInFunctions.ts, 136, 13))
595+
>x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
596596

597597
explicit(this: Base1): number { return this.x; }
598-
>explicit : Symbol(explicit, Decl(thisTypeInFunctions.ts, 138, 61))
598+
>explicit : Symbol(Base1.explicit, Decl(thisTypeInFunctions.ts, 138, 61))
599599
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 139, 13))
600600
>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
601-
>this.x : Symbol(x, Decl(thisTypeInFunctions.ts, 136, 13))
601+
>this.x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
602602
>this : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
603-
>x : Symbol(x, Decl(thisTypeInFunctions.ts, 136, 13))
603+
>x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
604604

605605
static explicitStatic(this: typeof Base1): number { return this.y; }
606606
>explicitStatic : Symbol(Base1.explicitStatic, Decl(thisTypeInFunctions.ts, 139, 52))
@@ -618,23 +618,23 @@ class Derived1 extends Base1 {
618618
>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
619619

620620
y: number
621-
>y : Symbol(y, Decl(thisTypeInFunctions.ts, 143, 30))
621+
>y : Symbol(Derived1.y, Decl(thisTypeInFunctions.ts, 143, 30))
622622
}
623623
class Base2 {
624624
>Base2 : Symbol(Base2, Decl(thisTypeInFunctions.ts, 145, 1))
625625

626626
y: number
627-
>y : Symbol(y, Decl(thisTypeInFunctions.ts, 146, 13))
627+
>y : Symbol(Base2.y, Decl(thisTypeInFunctions.ts, 146, 13))
628628

629629
polymorphic(this: this): number { return this.y; }
630-
>polymorphic : Symbol(polymorphic, Decl(thisTypeInFunctions.ts, 147, 13))
630+
>polymorphic : Symbol(Base2.polymorphic, Decl(thisTypeInFunctions.ts, 147, 13))
631631
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 148, 16))
632-
>this.y : Symbol(y, Decl(thisTypeInFunctions.ts, 146, 13))
632+
>this.y : Symbol(Base2.y, Decl(thisTypeInFunctions.ts, 146, 13))
633633
>this : Symbol(Base2, Decl(thisTypeInFunctions.ts, 145, 1))
634-
>y : Symbol(y, Decl(thisTypeInFunctions.ts, 146, 13))
634+
>y : Symbol(Base2.y, Decl(thisTypeInFunctions.ts, 146, 13))
635635

636636
explicit(this: Base1): number { return this.x; }
637-
>explicit : Symbol(explicit, Decl(thisTypeInFunctions.ts, 148, 54))
637+
>explicit : Symbol(Base2.explicit, Decl(thisTypeInFunctions.ts, 148, 54))
638638
>this : Symbol(this, Decl(thisTypeInFunctions.ts, 149, 13))
639639
>Base1 : Symbol(Base1, Decl(thisTypeInFunctions.ts, 133, 24))
640640
>this.x : Symbol(Base1.x, Decl(thisTypeInFunctions.ts, 136, 13))
@@ -646,7 +646,7 @@ class Derived2 extends Base2 {
646646
>Base2 : Symbol(Base2, Decl(thisTypeInFunctions.ts, 145, 1))
647647

648648
x: number
649-
>x : Symbol(x, Decl(thisTypeInFunctions.ts, 151, 30))
649+
>x : Symbol(Derived2.x, Decl(thisTypeInFunctions.ts, 151, 30))
650650
}
651651
let b1 = new Base1();
652652
>b1 : Symbol(b1, Decl(thisTypeInFunctions.ts, 154, 3))

‎tests/baselines/reference/unionThisTypeInFunctions.symbols‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ interface Real {
33
>Real : Symbol(Real, Decl(unionThisTypeInFunctions.ts, 0, 0))
44

55
method(this: this, n: number): void;
6-
>method : Symbol(method, Decl(unionThisTypeInFunctions.ts, 0, 16))
6+
>method : Symbol(Real.method, Decl(unionThisTypeInFunctions.ts, 0, 16))
77
>this : Symbol(this, Decl(unionThisTypeInFunctions.ts, 1, 11))
88
>n : Symbol(n, Decl(unionThisTypeInFunctions.ts, 1, 22))
99

1010
data: string;
11-
>data : Symbol(data, Decl(unionThisTypeInFunctions.ts, 1, 40))
11+
>data : Symbol(Real.data, Decl(unionThisTypeInFunctions.ts, 1, 40))
1212
}
1313
interface Fake {
1414
>Fake : Symbol(Fake, Decl(unionThisTypeInFunctions.ts, 3, 1))
1515

1616
method(this: this, n: number): void;
17-
>method : Symbol(method, Decl(unionThisTypeInFunctions.ts, 4, 16))
17+
>method : Symbol(Fake.method, Decl(unionThisTypeInFunctions.ts, 4, 16))
1818
>this : Symbol(this, Decl(unionThisTypeInFunctions.ts, 5, 11))
1919
>n : Symbol(n, Decl(unionThisTypeInFunctions.ts, 5, 22))
2020

2121
data: number;
22-
>data : Symbol(data, Decl(unionThisTypeInFunctions.ts, 5, 40))
22+
>data : Symbol(Fake.data, Decl(unionThisTypeInFunctions.ts, 5, 40))
2323
}
2424
function test(r: Real | Fake) {
2525
>test : Symbol(test, Decl(unionThisTypeInFunctions.ts, 7, 1))

0 commit comments

Comments
 (0)