Update description

microsoft · DanielRosenwasser · Mar 26, 2021 · Jul 15, 2020 · Jul 17, 2020 · Jul 17, 2020
commit 2fd560ae922a171eb377e7905d41ea925fc144bd
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -34428,16 +34428,16 @@ namespace ts {
                         const prop = getPropertyOfType(typeWithThis, declaredProp.escapedName);
                         const baseProp = getPropertyOfType(baseWithThis, declaredProp.escapedName);
                         if (prop && !baseProp && hasOverride) {
-                            error(member, Diagnostics.Method_cannot_have_override_modifier_because_it_s_not_existed_in_the_base_class_0, baseClassName);
+                            error(member, Diagnostics.Class_member_cannot_have_override_modifier_because_it_s_not_existed_in_the_base_class_0, baseClassName);
                         }
                         else if (prop && baseProp && !hasOverride) {
-                            error(member, Diagnostics.Method_must_have_override_modifier_because_it_s_override_the_base_class_0, baseClassName);
+                            error(member, Diagnostics.Class_member_must_have_override_modifier_because_it_s_override_the_base_class_0, baseClassName);
                         }
                     }
                 }
                 else if (hasOverride) {
                     const className = typeToString(type);
-                    error(member, Diagnostics.Method_cannot_have_override_modifier_because_class_0_does_not_extended_another_class, className);
+                    error(member, Diagnostics.Class_member_cannot_have_override_modifier_because_class_0_does_not_extended_another_class, className);
                 }
             }
         }

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -3361,15 +3361,15 @@
         "category": "Error",
         "code": 4110
     },
