Skip to content

Fix rest tuple arity check #25938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20132,10 +20132,7 @@ namespace ts {
if (pos - paramCount < getLengthOfTupleType(restType)) {
return restType.typeArguments![pos - paramCount];
}
const tupleRestType = getRestTypeOfTupleType(restType);
if (tupleRestType) {
return tupleRestType;
}
return getRestTypeOfTupleType(restType);
}
return getIndexTypeOfType(restType, IndexKind.Number);
}
Expand Down
21 changes: 20 additions & 1 deletion tests/baselines/reference/genericRestParameters1.errors.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
tests/cases/conformance/types/rest/genericRestParameters1.ts(22,1): error TS2556: Expected 3 arguments, but got 1 or more.
tests/cases/conformance/types/rest/genericRestParameters1.ts(31,1): error TS2556: Expected 3 arguments, but got 1 or more.
tests/cases/conformance/types/rest/genericRestParameters1.ts(166,1): error TS2322: Type '(a: never) => void' is not assignable to type '(...args: any[]) => void'.
Types of parameters 'a' and 'args' are incompatible.
Type 'any' is not assignable to type 'never'.


==== tests/cases/conformance/types/rest/genericRestParameters1.ts (2 errors) ====
==== tests/cases/conformance/types/rest/genericRestParameters1.ts (3 errors) ====
declare let f1: (...x: [number, string, boolean]) => void;
declare let f2: (x0: number, x1: string, x2: boolean) => void;

Expand Down Expand Up @@ -161,4 +164,20 @@ tests/cases/conformance/types/rest/genericRestParameters1.ts(31,1): error TS2556
events.emit('jump', 20, 'up');
events.emit('stop', 'Bye!');
events.emit('done');

// Repro from #25871

declare var ff1: (... args: any[]) => void;

declare var ff2: () => void;
declare var ff3: (...args: []) => void;
declare var ff4: (a: never) => void;

ff1 = ff2;
ff1 = ff3;
ff1 = ff4; // Error
~~~
!!! error TS2322: Type '(a: never) => void' is not assignable to type '(...args: any[]) => void'.
!!! error TS2322: Types of parameters 'a' and 'args' are incompatible.
!!! error TS2322: Type 'any' is not assignable to type 'never'.

19 changes: 19 additions & 0 deletions tests/baselines/reference/genericRestParameters1.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,18 @@ events.emit('move', 10, 'left');
events.emit('jump', 20, 'up');
events.emit('stop', 'Bye!');
events.emit('done');

// Repro from #25871

declare var ff1: (... args: any[]) => void;

declare var ff2: () => void;
declare var ff3: (...args: []) => void;
declare var ff4: (a: never) => void;

ff1 = ff2;
ff1 = ff3;
ff1 = ff4; // Error


//// [genericRestParameters1.js]
Expand Down Expand Up @@ -256,6 +268,9 @@ events.emit('move', 10, 'left');
events.emit('jump', 20, 'up');
events.emit('stop', 'Bye!');
events.emit('done');
ff1 = ff2;
ff1 = ff3;
ff1 = ff4; // Error


//// [genericRestParameters1.d.ts]
Expand Down Expand Up @@ -332,3 +347,7 @@ declare type EventType<T> = {
emit<K extends keyof T = keyof T>(e: K, ...payload: T[K] extends any[] ? T[K] : [T[K]]): void;
};
declare var events: EventType<Record1>;
declare var ff1: (...args: any[]) => void;
declare var ff2: () => void;
declare var ff3: (...args: []) => void;
declare var ff4: (a: never) => void;
29 changes: 29 additions & 0 deletions tests/baselines/reference/genericRestParameters1.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -622,3 +622,32 @@ events.emit('done');
>events : Symbol(events, Decl(genericRestParameters1.ts, 149, 11))
>emit : Symbol(emit, Decl(genericRestParameters1.ts, 145, 21))

// Repro from #25871

declare var ff1: (... args: any[]) => void;
>ff1 : Symbol(ff1, Decl(genericRestParameters1.ts, 157, 11))
>args : Symbol(args, Decl(genericRestParameters1.ts, 157, 18))

declare var ff2: () => void;
>ff2 : Symbol(ff2, Decl(genericRestParameters1.ts, 159, 11))

declare var ff3: (...args: []) => void;
>ff3 : Symbol(ff3, Decl(genericRestParameters1.ts, 160, 11))
>args : Symbol(args, Decl(genericRestParameters1.ts, 160, 18))

declare var ff4: (a: never) => void;
>ff4 : Symbol(ff4, Decl(genericRestParameters1.ts, 161, 11))
>a : Symbol(a, Decl(genericRestParameters1.ts, 161, 18))

ff1 = ff2;
>ff1 : Symbol(ff1, Decl(genericRestParameters1.ts, 157, 11))
>ff2 : Symbol(ff2, Decl(genericRestParameters1.ts, 159, 11))

ff1 = ff3;
>ff1 : Symbol(ff1, Decl(genericRestParameters1.ts, 157, 11))
>ff3 : Symbol(ff3, Decl(genericRestParameters1.ts, 160, 11))

ff1 = ff4; // Error
>ff1 : Symbol(ff1, Decl(genericRestParameters1.ts, 157, 11))
>ff4 : Symbol(ff4, Decl(genericRestParameters1.ts, 161, 11))

32 changes: 32 additions & 0 deletions tests/baselines/reference/genericRestParameters1.types
Original file line number Diff line number Diff line change
Expand Up @@ -849,3 +849,35 @@ events.emit('done');
>emit : <K extends "move" | "jump" | "stop" | "done" = "move" | "jump" | "stop" | "done">(e: K, ...payload: Record1[K] extends any[] ? Record1[K] : [Record1[K]]) => void
>'done' : "done"

// Repro from #25871

declare var ff1: (... args: any[]) => void;
>ff1 : (...args: any[]) => void
>args : any[]

declare var ff2: () => void;
>ff2 : () => void

declare var ff3: (...args: []) => void;
>ff3 : () => void
>args : []

declare var ff4: (a: never) => void;
>ff4 : (a: never) => void
>a : never

ff1 = ff2;
>ff1 = ff2 : () => void
>ff1 : (...args: any[]) => void
>ff2 : () => void

ff1 = ff3;
>ff1 = ff3 : () => void
>ff1 : (...args: any[]) => void
>ff3 : () => void

ff1 = ff4; // Error
>ff1 = ff4 : (a: never) => void
>ff1 : (...args: any[]) => void
>ff4 : (a: never) => void

12 changes: 12 additions & 0 deletions tests/cases/conformance/types/rest/genericRestParameters1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,15 @@ events.emit('move', 10, 'left');
events.emit('jump', 20, 'up');
events.emit('stop', 'Bye!');
events.emit('done');

// Repro from #25871

declare var ff1: (... args: any[]) => void;

declare var ff2: () => void;
declare var ff3: (...args: []) => void;
declare var ff4: (a: never) => void;

ff1 = ff2;
ff1 = ff3;
ff1 = ff4; // Error