Code review changes and simplification of diagnostic message

Author: rFlorian

src/compiler/checker.ts

@@ -19061,22 +19061,20 @@ namespace ts {
                     max = Math.max(max, maxCount);
                 }
 
+                const hasRestParameter = some(signatures, hasEffectiveRestParameter);
+                const paramRange = hasRestParameter ? min :
+                    min < max ? min + "-" + max :
+                    min;
                 const hasSpreadArgument = getSpreadArgumentIndex(args) > -1;
                 if (argCount <= max && hasSpreadArgument) argCount--;
 
-                const hasRestParameter = some(signatures, (sig: Signature) => sig.hasRestParameter);
-                const paramRange: string | number = hasRestParameter ?
-                    min :
-                    min < max ?
-                        min + "-" + max :
-                        min;
                 if (hasRestParameter || hasSpreadArgument) {
                     const error = hasRestParameter && hasSpreadArgument ? Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
                         hasRestParameter ? Diagnostics.Expected_at_least_0_arguments_but_got_1 : Diagnostics.Expected_0_arguments_but_got_1_or_more;
                     diagnostics.add(createDiagnosticForNode(node, error, paramRange, argCount));
                 }
                 else if (min < argCount && argCount < max) {
-                    diagnostics.add(createDiagnosticForNode(node, Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_at_least_2_arguments, argCount, belowArgCount, aboveArgCount));
+                    diagnostics.add(createDiagnosticForNode(node, Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount));
                 }
                 else {
                     diagnostics.add(createDiagnosticForNode(node, Diagnostics.Expected_0_arguments_but_got_1, paramRange, argCount));

src/compiler/diagnosticMessages.json

@@ -2056,7 +2056,7 @@
         "category": "Error",
         "code": 2574
     },
-    "No overload expects {0} arguments, but overloads do exist that expect either {1} or at least {2} arguments.": {
+    "No overload expects {0} arguments, but overloads do exist that expect either {1} or {2} arguments.": {
         "category": "Error",
         "code": 2575
     },

tests/baselines/reference/functionParameterArityMismatch.errors.txt

@@ -1,9 +1,9 @@
 tests/cases/compiler/functionParameterArityMismatch.ts(3,1): error TS2554: Expected 1-3 arguments, but got 0.
-tests/cases/compiler/functionParameterArityMismatch.ts(4,1): error TS2575: No overload expects 2 arguments, but overloads do exist that expect either 1 or at least 3 arguments.
+tests/cases/compiler/functionParameterArityMismatch.ts(4,1): error TS2575: No overload expects 2 arguments, but overloads do exist that expect either 1 or 3 arguments.
 tests/cases/compiler/functionParameterArityMismatch.ts(5,1): error TS2554: Expected 1-3 arguments, but got 4.
-tests/cases/compiler/functionParameterArityMismatch.ts(11,1): error TS2575: No overload expects 1 arguments, but overloads do exist that expect either 0 or at least 2 arguments.
-tests/cases/compiler/functionParameterArityMismatch.ts(12,1): error TS2575: No overload expects 3 arguments, but overloads do exist that expect either 2 or at least 4 arguments.
-tests/cases/compiler/functionParameterArityMismatch.ts(13,1): error TS2575: No overload expects 5 arguments, but overloads do exist that expect either 4 or at least 6 arguments.
+tests/cases/compiler/functionParameterArityMismatch.ts(11,1): error TS2575: No overload expects 1 arguments, but overloads do exist that expect either 0 or 2 arguments.
+tests/cases/compiler/functionParameterArityMismatch.ts(12,1): error TS2575: No overload expects 3 arguments, but overloads do exist that expect either 2 or 4 arguments.
+tests/cases/compiler/functionParameterArityMismatch.ts(13,1): error TS2575: No overload expects 5 arguments, but overloads do exist that expect either 4 or 6 arguments.
 tests/cases/compiler/functionParameterArityMismatch.ts(14,1): error TS2554: Expected 0-6 arguments, but got 7.
 
 
@@ -15,7 +15,7 @@ tests/cases/compiler/functionParameterArityMismatch.ts(14,1): error TS2554: Expe
 !!! error TS2554: Expected 1-3 arguments, but got 0.
     f1(1, 2);
     ~~~~~~~~
-!!! error TS2575: No overload expects 2 arguments, but overloads do exist that expect either 1 or at least 3 arguments.
+!!! error TS2575: No overload expects 2 arguments, but overloads do exist that expect either 1 or 3 arguments.
     f1(1, 2, 3, 4);
     ~~~~~~~~~~~~~~
 !!! error TS2554: Expected 1-3 arguments, but got 4.
@@ -26,13 +26,13 @@ tests/cases/compiler/functionParameterArityMismatch.ts(14,1): error TS2554: Expe
     declare function f2(a: number, b: number, c: number, d: number, e: number, f: number);
     f2(1);
     ~~~~~
-!!! error TS2575: No overload expects 1 arguments, but overloads do exist that expect either 0 or at least 2 arguments.
+!!! error TS2575: No overload expects 1 arguments, but overloads do exist that expect either 0 or 2 arguments.
     f2(1, 2, 3);
     ~~~~~~~~~~~
-!!! error TS2575: No overload expects 3 arguments, but overloads do exist that expect either 2 or at least 4 arguments.
+!!! error TS2575: No overload expects 3 arguments, but overloads do exist that expect either 2 or 4 arguments.
     f2(1, 2, 3, 4, 5);
     ~~~~~~~~~~~~~~~~~
-!!! error TS2575: No overload expects 5 arguments, but overloads do exist that expect either 4 or at least 6 arguments.
+!!! error TS2575: No overload expects 5 arguments, but overloads do exist that expect either 4 or 6 arguments.
     f2(1, 2, 3, 4, 5, 6, 7);
     ~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2554: Expected 0-6 arguments, but got 7.

tests/baselines/reference/genericRestParameters1.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/conformance/types/rest/genericRestParameters1.ts(22,1): error TS2557: Expected at least 3 arguments, but got 1 or more.
+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.
 
 
@@ -26,7 +26,7 @@ tests/cases/conformance/types/rest/genericRestParameters1.ts(31,1): error TS2556
     f1(ns[0], ns[1], true);
     f1(...ns, true);  // Error, tuple spread only expanded when last
     ~~~~~~~~~~~~~~~
-!!! error TS2557: Expected at least 3 arguments, but got 1 or more.
+!!! error TS2556: Expected 3 arguments, but got 1 or more.
 
     f2(42, "hello", true);
     f2(t3[0], t3[1], t3[2]);

tests/baselines/reference/iterableArrayPattern25.errors.txt

@@ -1,5 +1,5 @@
 tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts(1,33): error TS2501: A rest element cannot contain a binding pattern.
-tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts(2,1): error TS2555: Expected at least 2 arguments, but got 1.
+tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts(2,1): error TS2554: Expected 2 arguments, but got 1.
 
 
 ==== tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts (2 errors) ====
@@ -8,4 +8,4 @@ tests/cases/conformance/es6/destructuring/iterableArrayPattern25.ts(2,1): error
 !!! error TS2501: A rest element cannot contain a binding pattern.
     takeFirstTwoEntries(new Map([["", 0], ["hello", 1]]));
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2555: Expected at least 2 arguments, but got 1.
+!!! error TS2554: Expected 2 arguments, but got 1.