Port "Error on override used on dynamically named class members" + use proper JSDoc-related diagnostics

internal/checker/checker.go

@@ -4439,13 +4439,18 @@ func (c *Checker) checkMembersForOverrideModifier(node *ast.Node, t *Type, typeW
 }
 
 func (c *Checker) checkMemberForOverrideModifier(node *ast.Node, staticType *Type, baseStaticType *Type, baseWithThis *Type, t *Type, typeWithThis *Type, member *ast.Node) {
+	isJs := ast.IsInJSFile(node)
 	memberHasOverrideModifier := hasOverrideModifier(member)
 	if baseWithThis == nil {
 		if memberHasOverrideModifier {
-			c.error(member, diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class, c.TypeToString(t))
+			c.error(member, core.IfElse(isJs, diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_containing_class_0_does_not_extend_another_class, diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class), c.TypeToString(t))
 		}
 		return
 	}
+	if sym := member.Symbol(); memberHasOverrideModifier && sym != nil && sym.ValueDeclaration != nil && ast.IsClassElement(member) && member.Name() != nil && c.isNonBindableDynamicName(member.Name()) {
+		c.error(member, core.IfElse(isJs, diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_its_name_is_dynamic, diagnostics.This_member_cannot_have_an_override_modifier_because_its_name_is_dynamic))
+		return
+	}
 	if !memberHasOverrideModifier && !c.compilerOptions.NoImplicitOverride.IsTrue() {
 		return
 	}
@@ -4465,18 +4470,18 @@ func (c *Checker) checkMemberForOverrideModifier(node *ast.Node, staticType *Typ
 	if baseProp == nil && memberHasOverrideModifier {
 		suggestion := c.getSuggestedSymbolForNonexistentClassMember(ast.SymbolName(symbol), baseType)
 		if suggestion != nil {
-			c.error(member, diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1, c.TypeToString(baseWithThis), c.symbolToString(suggestion))
+			c.error(member, core.IfElse(isJs, diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1, diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1), c.TypeToString(baseWithThis), c.symbolToString(suggestion))
 			return
 		}
-		c.error(member, diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, c.TypeToString(baseWithThis))
+		c.error(member, core.IfElse(isJs, diagnostics.This_member_cannot_have_a_JSDoc_comment_with_an_override_tag_because_it_is_not_declared_in_the_base_class_0, diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0), c.TypeToString(baseWithThis))
 		return
 	}
 	if baseProp != nil && len(baseProp.Declarations) != 0 && !memberHasOverrideModifier && c.compilerOptions.NoImplicitOverride.IsTrue() && node.Flags&ast.NodeFlagsAmbient == 0 {
 		baseHasAbstract := core.Some(baseProp.Declarations, hasAbstractModifier)
 		if !baseHasAbstract {
 			message := core.IfElse(ast.IsParameter(member),
-				diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0,
-				diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0)
+				core.IfElse(isJs, diagnostics.This_parameter_property_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0, diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0),
+				core.IfElse(isJs, diagnostics.This_member_must_have_a_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0, diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0))
 			c.error(member, message, c.TypeToString(baseWithThis))
 			return
 		}

testdata/baselines/reference/submodule/conformance/jsdocOverrideTag1.errors.txt

@@ -1,5 +1,5 @@
-0.js(23,5): error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'A'.
-0.js(27,5): error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'A'.
+0.js(23,5): error TS4119: This member must have a JSDoc comment with an '@override' tag because it overrides a member in the base class 'A'.
+0.js(27,5): error TS4119: This member must have a JSDoc comment with an '@override' tag because it overrides a member in the base class 'A'.
 
 
 ==== 0.js (2 errors) ====
@@ -27,13 +27,13 @@
          */
         foo (a) {
         ~~~
-!!! error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'A'.
+!!! error TS4119: This member must have a JSDoc comment with an '@override' tag because it overrides a member in the base class 'A'.
             return super.foo(a)
         }
 
         bar () {
         ~~~
-!!! error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'A'.
+!!! error TS4119: This member must have a JSDoc comment with an '@override' tag because it overrides a member in the base class 'A'.
 
         }
 

testdata/baselines/reference/submodule/conformance/overrideDynamicName1(noimplicitoverride=false).errors.txt

@@ -0,0 +1,33 @@
+overrideDynamicName1.ts(8,12): error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+overrideDynamicName1.ts(22,12): error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+
+
+==== overrideDynamicName1.ts (2 errors) ====
+    let prop = "foo"
+
+    class Base1 {
+      [prop]() {}
+    }
+
+    class Derived1 extends Base1 {
+      override [prop]() {}
+               ~~~~~~
+!!! error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+    }
+
+    class Base2 {
+      [prop]() {}
+    }
+
+    class Derived2 extends Base2 {
+      [prop]() {}
+    }
+
+    class Base3 {}
+
+    class Derived3 extends Base3 {
+      override [prop]() {}
+               ~~~~~~
+!!! error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+    }
+

testdata/baselines/reference/submodule/conformance/overrideDynamicName1(noimplicitoverride=true).errors.txt

@@ -0,0 +1,33 @@
+overrideDynamicName1.ts(8,12): error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+overrideDynamicName1.ts(22,12): error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+
+
+==== overrideDynamicName1.ts (2 errors) ====
+    let prop = "foo"
+
+    class Base1 {
+      [prop]() {}
+    }
+
+    class Derived1 extends Base1 {
+      override [prop]() {}
+               ~~~~~~
+!!! error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+    }
+
+    class Base2 {
+      [prop]() {}
+    }
+
+    class Derived2 extends Base2 {
+      [prop]() {}
+    }
+
+    class Base3 {}
+
+    class Derived3 extends Base3 {
+      override [prop]() {}
+               ~~~~~~
+!!! error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+    }
+

testdata/baselines/reference/submodule/conformance/overrideLateBindableIndexSignature1(noimplicitoverride=false).errors.txt

@@ -0,0 +1,33 @@
+overrideLateBindableIndexSignature1.ts(8,12): error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+overrideLateBindableIndexSignature1.ts(22,12): error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+
+
+==== overrideLateBindableIndexSignature1.ts (2 errors) ====
+    const sym: symbol = Symbol();
+
+    class Base1 {
+      [sym]() {}
+    }
+
+    class Derived1 extends Base1 {
+      override [sym]() {}
+               ~~~~~
+!!! error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+    }
+
+    class Base2 {
+      [sym]() {}
+    }
+
+    class Derived2 extends Base2 {
+      [sym]() {}
+    }
+
+    class Base3 {}
+
+    class Derived3 extends Base3 {
+      override [sym]() {}
+               ~~~~~
+!!! error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+    }
+

testdata/baselines/reference/submodule/conformance/overrideLateBindableIndexSignature1(noimplicitoverride=true).errors.txt

@@ -0,0 +1,33 @@
+overrideLateBindableIndexSignature1.ts(8,12): error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+overrideLateBindableIndexSignature1.ts(22,12): error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+
+
+==== overrideLateBindableIndexSignature1.ts (2 errors) ====
+    const sym: symbol = Symbol();
+
+    class Base1 {
+      [sym]() {}
+    }
+
+    class Derived1 extends Base1 {
+      override [sym]() {}
+               ~~~~~
+!!! error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+    }
+
+    class Base2 {
+      [sym]() {}
+    }
+
+    class Derived2 extends Base2 {
+      [sym]() {}
+    }
+
+    class Base3 {}
+
+    class Derived3 extends Base3 {
+      override [sym]() {}
+               ~~~~~
+!!! error TS4127: This member cannot have an 'override' modifier because its name is dynamic.
+    }
+

testdata/baselines/reference/submodule/conformance/override_js2.errors.txt

@@ -1,5 +1,5 @@
-a.js(7,5): error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'B'.
-a.js(9,5): error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'B'.
+a.js(7,5): error TS4119: This member must have a JSDoc comment with an '@override' tag because it overrides a member in the base class 'B'.
+a.js(9,5): error TS4119: This member must have a JSDoc comment with an '@override' tag because it overrides a member in the base class 'B'.
 
 
 ==== a.js (2 errors) ====
@@ -11,11 +11,11 @@ a.js(9,5): error TS4114: This member must have an 'override' modifier because it
     class D extends B {
         foo (v) {}
         ~~~
-!!! error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'B'.
+!!! error TS4119: This member must have a JSDoc comment with an '@override' tag because it overrides a member in the base class 'B'.
         /** @override */
         fooo (v) {}
         ~~~~
-!!! error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'B'.
+!!! error TS4119: This member must have a JSDoc comment with an '@override' tag because it overrides a member in the base class 'B'.
         /** @override */
         bar(v) {}
     }

testdata/baselines/reference/submodule/conformance/override_js3.errors.txt

@@ -1,4 +1,4 @@
-a.js(9,5): error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'B'.
+a.js(9,5): error TS4119: This member must have a JSDoc comment with an '@override' tag because it overrides a member in the base class 'B'.
 
 
 ==== a.js (1 errors) ====
@@ -12,6 +12,6 @@ a.js(9,5): error TS4114: This member must have an 'override' modifier because it
         /** @override */
         fooo (v) {}
         ~~~~
-!!! error TS4114: This member must have an 'override' modifier because it overrides a member in the base class 'B'.
+!!! error TS4119: This member must have a JSDoc comment with an '@override' tag because it overrides a member in the base class 'B'.
     }