Skip to content

Commit bb40819

Browse files
committed
Update tests and baselines
1 parent 3c243db commit bb40819

4 files changed

+30
-79
lines changed

tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.js

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,13 @@ function foo1(x: string = "string", b: number) {
1212
x.length;
1313
}
1414

15-
function foo2(x: string | undefined = "string", b: number) {
16-
x.length; // ok, should be narrowed to string
17-
}
18-
19-
function foo3(x = "string", b: number) {
20-
x.length; // ok, should be narrowed to string
15+
function foo2(x = "string", b: number) {
16+
x.length;
2117
}
2218

23-
// .d.ts should have `T | undefined` for foo1, foo2, foo3
19+
// .d.ts should have `T | undefined` for foo1 and foo2
2420
foo1(undefined, 1);
2521
foo2(undefined, 1);
26-
foo3(undefined, 1);
2722

2823

2924
function removeUndefinedButNotFalse(x = true) {
@@ -60,16 +55,11 @@ function foo1(x, b) {
6055
}
6156
function foo2(x, b) {
6257
if (x === void 0) { x = "string"; }
63-
x.length; // ok, should be narrowed to string
64-
}
65-
function foo3(x, b) {
66-
if (x === void 0) { x = "string"; }
67-
x.length; // ok, should be narrowed to string
58+
x.length;
6859
}
69-
// .d.ts should have `T | undefined` for foo1, foo2, foo3
60+
// .d.ts should have `T | undefined` for foo1 and foo2
7061
foo1(undefined, 1);
7162
foo2(undefined, 1);
72-
foo3(undefined, 1);
7363
function removeUndefinedButNotFalse(x) {
7464
if (x === void 0) { x = true; }
7565
if (x === false) {
@@ -93,7 +83,6 @@ declare function g(addUndefined: string | undefined, addDefined: number): number
9383
declare let total: number;
9484
declare function foo1(x: string | undefined, b: number): void;
9585
declare function foo2(x: string | undefined, b: number): void;
96-
declare function foo3(x: string | undefined, b: number): void;
9786
declare function removeUndefinedButNotFalse(x?: boolean | undefined): false | undefined;
9887
declare const cond: boolean;
9988
declare function removeNothing(y?: boolean | undefined): boolean;

tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.symbols

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,18 @@ function foo1(x: string = "string", b: number) {
4646
>length : Symbol(String.length, Decl(lib.d.ts, --, --))
4747
}
4848

49-
function foo2(x: string | undefined = "string", b: number) {
49+
function foo2(x = "string", b: number) {
5050
>foo2 : Symbol(foo2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 11, 1))
5151
>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 14))
52-
>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 47))
52+
>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 27))
5353

54-
x.length; // ok, should be narrowed to string
54+
x.length;
5555
>x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
5656
>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 13, 14))
5757
>length : Symbol(String.length, Decl(lib.d.ts, --, --))
5858
}
5959

60-
function foo3(x = "string", b: number) {
61-
>foo3 : Symbol(foo3, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 15, 1))
62-
>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 14))
63-
>b : Symbol(b, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 27))
64-
65-
x.length; // ok, should be narrowed to string
66-
>x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
67-
>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 17, 14))
68-
>length : Symbol(String.length, Decl(lib.d.ts, --, --))
69-
}
70-
71-
// .d.ts should have `T | undefined` for foo1, foo2, foo3
60+
// .d.ts should have `T | undefined` for foo1 and foo2
7261
foo1(undefined, 1);
7362
>foo1 : Symbol(foo1, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 7, 36))
7463
>undefined : Symbol(undefined)
@@ -77,41 +66,37 @@ foo2(undefined, 1);
7766
>foo2 : Symbol(foo2, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 11, 1))
7867
>undefined : Symbol(undefined)
7968

80-
foo3(undefined, 1);
81-
>foo3 : Symbol(foo3, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 15, 1))
82-
>undefined : Symbol(undefined)
83-
8469

8570
function removeUndefinedButNotFalse(x = true) {
86-
>removeUndefinedButNotFalse : Symbol(removeUndefinedButNotFalse, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 24, 19))
87-
>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 27, 36))
71+
>removeUndefinedButNotFalse : Symbol(removeUndefinedButNotFalse, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 19, 19))
72+
>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 22, 36))
8873

8974
if (x === false) {
90-
>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 27, 36))
75+
>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 22, 36))
9176

9277
return x;
93-
>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 27, 36))
78+
>x : Symbol(x, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 22, 36))
9479
}
9580
}
9681

9782
declare const cond: boolean;
98-
>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 33, 13))
83+
>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 28, 13))
9984

