Skip to content

Commit 42d8968

Browse files
sandersnsandersn
committed
Finish botched merge from master
1 parent f1a1b7f commit 42d8968

File tree

83 files changed

+459
-459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+459
-459
lines changed

‎src/compiler/diagnosticMessages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1869,7 +1869,7 @@
18691869
},
18701870
"Expected {0} arguments, but got a minimum of {1}.": {
18711871
"category": "Error",
1872-
"code": 2555
1872+
"code": 2556
18731873
},
18741874
"Expected at least {0} arguments, but got a minimum of {1}.": {
18751875
"category": "Error",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/Symbols/ES5SymbolProperty5.ts(7,1): error TS2553: Expected 0 arguments, but got 1.
1+
tests/cases/conformance/Symbols/ES5SymbolProperty5.ts(7,1): error TS2554: Expected 0 arguments, but got 1.
22

33

44
==== tests/cases/conformance/Symbols/ES5SymbolProperty5.ts (1 errors) ====
@@ -10,4 +10,4 @@ tests/cases/conformance/Symbols/ES5SymbolProperty5.ts(7,1): error TS2553: Expect
1010

1111
(new C)[Symbol.iterator](0) // Should error
1212
~~~~~~~~~~~~~~~~~~~~~~~~~~~
13-
!!! error TS2553: Expected 0 arguments, but got 1.
13+
!!! error TS2554: Expected 0 arguments, but got 1.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
tests/cases/compiler/assigningFromObjectToAnythingElse.ts(3,1): error TS2322: Type 'Object' is not assignable to type 'RegExp'.
22
The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
33
Property 'exec' is missing in type 'Object'.
4-
tests/cases/compiler/assigningFromObjectToAnythingElse.ts(5,17): error TS2557: Expected 0 type arguments, but got 1.
5-
tests/cases/compiler/assigningFromObjectToAnythingElse.ts(6,17): error TS2557: Expected 0 type arguments, but got 1.
4+
tests/cases/compiler/assigningFromObjectToAnythingElse.ts(5,17): error TS2558: Expected 0 type arguments, but got 1.
5+
tests/cases/compiler/assigningFromObjectToAnythingElse.ts(6,17): error TS2558: Expected 0 type arguments, but got 1.
66
tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2322: Type 'Object' is not assignable to type 'Error'.
77
The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?
88
Property 'name' is missing in type 'Object'.
@@ -19,10 +19,10 @@ tests/cases/compiler/assigningFromObjectToAnythingElse.ts(8,5): error TS2322: Ty
1919

2020
var a: String = Object.create<Object>("");
2121
~~~~~~~~~~~~~~~~~~~~~~~~~
22-
!!! error TS2557: Expected 0 type arguments, but got 1.
22+
!!! error TS2558: Expected 0 type arguments, but got 1.
2323
var c: String = Object.create<Number>(1);
2424
~~~~~~~~~~~~~~~~~~~~~~~~
25-
!!! error TS2557: Expected 0 type arguments, but got 1.
25+
!!! error TS2558: Expected 0 type arguments, but got 1.
2626

2727
var w: Error = new Object();
2828
~

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tests/cases/compiler/baseCheck.ts(9,18): error TS2552: Cannot find name 'loc'. Did you mean 'ELoc'?
2-
tests/cases/compiler/baseCheck.ts(17,53): error TS2553: Expected 2 arguments, but got 1.
2+
tests/cases/compiler/baseCheck.ts(17,53): error TS2554: Expected 2 arguments, but got 1.
33
tests/cases/compiler/baseCheck.ts(17,59): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
44
tests/cases/compiler/baseCheck.ts(18,62): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
55
tests/cases/compiler/baseCheck.ts(19,59): error TS2345: Argument of type '"hello"' is not assignable to parameter of type 'number'.
@@ -30,7 +30,7 @@ tests/cases/compiler/baseCheck.ts(26,9): error TS2304: Cannot find name 'x'.
3030

3131
class D extends C { constructor(public z: number) { super(this.z) } } // too few params
3232
~~~~~~~~~~~~~
33-
!!! error TS2553: Expected 2 arguments, but got 1.
33+
!!! error TS2554: Expected 2 arguments, but got 1.
3434
~~~~
3535
!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
3636
class E extends C { constructor(public z: number) { super(0, this.z) } }

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(3,18): error TS2393: Duplicate function implementation.
2-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(5,9): error TS2553: Expected 0 arguments, but got 1.
2+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(5,9): error TS2554: Expected 0 arguments, but got 1.
33
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(8,18): error TS2393: Duplicate function implementation.
4-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(10,9): error TS2553: Expected 0 arguments, but got 1.
5-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(12,5): error TS2553: Expected 0 arguments, but got 1.
6-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(16,1): error TS2553: Expected 1 arguments, but got 0.
4+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(10,9): error TS2554: Expected 0 arguments, but got 1.
5+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(12,5): error TS2554: Expected 0 arguments, but got 1.
6+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(16,1): error TS2554: Expected 1 arguments, but got 0.
77

88

99
==== tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts (6 errors) ====
@@ -15,7 +15,7 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(16,1): error T
1515
foo();
1616
foo(10); // not ok
1717
~~~~~~~
18-
!!! error TS2553: Expected 0 arguments, but got 1.
18+
!!! error TS2554: Expected 0 arguments, but got 1.
1919
}
2020
else {
2121
function foo() { } // duplicate function
@@ -24,14 +24,14 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationES5.ts(16,1): error T
2424
foo();
2525
foo(10); // not ok
2626
~~~~~~~
27-
!!! error TS2553: Expected 0 arguments, but got 1.
27+
!!! error TS2554: Expected 0 arguments, but got 1.
2828
}
2929
foo(10); // not ok
3030
~~~~~~~
31-
!!! error TS2553: Expected 0 arguments, but got 1.
31+
!!! error TS2554: Expected 0 arguments, but got 1.
3232
foo();
3333
}
3434
foo(10);
3535
foo(); // not ok - needs number
3636
~~~~~
37-
!!! error TS2553: Expected 1 arguments, but got 0.
37+
!!! error TS2554: Expected 1 arguments, but got 0.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(3,18): error TS2393: Duplicate function implementation.
2-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(5,9): error TS2553: Expected 0 arguments, but got 1.
2+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(5,9): error TS2554: Expected 0 arguments, but got 1.
33
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(8,18): error TS2393: Duplicate function implementation.
4-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(10,9): error TS2553: Expected 0 arguments, but got 1.
5-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(12,5): error TS2553: Expected 0 arguments, but got 1.
6-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(16,1): error TS2553: Expected 1 arguments, but got 0.
4+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(10,9): error TS2554: Expected 0 arguments, but got 1.
5+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(12,5): error TS2554: Expected 0 arguments, but got 1.
6+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(16,1): error TS2554: Expected 1 arguments, but got 0.
77

