Skip to content

Commit 9b6de0c

Browse files
KiaraGrouwstraKiaraGrouwstra
committed
tests
1 parent d65d9b2 commit 9b6de0c

21 files changed

+537
-77
lines changed

‎src/compiler/checker.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/// <reference path="moduleNameResolver.ts"/>
22
/// <reference path="binder.ts"/>
33
/// <reference path="symbolWalker.ts" />
4-
// /// <reference types="node"/>
5-
// declare var console: Console;
64

75
/* @internal */
86
namespace ts {
@@ -6615,17 +6613,19 @@ namespace ts {
66156613
return getTypeOfSymbol(lastOrUndefined(signature.parameters));
66166614
}
66176615

6618-
function getRestTypeOfSignature(signature: Signature, pos: number): Type {
6616+
function getRestTypeOfSignature(signature: Signature, pos?: number): Type {
66196617
const arrIdx = pos - (signature.parameters.length - 1);
66206618
if (signature.hasRestParameter) {
66216619
const type = getRestConstraintOfSignature(signature);
66226620
if (isArrayType(type)) {
66236621
return (<TypeReference>type).typeArguments[0];
66246622
}
6623+
else if (isTupleLikeType(type)) {
6624+
const symbol = getPropertyOfObjectType(getApparentType(type), arrIdx + "" as __String);
6625+
return symbol ? getIndexedAccessType(type, pos !== undefined ? getLiteralType(arrIdx) : globalNumberType) : neverType;
6626+
}
66256627
else if (isArrayLikeType(type)) {
6626-
return getIndexedAccessType(type, getLiteralType(arrIdx));
6627-
// const symbol = getPropertyOfObjectType(getApparentType(type), arrIdx + "" as __String);
6628-
// return symbol ? getIndexedAccessType(type, getLiteralType(arrIdx)) : neverType;
6628+
return getIndexedAccessType(type, pos !== undefined ? getLiteralType(arrIdx) : globalNumberType);
66296629
}
66306630
}
66316631
return anyType;
@@ -10671,7 +10671,8 @@ namespace ts {
1067110671
if (type === inference.typeParameter) {
1067210672
return inference;
1067310673
}
10674-
else if ((type as IndexedAccessType).objectType === inference.typeParameter) {
10674+
else if ((type as IndexedAccessType).objectType === inference.typeParameter &&
10675+
isTypeInstanceOf((type as IndexedAccessType).indexType, globalNumberType)) {
1067510676
return inference;
1067610677
}
1067710678
}
@@ -18225,7 +18226,8 @@ namespace ts {
1822518226

1822618227
// Only check rest parameter type if it's not a binding pattern. Since binding patterns are
1822718228
// not allowed in a rest parameter, we already have an error from checkGrammarParameterList.
18228-
if (node.dotDotDotToken && !isBindingPattern(node.name) && !isArrayLikeType(getTypeOfSymbol(node.symbol))) {
18229+
const type = getTypeOfSymbol(node.symbol);
18230+
if (node.dotDotDotToken && !isBindingPattern(node.name) && (!isArrayLikeType(type) || type === anyType)) {
1822918231
error(node, Diagnostics.A_rest_parameter_must_be_of_an_array_type);
1823018232
}
1823118233
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts(1,16): error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
2+
tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts(1,20): error TS2523: 'yield' expressions cannot be used in a parameter initializer.
23
tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts(1,26): error TS1005: ',' expected.
34
tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts(1,29): error TS1138: Parameter declaration expected.
45
tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts(1,29): error TS2304: Cannot find name 'yield'.
56
tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts(1,34): error TS1005: ';' expected.
67

78

8-
==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts (5 errors) ====
9+
==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts (6 errors) ====
910
function * foo(a = yield => yield) {
1011
~~~~~~~~~
1112
!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
13+
~~~~~
14+
!!! error TS2523: 'yield' expressions cannot be used in a parameter initializer.
1215
~~
1316
!!! error TS1005: ',' expected.
1417
~~~~~

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts(1,20): error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
2+
tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts(1,24): error TS2524: 'await' expressions cannot be used in a parameter initializer.
23
tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts(1,30): error TS1109: Expression expected.
34
tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts(1,33): error TS1138: Parameter declaration expected.
45
tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts(1,33): error TS2304: Cannot find name 'await'.
@@ -8,10 +9,12 @@ tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclarati
89
tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts(1,53): error TS1109: Expression expected.
910

1011

11-
==== tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts (8 errors) ====
12+
==== tests/cases/conformance/async/es2017/functionDeclarations/asyncFunctionDeclaration10_es2017.ts (9 errors) ====
1213
async function foo(a = await => await): Promise<void> {
1314
~~~~~~~~~
1415
!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
16+
~~~~~
17+
!!! error TS2524: 'await' expressions cannot be used in a parameter initializer.
1518
~~
1619
!!! error TS1109: Expression expected.
1720
~~~~~

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,20): error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
2+
tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,24): error TS2524: 'await' expressions cannot be used in a parameter initializer.
23
tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,30): error TS1109: Expression expected.
34
tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,33): error TS1138: Parameter declaration expected.
45
tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,33): error TS2304: Cannot find name 'await'.
@@ -8,10 +9,12 @@ tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration1
89
tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts(1,53): error TS1109: Expression expected.
910

1011

11-
==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts (8 errors) ====
12+
==== tests/cases/conformance/async/es5/functionDeclarations/asyncFunctionDeclaration10_es5.ts (9 errors) ====
1213
async function foo(a = await => await): Promise<void> {
1314
~~~~~~~~~
1415
!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
16+
~~~~~
17+
!!! error TS2524: 'await' expressions cannot be used in a parameter initializer.
1518
~~
1619
!!! error TS1109: Expression expected.
1720
~~~~~

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts(1,20): error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
2+
tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts(1,24): error TS2524: 'await' expressions cannot be used in a parameter initializer.
23
tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts(1,30): error TS1109: Expression expected.
34
tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts(1,33): error TS1138: Parameter declaration expected.
45
tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts(1,33): error TS2304: Cannot find name 'await'.
@@ -8,10 +9,12 @@ tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1
89
tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts(1,53): error TS1109: Expression expected.
910

1011

11-
==== tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts (8 errors) ====
12+
==== tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration10_es6.ts (9 errors) ====
1213
async function foo(a = await => await): Promise<void> {
1314
~~~~~~~~~
1415
!!! error TS2371: A parameter initializer is only allowed in a function or constructor implementation.
16+
~~~~~
17+
!!! error TS2524: 'await' expressions cannot be used in a parameter initializer.
1518
~~
1619
!!! error TS1109: Expression expected.
1720
~~~~~

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎tests/baselines/reference/destructureGenerics.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@ declare function f<T extends any[]>(...args: T): T;
33
var x = f(1,2);
44
var x: [1, 2];
55
declare function g<T extends [number, number]>(...args: T): T;
6-
var y = g(1); // error
7-
var y: [1];
86
var z = g(1,2);
97
var z: [1,2];
10-
var a = g(1,2,3); // error
11-
var a: [1,2,3];
128
declare function h<T>(...args: T[]): T;
139
var b = h(1,2,3);
1410
var b: number;
@@ -17,11 +13,7 @@ var b: number;
1713
//// [destructureGenerics.js]
1814
var x = f(1, 2);
1915
var x;
20-
var y = g(1); // error
21-
var y;
2216
var z = g(1, 2);
2317
var z;
24-
var a = g(1, 2, 3); // error
25-
var a;
2618
var b = h(1, 2, 3);
2719
var b;

‎tests/baselines/reference/destructureGenerics.symbols‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,43 @@
11
=== tests/cases/compiler/destructureGenerics.ts ===
2-
// declare function f<T extends any[]>(...args: T): T;
3-
// var x = f(1,2);
4-
// var x: number[];
2+
declare function f<T extends any[]>(...args: T): T;
3+
>f : Symbol(f, Decl(destructureGenerics.ts, 0, 0))
4+
>T : Symbol(T, Decl(destructureGenerics.ts, 0, 19))
5+
>args : Symbol(args, Decl(destructureGenerics.ts, 0, 36))
6+
>T : Symbol(T, Decl(destructureGenerics.ts, 0, 19))
7+
>T : Symbol(T, Decl(destructureGenerics.ts, 0, 19))
8+
9+
var x = f(1,2);
10+
>x : Symbol(x, Decl(destructureGenerics.ts, 1, 3), Decl(destructureGenerics.ts, 2, 3))
11+
>f : Symbol(f, Decl(destructureGenerics.ts, 0, 0))
12+
13+
var x: [1, 2];
14+
>x : Symbol(x, Decl(destructureGenerics.ts, 1, 3), Decl(destructureGenerics.ts, 2, 3))
15+
516
declare function g<T extends [number, number]>(...args: T): T;
6-
>g : Symbol(g, Decl(destructureGenerics.ts, 0, 0))
17+
>g : Symbol(g, Decl(destructureGenerics.ts, 2, 14))
718
>T : Symbol(T, Decl(destructureGenerics.ts, 3, 19))
819
>args : Symbol(args, Decl(destructureGenerics.ts, 3, 47))
920
>T : Symbol(T, Decl(destructureGenerics.ts, 3, 19))
1021
>T : Symbol(T, Decl(destructureGenerics.ts, 3, 19))
1122

12-
// var y = g(1); // error
13-
// var y: [1];
1423
var z = g(1,2);
15-
>z : Symbol(z, Decl(destructureGenerics.ts, 6, 3))
16-
>g : Symbol(g, Decl(destructureGenerics.ts, 0, 0))
24+
>z : Symbol(z, Decl(destructureGenerics.ts, 4, 3), Decl(destructureGenerics.ts, 5, 3))
25+
>g : Symbol(g, Decl(destructureGenerics.ts, 2, 14))
26+
27+
var z: [1,2];
28+
>z : Symbol(z, Decl(destructureGenerics.ts, 4, 3), Decl(destructureGenerics.ts, 5, 3))
1729

18-
// var z: [1,2];
19-
// var a = g(1,2,3); // error
20-
// var a: [1,2,3];
2130
declare function h<T>(...args: T[]): T;
22-
>h : Symbol(h, Decl(destructureGenerics.ts, 6, 15))
23-
>T : Symbol(T, Decl(destructureGenerics.ts, 10, 19))
24-
>args : Symbol(args, Decl(destructureGenerics.ts, 10, 22))
25-
>T : Symbol(T, Decl(destructureGenerics.ts, 10, 19))
26-
>T : Symbol(T, Decl(destructureGenerics.ts, 10, 19))
31+
>h : Symbol(h, Decl(destructureGenerics.ts, 5, 13))
32+
>T : Symbol(T, Decl(destructureGenerics.ts, 6, 19))
33+
>args : Symbol(args, Decl(destructureGenerics.ts, 6, 22))
34+
>T : Symbol(T, Decl(destructureGenerics.ts, 6, 19))
35+
>T : Symbol(T, Decl(destructureGenerics.ts, 6, 19))
2736

2837
var b = h(1,2,3);
29-
>b : Symbol(b, Decl(destructureGenerics.ts, 11, 3))
30-
>h : Symbol(h, Decl(destructureGenerics.ts, 6, 15))
38+
>b : Symbol(b, Decl(destructureGenerics.ts, 7, 3), Decl(destructureGenerics.ts, 8, 3))
39+
>h : Symbol(h, Decl(destructureGenerics.ts, 5, 13))
3140

32-
// var b: 1|2|3;
41+
var b: number;
42+
>b : Symbol(b, Decl(destructureGenerics.ts, 7, 3), Decl(destructureGenerics.ts, 8, 3))
3343

‎tests/baselines/reference/destructureGenerics.types‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
11
=== tests/cases/compiler/destructureGenerics.ts ===
2-
// declare function f<T extends any[]>(...args: T): T;
3-
// var x = f(1,2);
4-
// var x: number[];
2+
declare function f<T extends any[]>(...args: T): T;
3+
>f : <T extends any[]>(...args: T) => T
4+
>T : T
5+
>args : T
6+
>T : T
7+
>T : T
8+
9+
var x = f(1,2);
10+
>x : [1, 2]
11+
>f(1,2) : [1, 2]
12+
>f : <T extends any[]>(...args: T) => T
13+
>1 : 1
14+
>2 : 2
15+
16+
var x: [1, 2];
17+
>x : [1, 2]
18+
519
declare function g<T extends [number, number]>(...args: T): T;
620
>g : <T extends [number, number]>(...args: T) => T
721
>T : T
822
>args : T
923
>T : T
1024
>T : T
1125

12-
// var y = g(1); // error
13-
// var y: [1];
1426
var z = g(1,2);
1527
>z : [1, 2]
1628
>g(1,2) : [1, 2]
1729
>g : <T extends [number, number]>(...args: T) => T
1830
>1 : 1
1931
>2 : 2
2032

21-
// var z: [1,2];
22-
// var a = g(1,2,3); // error
23-
// var a: [1,2,3];
33+
var z: [1,2];
34+
>z : [1, 2]
35+
2436
declare function h<T>(...args: T[]): T;
2537
>h : <T>(...args: T[]) => T
2638
>T : T
@@ -36,5 +48,6 @@ var b = h(1,2,3);
3648
>2 : 2
3749
>3 : 3
3850

39-
// var b: 1|2|3;
51+
var b: number;
52+
>b : number
4053

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
tests/cases/compiler/destructureGenericsErrors.ts(2,9): error TS2554: Expected 2 arguments, but got 1.
2+
tests/cases/compiler/destructureGenericsErrors.ts(4,15): error TS2345: Argument of type '3' is not assignable to parameter of type 'never'.
3+
4+
5+
==== tests/cases/compiler/destructureGenericsErrors.ts (2 errors) ====
6+
declare function g<T extends [number, number]>(...args: T): T;
7+
var y = g(1); // error
8+
~~~~
9+
!!! error TS2554: Expected 2 arguments, but got 1.
10+
var y: [1];
11+
var a = g(1,2,3); // error
12+
~
13+
!!! error TS2345: Argument of type '3' is not assignable to parameter of type 'never'.
14+
var a: [1,2,3];
15+

0 commit comments

Comments
 (0)