Skip to content

Commit fefe220

Browse files
AndaristAndarist
authored
Fixed outdated expectation comments (#49691)
1 parent f6684be commit fefe220

10 files changed

+72
-72
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ tests/cases/conformance/classes/propertyMemberDeclarations/accessorsOverrideProp
1414
}
1515

1616
const obj = new Derived(); // nothing printed
17-
console.log(obj.x); // 1
17+
console.log(obj.x); // number
1818

‎tests/baselines/reference/accessorsOverrideProperty2.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Derived extends Base {
99
}
1010

1111
const obj = new Derived(); // nothing printed
12-
console.log(obj.x); // 1
12+
console.log(obj.x); // number
1313

1414

1515
//// [accessorsOverrideProperty2.js]
@@ -21,4 +21,4 @@ class Derived extends Base {
2121
set x(value) { console.log(`x was set to ${value}`); }
2222
}
2323
const obj = new Derived(); // nothing printed
24-
console.log(obj.x); // 1
24+
console.log(obj.x); // number

‎tests/baselines/reference/accessorsOverrideProperty2.symbols

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const obj = new Derived(); // nothing printed
2626
>obj : Symbol(obj, Decl(accessorsOverrideProperty2.ts, 9, 5))
2727
>Derived : Symbol(Derived, Decl(accessorsOverrideProperty2.ts, 2, 1))
2828

29-
console.log(obj.x); // 1
29+
console.log(obj.x); // number
3030
>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
3131
>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
3232
>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))

‎tests/baselines/reference/accessorsOverrideProperty2.types

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const obj = new Derived(); // nothing printed
3131
>new Derived() : Derived
3232
>Derived : typeof Derived
3333

34-
console.log(obj.x); // 1
34+
console.log(obj.x); // number
3535
>console.log(obj.x) : void
3636
>console.log : (...data: any[]) => void
3737
>console : Console

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ tests/cases/conformance/types/literal/templateLiteralTypes2.ts(32,11): error TS2
55

66
==== tests/cases/conformance/types/literal/templateLiteralTypes2.ts (3 errors) ====
77
function ft1<T extends string>(s: string, n: number, u: 'foo' | 'bar' | 'baz', t: T) {
8-
const c1 = `abc${s}`; // `abc${string}`
9-
const c2 = `abc${n}`; // `abc${number}`
10-
const c3 = `abc${u}`; // "abcfoo" | "abcbar" | "abcbaz"
11-
const c4 = `abc${t}`; // `abc${T}
8+
const c1 = `abc${s}`;
9+
const c2 = `abc${n}`;
10+
const c3 = `abc${u}`;
11+
const c4 = `abc${t}`;
1212
const d1: `abc${string}` = `abc${s}`;
1313
const d2: `abc${number}` = `abc${n}`;
1414
const d3: `abc${'foo' | 'bar' | 'baz'}` = `abc${u}`;
@@ -20,9 +20,9 @@ tests/cases/conformance/types/literal/templateLiteralTypes2.ts(32,11): error TS2
2020
}
2121

2222
function ft10(s: string) {
23-
const c1 = `abc${s}`; // Widening type `abc${string}`
23+
const c1 = `abc${s}`; // Type string
2424
let v1 = c1; // Type string
25-
const c2 = c1; // Widening type `abc${string}`
25+
const c2 = c1; // Type string
2626
let v2 = c2; // Type string
2727
const c3: `abc${string}` = `abc${s}`;
2828
let v3 = c3; // Type `abc${string}`
@@ -33,18 +33,18 @@ tests/cases/conformance/types/literal/templateLiteralTypes2.ts(32,11): error TS2
3333
}
3434

3535
function ft11(s: string, cond: boolean) {
36-
const c1 = cond ? `foo${s}` : `bar${s}`; // widening `foo${string}` | widening `bar${string}`
36+
const c1 = cond ? `foo${s}` : `bar${s}`; // string
3737
const c2: `foo${string}` | `bar${string}` = c1; // `foo${string}` | `bar${string}`
3838
~~
3939
!!! error TS2322: Type 'string' is not assignable to type '`foo${string}` | `bar${string}`'.
40-
const c3 = cond ? c1 : c2; // `foo${string}` | `bar${string}`
41-
const c4 = cond ? c3 : `baz${s}`; // `foo${string}` | `bar${string}` | widening `baz${string}`
40+
const c3 = cond ? c1 : c2; // string
41+
const c4 = cond ? c3 : `baz${s}`; // string
4242
const c5: `foo${string}` | `bar${string}` | `baz${string}` = c4; // `foo${string}` | `bar${string}` | `baz${string}`
4343
~~
4444
!!! error TS2322: Type 'string' is not assignable to type '`foo${string}` | `bar${string}` | `baz${string}`'.
4545
let v1 = c1; // string
4646
let v2 = c2; // `foo${string}` | `bar${string}`
47-
let v3 = c3; // `foo${string}` | `bar${string}`
47+
let v3 = c3; // string
4848
let v4 = c4; // string
4949
let v5 = c5; // `foo${string}` | `bar${string}` | `baz${string}`
5050
}
@@ -102,7 +102,7 @@ tests/cases/conformance/types/literal/templateLiteralTypes2.ts(32,11): error TS2
102102
const t3 = takesLiteral(`foo.bar.${someString}`); // string
103103