88

99
==== tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts (6 errors) ====
@@ -15,7 +15,7 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(16,1): error T
1515
foo();
1616
foo(10); // not ok
1717
~~~~~~~
18-
!!! error TS2553: Expected 0 arguments, but got 1.
18+
!!! error TS2554: Expected 0 arguments, but got 1.
1919
}
2020
else {
2121
function foo() { } // duplicate
@@ -24,14 +24,14 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationES6.ts(16,1): error T
2424
foo();
2525
foo(10);// not ok
2626
~~~~~~~
27-
!!! error TS2553: Expected 0 arguments, but got 1.
27+
!!! error TS2554: Expected 0 arguments, but got 1.
2828
}
2929
foo(10); // not ok
3030
~~~~~~~
31-
!!! error TS2553: Expected 0 arguments, but got 1.
31+
!!! error TS2554: Expected 0 arguments, but got 1.
3232
foo();
3333
}
3434
foo(10);
3535
foo(); // not ok - needs number
3636
~~~~~
37-
!!! error TS2553: Expected 1 arguments, but got 0.
37+
!!! error TS2554: Expected 1 arguments, but got 0.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(4,18): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
2-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(6,9): error TS2553: Expected 0 arguments, but got 1.
2+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(6,9): error TS2554: Expected 0 arguments, but got 1.
33
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(9,18): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'.
4-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(11,9): error TS2553: Expected 0 arguments, but got 1.
5-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(14,5): error TS2553: Expected 1 arguments, but got 0.
6-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(17,1): error TS2553: Expected 1 arguments, but got 0.
4+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(11,9): error TS2554: Expected 0 arguments, but got 1.
5+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(14,5): error TS2554: Expected 1 arguments, but got 0.
6+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(17,1): error TS2554: Expected 1 arguments, but got 0.
77

