change diagnostic messages

Author: a-tarasyuk

src/compiler/checker.ts

@@ -45151,12 +45151,32 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
 
         for (const [errorNode, memberInfo] of notImplementedInfo) {
-            const missedProperties = map(memberInfo.missedProperties, prop => `'${prop}'`).join(", ");
-            if (isClassExpression(errorNode)) {
-                error(errorNode, length(memberInfo.missedProperties) > 1 ? Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_members_0_from_class_1 : Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, missedProperties, memberInfo.baseTypeName);
+            if (length(memberInfo.missedProperties) === 1) {
+                if (isClassExpression(errorNode)) {
+                    error(errorNode, Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, first(memberInfo.missedProperties), memberInfo.baseTypeName);
+                }
+                else {
+                    error(errorNode, Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2, memberInfo.typeName, first(memberInfo.missedProperties), memberInfo.baseTypeName);
+                }
+            }
+            else if (length(memberInfo.missedProperties) > 5) {
+                const missedProperties = map(memberInfo.missedProperties.slice(0, 4), prop => `'${prop}'`).join(", ");
+                const remainingMissedProperties = length(memberInfo.missedProperties) - 4;
+                if (isClassExpression(errorNode)) {
+                    error(errorNode, Diagnostics.Non_abstract_class_expression_is_missing_implementations_for_the_following_members_of_0_Colon_1_and_2_more, memberInfo.baseTypeName, missedProperties, remainingMissedProperties);
+                }
+                else {
+                    error(errorNode, Diagnostics.Non_abstract_class_0_is_missing_implementations_for_the_following_members_of_1_Colon_2_and_3_more, memberInfo.typeName, memberInfo.baseTypeName, missedProperties, remainingMissedProperties);
+                }
             }
             else {
-                error(errorNode, length(memberInfo.missedProperties) > 1 ? Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_members_1_from_class_2 : Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2, memberInfo.typeName, missedProperties, memberInfo.baseTypeName);
+                const missedProperties = map(memberInfo.missedProperties, prop => `'${prop}'`).join(", ");
+                if (isClassExpression(errorNode)) {
+                    error(errorNode, Diagnostics.Non_abstract_class_expression_is_missing_implementations_for_the_following_members_of_0_Colon_1, memberInfo.baseTypeName, missedProperties);
+                }
+                else {
+                    error(errorNode, Diagnostics.Non_abstract_class_0_is_missing_implementations_for_the_following_members_of_1_Colon_2, memberInfo.typeName, memberInfo.baseTypeName, missedProperties);
+                }
             }
         }
     }

src/compiler/diagnosticMessages.json

@@ -2938,6 +2938,10 @@
         "category": "Error",
         "code": 2649
     },
+    "Non-abstract class expression is missing implementations for the following members of '{0}': {1} and {2} more.": {
+        "category": "Error",
+        "code": 2650
+    },
     "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.": {
         "category": "Error",
         "code": 2651
@@ -2950,14 +2954,18 @@
         "category": "Error",
         "code": 2653
     },
