Address code review: have more explicit error

Author: Yui T

src/compiler/checker.ts

@@ -12441,7 +12441,15 @@ module ts {
                 let identifier = <Identifier>name;
                 if (contextNode && (contextNode.parserContextFlags & ParserContextFlags.StrictMode) && isEvalOrArgumentsIdentifier(identifier)) {
                     let nameText = declarationNameToString(identifier);
-                    return grammarErrorOnNode(identifier, Diagnostics.Invalid_use_of_0_in_strict_mode, nameText);
+
+                    // We are checking if this parameter's name is of method or constructor so that we can give more explicit errors because
+                    // invalid usage error particularly of "arguments" is very common mistake
+                    if (contextNode && (contextNode.parent.kind === SyntaxKind.MethodDeclaration || contextNode.parent.kind === SyntaxKind.Constructor)) {
+                        return grammarErrorOnNode(identifier, Diagnostics.Invalid_use_of_0_because_class_definition_is_considered_a_strict_mode_code, nameText);
+                    }
+                    else {
+                        return grammarErrorOnNode(identifier, Diagnostics.Invalid_use_of_0_in_strict_mode, nameText);
+                    }
                 }
             }
         }

src/compiler/diagnosticInformationMap.generated.ts

@@ -167,6 +167,7 @@ module ts {
         Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: DiagnosticCategory.Error, key: "Decorators cannot be applied to multiple get/set accessors of the same name." },
         Cannot_compile_non_external_modules_when_the_separateCompilation_flag_is_provided: { code: 1208, category: DiagnosticCategory.Error, key: "Cannot compile non-external modules when the '--separateCompilation' flag is provided." },
         Ambient_const_enums_are_not_allowed_when_the_separateCompilation_flag_is_provided: { code: 1209, category: DiagnosticCategory.Error, key: "Ambient const enums are not allowed when the '--separateCompilation' flag is provided." },
+        Invalid_use_of_0_because_class_definition_is_considered_a_strict_mode_code: { code: 1210, category: DiagnosticCategory.Error, key: "Invalid use of '{0}' because class definition is considered a strict mode code " },
         Duplicate_identifier_0: { code: 2300, category: DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },

src/compiler/diagnosticMessages.json

@@ -659,6 +659,10 @@
         "category": "Error",
         "code": 1209
     },
+    "Invalid use of '{0}' because class definition is considered a strict mode code ": {
+        "category": "Error",
+        "code":  1210
+    },
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2300

tests/baselines/reference/collisionArgumentsClassConstructor.errors.txt

@@ -1,34 +1,34 @@
 tests/cases/compiler/collisionArgumentsClassMethod.ts(2,27): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(2,30): error TS1100: Invalid use of 'arguments' in strict mode.
+tests/cases/compiler/collisionArgumentsClassMethod.ts(2,30): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
 tests/cases/compiler/collisionArgumentsClassMethod.ts(3,13): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(5,17): error TS1100: Invalid use of 'arguments' in strict mode.
+tests/cases/compiler/collisionArgumentsClassMethod.ts(5,17): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
 tests/cases/compiler/collisionArgumentsClassMethod.ts(5,17): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 tests/cases/compiler/collisionArgumentsClassMethod.ts(6,13): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(8,23): error TS1100: Invalid use of 'arguments' in strict mode.
+tests/cases/compiler/collisionArgumentsClassMethod.ts(8,23): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
 tests/cases/compiler/collisionArgumentsClassMethod.ts(9,13): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(11,29): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(12,29): error TS1100: Invalid use of 'arguments' in strict mode.
+tests/cases/compiler/collisionArgumentsClassMethod.ts(11,29): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(12,29): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
 tests/cases/compiler/collisionArgumentsClassMethod.ts(13,23): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(13,26): error TS1100: Invalid use of 'arguments' in strict mode.
+tests/cases/compiler/collisionArgumentsClassMethod.ts(13,26): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
 tests/cases/compiler/collisionArgumentsClassMethod.ts(14,13): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(16,16): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(17,16): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(18,16): error TS1100: Invalid use of 'arguments' in strict mode.
+tests/cases/compiler/collisionArgumentsClassMethod.ts(16,16): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(17,16): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(18,16): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
 tests/cases/compiler/collisionArgumentsClassMethod.ts(18,16): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
 tests/cases/compiler/collisionArgumentsClassMethod.ts(19,13): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(21,22): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(22,22): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(23,22): error TS1100: Invalid use of 'arguments' in strict mode.
+tests/cases/compiler/collisionArgumentsClassMethod.ts(21,22): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(22,22): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(23,22): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
 tests/cases/compiler/collisionArgumentsClassMethod.ts(24,13): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(29,30): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(30,17): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(31,23): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(33,29): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(34,29): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(35,16): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(36,16): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(37,22): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/compiler/collisionArgumentsClassMethod.ts(38,22): error TS1100: Invalid use of 'arguments' in strict mode.
