improve error message and update testcase

Author: Kingwl

src/compiler/checker.ts

@@ -28717,16 +28717,7 @@ namespace ts {
         }
 
         function getNonSimpleParameters(parameters: ReadonlyArray<ParameterDeclaration>): ReadonlyArray<ParameterDeclaration> {
-            // ECMA-262 14.1.13
-            if (parameters.length === 0) return [];
-
-            const last = lastOrUndefined(parameters);
-            if (last && isRestParameter(last)) return [last];
-
-            return filter(parameters, parameter => {
-                // ECMA-262 13.3.3.4
-                return !!parameter.initializer || isBindingPattern(parameter.name);
-            });
+            return filter(parameters, parameter => !!parameter.initializer || isBindingPattern(parameter.name) || isRestParameter(parameter));
         }
 
         function checkGrammarForUseStrictSimpleParameterList(node: FunctionLikeDeclaration): boolean {
@@ -28738,12 +28729,12 @@ namespace ts {
                         forEach(nonSimpleParameters, parameter => {
                             addRelatedInfo(
                                 error(parameter, Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive),
-                                createDiagnosticForNode(useStrictDirective, Diagnostics._0_is_here, "use strict directive")
+                                createDiagnosticForNode(useStrictDirective, Diagnostics.use_strict_directive_used_here)
                             );
                         });
 
                         const diagnostics = nonSimpleParameters.map((parameter, index) => (
-                            index === 0 ? createDiagnosticForNode(parameter, Diagnostics._0_is_here, "parameter") : createDiagnosticForNode(parameter, Diagnostics.and_here)
+                            index === 0 ? createDiagnosticForNode(parameter, Diagnostics.Non_simple_parameter_declared_here) : createDiagnosticForNode(parameter, Diagnostics.and_here)
                         )) as [DiagnosticWithLocation, ...DiagnosticWithLocation[]];
                         addRelatedInfo(error(useStrictDirective, Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list), ...diagnostics);
                         return true;

src/compiler/diagnosticMessages.json

@@ -991,14 +991,18 @@
         "category": "Error",
         "code": 1345
     },
-    "'use strict' directive cannot be used with non simple parameter list.": {
+    "'use strict' directive cannot be used with non-simple parameter list.": {
         "category": "Error",
         "code": 1346
     },
-    "{0} is here.": {
+    "Non-simple parameter declared here.": {
         "category": "Error",
         "code": 1347
     },
+    "'use strict' directive used here.": {
+        "category": "Error",
+        "code": 1348
+    },
 
     "Duplicate identifier '{0}'.": {
         "category": "Error",

tests/baselines/reference/functionWithUseStrictAndSimpleParameterList.js

@@ -17,6 +17,10 @@ function rest(...args: any[]) {
     'use strict';
 }
 
+function rest1(a = 1, ...args) {
+    'use strict';
+}
+
 function paramDefault(param = 1) {
     'use strict';
 }
@@ -69,6 +73,14 @@ function rest() {
         args[_i] = arguments[_i];
     }
 }
+function rest1(a) {
+    'use strict';
+    if (a === void 0) { a = 1; }
+    var args = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args[_i - 1] = arguments[_i];
+    }
+}
 function paramDefault(param) {
     'use strict';
     if (param === void 0) { param = 1; }

tests/baselines/reference/functionWithUseStrictAndSimpleParameterList.symbols

@@ -31,52 +31,60 @@ function rest(...args: any[]) {
     'use strict';
 }
 
+function rest1(a = 1, ...args) {
+>rest1 : Symbol(rest1, Decl(functionWithUseStrictAndSimpleParameterList.ts, 16, 1))
+>a : Symbol(a, Decl(functionWithUseStrictAndSimpleParameterList.ts, 18, 15))
+>args : Symbol(args, Decl(functionWithUseStrictAndSimpleParameterList.ts, 18, 21))
+
+    'use strict';
+}
+
 function paramDefault(param = 1) {
->paramDefault : Symbol(paramDefault, Decl(functionWithUseStrictAndSimpleParameterList.ts, 16, 1))
->param : Symbol(param, Decl(functionWithUseStrictAndSimpleParameterList.ts, 18, 22))
+>paramDefault : Symbol(paramDefault, Decl(functionWithUseStrictAndSimpleParameterList.ts, 20, 1))
+>param : Symbol(param, Decl(functionWithUseStrictAndSimpleParameterList.ts, 22, 22))
 
     'use strict';
 }
 
 function objectBindingPattern({foo}: any) {
->objectBindingPattern : Symbol(objectBindingPattern, Decl(functionWithUseStrictAndSimpleParameterList.ts, 20, 1))
->foo : Symbol(foo, Decl(functionWithUseStrictAndSimpleParameterList.ts, 22, 31))
+>objectBindingPattern : Symbol(objectBindingPattern, Decl(functionWithUseStrictAndSimpleParameterList.ts, 24, 1))
+>foo : Symbol(foo, Decl(functionWithUseStrictAndSimpleParameterList.ts, 26, 31))
 
     'use strict';
 }
 
 function arrayBindingPattern([foo]: any[]) {
->arrayBindingPattern : Symbol(arrayBindingPattern, Decl(functionWithUseStrictAndSimpleParameterList.ts, 24, 1))
->foo : Symbol(foo, Decl(functionWithUseStrictAndSimpleParameterList.ts, 26, 30))
+>arrayBindingPattern : Symbol(arrayBindingPattern, Decl(functionWithUseStrictAndSimpleParameterList.ts, 28, 1))
+>foo : Symbol(foo, Decl(functionWithUseStrictAndSimpleParameterList.ts, 30, 30))
 
     'use strict';
 }
 
 function manyParameter(a = 10, b = 20) {
->manyParameter : Symbol(manyParameter, Decl(functionWithUseStrictAndSimpleParameterList.ts, 28, 1))
->a : Symbol(a, Decl(functionWithUseStrictAndSimpleParameterList.ts, 30, 23))
->b : Symbol(b, Decl(functionWithUseStrictAndSimpleParameterList.ts, 30, 30))
+>manyParameter : Symbol(manyParameter, Decl(functionWithUseStrictAndSimpleParameterList.ts, 32, 1))
+>a : Symbol(a, Decl(functionWithUseStrictAndSimpleParameterList.ts, 34, 23))
+>b : Symbol(b, Decl(functionWithUseStrictAndSimpleParameterList.ts, 34, 30))
 
     "use strict";
 }
 
 function manyPrologue(a = 10, b = 20) {
->manyPrologue : Symbol(manyPrologue, Decl(functionWithUseStrictAndSimpleParameterList.ts, 32, 1))
->a : Symbol(a, Decl(functionWithUseStrictAndSimpleParameterList.ts, 34, 22))
->b : Symbol(b, Decl(functionWithUseStrictAndSimpleParameterList.ts, 34, 29))
+>manyPrologue : Symbol(manyPrologue, Decl(functionWithUseStrictAndSimpleParameterList.ts, 36, 1))
+>a : Symbol(a, Decl(functionWithUseStrictAndSimpleParameterList.ts, 38, 22))
+>b : Symbol(b, Decl(functionWithUseStrictAndSimpleParameterList.ts, 38, 29))
 
     "foo";
     "use strict";
 }
 
 function invalidPrologue(a = 10, b = 20) {
->invalidPrologue : Symbol(invalidPrologue, Decl(functionWithUseStrictAndSimpleParameterList.ts, 37, 1))
->a : Symbol(a, Decl(functionWithUseStrictAndSimpleParameterList.ts, 39, 25))
->b : Symbol(b, Decl(functionWithUseStrictAndSimpleParameterList.ts, 39, 32))
+>invalidPrologue : Symbol(invalidPrologue, Decl(functionWithUseStrictAndSimpleParameterList.ts, 41, 1))
+>a : Symbol(a, Decl(functionWithUseStrictAndSimpleParameterList.ts, 43, 25))
+>b : Symbol(b, Decl(functionWithUseStrictAndSimpleParameterList.ts, 43, 32))
 
     "foo";
     const c = 1;
->c : Symbol(c, Decl(functionWithUseStrictAndSimpleParameterList.ts, 41, 9))
+>c : Symbol(c, Decl(functionWithUseStrictAndSimpleParameterList.ts, 45, 9))
 
     "use strict";
 }

tests/baselines/reference/functionWithUseStrictAndSimpleParameterList.types

@@ -39,6 +39,16 @@ function rest(...args: any[]) {
 >'use strict' : "use strict"
 }
 
+function rest1(a = 1, ...args) {
+>rest1 : (a?: number, ...args: any[]) => void
+>a : number
+>1 : 1
+>args : any[]
+
+    'use strict';
+>'use strict' : "use strict"
+}
+
 function paramDefault(param = 1) {
 >paramDefault : (param?: number) => void
 >param : number