Updated error message for TS1031 (microsoft#40889)

saigeethakandepallicherukuru · Sai Geetha · web-flow · commit 0ba250dc3bf0 · 2020-10-01T16:37:14.000-07:00
Co-authored-by: Sai Geetha &lt;sai.geetha@ssi.samsung.com&gt;
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -38687,7 +38687,7 @@ namespace ts {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
                         else if (isClassLike(node.parent)) {
-                            return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
+                            return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_class_elements_of_this_kind, "export");
                         }
                         else if (node.kind === SyntaxKind.Parameter) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
@@ -38710,7 +38710,7 @@ namespace ts {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
                         else if (isClassLike(node.parent) && !isPropertyDeclaration(node)) {
-                            return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
+                            return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_class_elements_of_this_kind, "declare");
                         }
                         else if (node.kind === SyntaxKind.Parameter) {
                             return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -99,7 +99,7 @@
         "category": "Error",
         "code": 1030
     },
-    "'{0}' modifier cannot appear on a class element.": {
+    "'{0}' modifier cannot appear on class elements of this kind.": {
         "category": "Error",
         "code": 1031
     },
diff --git a/tests/baselines/reference/classExpressionPropertyModifiers.errors.txt b/tests/baselines/reference/classExpressionPropertyModifiers.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/classExpressionPropertyModifiers.ts(2,36): error TS1039: Initializers are not allowed in ambient contexts.
-tests/cases/compiler/classExpressionPropertyModifiers.ts(3,5): error TS1031: 'export' modifier cannot appear on a class element.
+tests/cases/compiler/classExpressionPropertyModifiers.ts(3,5): error TS1031: 'export' modifier cannot appear on class elements of this kind.
 
 
 ==== tests/cases/compiler/classExpressionPropertyModifiers.ts (2 errors) ====
@@ -9,6 +9,6 @@ tests/cases/compiler/classExpressionPropertyModifiers.ts(3,5): error TS1031: 'ex
 !!! error TS1039: Initializers are not allowed in ambient contexts.
         export foo = 1;
         ~~~~~~
-!!! error TS1031: 'export' modifier cannot appear on a class element.
+!!! error TS1031: 'export' modifier cannot appear on class elements of this kind.
     }
     
diff --git a/tests/baselines/reference/derivedUninitializedPropertyDeclaration.errors.txt b/tests/baselines/reference/derivedUninitializedPropertyDeclaration.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/conformance/classes/propertyMemberDeclarations/derivedUninitializedPropertyDeclaration.ts(12,21): error TS1255: A definite assignment assertion '!' is not permitted in this context.
-tests/cases/conformance/classes/propertyMemberDeclarations/derivedUninitializedPropertyDeclaration.ts(15,5): error TS1031: 'declare' modifier cannot appear on a class element.
+tests/cases/conformance/classes/propertyMemberDeclarations/derivedUninitializedPropertyDeclaration.ts(15,5): error TS1031: 'declare' modifier cannot appear on class elements of this kind.
 tests/cases/conformance/classes/propertyMemberDeclarations/derivedUninitializedPropertyDeclaration.ts(15,17): error TS1183: An implementation cannot be declared in ambient contexts.
 tests/cases/conformance/classes/propertyMemberDeclarations/derivedUninitializedPropertyDeclaration.ts(17,24): error TS1039: Initializers are not allowed in ambient contexts.
 tests/cases/conformance/classes/propertyMemberDeclarations/derivedUninitializedPropertyDeclaration.ts(24,5): error TS2564: Property 'p' has no initializer and is not definitely assigned in the constructor.
@@ -25,7 +25,7 @@ tests/cases/conformance/classes/propertyMemberDeclarations/derivedUninitializedP
     class BOther extends A {
         declare m() { return 2 } // not allowed on methods
         ~~~~~~~
-!!! error TS1031: 'declare' modifier cannot appear on a class element.
+!!! error TS1031: 'declare' modifier cannot appear on class elements of this kind.
                     ~
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
         declare nonce: any; // ok, even though it's not in the base
diff --git a/tests/baselines/reference/illegalModifiersOnClassElements.errors.txt b/tests/baselines/reference/illegalModifiersOnClassElements.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/illegalModifiersOnClassElements.ts(2,19): error TS1039: Initializers are not allowed in ambient contexts.
-tests/cases/compiler/illegalModifiersOnClassElements.ts(3,5): error TS1031: 'export' modifier cannot appear on a class element.
+tests/cases/compiler/illegalModifiersOnClassElements.ts(3,5): error TS1031: 'export' modifier cannot appear on class elements of this kind.
 
 
 ==== tests/cases/compiler/illegalModifiersOnClassElements.ts (2 errors) ====
@@ -9,5 +9,5 @@ tests/cases/compiler/illegalModifiersOnClassElements.ts(3,5): error TS1031: 'exp
 !!! error TS1039: Initializers are not allowed in ambient contexts.
         export bar = 1;
         ~~~~~~
-!!! error TS1031: 'export' modifier cannot appear on a class element.
+!!! error TS1031: 'export' modifier cannot appear on class elements of this kind.
     }
diff --git a/tests/baselines/reference/parserConstructorDeclaration3.errors.txt b/tests/baselines/reference/parserConstructorDeclaration3.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration3.ts(2,3): error TS1031: 'export' modifier cannot appear on a class element.
+tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration3.ts(2,3): error TS1031: 'export' modifier cannot appear on class elements of this kind.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration3.ts (1 errors) ====
     class C {
       export constructor() { }
       ~~~~~~
-!!! error TS1031: 'export' modifier cannot appear on a class element.
+!!! error TS1031: 'export' modifier cannot appear on class elements of this kind.
     }
diff --git a/tests/baselines/reference/parserConstructorDeclaration4.errors.txt b/tests/baselines/reference/parserConstructorDeclaration4.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration4.ts(2,3): error TS1031: 'declare' modifier cannot appear on a class element.
+tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration4.ts(2,3): error TS1031: 'declare' modifier cannot appear on class elements of this kind.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration4.ts (1 errors) ====
     class C {
       declare constructor() { }
       ~~~~~~~
-!!! error TS1031: 'declare' modifier cannot appear on a class element.
+!!! error TS1031: 'declare' modifier cannot appear on class elements of this kind.
     }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt
@@ -1,12 +1,12 @@
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts(2,5): error TS1031: 'export' modifier cannot appear on a class element.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts(2,5): error TS1031: 'export' modifier cannot appear on class elements of this kind.
 tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts(2,16): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts (2 errors) ====
     class C {
         export get Foo() { }
         ~~~~~~
-!!! error TS1031: 'export' modifier cannot appear on a class element.
+!!! error TS1031: 'export' modifier cannot appear on class elements of this kind.
                    ~~~
 !!! error TS2378: A 'get' accessor must return a value.
     }
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration11.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration11.errors.txt
@@ -1,12 +1,12 @@
-tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts(2,5): error TS1031: 'declare' modifier cannot appear on a class element.
+tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts(2,5): error TS1031: 'declare' modifier cannot appear on class elements of this kind.
 tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts(2,17): error TS2378: A 'get' accessor must return a value.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts (2 errors) ====
     class C {
         declare get Foo() { }
         ~~~~~~~
-!!! error TS1031: 'declare' modifier cannot appear on a class element.
+!!! error TS1031: 'declare' modifier cannot appear on class elements of this kind.
                     ~~~
 !!! error TS2378: A 'get' accessor must return a value.
     }
diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration4.errors.txt b/tests/baselines/reference/parserMemberFunctionDeclaration4.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration4.ts(2,5): error TS1031: 'export' modifier cannot appear on a class element.
+tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration4.ts(2,5): error TS1031: 'export' modifier cannot appear on class elements of this kind.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration4.ts (1 errors) ====
     class C {
         export Foo() { }
         ~~~~~~
-!!! error TS1031: 'export' modifier cannot appear on a class element.
+!!! error TS1031: 'export' modifier cannot appear on class elements of this kind.
     }
diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration5.errors.txt b/tests/baselines/reference/parserMemberFunctionDeclaration5.errors.txt
@@ -1,12 +1,12 @@
-tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration5.ts(2,5): error TS1031: 'declare' modifier cannot appear on a class element.
+tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration5.ts(2,5): error TS1031: 'declare' modifier cannot appear on class elements of this kind.
 tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration5.ts(2,19): error TS1183: An implementation cannot be declared in ambient contexts.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration5.ts (2 errors) ====
     class C {
         declare Foo() { }
         ~~~~~~~
-!!! error TS1031: 'declare' modifier cannot appear on a class element.
+!!! error TS1031: 'declare' modifier cannot appear on class elements of this kind.
                       ~
 !!! error TS1183: An implementation cannot be declared in ambient contexts.
     }
diff --git a/tests/baselines/reference/parserMemberVariableDeclaration4.errors.txt b/tests/baselines/reference/parserMemberVariableDeclaration4.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration4.ts(2,3): error TS1031: 'export' modifier cannot appear on a class element.
+tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration4.ts(2,3): error TS1031: 'export' modifier cannot appear on class elements of this kind.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration4.ts (1 errors) ====
     class C {
       export Foo;
       ~~~~~~
-!!! error TS1031: 'export' modifier cannot appear on a class element.
+!!! error TS1031: 'export' modifier cannot appear on class elements of this kind.
     }

Original file line number	Diff line number	Diff line change
`@@ -38687,7 +38687,7 @@ namespace ts {`
`38687`	`38687`	`return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");`
`38688`	`38688`	`}`
`38689`	`38689`	`else if (isClassLike(node.parent)) {`
`38690`		`- return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");`
	`38690`	`+ return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_class_elements_of_this_kind, "export");`
`38691`	`38691`	`}`
`38692`	`38692`	`else if (node.kind === SyntaxKind.Parameter) {`
`38693`	`38693`	`return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");`
`@@ -38710,7 +38710,7 @@ namespace ts {`
`38710`	`38710`	`return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");`
`38711`	`38711`	`}`
`38712`	`38712`	`else if (isClassLike(node.parent) && !isPropertyDeclaration(node)) {`
`38713`		`- return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");`
	`38713`	`+ return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_class_elements_of_this_kind, "declare");`
`38714`	`38714`	`}`
`38715`	`38715`	`else if (node.kind === SyntaxKind.Parameter) {`
`38716`	`38716`	`return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration5.ts(2,5): error TS1031: 'declare' modifier cannot appear on a class element.`
	`1`	`+tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration5.ts(2,5): error TS1031: 'declare' modifier cannot appear on class elements of this kind.`
`2`	`2`	`tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration5.ts(2,19): error TS1183: An implementation cannot be declared in ambient contexts.`
`3`	`3`
`4`	`4`
`5`	`5`	`==== tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration5.ts (2 errors) ====`
`6`	`6`	`class C {`
`7`	`7`	`declare Foo() { }`
`8`	`8`	`~~~~~~~`
`9`		`-!!! error TS1031: 'declare' modifier cannot appear on a class element.`
	`9`	`+!!! error TS1031: 'declare' modifier cannot appear on class elements of this kind.`
`10`	`10`	`~`
`11`	`11`	`!!! error TS1183: An implementation cannot be declared in ambient contexts.`
`12`	`12`	`}`