88

99
==== tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts (6 errors) ====
@@ -16,7 +16,7 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(17,1): e
1616
foo();
1717
foo(10); // not ok
1818
~~~~~~~
19-
!!! error TS2553: Expected 0 arguments, but got 1.
19+
!!! error TS2554: Expected 0 arguments, but got 1.
2020
}
2121
else {
2222
function foo() { } // Error to declare function in block scope
@@ -25,14 +25,14 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES5.ts(17,1): e
2525
foo();
2626
foo(10); // not ok
2727
~~~~~~~
28-
!!! error TS2553: Expected 0 arguments, but got 1.
28+
!!! error TS2554: Expected 0 arguments, but got 1.
2929
}
3030
foo(10);
3131
foo(); // not ok - needs number
3232
~~~~~
33-
!!! error TS2553: Expected 1 arguments, but got 0.
33+
!!! error TS2554: Expected 1 arguments, but got 0.
3434
}
3535
foo(10);
3636
foo(); // not ok - needs number
3737
~~~~~
38-
!!! error TS2553: Expected 1 arguments, but got 0.
38+
!!! error TS2554: Expected 1 arguments, but got 0.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(6,9): error TS2553: Expected 0 arguments, but got 1.
2-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(11,9): error TS2553: Expected 0 arguments, but got 1.
3-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(14,5): error TS2553: Expected 1 arguments, but got 0.
4-
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(17,1): error TS2553: Expected 1 arguments, but got 0.
1+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(6,9): error TS2554: Expected 0 arguments, but got 1.
2+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(11,9): error TS2554: Expected 0 arguments, but got 1.
3+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(14,5): error TS2554: Expected 1 arguments, but got 0.
4+
tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(17,1): error TS2554: Expected 1 arguments, but got 0.
55

66

77
==== tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts (4 errors) ====
@@ -12,21 +12,21 @@ tests/cases/compiler/blockScopedSameNameFunctionDeclarationStrictES6.ts(17,1): e
1212
foo();
1313
foo(10); // not ok
1414
~~~~~~~
15-
!!! error TS2553: Expected 0 arguments, but got 1.
15+
!!! error TS2554: Expected 0 arguments, but got 1.
1616
}
1717
else {
1818
function foo() { }
1919
foo();
2020
foo(10); // not ok
2121
~~~~~~~
22-
!!! error TS2553: Expected 0 arguments, but got 1.
22+
!!! error TS2554: Expected 0 arguments, but got 1.
2323
}
2424
foo(10);
2525
foo(); // not ok
2626
~~~~~
27-
!!! error TS2553: Expected 1 arguments, but got 0.
27+
!!! error TS2554: Expected 1 arguments, but got 0.
2828
}
2929
foo(10);
3030
foo(); // not ok - needs number
3131
~~~~~
32-
!!! error TS2553: Expected 1 arguments, but got 0.
32+
!!! error TS2554: Expected 1 arguments, but got 0.

0 commit comments

Comments
 (0)