104104
const id4 = `foo.bar.${someString}`;
105-
const t4 = takesLiteral(id4); // string
105+
const t4 = takesLiteral(id4); // unknown
106106

107107
declare const someUnion: 'abc' | 'def' | 'ghi';
108108
const t5 = takesLiteral(`foo.bar.${someUnion}`); // "abc" | "def" | "ghi"

‎tests/baselines/reference/templateLiteralTypes2.js

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//// [templateLiteralTypes2.ts]
22
function ft1<T extends string>(s: string, n: number, u: 'foo' | 'bar' | 'baz', t: T) {
3-
const c1 = `abc${s}`; // `abc${string}`
4-
const c2 = `abc${n}`; // `abc${number}`
5-
const c3 = `abc${u}`; // "abcfoo" | "abcbar" | "abcbaz"
6-
const c4 = `abc${t}`; // `abc${T}
3+
const c1 = `abc${s}`;
4+
const c2 = `abc${n}`;
5+
const c3 = `abc${u}`;
6+
const c4 = `abc${t}`;
77
const d1: `abc${string}` = `abc${s}`;
88
const d2: `abc${number}` = `abc${n}`;
99
const d3: `abc${'foo' | 'bar' | 'baz'}` = `abc${u}`;
@@ -15,9 +15,9 @@ function ft2(s: string) {
1515
}
1616

1717
function ft10(s: string) {
18-
const c1 = `abc${s}`; // Widening type `abc${string}`
18+
const c1 = `abc${s}`; // Type string
1919
let v1 = c1; // Type string
20-
const c2 = c1; // Widening type `abc${string}`
20+
const c2 = c1; // Type string
2121
let v2 = c2; // Type string
2222
const c3: `abc${string}` = `abc${s}`;
2323
let v3 = c3; // Type `abc${string}`
@@ -26,14 +26,14 @@ function ft10(s: string) {
2626
}
2727

2828
function ft11(s: string, cond: boolean) {
29-
const c1 = cond ? `foo${s}` : `bar${s}`; // widening `foo${string}` | widening `bar${string}`
29+
const c1 = cond ? `foo${s}` : `bar${s}`; // string
3030
const c2: `foo${string}` | `bar${string}` = c1; // `foo${string}` | `bar${string}`
31-
const c3 = cond ? c1 : c2; // `foo${string}` | `bar${string}`
32-
const c4 = cond ? c3 : `baz${s}`; // `foo${string}` | `bar${string}` | widening `baz${string}`
31+
const c3 = cond ? c1 : c2; // string
32+
const c4 = cond ? c3 : `baz${s}`; // string
3333
const c5: `foo${string}` | `bar${string}` | `baz${string}` = c4; // `foo${string}` | `bar${string}` | `baz${string}`
3434
let v1 = c1; // string
3535
let v2 = c2; // `foo${string}` | `bar${string}`
36-
let v3 = c3; // `foo${string}` | `bar${string}`
36+
let v3 = c3; // string
3737
let v4 = c4; // string
3838
let v5 = c5; // `foo${string}` | `bar${string}` | `baz${string}`
3939
}
@@ -91,7 +91,7 @@ declare const someString: string;
9191
const t3 = takesLiteral(`foo.bar.${someString}`); // string
9292

9393
const id4 = `foo.bar.${someString}`;
94-
const t4 = takesLiteral(id4); // string
94+
const t4 = takesLiteral(id4); // unknown
9595

9696
declare const someUnion: 'abc' | 'def' | 'ghi';
9797
const t5 = takesLiteral(`foo.bar.${someUnion}`); // "abc" | "def" | "ghi"
@@ -122,10 +122,10 @@ C2(`rotate(${interpolatedStyle.rotate}dig)`);
122122
//// [templateLiteralTypes2.js]
123123
"use strict";
124124
function ft1(s, n, u, t) {
125-
var c1 = "abc".concat(s); // `abc${string}`
126-
var c2 = "abc".concat(n); // `abc${number}`
127-
var c3 = "abc".concat(u); // "abcfoo" | "abcbar" | "abcbaz"
128-
var c4 = "abc".concat(t); // `abc${T}
125+
var c1 = "abc".concat(s);
126+
var c2 = "abc".concat(n);
127+
var c3 = "abc".concat(u);
128+
var c4 = "abc".concat(t);
129129
var d1 = "abc".concat(s);
130130
var d2 = "abc".concat(n);
131131
var d3 = "abc".concat(u);
@@ -135,24 +135,24 @@ function ft2(s) {
135135
return "abc".concat(s);
136136
}
137137
function ft10(s) {
138-
var c1 = "abc".concat(s); // Widening type `abc${string}`
138+
var c1 = "abc".concat(s); // Type string
139139
var v1 = c1; // Type string
140-
var c2 = c1; // Widening type `abc${string}`
140+
var c2 = c1; // Type string
141141
var v2 = c2; // Type string
142142
var c3 = "abc".concat(s);
143143
var v3 = c3; // Type `abc${string}`
144144
var c4 = c1; // Type `abc${string}`
145145
var v4 = c4; // Type `abc${string}`
146146
}
147147
function ft11(s, cond) {
148-
var c1 = cond ? "foo".concat(s) : "bar".concat(s); // widening `foo${string}` | widening `bar${string}`
148+
var c1 = cond ? "foo".concat(s) : "bar".concat(s); // string
149149
var c2 = c1; // `foo${string}` | `bar${string}`
150-
var c3 = cond ? c1 : c2; // `foo${string}` | `bar${string}`
151-
var c4 = cond ? c3 : "baz".concat(s); // `foo${string}` | `bar${string}` | widening `baz${string}`
150+
var c3 = cond ? c1 : c2; // string
151+
var c4 = cond ? c3 : "baz".concat(s); // string
152152
var c5 = c4; // `foo${string}` | `bar${string}` | `baz${string}`
153153
var v1 = c1; // string
154154
var v2 = c2; // `foo${string}` | `bar${string}`
155-
var v3 = c3; // `foo${string}` | `bar${string}`
155+
var v3 = c3; // string
156156
var v4 = c4; // string
157157
var v5 = c5; // `foo${string}` | `bar${string}` | `baz${string}`
158158
}
@@ -190,7 +190,7 @@ var id2 = "foo.bar.baz";
190190
var t2 = takesLiteral(id2); // "baz"
191191
var t3 = takesLiteral("foo.bar.".concat(someString)); // string
192192
var id4 = "foo.bar.".concat(someString);
193-
var t4 = takesLiteral(id4); // string
193+
var t4 = takesLiteral(id4); // unknown
194194
var t5 = takesLiteral("foo.bar.".concat(someUnion)); // "abc" | "def" | "ghi"
195195
// Repro from #41732
196196
var pixelValue = 22;

‎tests/baselines/reference/templateLiteralTypes2.symbols

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ function ft1<T extends string>(s: string, n: number, u: 'foo' | 'bar' | 'baz', t
88
>t : Symbol(t, Decl(templateLiteralTypes2.ts, 0, 78))
99
>T : Symbol(T, Decl(templateLiteralTypes2.ts, 0, 13))
1010

11-
const c1 = `abc${s}`; // `abc${string}`
11+
const c1 = `abc${s}`;
1212
>c1 : Symbol(c1, Decl(templateLiteralTypes2.ts, 1, 9))
1313
>s : Symbol(s, Decl(templateLiteralTypes2.ts, 0, 31))
1414

15-
const c2 = `abc${n}`; // `abc${number}`
15+
const c2 = `abc${n}`;
1616
>c2 : Symbol(c2, Decl(templateLiteralTypes2.ts, 2, 9))
1717
>n : Symbol(n, Decl(templateLiteralTypes2.ts, 0, 41))
1818

19-
const c3 = `abc${u}`; // "abcfoo" | "abcbar" | "abcbaz"
19+
const c3 = `abc${u}`;
2020
>c3 : Symbol(c3, Decl(templateLiteralTypes2.ts, 3, 9))
2121
>u : Symbol(u, Decl(templateLiteralTypes2.ts, 0, 52))
2222

23-
const c4 = `abc${t}`; // `abc${T}
23+
const c4 = `abc${t}`;
2424
>c4 : Symbol(c4, Decl(templateLiteralTypes2.ts, 4, 9))
2525
>t : Symbol(t, Decl(templateLiteralTypes2.ts, 0, 78))
2626

@@ -54,15 +54,15 @@ function ft10(s: string) {
5454
>ft10 : Symbol(ft10, Decl(templateLiteralTypes2.ts, 13, 1))
5555
>s : Symbol(s, Decl(templateLiteralTypes2.ts, 15, 14))
5656

57-
const c1 = `abc${s}`; // Widening type `abc${string}`
57+
const c1 = `abc${s}`; // Type string
5858
>c1 : Symbol(c1, Decl(templateLiteralTypes2.ts, 16, 9))
5959
>s : Symbol(s, Decl(templateLiteralTypes2.ts, 15, 14))
6060

6161
let v1 = c1; // Type string
6262
>v1 : Symbol(v1, Decl(templateLiteralTypes2.ts, 17, 7))
6363
>c1 : Symbol(c1, Decl(templateLiteralTypes2.ts, 16, 9))
6464

65-
const c2 = c1; // Widening type `abc${string}`
65+
const c2 = c1; // Type string
6666
>c2 : Symbol(c2, Decl(templateLiteralTypes2.ts, 18, 9))
6767
>c1 : Symbol(c1, Decl(templateLiteralTypes2.ts, 16, 9))
6868

@@ -92,7 +92,7 @@ function ft11(s: string, cond: boolean) {
9292
>s : Symbol(s, Decl(templateLiteralTypes2.ts, 26, 14))
9393
>cond : Symbol(cond, Decl(templateLiteralTypes2.ts, 26, 24))
9494

95-
const c1 = cond ? `foo${s}` : `bar${s}`; // widening `foo${string}` | widening `bar${string}`
95+
const c1 = cond ? `foo${s}` : `bar${s}`; // string
9696
>c1 : Symbol(c1, Decl(templateLiteralTypes2.ts, 27, 9))
9797
>cond : Symbol(cond, Decl(templateLiteralTypes2.ts, 26, 24))
9898
>s : Symbol(s, Decl(templateLiteralTypes2.ts, 26, 14))
@@ -102,13 +102,13 @@ function ft11(s: string, cond: boolean) {
102102
>c2 : Symbol(c2, Decl(templateLiteralTypes2.ts, 28, 9))
103103
>c1 : Symbol(c1, Decl(templateLiteralTypes2.ts, 27, 9))
104104

105-
const c3 = cond ? c1 : c2; // `foo${string}` | `bar${string}`
105+
const c3 = cond ? c1 : c2; // string
106106
>c3 : Symbol(c3, Decl(templateLiteralTypes2.ts, 29, 9))
107107
>cond : Symbol(cond, Decl(templateLiteralTypes2.ts, 26, 24))
108108
>c1 : Symbol(c1, Decl(templateLiteralTypes2.ts, 27, 9))
109109
>c2 : Symbol(c2, Decl(templateLiteralTypes2.ts, 28, 9))
110110

111-
const c4 = cond ? c3 : `baz${s}`; // `foo${string}` | `bar${string}` | widening `baz${string}`
111+
const c4 = cond ? c3 : `baz${s}`; // string
112112
>c4 : Symbol(c4, Decl(templateLiteralTypes2.ts, 30, 9))
113113
>cond : Symbol(cond, Decl(templateLiteralTypes2.ts, 26, 24))
114114
>c3 : Symbol(c3, Decl(templateLiteralTypes2.ts, 29, 9))
@@ -126,7 +126,7 @@ function ft11(s: string, cond: boolean) {
126126
>v2 : Symbol(v2, Decl(templateLiteralTypes2.ts, 33, 7))
127127
>c2 : Symbol(c2, Decl(templateLiteralTypes2.ts, 28, 9))
128128

129-
let v3 = c3; // `foo${string}` | `bar${string}`
129+
let v3 = c3; // string
130130
>v3 : Symbol(v3, Decl(templateLiteralTypes2.ts, 34, 7))
131131
>c3 : Symbol(c3, Decl(templateLiteralTypes2.ts, 29, 9))
132132

@@ -322,7 +322,7 @@ const id4 = `foo.bar.${someString}`;
322322
>id4 : Symbol(id4, Decl(templateLiteralTypes2.ts, 91, 5))
323323
>someString : Symbol(someString, Decl(templateLiteralTypes2.ts, 88, 13))
324324

325-
const t4 = takesLiteral(id4); // string
325+
const t4 = takesLiteral(id4); // unknown
326326
>t4 : Symbol(t4, Decl(templateLiteralTypes2.ts, 92, 5))
327327
>takesLiteral : Symbol(takesLiteral, Decl(templateLiteralTypes2.ts, 78, 1))
328328
>id4 : Symbol(id4, Decl(templateLiteralTypes2.ts, 91, 5))

‎tests/baselines/reference/templateLiteralTypes2.types

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ function ft1<T extends string>(s: string, n: number, u: 'foo' | 'bar' | 'baz', t
66
>u : "foo" | "bar" | "baz"
77
>t : T
88

9-
const c1 = `abc${s}`; // `abc${string}`
9+
const c1 = `abc${s}`;
1010
>c1 : string
1111
>`abc${s}` : string
1212
>s : string
1313

14-
const c2 = `abc${n}`; // `abc${number}`
14+
const c2 = `abc${n}`;
1515
>c2 : string
1616
>`abc${n}` : string
1717
>n : number
1818

19-
const c3 = `abc${u}`; // "abcfoo" | "abcbar" | "abcbaz"
19+
const c3 = `abc${u}`;
2020
>c3 : string
2121
>`abc${u}` : string
2222
>u : "foo" | "bar" | "baz"
2323

24-
const c4 = `abc${t}`; // `abc${T}
24+
const c4 = `abc${t}`;
2525
>c4 : string
2626
>`abc${t}` : string
2727
>t : T
@@ -60,7 +60,7 @@ function ft10(s: string) {
6060
>ft10 : (s: string) => void
6161
>s : string
6262

63-
const c1 = `abc${s}`; // Widening type `abc${string}`
63+
const c1 = `abc${s}`; // Type string
6464
>c1 : string
6565
>`abc${s}` : string
6666
>s : string
@@ -69,7 +69,7 @@ function ft10(s: string) {
6969
>v1 : string
7070
>c1 : string
7171

72-
const c2 = c1; // Widening type `abc${string}`
72+
const c2 = c1; // Type string
7373
>c2 : string
7474
>c1 : string
7575

@@ -100,7 +100,7 @@ function ft11(s: string, cond: boolean) {
100100
>s : string
101101
>cond : boolean
102102

103-
const c1 = cond ? `foo${s}` : `bar${s}`; // widening `foo${string}` | widening `bar${string}`
103+
const c1 = cond ? `foo${s}` : `bar${s}`; // string
104104
>c1 : string
105105
>cond ? `foo${s}` : `bar${s}` : string
106106
>cond : boolean
@@ -113,14 +113,14 @@ function ft11(s: string, cond: boolean) {
113113
>c2 : `foo${string}` | `bar${string}`
114114
>c1 : string
115115

116-
const c3 = cond ? c1 : c2; // `foo${string}` | `bar${string}`
116+
const c3 = cond ? c1 : c2; // string
117117
>c3 : string
118118
>cond ? c1 : c2 : string
119119
>cond : boolean
120120
>c1 : string
121121
>c2 : `foo${string}` | `bar${string}`
122122

123-
const c4 = cond ? c3 : `baz${s}`; // `foo${string}` | `bar${string}` | widening `baz${string}`
123+
const c4 = cond ? c3 : `baz${s}`; // string
124124
>c4 : string
125125
>cond ? c3 : `baz${s}` : string
126126
>cond : boolean
@@ -140,7 +140,7 @@ function ft11(s: string, cond: boolean) {
140140
>v2 : `foo${string}` | `bar${string}`
141141
>c2 : `foo${string}` | `bar${string}`
142142

143-
let v3 = c3; // `foo${string}` | `bar${string}`
143+
let v3 = c3; // string
144144
>v3 : string
145145
>c3 : string
146146

@@ -347,7 +347,7 @@ const id4 = `foo.bar.${someString}`;
347347
>`foo.bar.${someString}` : string
348348
>someString : string
349349

350-
const t4 = takesLiteral(id4); // string
350+
const t4 = takesLiteral(id4); // unknown
351351
>t4 : unknown
352352
>takesLiteral(id4) : unknown
353353
>takesLiteral : <T extends string>(literal: T) => T extends `foo.bar.${infer R}` ? R : unknown

‎tests/cases/conformance/classes/propertyMemberDeclarations/accessorsOverrideProperty2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ class Derived extends Base {
1010
}
1111

1212
const obj = new Derived(); // nothing printed
13-
console.log(obj.x); // 1
13+
console.log(obj.x); // number

0 commit comments

Comments
 (0)