-    "Non-abstract class '{0}' does not implement inherited abstract members {1} from class '{2}'.": {
+    "Non-abstract class '{0}' is missing implementations for the following members of '{1}': {2}.": {
         "category": "Error",
         "code": 2654
     },
-    "Non-abstract class expression does not implement inherited abstract members {0} from class '{1}'.": {
+    "Non-abstract class '{0}' is missing implementations for the following members of '{1}': {2} and {3} more.": {
         "category": "Error",
         "code": 2655
     },
+    "Non-abstract class expression is missing implementations for the following members of '{0}': {1}.": {
+        "category": "Error",
+        "code": 2656
+    },
     "JSX expressions must have one parent element.": {
         "category": "Error",
         "code": 2657

src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts

@@ -27,10 +27,13 @@ import {
 
 const errorCodes = [
     Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2.code,
-    Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_members_1_from_class_2.code,
+    Diagnostics.Non_abstract_class_0_is_missing_implementations_for_the_following_members_of_1_Colon_2.code,
+    Diagnostics.Non_abstract_class_0_is_missing_implementations_for_the_following_members_of_1_Colon_2_and_3_more.code,
     Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1.code,
-    Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_members_0_from_class_1.code,
+    Diagnostics.Non_abstract_class_expression_is_missing_implementations_for_the_following_members_of_0_Colon_1.code,
+    Diagnostics.Non_abstract_class_expression_is_missing_implementations_for_the_following_members_of_0_Colon_1_and_2_more.code,
 ];
+
 const fixId = "fixClassDoesntImplementInheritedAbstractMember";
 registerCodeFix({
     errorCodes,

tests/baselines/reference/abstractPropertyNegative.errors.txt

@@ -1,4 +1,4 @@
-abstractPropertyNegative.ts(13,7): error TS2654: Non-abstract class 'C' does not implement inherited abstract members 'prop', 'readonlyProp', 'm', 'mismatch' from class 'B'.
+abstractPropertyNegative.ts(13,7): error TS2654: Non-abstract class 'C' is missing implementations for the following members of 'B': 'prop', 'readonlyProp', 'm', 'mismatch'.
 abstractPropertyNegative.ts(15,5): error TS1253: Abstract properties can only appear within an abstract class.
 abstractPropertyNegative.ts(16,37): error TS1005: '{' expected.
 abstractPropertyNegative.ts(19,3): error TS2540: Cannot assign to 'ro' because it is a read-only property.
@@ -29,7 +29,7 @@ abstractPropertyNegative.ts(41,18): error TS2676: Accessors must both be abstrac
     }
     class C extends B {
           ~
-!!! error TS2654: Non-abstract class 'C' does not implement inherited abstract members 'prop', 'readonlyProp', 'm', 'mismatch' from class 'B'.
+!!! error TS2654: Non-abstract class 'C' is missing implementations for the following members of 'B': 'prop', 'readonlyProp', 'm', 'mismatch'.
         readonly ro = "readonly please";
         abstract notAllowed: string;
         ~~~~~~~~

tests/baselines/reference/classAbstractDeclarations.d.errors.txt

@@ -1,8 +1,8 @@
 classAbstractDeclarations.d.ts(2,5): error TS1242: 'abstract' modifier can only appear on a class, method, or property declaration.
 classAbstractDeclarations.d.ts(2,28): error TS1183: An implementation cannot be declared in ambient contexts.
-classAbstractDeclarations.d.ts(11,15): error TS2515: Non-abstract class 'CC' does not implement inherited abstract member 'foo' from class 'AA'.
-classAbstractDeclarations.d.ts(13,15): error TS2515: Non-abstract class 'DD' does not implement inherited abstract member 'foo' from class 'BB'.
-classAbstractDeclarations.d.ts(17,15): error TS2515: Non-abstract class 'FF' does not implement inherited abstract member 'foo' from class 'CC'.
+classAbstractDeclarations.d.ts(11,15): error TS2515: Non-abstract class 'CC' does not implement inherited abstract member foo from class 'AA'.
+classAbstractDeclarations.d.ts(13,15): error TS2515: Non-abstract class 'DD' does not implement inherited abstract member foo from class 'BB'.
+classAbstractDeclarations.d.ts(17,15): error TS2515: Non-abstract class 'FF' does not implement inherited abstract member foo from class 'CC'.
 
 
 ==== classAbstractDeclarations.d.ts (5 errors) ====
@@ -22,17 +22,17 @@ classAbstractDeclarations.d.ts(17,15): error TS2515: Non-abstract class 'FF' doe
 
     declare class CC extends AA {}
                   ~~
-!!! error TS2515: Non-abstract class 'CC' does not implement inherited abstract member 'foo' from class 'AA'.
+!!! error TS2515: Non-abstract class 'CC' does not implement inherited abstract member foo from class 'AA'.
 
     declare class DD extends BB {}
                   ~~
-!!! error TS2515: Non-abstract class 'DD' does not implement inherited abstract member 'foo' from class 'BB'.
+!!! error TS2515: Non-abstract class 'DD' does not implement inherited abstract member foo from class 'BB'.
 
     declare abstract class EE extends BB {}
 
     declare class FF extends CC {}
                   ~~
-!!! error TS2515: Non-abstract class 'FF' does not implement inherited abstract member 'foo' from class 'CC'.
+!!! error TS2515: Non-abstract class 'FF' does not implement inherited abstract member foo from class 'CC'.
 
     declare abstract class GG extends CC {}
 

tests/baselines/reference/classAbstractExtends.errors.txt

@@ -1,4 +1,4 @@
-classAbstractExtends.ts(9,7): error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'bar' from class 'B'.
+classAbstractExtends.ts(9,7): error TS2515: Non-abstract class 'C' does not implement inherited abstract member bar from class 'B'.
 
 
 ==== classAbstractExtends.ts (1 errors) ====
@@ -12,7 +12,7 @@ classAbstractExtends.ts(9,7): error TS2515: Non-abstract class 'C' does not impl
 
     class C extends B { }
           ~
-!!! error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'bar' from class 'B'.
+!!! error TS2515: Non-abstract class 'C' does not implement inherited abstract member bar from class 'B'.
 
     abstract class D extends B {}
 

tests/baselines/reference/classAbstractGeneric.errors.txt

@@ -1,7 +1,7 @@
-classAbstractGeneric.ts(10,7): error TS2654: Non-abstract class 'C<T>' does not implement inherited abstract members 'foo', 'bar' from class 'A<T>'.
-classAbstractGeneric.ts(12,7): error TS2654: Non-abstract class 'D' does not implement inherited abstract members 'foo', 'bar' from class 'A<number>'.
-classAbstractGeneric.ts(14,7): error TS2515: Non-abstract class 'E<T>' does not implement inherited abstract member 'bar' from class 'A<T>'.
-classAbstractGeneric.ts(18,7): error TS2515: Non-abstract class 'F<T>' does not implement inherited abstract member 'foo' from class 'A<T>'.
+classAbstractGeneric.ts(10,7): error TS2654: Non-abstract class 'C<T>' is missing implementations for the following members of 'A<T>': 'foo', 'bar'.
+classAbstractGeneric.ts(12,7): error TS2654: Non-abstract class 'D' is missing implementations for the following members of 'A<number>': 'foo', 'bar'.
+classAbstractGeneric.ts(14,7): error TS2515: Non-abstract class 'E<T>' does not implement inherited abstract member bar from class 'A<T>'.
+classAbstractGeneric.ts(18,7): error TS2515: Non-abstract class 'F<T>' does not implement inherited abstract member foo from class 'A<T>'.
 
 
 ==== classAbstractGeneric.ts (4 errors) ====
@@ -16,21 +16,21 @@ classAbstractGeneric.ts(18,7): error TS2515: Non-abstract class 'F<T>' does not
 
     class C<T> extends A<T> {} // error -- inherits abstract methods
           ~
-!!! error TS2654: Non-abstract class 'C<T>' does not implement inherited abstract members 'foo', 'bar' from class 'A<T>'.
+!!! error TS2654: Non-abstract class 'C<T>' is missing implementations for the following members of 'A<T>': 'foo', 'bar'.
 
     class D extends A<number> {} // error -- inherits abstract methods
           ~
-!!! error TS2654: Non-abstract class 'D' does not implement inherited abstract members 'foo', 'bar' from class 'A<number>'.
+!!! error TS2654: Non-abstract class 'D' is missing implementations for the following members of 'A<number>': 'foo', 'bar'.
 
     class E<T> extends A<T> { // error -- doesn't implement bar
           ~
-!!! error TS2515: Non-abstract class 'E<T>' does not implement inherited abstract member 'bar' from class 'A<T>'.
+!!! error TS2515: Non-abstract class 'E<T>' does not implement inherited abstract member bar from class 'A<T>'.
         foo() { return this.t; }
     }
 
     class F<T> extends A<T> { // error -- doesn't implement foo
           ~
-!!! error TS2515: Non-abstract class 'F<T>' does not implement inherited abstract member 'foo' from class 'A<T>'.
+!!! error TS2515: Non-abstract class 'F<T>' does not implement inherited abstract member foo from class 'A<T>'.
         bar(t : T) {}
     }
 

tests/baselines/reference/classAbstractInheritance.errors.txt

@@ -0,0 +1,33 @@
+classAbstractInheritance1.ts(13,7): error TS2515: Non-abstract class 'CC' does not implement inherited abstract member foo from class 'AA'.
+classAbstractInheritance1.ts(15,7): error TS2515: Non-abstract class 'DD' does not implement inherited abstract member foo from class 'BB'.
+classAbstractInheritance1.ts(19,7): error TS2515: Non-abstract class 'FF' does not implement inherited abstract member foo from class 'CC'.
+
+
+==== classAbstractInheritance1.ts (3 errors) ====
+    abstract class A {}
+    
+    abstract class B extends A {}
+    
+    class C extends A {}
+    
+    abstract class AA {
+        abstract foo();
+    }
+    
+    abstract class BB extends AA {}
+    
+    class CC extends AA {}
+          ~~
+!!! error TS2515: Non-abstract class 'CC' does not implement inherited abstract member foo from class 'AA'.
+    
+    class DD extends BB {}
+          ~~
+!!! error TS2515: Non-abstract class 'DD' does not implement inherited abstract member foo from class 'BB'.
+    
+    abstract class EE extends BB {}
+    
+    class FF extends CC {}
+          ~~
+!!! error TS2515: Non-abstract class 'FF' does not implement inherited abstract member foo from class 'CC'.
+    
+    abstract class GG extends CC {}

tests/baselines/reference/classAbstractInheritance.symbols

@@ -1,6 +1,6 @@
-//// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance.ts] ////
+//// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance1.ts] ////
 
-//// [classAbstractInheritance.ts]
+//// [classAbstractInheritance1.ts]
 abstract class A {}
 
 abstract class B extends A {}
@@ -23,7 +23,7 @@ class FF extends CC {}
 
 abstract class GG extends CC {}
 
-//// [classAbstractInheritance.js]
+//// [classAbstractInheritance1.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||

tests/baselines/reference/classAbstractInheritance1.errors.txt

@@ -0,0 +1,45 @@
+//// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance1.ts] ////
+
+=== classAbstractInheritance1.ts ===
+abstract class A {}
+>A : Symbol(A, Decl(classAbstractInheritance1.ts, 0, 0))
+
+abstract class B extends A {}
+>B : Symbol(B, Decl(classAbstractInheritance1.ts, 0, 19))
+>A : Symbol(A, Decl(classAbstractInheritance1.ts, 0, 0))
+
+class C extends A {}
+>C : Symbol(C, Decl(classAbstractInheritance1.ts, 2, 29))
+>A : Symbol(A, Decl(classAbstractInheritance1.ts, 0, 0))
+
+abstract class AA {
+>AA : Symbol(AA, Decl(classAbstractInheritance1.ts, 4, 20))
+
+    abstract foo();
+>foo : Symbol(AA.foo, Decl(classAbstractInheritance1.ts, 6, 19))
+}
+
+abstract class BB extends AA {}
+>BB : Symbol(BB, Decl(classAbstractInheritance1.ts, 8, 1))
+>AA : Symbol(AA, Decl(classAbstractInheritance1.ts, 4, 20))
+
+class CC extends AA {}
+>CC : Symbol(CC, Decl(classAbstractInheritance1.ts, 10, 31))
+>AA : Symbol(AA, Decl(classAbstractInheritance1.ts, 4, 20))
+
+class DD extends BB {}
+>DD : Symbol(DD, Decl(classAbstractInheritance1.ts, 12, 22))
+>BB : Symbol(BB, Decl(classAbstractInheritance1.ts, 8, 1))
+
+abstract class EE extends BB {}
+>EE : Symbol(EE, Decl(classAbstractInheritance1.ts, 14, 22))
+>BB : Symbol(BB, Decl(classAbstractInheritance1.ts, 8, 1))
+
+class FF extends CC {}
+>FF : Symbol(FF, Decl(classAbstractInheritance1.ts, 16, 31))
+>CC : Symbol(CC, Decl(classAbstractInheritance1.ts, 10, 31))
+
+abstract class GG extends CC {}
+>GG : Symbol(GG, Decl(classAbstractInheritance1.ts, 18, 22))
+>CC : Symbol(CC, Decl(classAbstractInheritance1.ts, 10, 31))
+

tests/baselines/reference/classAbstractInheritance.js renamed to tests/baselines/reference/classAbstractInheritance1.js

@@ -1,6 +1,6 @@
-//// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance.ts] ////
+//// [tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInheritance1.ts] ////
 
-=== classAbstractInheritance.ts ===
+=== classAbstractInheritance1.ts ===
 abstract class A {}
 >A : A