10085
function removeNothing(y = cond ? true : undefined) {
101-
>removeNothing : Symbol(removeNothing, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 33, 28))
102-
>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23))
103-
>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 33, 13))
86+
>removeNothing : Symbol(removeNothing, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 28, 28))
87+
>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23))
88+
>cond : Symbol(cond, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 28, 13))
10489
>undefined : Symbol(undefined)
10590

10691
if (y !== undefined) {
107-
>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23))
92+
>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23))
10893
>undefined : Symbol(undefined)
10994

11095
if (y === false) {
111-
>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23))
96+
>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23))
11297

11398
return y;
114-
>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 34, 23))
99+
>y : Symbol(y, Decl(defaultParameterAddsUndefinedWithStrictNullChecks.ts, 29, 23))
115100
}
116101
}
117102
return true;

tests/baselines/reference/defaultParameterAddsUndefinedWithStrictNullChecks.types

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts ===
22
function f(addUndefined1 = "J", addUndefined2?: number) {
33
>f : (addUndefined1?: string | undefined, addUndefined2?: number | undefined) => number
4-
>addUndefined1 : string | undefined
4+
>addUndefined1 : string
55
>"J" : "J"
66
>addUndefined2 : number | undefined
77

@@ -17,7 +17,7 @@ function f(addUndefined1 = "J", addUndefined2?: number) {
1717
}
1818
function g(addUndefined = "J", addDefined: number) {
1919
>g : (addUndefined: string | undefined, addDefined: number) => number
20-
>addUndefined : string | undefined
20+
>addUndefined : string
2121
>"J" : "J"
2222
>addDefined : number
2323

@@ -62,7 +62,7 @@ total = g('c', 3) + g(undefined, 4);
6262

6363
function foo1(x: string = "string", b: number) {
6464
>foo1 : (x: string | undefined, b: number) => void
65-
>x : string | undefined
65+
>x : string
6666
>"string" : "string"
6767
>b : number
6868

@@ -72,31 +72,19 @@ function foo1(x: string = "string", b: number) {
7272
>length : number
7373
}
7474

75-
function foo2(x: string | undefined = "string", b: number) {
75+
function foo2(x = "string", b: number) {
7676
>foo2 : (x: string | undefined, b: number) => void
77-
>x : string | undefined
78-
>"string" : "string"
79-
>b : number
80-
81-
x.length; // ok, should be narrowed to string
82-
>x.length : number
8377
>x : string
84-
>length : number
85-
}
86-
87-
function foo3(x = "string", b: number) {
88-
>foo3 : (x: string | undefined, b: number) => void
89-
>x : string | undefined
9078
>"string" : "string"
9179
>b : number
9280

93-
x.length; // ok, should be narrowed to string
81+
x.length;
9482
>x.length : number
9583
>x : string
9684
>length : number
9785
}
9886

99-
// .d.ts should have `T | undefined` for foo1, foo2, foo3
87+
// .d.ts should have `T | undefined` for foo1 and foo2
10088
foo1(undefined, 1);
10189
>foo1(undefined, 1) : void
10290
>foo1 : (x: string | undefined, b: number) => void
@@ -109,16 +97,10 @@ foo2(undefined, 1);
10997
>undefined : undefined
11098
>1 : 1
11199

112-
foo3(undefined, 1);
113-
>foo3(undefined, 1) : void
114-
>foo3 : (x: string | undefined, b: number) => void
115-
>undefined : undefined
116-
>1 : 1
117-
118100

119101
function removeUndefinedButNotFalse(x = true) {
120102
>removeUndefinedButNotFalse : (x?: boolean | undefined) => false | undefined
121-
>x : boolean | undefined
103+
>x : boolean
122104
>true : true
123105

124106
if (x === false) {

tests/cases/compiler/defaultParameterAddsUndefinedWithStrictNullChecks.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,13 @@ function foo1(x: string = "string", b: number) {
1313
x.length;
1414
}
1515

16-
function foo2(x: string | undefined = "string", b: number) {
17-
x.length; // ok, should be narrowed to string
18-
}
19-
20-
function foo3(x = "string", b: number) {
21-
x.length; // ok, should be narrowed to string
16+
function foo2(x = "string", b: number) {
17+
x.length;
2218
}
2319

24-
// .d.ts should have `T | undefined` for foo1, foo2, foo3
20+
// .d.ts should have `T | undefined` for foo1 and foo2
2521
foo1(undefined, 1);
2622
foo2(undefined, 1);
27-
foo3(undefined, 1);
2823

2924

3025
function removeUndefinedButNotFalse(x = true) {

0 commit comments

Comments
 (0)