Skip to content

Commit 2fd560a

Browse files
committed
Update description
1 parent dca93ac commit 2fd560a

8 files changed

+40
-40
lines changed

src/compiler/checker.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -34428,16 +34428,16 @@ namespace ts {
3442834428
const prop = getPropertyOfType(typeWithThis, declaredProp.escapedName);
3442934429
const baseProp = getPropertyOfType(baseWithThis, declaredProp.escapedName);
3443034430
if (prop && !baseProp && hasOverride) {
34431-
error(member, Diagnostics.Method_cannot_have_override_modifier_because_it_s_not_existed_in_the_base_class_0, baseClassName);
34431+
error(member, Diagnostics.Class_member_cannot_have_override_modifier_because_it_s_not_existed_in_the_base_class_0, baseClassName);
3443234432
}
3443334433
else if (prop && baseProp && !hasOverride) {
34434-
error(member, Diagnostics.Method_must_have_override_modifier_because_it_s_override_the_base_class_0, baseClassName);
34434+
error(member, Diagnostics.Class_member_must_have_override_modifier_because_it_s_override_the_base_class_0, baseClassName);
3443534435
}
3443634436
}
3443734437
}
3443834438
else if (hasOverride) {
3443934439
const className = typeToString(type);
34440-
error(member, Diagnostics.Method_cannot_have_override_modifier_because_class_0_does_not_extended_another_class, className);
34440+
error(member, Diagnostics.Class_member_cannot_have_override_modifier_because_class_0_does_not_extended_another_class, className);
3444134441
}
3444234442
}
3444334443
}

src/compiler/diagnosticMessages.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -3361,15 +3361,15 @@
33613361
"category": "Error",
33623362
"code": 4110
33633363
},
3364-
"Method cannot have override modifier because class '{0}' does not extended another class.": {
3364+
"Class member cannot have override modifier because class '{0}' does not extended another class.": {
33653365
"category": "Error",
33663366
"code": 4111
33673367
},
3368-
"Method cannot have override modifier because it's not existed in the base class '{0}'.": {
3368+
"Class member cannot have override modifier because it's not existed in the base class '{0}'.": {
33693369
"category": "Error",
33703370
"code": 4112
33713371
},
3372-
"Method must have override modifier because it's override the base class '{0}'.": {
3372+
"Class member must have override modifier because it's override the base class '{0}'.": {
33733373
"category": "Error",
33743374
"code": 4113
33753375
},
+16-16
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
tests/cases/conformance/override/override1.ts(9,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
2-
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'.
3-
tests/cases/conformance/override/override1.ts(15,14): error TS4111: Method cannot have override modifier because class 'C' does not extended another class.
4-
tests/cases/conformance/override/override1.ts(22,9): error TS4113: Method must have override modifier because it's override the base class 'B'.
5-
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'.
6-
tests/cases/conformance/override/override1.ts(33,5): error TS4113: Method must have override modifier because it's override the base class '(Anonymous class)'.
7-
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)'.
8-
tests/cases/conformance/override/override1.ts(42,18): error TS4111: Method cannot have override modifier because class '(Anonymous class)' does not extended another class.
1+
tests/cases/conformance/override/override1.ts(9,5): error TS4113: Class member must have override modifier because it's override the base class 'B'.
2+
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'.
3+
tests/cases/conformance/override/override1.ts(15,14): error TS4111: Class member cannot have override modifier because class 'C' does not extended another class.
4+
tests/cases/conformance/override/override1.ts(22,9): error TS4113: Class member must have override modifier because it's override the base class 'B'.
5+
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'.
6+
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)'.
7+
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)'.
8+
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.
99

1010

1111
==== tests/cases/conformance/override/override1.ts (8 errors) ====
@@ -19,17 +19,17 @@ tests/cases/conformance/override/override1.ts(42,18): error TS4111: Method canno
1919

2020
fooo (v: string) {}
2121
~~~~
22-
!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
22+
!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
2323

2424
override bar(v: string) {}
2525
~~~
26-
!!! error TS4112: Method cannot have override modifier because it's not existed in the base class 'B'.
26+
!!! error TS4112: Class member cannot have override modifier because it's not existed in the base class 'B'.
2727
}
2828

2929
class C {
3030
override foo(v: string) {}
3131
~~~
32-
!!! error TS4111: Method cannot have override modifier because class 'C' does not extended another class.
32+
!!! error TS4111: Class member cannot have override modifier because class 'C' does not extended another class.
3333
}
3434

3535
function f () {
@@ -38,11 +38,11 @@ tests/cases/conformance/override/override1.ts(42,18): error TS4111: Method canno
3838

3939
fooo (v: string) {}
4040
~~~~
41-
!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
41+
!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
4242

4343
override bar(v: string) {}
4444
~~~
45-
!!! error TS4112: Method cannot have override modifier because it's not existed in the base class 'B'.
45+
!!! error TS4112: Class member cannot have override modifier because it's not existed in the base class 'B'.
4646
}
4747
}
4848

@@ -53,19 +53,19 @@ tests/cases/conformance/override/override1.ts(42,18): error TS4111: Method canno
5353
override foo () { }
5454
bar () { }
5555
~~~
56-
!!! error TS4113: Method must have override modifier because it's override the base class '(Anonymous class)'.
56+
!!! error TS4113: Class member must have override modifier because it's override the base class '(Anonymous class)'.
5757

5858
baz() {}
5959

