Skip to content

Commit 465e9c8

Browse files
committed
Revert Function.bind/apply/call this-overloads
1 parent 078d6da commit 465e9c8

22 files changed

+286
-69
lines changed

src/lib/es5.d.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,13 @@ interface Function {
215215
* @param thisArg The object to be used as the this object.
216216
* @param argArray A set of arguments to be passed to the function.
217217
*/
218-
apply<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U;
219218
apply(this: Function, thisArg: any, argArray?: any): any;
220219

221220
/**
222221
* Calls a method of an object, substituting another object for the current object.
223222
* @param thisArg The object to be used as the current object.
224223
* @param argArray A list of arguments to be passed to the method.
225224
*/
226-
call<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U;
227225
call(this: Function, thisArg: any, ...argArray: any[]): any;
228226

229227
/**
@@ -232,7 +230,6 @@ interface Function {
232230
* @param thisArg An object to which the this keyword can refer inside the new function.
233231
* @param argArray A list of arguments to be passed to the new function.
234232
*/
235-
bind<T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): (this: void, ...argArray: any[]) => U;
236233
bind(this: Function, thisArg: any, ...argArray: any[]): any;
237234

238235
prototype: any;

tests/baselines/reference/assignmentToObjectAndFunction.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ tests/cases/compiler/assignmentToObjectAndFunction.ts(8,5): error TS2322: Type '
55
Property 'apply' is missing in type '{}'.
66
tests/cases/compiler/assignmentToObjectAndFunction.ts(29,5): error TS2322: Type 'typeof bad' is not assignable to type 'Function'.
77
Types of property 'apply' are incompatible.
8-
Type 'number' is not assignable to type '{ <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }'.
8+
Type 'number' is not assignable to type '(this: Function, thisArg: any, argArray?: any) => any'.
99

1010

1111
==== tests/cases/compiler/assignmentToObjectAndFunction.ts (3 errors) ====
@@ -48,4 +48,4 @@ tests/cases/compiler/assignmentToObjectAndFunction.ts(29,5): error TS2322: Type
4848
~~~~~~~~~~
4949
!!! error TS2322: Type 'typeof bad' is not assignable to type 'Function'.
5050
!!! error TS2322: Types of property 'apply' are incompatible.
51-
!!! error TS2322: Type 'number' is not assignable to type '{ <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }'.
51+
!!! error TS2322: Type 'number' is not assignable to type '(this: Function, thisArg: any, argArray?: any) => any'.

tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.symbols

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ class C {
1010

1111
var fn = async () => await other.apply(this, arguments);
1212
>fn : Symbol(fn, Decl(asyncArrowFunctionCapturesArguments_es6.ts, 3, 9))
13-
>other.apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
13+
>other.apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --))
1414
>other : Symbol(other, Decl(asyncArrowFunctionCapturesArguments_es6.ts, 1, 13))
15-
>apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
15+
>apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --))
1616
>this : Symbol(C, Decl(asyncArrowFunctionCapturesArguments_es6.ts, 0, 0))
1717
>arguments : Symbol(arguments)
1818
}

tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.types

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ class C {
99
>other : () => void
1010

1111
var fn = async () => await other.apply(this, arguments);
12-
>fn : () => Promise<void>
13-
>async () => await other.apply(this, arguments) : () => Promise<void>
14-
>await other.apply(this, arguments) : void
15-
>other.apply(this, arguments) : void
16-
>other.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
12+
>fn : () => Promise<any>
13+
>async () => await other.apply(this, arguments) : () => Promise<any>
14+
>await other.apply(this, arguments) : any
15+
>other.apply(this, arguments) : any
16+
>other.apply : (this: Function, thisArg: any, argArray?: any) => any
1717
>other : () => void
18-
>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
18+
>apply : (this: Function, thisArg: any, argArray?: any) => any
1919
>this : this
2020
>arguments : IArguments
2121
}

tests/baselines/reference/declarationEmitPromise.symbols

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ export async function runSampleWorks<A, B, C, D, E>(
6868
>T : Symbol(T, Decl(declarationEmitPromise.ts, 8, 16))
6969

7070
f.apply(this, result);
71-
>f.apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
71+
>f.apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --))
7272
>f : Symbol(f, Decl(declarationEmitPromise.ts, 8, 19))
73-
>apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
73+
>apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --))
7474
>result : Symbol(result, Decl(declarationEmitPromise.ts, 7, 7))
7575