-    "Method cannot have override modifier because class '{0}' does not extended another class.": {
+    "Class member cannot have override modifier because class '{0}' does not extended another class.": {
         "category": "Error",
         "code": 4111
     },
-    "Method cannot have override modifier because it's not existed in the base class '{0}'.": {
+    "Class member cannot have override modifier because it's not existed in the base class '{0}'.": {
         "category": "Error",
         "code": 4112
     },
-    "Method must have override modifier because it's override the base class '{0}'.": {
+    "Class member must have override modifier because it's override the base class '{0}'.": {
         "category": "Error",
         "code": 4113
     },

diff --git a/tests/baselines/reference/override1.errors.txt b/tests/baselines/reference/override1.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/override/override1.ts(9,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
-tests/cases/conformance/override/override1.ts(11,14): error TS4112: Method cannot have override modifier because it's not existed in the base class 'B'.
-tests/cases/conformance/override/override1.ts(15,14): error TS4111: Method cannot have override modifier because class 'C' does not extended another class.
-tests/cases/conformance/override/override1.ts(22,9): error TS4113: Method must have override modifier because it's override the base class 'B'.
-tests/cases/conformance/override/override1.ts(24,18): error TS4112: Method cannot have override modifier because it's not existed in the base class 'B'.
-tests/cases/conformance/override/override1.ts(33,5): error TS4113: Method must have override modifier because it's override the base class '(Anonymous class)'.
-tests/cases/conformance/override/override1.ts(37,14): error TS4112: Method cannot have override modifier because it's not existed in the base class '(Anonymous class)'.
-tests/cases/conformance/override/override1.ts(42,18): error TS4111: Method cannot have override modifier because class '(Anonymous class)' does not extended another class.
+tests/cases/conformance/override/override1.ts(9,5): error TS4113: Class member must have override modifier because it's override the base class 'B'.
+tests/cases/conformance/override/override1.ts(11,14): error TS4112: Class member cannot have override modifier because it's not existed in the base class 'B'.
+tests/cases/conformance/override/override1.ts(15,14): error TS4111: Class member cannot have override modifier because class 'C' does not extended another class.
+tests/cases/conformance/override/override1.ts(22,9): error TS4113: Class member must have override modifier because it's override the base class 'B'.
+tests/cases/conformance/override/override1.ts(24,18): error TS4112: Class member cannot have override modifier because it's not existed in the base class 'B'.
+tests/cases/conformance/override/override1.ts(33,5): error TS4113: Class member must have override modifier because it's override the base class '(Anonymous class)'.
+tests/cases/conformance/override/override1.ts(37,14): error TS4112: Class member cannot have override modifier because it's not existed in the base class '(Anonymous class)'.
+tests/cases/conformance/override/override1.ts(42,18): error TS4111: Class member cannot have override modifier because class '(Anonymous class)' does not extended another class.
 
 
 ==== tests/cases/conformance/override/override1.ts (8 errors) ====
@@ -19,17 +19,17 @@ tests/cases/conformance/override/override1.ts(42,18): error TS4111: Method canno
 
         fooo (v: string) {}
         ~~~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
 
         override bar(v: string) {}
                  ~~~
-!!! error TS4112: Method cannot have override modifier because it's not existed in the base class 'B'.
+!!! error TS4112: Class member cannot have override modifier because it's not existed in the base class 'B'.
     }
 
     class C {
         override foo(v: string) {}
                  ~~~
-!!! error TS4111: Method cannot have override modifier because class 'C' does not extended another class.
+!!! error TS4111: Class member cannot have override modifier because class 'C' does not extended another class.
     }
 
     function f () {
@@ -38,11 +38,11 @@ tests/cases/conformance/override/override1.ts(42,18): error TS4111: Method canno
 
             fooo (v: string) {}
             ~~~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
 
             override bar(v: string) {}
                      ~~~
-!!! error TS4112: Method cannot have override modifier because it's not existed in the base class 'B'.
+!!! error TS4112: Class member cannot have override modifier because it's not existed in the base class 'B'.
         }
     }
 
@@ -53,19 +53,19 @@ tests/cases/conformance/override/override1.ts(42,18): error TS4111: Method canno
         override foo () { }
         bar () { }
         ~~~
-!!! error TS4113: Method must have override modifier because it's override the base class '(Anonymous class)'.
+!!! error TS4113: Class member must have override modifier because it's override the base class '(Anonymous class)'.
 
         baz() {}
 
         override bazz () {}
                  ~~~~
-!!! error TS4112: Method cannot have override modifier because it's not existed in the base class '(Anonymous class)'.
+!!! error TS4112: Class member cannot have override modifier because it's not existed in the base class '(Anonymous class)'.
     }
 
     function ff () {
         return class {
             override foo () {}
                      ~~~
-!!! error TS4111: Method cannot have override modifier because class '(Anonymous class)' does not extended another class.
+!!! error TS4111: Class member cannot have override modifier because class '(Anonymous class)' does not extended another class.
         }
     }
diff --git a/tests/baselines/reference/override2.errors.txt b/tests/baselines/reference/override2.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/override/override2.ts(12,14): error TS4113: Method must have override modifier because it's override the base class 'AB'.
-tests/cases/conformance/override/override2.ts(17,14): error TS4113: Method must have override modifier because it's override the base class 'AB'.
+tests/cases/conformance/override/override2.ts(12,14): error TS4113: Class member must have override modifier because it's override the base class 'AB'.
+tests/cases/conformance/override/override2.ts(17,14): error TS4113: Class member must have override modifier because it's override the base class 'AB'.
 
 
 ==== tests/cases/conformance/override/override2.ts (2 errors) ====
@@ -16,14 +16,14 @@ tests/cases/conformance/override/override2.ts(17,14): error TS4113: Method must
     abstract class AD2 extends AB {
         abstract foo(v: ''): void // need override?
                  ~~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'AB'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'AB'.
     }
 
     abstract class AD3 extends AB {
         override foo(v: ''): void { } // need override?
         abstract bar(): void;
                  ~~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'AB'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'AB'.
     }
 
     class D4 extends AB {

diff --git a/tests/baselines/reference/override3.errors.txt b/tests/baselines/reference/override3.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/override/override3.ts(22,5): error TS4113: Method must have override modifier because it's override the base class 'D'.
+tests/cases/conformance/override/override3.ts(22,5): error TS4113: Class member must have override modifier because it's override the base class 'D'.
 
 
 ==== tests/cases/conformance/override/override3.ts (1 errors) ====
@@ -25,7 +25,7 @@ tests/cases/conformance/override/override3.ts(22,5): error TS4113: Method must h
     class EB extends D {
         foo(): void {}
         ~~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'D'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'D'.
         override bar(): void {}
     }
 
diff --git a/tests/baselines/reference/override4.errors.txt b/tests/baselines/reference/override4.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/override/override4.ts(11,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
-tests/cases/conformance/override/override4.ts(13,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
-tests/cases/conformance/override/override4.ts(17,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
-tests/cases/conformance/override/override4.ts(23,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
+tests/cases/conformance/override/override4.ts(11,5): error TS4113: Class member must have override modifier because it's override the base class 'B'.
+tests/cases/conformance/override/override4.ts(13,5): error TS4113: Class member must have override modifier because it's override the base class 'B'.
+tests/cases/conformance/override/override4.ts(17,5): error TS4113: Class member must have override modifier because it's override the base class 'B'.
+tests/cases/conformance/override/override4.ts(23,5): error TS4113: Class member must have override modifier because it's override the base class 'B'.
 
 
 ==== tests/cases/conformance/override/override4.ts (4 errors) ====
@@ -17,23 +17,23 @@ tests/cases/conformance/override/override4.ts(23,5): error TS4113: Method must h
     class D extends B {
         p1: number = 2;
         ~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
         override p2: number = 3;
         p3: () => void;
         ~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
         override p4: () => void;
         override foo (v: string) {}
 
         fooo (v: string) {}
         ~~~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
 
     }
 
     class DD extends B {
         override foo: () => void
         fooo: () => void;
         ~~~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
     }
diff --git a/tests/baselines/reference/override5.errors.txt b/tests/baselines/reference/override5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/override/override5.ts(10,13): error TS4113: Method must have override modifier because it's override the base class 'B'.
+tests/cases/conformance/override/override5.ts(10,13): error TS4113: Class member must have override modifier because it's override the base class 'B'.
 tests/cases/conformance/override/override5.ts(12,14): error TS1040: 'override' modifier cannot be used in an ambient context.
 tests/cases/conformance/override/override5.ts(14,14): error TS1243: 'static' modifier cannot be used with 'override' modifier.
 tests/cases/conformance/override/override5.ts(16,14): error TS1030: 'override' modifier already seen.
@@ -18,7 +18,7 @@ tests/cases/conformance/override/override5.ts(21,5): error TS1089: 'override' mo
     class D extends B{
         declare p1: number
                 ~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
 
         override declare p2: number
                  ~~~~~~~

diff --git a/tests/baselines/reference/override6.errors.txt b/tests/baselines/reference/override6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/override/override6.ts(9,12): error TS4113: Method must have override modifier because it's override the base class 'B'.
+tests/cases/conformance/override/override6.ts(9,12): error TS4113: Class member must have override modifier because it's override the base class 'B'.
 
 
 ==== tests/cases/conformance/override/override6.ts (1 errors) ====
@@ -12,7 +12,7 @@ tests/cases/conformance/override/override6.ts(9,12): error TS4113: Method must h
     class D extends B {
         public bar: number = 1
                ~~~
-!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
+!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
         constructor(public foo: string, public baz: number) {
             super(foo, 42)
         }