Skip to content

Always grammar checker for override #43544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2021
Merged

Always grammar checker for override #43544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40385,7 +40385,7 @@ namespace ts {
if (flags & ModifierFlags.AccessibilityModifier) {
return grammarErrorOnNode(modifier, Diagnostics.Accessibility_modifier_already_seen);
}
else if (compilerOptions.noImplicitOverride && flags & ModifierFlags.Override) {
else if (flags & ModifierFlags.Override) {
return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "override");
}
else if (flags & ModifierFlags.Static) {
Expand Down Expand Up @@ -40421,7 +40421,7 @@ namespace ts {
else if (flags & ModifierFlags.Readonly) {
return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "static", "readonly");
}
else if (compilerOptions.noImplicitOverride && flags & ModifierFlags.Override) {
else if (flags & ModifierFlags.Override) {
return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "override");
}
else if (flags & ModifierFlags.Async) {
Expand Down Expand Up @@ -40488,7 +40488,7 @@ namespace ts {
else if (flags & ModifierFlags.Async) {
return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
}
else if (compilerOptions.noImplicitOverride && flags & ModifierFlags.Override) {
else if (flags & ModifierFlags.Override) {
return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "override");
}
else if (isClassLike(node.parent) && !isPropertyDeclaration(node)) {
Expand Down Expand Up @@ -40565,7 +40565,7 @@ namespace ts {
if (flags & ModifierFlags.Abstract) {
return grammarErrorOnNode(lastStatic!, Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract"); // TODO: GH#18217
}
if (compilerOptions.noImplicitOverride && flags & ModifierFlags.Override) {
if (flags & ModifierFlags.Override) {
return grammarErrorOnNode(lastOverride!, Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "override"); // TODO: GH#18217
}
else if (flags & ModifierFlags.Async) {
Expand Down
14 changes: 13 additions & 1 deletion tests/baselines/reference/override7.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
tests/cases/conformance/override/override7.ts(11,14): error TS1040: 'override' modifier cannot be used in an ambient context.
tests/cases/conformance/override/override7.ts(17,14): error TS1243: 'static' modifier cannot be used with 'override' modifier.
tests/cases/conformance/override/override7.ts(19,14): error TS1030: 'override' modifier already seen.
tests/cases/conformance/override/override7.ts(19,23): error TS4113: This member cannot have an 'override' modifier because it is not declared in the base class 'B'.
tests/cases/conformance/override/override7.ts(21,21): error TS4113: This member cannot have an 'override' modifier because it is not declared in the base class 'B'.
tests/cases/conformance/override/override7.ts(22,14): error TS1029: 'public' modifier must precede 'override' modifier.
tests/cases/conformance/override/override7.ts(22,21): error TS4113: This member cannot have an 'override' modifier because it is not declared in the base class 'B'.
tests/cases/conformance/override/override7.ts(24,5): error TS1089: 'override' modifier cannot appear on a constructor declaration.
tests/cases/conformance/override/override7.ts(41,23): error TS4112: This member cannot have an 'override' modifier because its containing class 'AND' does not extend another class.
tests/cases/conformance/override/override7.ts(42,23): error TS4112: This member cannot have an 'override' modifier because its containing class 'AND' does not extend another class.


==== tests/cases/conformance/override/override7.ts (6 errors) ====
==== tests/cases/conformance/override/override7.ts (10 errors) ====
class B {
p1: number = 1;
p2: number = 2;
Expand All @@ -18,12 +22,16 @@ tests/cases/conformance/override/override7.ts(42,23): error TS4112: This member
declare p1: number

override declare p2: number;
~~~~~~~
!!! error TS1040: 'override' modifier cannot be used in an ambient context.

readonly override p3: number;

override readonly p4: number;

override static sp: number;
~~~~~~
!!! error TS1243: 'static' modifier cannot be used with 'override' modifier.

override override oop: number;
~~~~~~~~
Expand All @@ -35,10 +43,14 @@ tests/cases/conformance/override/override7.ts(42,23): error TS4112: This member
~~
!!! error TS4113: This member cannot have an 'override' modifier because it is not declared in the base class 'B'.
override public op: number;
~~~~~~
!!! error TS1029: 'public' modifier must precede 'override' modifier.
~~
!!! error TS4113: This member cannot have an 'override' modifier because it is not declared in the base class 'B'.

override constructor () {
~~~~~~~~
!!! error TS1089: 'override' modifier cannot appear on a constructor declaration.
super();
}
}
Expand Down