7676
let rfunc: typeof func & {} = func as any; // <- This is the only difference
@@ -140,9 +140,9 @@ export async function runSampleBreaks<A, B, C, D, E>(
140140
>T : Symbol(T, Decl(declarationEmitPromise.ts, 17, 16))
141141

142142
f.apply(this, result);
143-
>f.apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
143+
>f.apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --))
144144
>f : Symbol(f, Decl(declarationEmitPromise.ts, 17, 19))
145-
>apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
145+
>apply : Symbol(Function.apply, Decl(lib.es5.d.ts, --, --))
146146
>result : Symbol(result, Decl(declarationEmitPromise.ts, 16, 7))
147147

148148
let rfunc: typeof func = func as any; // <- This is the only difference

tests/baselines/reference/declarationEmitPromise.types

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ export async function runSampleWorks<A, B, C, D, E>(
7878
>T : T
7979

8080
f.apply(this, result);
81-
>f.apply(this, result) : T
82-
>f.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
81+
>f.apply(this, result) : any
82+
>f.apply : (this: Function, thisArg: any, argArray?: any) => any
8383
>f : (a: A, b?: B, c?: C, d?: D, e?: E) => T
84-
>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
84+
>apply : (this: Function, thisArg: any, argArray?: any) => any
8585
>this : any
8686
>result : any
8787

@@ -163,10 +163,10 @@ export async function runSampleBreaks<A, B, C, D, E>(
163163
>T : T
164164

165165
f.apply(this, result);
166-
>f.apply(this, result) : T
167-
>f.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
166+
>f.apply(this, result) : any
167+
>f.apply : (this: Function, thisArg: any, argArray?: any) => any
168168
>f : (a: A, b?: B, c?: C, d?: D, e?: E) => T
169-
>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
169+
>apply : (this: Function, thisArg: any, argArray?: any) => any
170170
>this : any
171171
>result : any
172172

tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.symbols

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function fn(x = () => this, y = x()) {
1212
}
1313

1414
fn.call(4); // Should be 4
15-
>fn.call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
15+
>fn.call : Symbol(Function.call, Decl(lib.d.ts, --, --))
1616
>fn : Symbol(fn, Decl(fatarrowfunctionsInFunctionParameterDefaults.ts, 0, 0))
17-
>call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
17+
>call : Symbol(Function.call, Decl(lib.d.ts, --, --))
1818

tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ function fn(x = () => this, y = x()) {
1616

1717
fn.call(4); // Should be 4
1818
>fn.call(4) : any
19-
>fn.call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
19+
>fn.call : (this: Function, thisArg: any, ...argArray: any[]) => any
2020
>fn : (x?: () => any, y?: any) => any
21-
>call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
21+
>call : (this: Function, thisArg: any, ...argArray: any[]) => any
2222
>4 : number
2323

tests/baselines/reference/functionType.symbols

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ function salt() {}
33
>salt : Symbol(salt, Decl(functionType.ts, 0, 0))
44

55
salt.apply("hello", []);
6-
>salt.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
6+
>salt.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
77
>salt : Symbol(salt, Decl(functionType.ts, 0, 0))
8-
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
8+
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
99

1010
(new Function("return 5"))();
1111
>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))

tests/baselines/reference/functionType.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ function salt() {}
33
>salt : () => void
44

55
salt.apply("hello", []);
6-
>salt.apply("hello", []) : void
7-
>salt.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
6+
>salt.apply("hello", []) : any
7+
>salt.apply : (this: Function, thisArg: any, argArray?: any) => any
88
>salt : () => void
9-
>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
9+
>apply : (this: Function, thisArg: any, argArray?: any) => any
1010
>"hello" : string
1111
>[] : undefined[]
1212

tests/baselines/reference/genericTypeParameterEquivalence2.symbols

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ function compose<A, B, C>(f: (b: B) => C, g: (a:A) => B): (a:A) => C {
2424

2525
return f(g.apply(null, a));
2626
>f : Symbol(f, Decl(genericTypeParameterEquivalence2.ts, 1, 26))
27-
>g.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
27+
>g.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
2828
>g : Symbol(g, Decl(genericTypeParameterEquivalence2.ts, 1, 41))
29-
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
29+
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
3030
>a : Symbol(a, Decl(genericTypeParameterEquivalence2.ts, 2, 21))
3131

3232
};

tests/baselines/reference/genericTypeParameterEquivalence2.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ function compose<A, B, C>(f: (b: B) => C, g: (a:A) => B): (a:A) => C {
2626
return f(g.apply(null, a));
2727
>f(g.apply(null, a)) : C
2828
>f : (b: B) => C
29-
>g.apply(null, a) : B
30-
>g.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
29+
>g.apply(null, a) : any
30+
>g.apply : (this: Function, thisArg: any, argArray?: any) => any
3131
>g : (a: A) => B
32-
>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
32+
>apply : (this: Function, thisArg: any, argArray?: any) => any
3333
>null : null
3434
>a : A
3535

tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.symbols

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,39 @@ function apply(func, thisArg, args) {
2626
>length : Symbol(length, Decl(_apply.js, 12, 7))
2727

2828
case 0: return func.call(thisArg);
29-
>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
29+
>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --))
3030
>func : Symbol(func, Decl(_apply.js, 11, 15))
31-
>call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
31+
>call : Symbol(Function.call, Decl(lib.d.ts, --, --))
3232
>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
3333

3434
case 1: return func.call(thisArg, args[0]);
35-
>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
35+
>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --))
3636
>func : Symbol(func, Decl(_apply.js, 11, 15))
37-
>call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
37+
>call : Symbol(Function.call, Decl(lib.d.ts, --, --))
3838
>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
3939
>args : Symbol(args, Decl(_apply.js, 11, 29))
4040

