Skip to content

Commit 87bb96d

Browse files
DanielRosenwasserDanielRosenwasser
committed
Accepted baselines.
1 parent 70feb7b commit 87bb96d

4 files changed

+100
-3
lines changed

‎tests/baselines/reference/taggedTemplatesWithTypeArguments2.errors.txt

+23-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(13,30): error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
22
tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(15,11): error TS2347: Untyped function calls may not accept type arguments.
33
tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(17,30): error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
4+
tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(35,5): error TS2377: Constructors for derived classes must contain a 'super' call.
5+
tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(36,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
6+
tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(36,14): error TS1034: 'super' must be followed by an argument list or member access.
47

58

6-
==== tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts (3 errors) ====
9+
==== tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts (6 errors) ====
710
export interface SomethingTaggable {
811
<T>(t: TemplateStringsArray, ...args: T[]): SomethingNewable;
912
}
@@ -37,4 +40,22 @@ tests/cases/conformance/es6/templates/taggedTemplatesWithTypeArguments2.ts(17,30
3740
* ```
3841
*/
3942
const e = new tag<number>
40-
`hello`();
43+
`hello`();
44+
45+
class SomeBase<A, B, C> {
46+
a!: A; b!: B; c!: C;
47+
}
48+
49+
class SomeDerived<T> extends SomeBase<number, string, T> {
50+
constructor() {
51+
~~~~~~~~~~~~~~~
52+
super<number, string, T> `hello world`;
53+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
54+
~~~~~
55+
!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
56+
~
57+
!!! error TS1034: 'super' must be followed by an argument list or member access.
58+
}
59+
~~~~~
60+
!!! error TS2377: Constructors for derived classes must contain a 'super' call.
61+
}

‎tests/baselines/reference/taggedTemplatesWithTypeArguments2.js

+18-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,17 @@ const d = new tag<number> `${"hello"} ${"world"}`<string>(100, 200);
2626
* ```
2727
*/
2828
const e = new tag<number>
29-
`hello`();
29+
`hello`();
30+
31+
class SomeBase<A, B, C> {
32+
a!: A; b!: B; c!: C;
33+
}
34+
35+
class SomeDerived<T> extends SomeBase<number, string, T> {
36+
constructor() {
37+
super<number, string, T> `hello world`;
38+
}
39+
}
3040

3141
//// [taggedTemplatesWithTypeArguments2.js]
3242
const a = new tag `${100} ${200}`("hello", "world");
@@ -42,3 +52,10 @@ const d = (new tag `${"hello"} ${"world"}`)(100, 200);
4252
* ```
4353
*/
4454
const e = new tag `hello`();
55+
class SomeBase {
56+
}
57+
class SomeDerived extends SomeBase {
58+
constructor() {
59+
super. `hello world`;
60+
}
61+
}

‎tests/baselines/reference/taggedTemplatesWithTypeArguments2.symbols

+28
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,31 @@ const e = new tag<number>
5353
>tag : Symbol(tag, Decl(taggedTemplatesWithTypeArguments2.ts, 8, 13))
5454

5555
`hello`();
56+
57+
class SomeBase<A, B, C> {
58+
>SomeBase : Symbol(SomeBase, Decl(taggedTemplatesWithTypeArguments2.ts, 27, 10))
59+
>A : Symbol(A, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 15))
60+
>B : Symbol(B, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 17))
61+
>C : Symbol(C, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 20))
62+
63+
a!: A; b!: B; c!: C;
64+
>a : Symbol(SomeBase.a, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 25))
65+
>A : Symbol(A, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 15))
66+
>b : Symbol(SomeBase.b, Decl(taggedTemplatesWithTypeArguments2.ts, 30, 10))
67+
>B : Symbol(B, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 17))
68+
>c : Symbol(SomeBase.c, Decl(taggedTemplatesWithTypeArguments2.ts, 30, 17))
69+
>C : Symbol(C, Decl(taggedTemplatesWithTypeArguments2.ts, 29, 20))
70+
}
71+
72+
class SomeDerived<T> extends SomeBase<number, string, T> {
73+
>SomeDerived : Symbol(SomeDerived, Decl(taggedTemplatesWithTypeArguments2.ts, 31, 1))
74+
>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments2.ts, 33, 18))
75+
>SomeBase : Symbol(SomeBase, Decl(taggedTemplatesWithTypeArguments2.ts, 27, 10))
76+
>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments2.ts, 33, 18))
77+
78+
constructor() {
79+
super<number, string, T> `hello world`;
80+
>super : Symbol(SomeBase, Decl(taggedTemplatesWithTypeArguments2.ts, 27, 10))
81+
>T : Symbol(T, Decl(taggedTemplatesWithTypeArguments2.ts, 33, 18))
82+
}
83+
}

‎tests/baselines/reference/taggedTemplatesWithTypeArguments2.types

+31
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,34 @@ const e = new tag<number>
8787
`hello`();
8888
>`hello` : "hello"
8989

90+
class SomeBase<A, B, C> {
91+
>SomeBase : SomeBase<A, B, C>
92+
>A : A
93+
>B : B
94+
>C : C
95+
96+
a!: A; b!: B; c!: C;
97+
>a : A
98+
>A : A
99+
>b : B
100+
>B : B
101+
>c : C
102+
>C : C
103+
}
104+
105+
class SomeDerived<T> extends SomeBase<number, string, T> {
106+
>SomeDerived : SomeDerived<T>
107+
>T : T
108+
>SomeBase : SomeBase<number, string, T>
109+
>T : T
110+
111+
constructor() {
112+
super<number, string, T> `hello world`;
113+
>super<number, string, T> `hello world` : any
114+
>super : any
115+
>super : SomeBase<number, string, T>
116+
> : any
117+
>T : T
118+
>`hello world` : "hello world"
119+
}
120+
}

0 commit comments

Comments
 (0)