Skip to content

Commit 0263d60

Browse files
DanielRosenwasserDanielRosenwasser
committed
Split contextual typing test for substitution expressions into two tests.
1 parent e68c53f commit 0263d60

File tree

6 files changed

+87
-80
lines changed

6 files changed

+87
-80
lines changed

tests/baselines/reference/taggedTemplateContextualTyping.js renamed to tests/baselines/reference/taggedTemplateContextualTyping1.js

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//// [taggedTemplateContextualTyping.ts]
1+
//// [taggedTemplateContextualTyping1.ts]
22

33
function tempTag1<T>(templateStrs: TemplateStringsArray, f: (x: T) => T, x: T): T;
44
function tempTag1<T>(templateStrs: TemplateStringsArray, f: (x: T) => T, h: (y: T) => T, x: T): T;
@@ -10,18 +10,9 @@ tempTag1 `${ x => x }${ 10 }`;
1010
tempTag1 `${ x => x }${ y => y }${ 10 }`;
1111
tempTag1 `${ x => x }${ (y: number) => y }${ undefined }`;
1212
tempTag1 `${ (x: number) => x }${ y => y }${ undefined }`;
13-
14-
function tempTag2(templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number;
15-
function tempTag2(templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string;
16-
function tempTag2(...rest: any[]): any {
17-
return undefined;
18-
}
19-
20-
tempTag2 `${ x => x }${ 0 }`;
21-
tempTag2 `${ x => x }${ y => y }${ "hello" }`;
22-
tempTag2 `${ x => x }${ 0 }`;
2313

24-
//// [taggedTemplateContextualTyping.js]
14+
15+
//// [taggedTemplateContextualTyping1.js]
2516
function tempTag1() {
2617
var rest = [];
2718
for (var _i = 0; _i < arguments.length; _i++) {
@@ -33,13 +24,3 @@ tempTag1 `${function (x) { return x; }}${10}`;
3324
tempTag1 `${function (x) { return x; }}${function (y) { return y; }}${10}`;
3425
tempTag1 `${function (x) { return x; }}${function (y) { return y; }}${undefined}`;
3526
tempTag1 `${function (x) { return x; }}${function (y) { return y; }}${undefined}`;
36-
function tempTag2() {
37-
var rest = [];
38-
for (var _i = 0; _i < arguments.length; _i++) {
39-
rest[_i - 0] = arguments[_i];
40-
}
41-
return undefined;
42-
}
43-
tempTag2 `${function (x) { return x; }}${0}`;
44-
tempTag2 `${function (x) { return x; }}${function (y) { return y; }}${"hello"}`;
45-
tempTag2 `${function (x) { return x; }}${0}`;

tests/baselines/reference/taggedTemplateContextualTyping.types renamed to tests/baselines/reference/taggedTemplateContextualTyping1.types

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
=== tests/cases/conformance/expressions/contextualTyping/taggedTemplateContextualTyping.ts ===
1+
=== tests/cases/conformance/expressions/contextualTyping/taggedTemplateContextualTyping1.ts ===
22

33
function tempTag1<T>(templateStrs: TemplateStringsArray, f: (x: T) => T, x: T): T;
44
>tempTag1 : { <T>(templateStrs: TemplateStringsArray, f: (x: T) => T, x: T): T; <T>(templateStrs: TemplateStringsArray, f: (x: T) => T, h: (y: T) => T, x: T): T; }
@@ -75,50 +75,3 @@ tempTag1 `${ (x: number) => x }${ y => y }${ undefined }`;
7575
>y : number
7676
>undefined : undefined
7777

78-
function tempTag2(templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number;
79-
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
80-
>templateStrs : TemplateStringsArray
81-
>TemplateStringsArray : TemplateStringsArray
82-
>f : (x: number) => number
83-
>x : number
84-
>x : number
85-
86-
function tempTag2(templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string;
87-
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
88-
>templateStrs : TemplateStringsArray
89-
>TemplateStringsArray : TemplateStringsArray
90-
>f : (x: string) => string
91-
>x : string
92-
>h : (y: string) => string
93-
>y : string
94-
>x : string
95-
96-
function tempTag2(...rest: any[]): any {
97-
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
98-
>rest : any[]
99-
100-
return undefined;
101-
>undefined : undefined
102-
}
103-
104-
tempTag2 `${ x => x }${ 0 }`;
105-
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
106-
>x => x : (x: number) => number
107-
>x : number
108-
>x : number
109-
110-
tempTag2 `${ x => x }${ y => y }${ "hello" }`;
111-
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
112-
>x => x : (x: string) => string
113-
>x : string
114-
>x : string
115-
>y => y : (y: string) => string
116-
>y : string
117-
>y : string
118-
119-
tempTag2 `${ x => x }${ 0 }`;
120-
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
121-
>x => x : (x: number) => number
122-
>x : number
123-
>x : number
124-

‎tests/baselines/reference/taggedTemplateContextualTyping2.js‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
//// [taggedTemplateContextualTyping2.ts]
2+
3+
function tempTag2(templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number;
4+
function tempTag2(templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string;
5+
function tempTag2(...rest: any[]): any {
6+
return undefined;
7+
}
8+
9+
tempTag2 `${ x => x }${ 0 }`;
10+
tempTag2 `${ x => x }${ y => y }${ "hello" }`;
11+
tempTag2 `${ x => x }${ 0 }`;
12+
13+
//// [taggedTemplateContextualTyping2.js]
14+
function tempTag2() {
15+
var rest = [];
16+
for (var _i = 0; _i < arguments.length; _i++) {
17+
rest[_i - 0] = arguments[_i];
18+
}
19+
return undefined;
20+
}
21+
tempTag2 `${function (x) { return x; }}${0}`;
22+
tempTag2 `${function (x) { return x; }}${function (y) { return y; }}${"hello"}`;
23+
tempTag2 `${function (x) { return x; }}${0}`;

‎tests/baselines/reference/taggedTemplateContextualTyping2.types‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
=== tests/cases/conformance/expressions/contextualTyping/taggedTemplateContextualTyping2.ts ===
2+
3+
function tempTag2(templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number;
4+
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
5+
>templateStrs : TemplateStringsArray
6+
>TemplateStringsArray : TemplateStringsArray
7+
>f : (x: number) => number
8+
>x : number
9+
>x : number
10+
11+
function tempTag2(templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string;
12+
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
13+
>templateStrs : TemplateStringsArray
14+
>TemplateStringsArray : TemplateStringsArray
15+
>f : (x: string) => string
16+
>x : string
17+
>h : (y: string) => string
18+
>y : string
19+
>x : string
20+
21+
function tempTag2(...rest: any[]): any {
22+
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
23+
>rest : any[]
24+
25+
return undefined;
26+
>undefined : undefined
27+
}
28+
29+
tempTag2 `${ x => x }${ 0 }`;
30+
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
31+
>x => x : (x: number) => number
32+
>x : number
33+
>x : number
34+
35+
tempTag2 `${ x => x }${ y => y }${ "hello" }`;
36+
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
37+
>x => x : (x: string) => string
38+
>x : string
39+
>x : string
40+
>y => y : (y: string) => string
41+
>y : string
42+
>y : string
43+
44+
tempTag2 `${ x => x }${ 0 }`;
45+
>tempTag2 : { (templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number; (templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string; }
46+
>x => x : (x: number) => number
47+
>x : number
48+
>x : number
49+

tests/cases/conformance/expressions/contextualTyping/taggedTemplateContextualTyping.ts renamed to tests/cases/conformance/expressions/contextualTyping/taggedTemplateContextualTyping1.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,3 @@ tempTag1 `${ x => x }${ 10 }`;
1010
tempTag1 `${ x => x }${ y => y }${ 10 }`;
1111
tempTag1 `${ x => x }${ (y: number) => y }${ undefined }`;
1212
tempTag1 `${ (x: number) => x }${ y => y }${ undefined }`;
13-
14-
function tempTag2(templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number;
15-
function tempTag2(templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string;
16-
function tempTag2(...rest: any[]): any {
17-
return undefined;
18-
}
19-
20-
tempTag2 `${ x => x }${ 0 }`;
21-
tempTag2 `${ x => x }${ y => y }${ "hello" }`;
22-
tempTag2 `${ x => x }${ 0 }`;

‎tests/cases/conformance/expressions/contextualTyping/taggedTemplateContextualTyping2.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// @target: ES6
2+
3+
function tempTag2(templateStrs: TemplateStringsArray, f: (x: number) => number, x: number): number;
4+
function tempTag2(templateStrs: TemplateStringsArray, f: (x: string) => string, h: (y: string) => string, x: string): string;
5+
function tempTag2(...rest: any[]): any {
6+
return undefined;
7+
}
8+
9+
tempTag2 `${ x => x }${ 0 }`;
10+
tempTag2 `${ x => x }${ y => y }${ "hello" }`;
11+
tempTag2 `${ x => x }${ 0 }`;

0 commit comments

Comments
 (0)