4141
case 2: return func.call(thisArg, args[0], args[1]);
42-
>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
42+
>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --))
4343
>func : Symbol(func, Decl(_apply.js, 11, 15))
44-
>call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
44+
>call : Symbol(Function.call, Decl(lib.d.ts, --, --))
4545
>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
4646
>args : Symbol(args, Decl(_apply.js, 11, 29))
4747
>args : Symbol(args, Decl(_apply.js, 11, 29))
4848

4949
case 3: return func.call(thisArg, args[0], args[1], args[2]);
50-
>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
50+
>func.call : Symbol(Function.call, Decl(lib.d.ts, --, --))
5151
>func : Symbol(func, Decl(_apply.js, 11, 15))
52-
>call : Symbol(Function.call, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
52+
>call : Symbol(Function.call, Decl(lib.d.ts, --, --))
5353
>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
5454
>args : Symbol(args, Decl(_apply.js, 11, 29))
5555
>args : Symbol(args, Decl(_apply.js, 11, 29))
5656
>args : Symbol(args, Decl(_apply.js, 11, 29))
5757
}
5858
return func.apply(thisArg, args);
59-
>func.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
59+
>func.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
6060
>func : Symbol(func, Decl(_apply.js, 11, 15))
61-
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
61+
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
6262
>thisArg : Symbol(thisArg, Decl(_apply.js, 11, 20))
6363
>args : Symbol(args, Decl(_apply.js, 11, 29))
6464
}

tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.types

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ function apply(func, thisArg, args) {
2828
case 0: return func.call(thisArg);
2929
>0 : number
3030
>func.call(thisArg) : any
31-
>func.call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
31+
>func.call : (this: Function, thisArg: any, ...argArray: any[]) => any
3232
>func : Function
33-
>call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
33+
>call : (this: Function, thisArg: any, ...argArray: any[]) => any
3434
>thisArg : any
3535

3636
case 1: return func.call(thisArg, args[0]);
3737
>1 : number
3838
>func.call(thisArg, args[0]) : any
39-
>func.call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
39+
>func.call : (this: Function, thisArg: any, ...argArray: any[]) => any
4040
>func : Function
41-
>call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
41+
>call : (this: Function, thisArg: any, ...argArray: any[]) => any
4242
>thisArg : any
4343
>args[0] : any
4444
>args : any[]
@@ -47,9 +47,9 @@ function apply(func, thisArg, args) {
4747
case 2: return func.call(thisArg, args[0], args[1]);
4848
>2 : number
4949
>func.call(thisArg, args[0], args[1]) : any
50-
>func.call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
50+
>func.call : (this: Function, thisArg: any, ...argArray: any[]) => any
5151
>func : Function
52-
>call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
52+
>call : (this: Function, thisArg: any, ...argArray: any[]) => any
5353
>thisArg : any
5454
>args[0] : any
5555
>args : any[]
@@ -61,9 +61,9 @@ function apply(func, thisArg, args) {
6161
case 3: return func.call(thisArg, args[0], args[1], args[2]);
6262
>3 : number
6363
>func.call(thisArg, args[0], args[1], args[2]) : any
64-
>func.call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
64+
>func.call : (this: Function, thisArg: any, ...argArray: any[]) => any
6565
>func : Function
66-
>call : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, ...argArray: any[]): U; (this: Function, thisArg: any, ...argArray: any[]): any; }
66+
>call : (this: Function, thisArg: any, ...argArray: any[]) => any
6767
>thisArg : any
6868
>args[0] : any
6969
>args : any[]
@@ -77,9 +77,9 @@ function apply(func, thisArg, args) {
7777
}
7878
return func.apply(thisArg, args);
7979
>func.apply(thisArg, args) : any
80-
>func.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
80+
>func.apply : (this: Function, thisArg: any, argArray?: any) => any
8181
>func : Function
82-
>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
82+
>apply : (this: Function, thisArg: any, argArray?: any) => any
8383
>thisArg : any
8484
>args : any[]
8585
}

tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.symbols

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ var r2b: (x: any, y?: any) => any = i.apply;
2020
>r2b : Symbol(r2b, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 9, 3))
2121
>x : Symbol(x, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 9, 10))
2222
>y : Symbol(y, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 9, 17))
23-
>i.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
23+
>i.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
2424
>i : Symbol(i, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 7, 3))
25-
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
25+
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
2626

2727
var b: {
2828
>b : Symbol(b, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 11, 3))
@@ -38,7 +38,7 @@ var rb4: (x: any, y?: any) => any = b.apply;
3838
>rb4 : Symbol(rb4, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 16, 3))
3939
>x : Symbol(x, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 16, 10))
4040
>y : Symbol(y, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 16, 17))
41-
>b.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
41+
>b.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
4242
>b : Symbol(b, Decl(objectTypeWithCallSignatureAppearsToBeFunctionType.ts, 11, 3))
43-
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
43+
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
4444

tests/baselines/reference/objectTypeWithCallSignatureAppearsToBeFunctionType.types

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ var r2b: (x: any, y?: any) => any = i.apply;
2121
>r2b : (x: any, y?: any) => any
2222
>x : any
2323
>y : any
24-
>i.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
24+
>i.apply : (this: Function, thisArg: any, argArray?: any) => any
2525
>i : I
26-
>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
26+
>apply : (this: Function, thisArg: any, argArray?: any) => any
2727

2828
var b: {
2929
>b : () => void
@@ -40,7 +40,7 @@ var rb4: (x: any, y?: any) => any = b.apply;
4040
>rb4 : (x: any, y?: any) => any
4141
>x : any
4242
>y : any
43-
>b.apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
43+
>b.apply : (this: Function, thisArg: any, argArray?: any) => any
4444
>b : () => void
45-
>apply : { <T, U>(this: (this: T, ...argArray: any[]) => U, thisArg: T, argArray?: any): U; (this: Function, thisArg: any, argArray?: any): any; }
45+
>apply : (this: Function, thisArg: any, argArray?: any) => any
4646

tests/baselines/reference/returnTypeParameterWithModules.symbols

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ module M1 {
1212
>A : Symbol(A, Decl(returnTypeParameterWithModules.ts, 1, 27))
1313

1414
return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]);
15-
>Array.prototype.reduce.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
15+
>Array.prototype.reduce.apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
1616
>Array.prototype.reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
1717
>Array.prototype : Symbol(ArrayConstructor.prototype, Decl(lib.d.ts, --, --))
1818
>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
1919
>prototype : Symbol(ArrayConstructor.prototype, Decl(lib.d.ts, --, --))
2020
>reduce : Symbol(Array.reduce, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
21-
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
21+
>apply : Symbol(Function.apply, Decl(lib.d.ts, --, --))
2222
>ar : Symbol(ar, Decl(returnTypeParameterWithModules.ts, 1, 30))
2323
>e : Symbol(e, Decl(returnTypeParameterWithModules.ts, 1, 36))
2424
>f : Symbol(f, Decl(returnTypeParameterWithModules.ts, 1, 33))

0 commit comments

Comments
 (0)