6060
override bazz () {}
6161
~~~~
62-
!!! error TS4112: Method cannot have override modifier because it's not existed in the base class '(Anonymous class)'.
62+
!!! error TS4112: Class member cannot have override modifier because it's not existed in the base class '(Anonymous class)'.
6363
}
6464

6565
function ff () {
6666
return class {
6767
override foo () {}
6868
~~~
69-
!!! error TS4111: Method cannot have override modifier because class '(Anonymous class)' does not extended another class.
69+
!!! error TS4111: Class member cannot have override modifier because class '(Anonymous class)' does not extended another class.
7070
}
7171
}

tests/baselines/reference/override2.errors.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tests/cases/conformance/override/override2.ts(12,14): error TS4113: Method must have override modifier because it's override the base class 'AB'.
2-
tests/cases/conformance/override/override2.ts(17,14): error TS4113: Method must have override modifier because it's override the base class 'AB'.
1+
tests/cases/conformance/override/override2.ts(12,14): error TS4113: Class member must have override modifier because it's override the base class 'AB'.
2+
tests/cases/conformance/override/override2.ts(17,14): error TS4113: Class member must have override modifier because it's override the base class 'AB'.
33

44

55
==== tests/cases/conformance/override/override2.ts (2 errors) ====
@@ -16,14 +16,14 @@ tests/cases/conformance/override/override2.ts(17,14): error TS4113: Method must
1616
abstract class AD2 extends AB {
1717
abstract foo(v: ''): void // need override?
1818
~~~
19-
!!! error TS4113: Method must have override modifier because it's override the base class 'AB'.
19+
!!! error TS4113: Class member must have override modifier because it's override the base class 'AB'.
2020
}
2121

2222
abstract class AD3 extends AB {
2323
override foo(v: ''): void { } // need override?
2424
abstract bar(): void;
2525
~~~
26-
!!! error TS4113: Method must have override modifier because it's override the base class 'AB'.
26+
!!! error TS4113: Class member must have override modifier because it's override the base class 'AB'.
2727
}
2828

2929
class D4 extends AB {

tests/baselines/reference/override3.errors.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/override/override3.ts(22,5): error TS4113: Method must have override modifier because it's override the base class 'D'.
1+
tests/cases/conformance/override/override3.ts(22,5): error TS4113: Class member must have override modifier because it's override the base class 'D'.
22

33

44
==== 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
2525
class EB extends D {
2626
foo(): void {}
2727
~~~
28-
!!! error TS4113: Method must have override modifier because it's override the base class 'D'.
28+
!!! error TS4113: Class member must have override modifier because it's override the base class 'D'.
2929
override bar(): void {}
3030
}
3131

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
tests/cases/conformance/override/override4.ts(11,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
2-
tests/cases/conformance/override/override4.ts(13,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
3-
tests/cases/conformance/override/override4.ts(17,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
4-
tests/cases/conformance/override/override4.ts(23,5): error TS4113: Method must have override modifier because it's override the base class 'B'.
1+
tests/cases/conformance/override/override4.ts(11,5): error TS4113: Class member must have override modifier because it's override the base class 'B'.
2+
tests/cases/conformance/override/override4.ts(13,5): error TS4113: Class member must have override modifier because it's override the base class 'B'.
3+
tests/cases/conformance/override/override4.ts(17,5): error TS4113: Class member must have override modifier because it's override the base class 'B'.
4+
tests/cases/conformance/override/override4.ts(23,5): error TS4113: Class member must have override modifier because it's override the base class 'B'.
55

66

77
==== 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
1717
class D extends B {
1818
p1: number = 2;
1919
~~
20-
!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
20+
!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
2121
override p2: number = 3;
2222
p3: () => void;
2323
~~
24-
!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
24+
!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
2525
override p4: () => void;
2626
override foo (v: string) {}
2727

2828
fooo (v: string) {}
2929
~~~~
30-
!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
30+
!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
3131

3232
}
3333

3434
class DD extends B {
3535
override foo: () => void
3636
fooo: () => void;
3737
~~~~
38-
!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
38+
!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
3939
}

tests/baselines/reference/override5.errors.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/override/override5.ts(10,13): error TS4113: Method must have override modifier because it's override the base class 'B'.
1+
tests/cases/conformance/override/override5.ts(10,13): error TS4113: Class member must have override modifier because it's override the base class 'B'.
22
tests/cases/conformance/override/override5.ts(12,14): error TS1040: 'override' modifier cannot be used in an ambient context.
33
tests/cases/conformance/override/override5.ts(14,14): error TS1243: 'static' modifier cannot be used with 'override' modifier.
44
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
1818
class D extends B{
1919
declare p1: number
2020
~~
21-
!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
21+
!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
2222

2323
override declare p2: number
2424
~~~~~~~

tests/baselines/reference/override6.errors.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/override/override6.ts(9,12): error TS4113: Method must have override modifier because it's override the base class 'B'.
1+
tests/cases/conformance/override/override6.ts(9,12): error TS4113: Class member must have override modifier because it's override the base class 'B'.
22

33

44
==== 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
1212
class D extends B {
1313
public bar: number = 1
1414
~~~
15-
!!! error TS4113: Method must have override modifier because it's override the base class 'B'.
15+
!!! error TS4113: Class member must have override modifier because it's override the base class 'B'.
1616
constructor(public foo: string, public baz: number) {
1717
super(foo, 42)
1818
}

0 commit comments

Comments
 (0)