File tree Expand file tree Collapse file tree 2 files changed +20
-3
lines changed Expand file tree Collapse file tree 2 files changed +20
-3
lines changed Original file line number Diff line number Diff line change @@ -37702,6 +37702,7 @@ namespace ts {
37702
37702
function checkClassMember(member: ClassElement | ParameterPropertyDeclaration, memberIsParameterProperty?: boolean) {
37703
37703
const hasOverride = hasOverrideModifier(member);
37704
37704
const hasStatic = isStatic(member);
37705
+ const isJs = isInJSFile(member);
37705
37706
if (baseWithThis && (hasOverride || compilerOptions.noImplicitOverride)) {
37706
37707
const declaredProp = member.name && getSymbolAtLocation(member.name) || getSymbolAtLocation(member);
37707
37708
if (!declaredProp) {
@@ -37727,9 +37728,17 @@ namespace ts {
37727
37728
}
37728
37729
37729
37730
if (!baseHasAbstract) {
37730
- const diag = memberIsParameterProperty ?
37731
- Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0 :
37732
- Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0;
37731
+ let diag: DiagnosticMessage;
37732
+ if (isJs) {
37733
+ diag = memberIsParameterProperty ?
37734
+ Diagnostics.This_parameter_property_must_have_a_leading_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0 :
37735
+ Diagnostics.This_member_must_have_a_leading_JSDoc_comment_with_an_override_tag_because_it_overrides_a_member_in_the_base_class_0;
37736
+ }
37737
+ else {
37738
+ diag = memberIsParameterProperty ?
37739
+ Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0 :
37740
+ Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0;
37741
+ }
37733
37742
error(member, diag, baseClassName);
37734
37743
}
37735
37744
else if (hasAbstractModifier(member) && baseHasAbstract) {
Original file line number Diff line number Diff line change 3817
3817
"category" : " Error" ,
3818
3818
"code" : 4118
3819
3819
},
3820
+ "This member must have a leading JSDoc comment with an '@override' tag because it overrides a member in the base class '{0}'." : {
3821
+ "category" : " Error" ,
3822
+ "code" : 4119
3823
+ },
3824
+ "This parameter property must have a leading JSDoc comment with an '@override' tag because it overrides a member in the base class '{0}'." : {
3825
+ "category" : " Error" ,
3826
+ "code" : 4120
3827
+ },
3820
3828
3821
3829
"The current host does not support the '{0}' option." : {
3822
3830
"category" : " Error" ,
You can’t perform that action at this time.
0 commit comments