+tests/cases/compiler/collisionArgumentsClassMethod.ts(29,30): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(30,17): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(31,23): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(33,29): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(34,29): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(35,16): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(36,16): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(37,22): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/compiler/collisionArgumentsClassMethod.ts(38,22): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
 tests/cases/compiler/collisionArgumentsClassMethod.ts(43,13): error TS1100: Invalid use of 'arguments' in strict mode.
 tests/cases/compiler/collisionArgumentsClassMethod.ts(46,13): error TS1100: Invalid use of 'arguments' in strict mode.
 
@@ -39,14 +39,14 @@ tests/cases/compiler/collisionArgumentsClassMethod.ts(46,13): error TS1100: Inva
                               ~~~~~~~~~~~~
 !!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
                                  ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
             var arguments: any[]; // no error
                 ~~~~~~~~~
 !!! error TS1100: Invalid use of 'arguments' in strict mode.
         }
         public foo1(arguments: number, ...rest) { //arguments is error
                     ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
                     ~~~~~~~~~~~~~~~~~
 !!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
             var arguments = 10; // no error
@@ -55,35 +55,35 @@ tests/cases/compiler/collisionArgumentsClassMethod.ts(46,13): error TS1100: Inva
         }
         public fooNoError(arguments: number) { // no error
                           ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
             var arguments = 10; // no error
                 ~~~~~~~~~
 !!! error TS1100: Invalid use of 'arguments' in strict mode.
         }
         public f4(i: number, ...arguments); // no codegen no error
                                 ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f4(i: string, ...arguments); // no codegen no error
                                 ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f4(i: any, ...arguments) { // error
                           ~~~~~~~~~~~~
 !!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
                              ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
             var arguments: any[]; // no error
                 ~~~~~~~~~
 !!! error TS1100: Invalid use of 'arguments' in strict mode.
         }
         public f41(arguments: number, ...rest); // no codegen no error
                    ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f41(arguments: string, ...rest); // no codegen no error
                    ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f41(arguments: any, ...rest) { // error
                    ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
                    ~~~~~~~~~~~~~~
 !!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
             var arguments: any; // no error
@@ -92,13 +92,13 @@ tests/cases/compiler/collisionArgumentsClassMethod.ts(46,13): error TS1100: Inva
         }
         public f4NoError(arguments: number); // no error
                          ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f4NoError(arguments: string); // no error
                          ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f4NoError(arguments: any) { // no error
                          ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
             var arguments: any; // no error
                 ~~~~~~~~~
 !!! error TS1100: Invalid use of 'arguments' in strict mode.
@@ -108,32 +108,32 @@ tests/cases/compiler/collisionArgumentsClassMethod.ts(46,13): error TS1100: Inva
     declare class c2 {
         public foo(i: number, ...arguments); // No error - no code gen
                                  ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public foo1(arguments: number, ...rest); // No error - no code gen
                     ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public fooNoError(arguments: number); // No error - no code gen
                           ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
 
         public f4(i: number, ...arguments); // no codegen no error
                                 ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f4(i: string, ...arguments); // no codegen no error
                                 ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f41(arguments: number, ...rest); // no codegen no error
                    ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f41(arguments: string, ...rest); // no codegen no error
                    ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f4NoError(arguments: number); // no error
                          ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         public f4NoError(arguments: string); // no error
                          ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
     }
 
     class c3 {

tests/baselines/reference/collisionArgumentsClassMethod.errors.txt

@@ -1,5 +1,5 @@
-tests/cases/conformance/es6/classDeclaration/parseClassDeclarationInStrictModeByDefaultInES6.ts(4,16): error TS1100: Invalid use of 'arguments' in strict mode.
-tests/cases/conformance/es6/classDeclaration/parseClassDeclarationInStrictModeByDefaultInES6.ts(5,17): error TS1100: Invalid use of 'eval' in strict mode.
+tests/cases/conformance/es6/classDeclaration/parseClassDeclarationInStrictModeByDefaultInES6.ts(4,16): error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
+tests/cases/conformance/es6/classDeclaration/parseClassDeclarationInStrictModeByDefaultInES6.ts(5,17): error TS1210: Invalid use of 'eval' because class definition is considered a strict mode code 
 tests/cases/conformance/es6/classDeclaration/parseClassDeclarationInStrictModeByDefaultInES6.ts(6,9): error TS1100: Invalid use of 'arguments' in strict mode.
 tests/cases/conformance/es6/classDeclaration/parseClassDeclarationInStrictModeByDefaultInES6.ts(6,9): error TS2322: Type 'string' is not assignable to type 'IArguments'.
   Property 'callee' is missing in type 'String'.
@@ -11,10 +11,10 @@ tests/cases/conformance/es6/classDeclaration/parseClassDeclarationInStrictModeBy
         public implements() { }
         public foo(arguments: any) { }
                    ~~~~~~~~~
-!!! error TS1100: Invalid use of 'arguments' in strict mode.
+!!! error TS1210: Invalid use of 'arguments' because class definition is considered a strict mode code 
         private bar(eval:any) {
                     ~~~~
-!!! error TS1100: Invalid use of 'eval' in strict mode.
+!!! error TS1210: Invalid use of 'eval' because class definition is considered a strict mode code 
             arguments = "hello";
             ~~~~~~~~~
 !!! error TS1100: Invalid use of 'arguments' in strict mode.