Print the correct type in the top level chain as the message indicates (#21127)

Author: weswigham

src/compiler/checker.ts

@@ -23005,7 +23005,7 @@ namespace ts {
                             Diagnostics.Property_0_in_type_1_is_not_assignable_to_the_same_property_in_base_type_2,
                             unescapeLeadingUnderscores(declaredProp.escapedName),
                             typeToString(typeWithThis),
-                            typeToString(getTypeOfSymbol(baseProp))
+                            typeToString(baseWithThis)
                         );
                         if (!checkTypeAssignableTo(getTypeOfSymbol(prop), getTypeOfSymbol(baseProp), member.name || member, /*message*/ undefined, rootChain)) {
                             issuedMemberError = true;

tests/baselines/reference/abstractPropertyNegative.errors.txt

@@ -7,11 +7,11 @@ tests/cases/compiler/abstractPropertyNegative.ts(13,7): error TS2515: Non-abstra
 tests/cases/compiler/abstractPropertyNegative.ts(15,5): error TS1244: Abstract methods can only appear within an abstract class.
 tests/cases/compiler/abstractPropertyNegative.ts(16,37): error TS1005: '{' expected.
 tests/cases/compiler/abstractPropertyNegative.ts(19,3): error TS2540: Cannot assign to 'ro' because it is a constant or a read-only property.
-tests/cases/compiler/abstractPropertyNegative.ts(25,5): error TS2416: Property 'num' in type 'WrongTypePropertyImpl' is not assignable to the same property in base type 'number'.
+tests/cases/compiler/abstractPropertyNegative.ts(25,5): error TS2416: Property 'num' in type 'WrongTypePropertyImpl' is not assignable to the same property in base type 'WrongTypeProperty'.
   Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/abstractPropertyNegative.ts(31,9): error TS2416: Property 'num' in type 'WrongTypeAccessorImpl' is not assignable to the same property in base type 'number'.
+tests/cases/compiler/abstractPropertyNegative.ts(31,9): error TS2416: Property 'num' in type 'WrongTypeAccessorImpl' is not assignable to the same property in base type 'WrongTypeAccessor'.
   Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/abstractPropertyNegative.ts(34,5): error TS2416: Property 'num' in type 'WrongTypeAccessorImpl2' is not assignable to the same property in base type 'number'.
+tests/cases/compiler/abstractPropertyNegative.ts(34,5): error TS2416: Property 'num' in type 'WrongTypeAccessorImpl2' is not assignable to the same property in base type 'WrongTypeAccessor'.
   Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/abstractPropertyNegative.ts(38,18): error TS2676: Accessors must both be abstract or non-abstract.
 tests/cases/compiler/abstractPropertyNegative.ts(39,9): error TS2676: Accessors must both be abstract or non-abstract.
@@ -64,7 +64,7 @@ tests/cases/compiler/abstractPropertyNegative.ts(41,18): error TS2676: Accessors
     class WrongTypePropertyImpl extends WrongTypeProperty {
         num = "nope, wrong";
         ~~~
-!!! error TS2416: Property 'num' in type 'WrongTypePropertyImpl' is not assignable to the same property in base type 'number'.
+!!! error TS2416: Property 'num' in type 'WrongTypePropertyImpl' is not assignable to the same property in base type 'WrongTypeProperty'.
 !!! error TS2416:   Type 'string' is not assignable to type 'number'.
     }
     abstract class WrongTypeAccessor {
@@ -73,13 +73,13 @@ tests/cases/compiler/abstractPropertyNegative.ts(41,18): error TS2676: Accessors
     class WrongTypeAccessorImpl extends WrongTypeAccessor {
         get num() { return "nope, wrong"; }
             ~~~
-!!! error TS2416: Property 'num' in type 'WrongTypeAccessorImpl' is not assignable to the same property in base type 'number'.
+!!! error TS2416: Property 'num' in type 'WrongTypeAccessorImpl' is not assignable to the same property in base type 'WrongTypeAccessor'.
 !!! error TS2416:   Type 'string' is not assignable to type 'number'.
     }
     class WrongTypeAccessorImpl2 extends WrongTypeAccessor {
         num = "nope, wrong";
         ~~~
-!!! error TS2416: Property 'num' in type 'WrongTypeAccessorImpl2' is not assignable to the same property in base type 'number'.
+!!! error TS2416: Property 'num' in type 'WrongTypeAccessorImpl2' is not assignable to the same property in base type 'WrongTypeAccessor'.
 !!! error TS2416:   Type 'string' is not assignable to type 'number'.
     }
 

tests/baselines/reference/apparentTypeSubtyping.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSubtyping.ts(10,5): error TS2416: Property 'x' in type 'Derived<U>' is not assignable to the same property in base type 'string'.
+tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSubtyping.ts(10,5): error TS2416: Property 'x' in type 'Derived<U>' is not assignable to the same property in base type 'Base<string>'.
   Type 'String' is not assignable to type 'string'.
     'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
 
@@ -15,7 +15,7 @@ tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSubtypi
     class Derived<U> extends Base<string> { // error
         x: String;
         ~
-!!! error TS2416: Property 'x' in type 'Derived<U>' is not assignable to the same property in base type 'string'.
+!!! error TS2416: Property 'x' in type 'Derived<U>' is not assignable to the same property in base type 'Base<string>'.
 !!! error TS2416:   Type 'String' is not assignable to type 'string'.
 !!! error TS2416:     'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
     }

tests/baselines/reference/apparentTypeSupertype.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSupertype.ts(10,5): error TS2416: Property 'x' in type 'Derived<U>' is not assignable to the same property in base type 'string'.
+tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSupertype.ts(10,5): error TS2416: Property 'x' in type 'Derived<U>' is not assignable to the same property in base type 'Base'.
   Type 'U' is not assignable to type 'string'.
     Type 'String' is not assignable to type 'string'.
       'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.
@@ -16,7 +16,7 @@ tests/cases/conformance/types/typeRelationships/apparentType/apparentTypeSuperty
     class Derived<U extends String> extends Base { // error
         x: U;
         ~
-!!! error TS2416: Property 'x' in type 'Derived<U>' is not assignable to the same property in base type 'string'.
+!!! error TS2416: Property 'x' in type 'Derived<U>' is not assignable to the same property in base type 'Base'.
 !!! error TS2416:   Type 'U' is not assignable to type 'string'.
 !!! error TS2416:     Type 'String' is not assignable to type 'string'.
 !!! error TS2416:       'string' is a primitive, but 'String' is a wrapper object. Prefer using 'string' when possible.

tests/baselines/reference/baseClassImprovedMismatchErrors.errors.txt

@@ -1,24 +1,24 @@
-tests/cases/compiler/baseClassImprovedMismatchErrors.ts(8,5): error TS2416: Property 'n' in type 'Derived' is not assignable to the same property in base type 'string | Base'.
+tests/cases/compiler/baseClassImprovedMismatchErrors.ts(8,5): error TS2416: Property 'n' in type 'Derived' is not assignable to the same property in base type 'Base'.
   Type 'string | Derived' is not assignable to type 'string | Base'.
     Type 'Derived' is not assignable to type 'string | Base'.
       Type 'Derived' is not assignable to type 'Base'.
         Types of property 'n' are incompatible.
           Type 'string | Derived' is not assignable to type 'string | Base'.
             Type 'Derived' is not assignable to type 'string | Base'.
               Type 'Derived' is not assignable to type 'Base'.
-tests/cases/compiler/baseClassImprovedMismatchErrors.ts(9,5): error TS2416: Property 'fn' in type 'Derived' is not assignable to the same property in base type '() => number'.
+tests/cases/compiler/baseClassImprovedMismatchErrors.ts(9,5): error TS2416: Property 'fn' in type 'Derived' is not assignable to the same property in base type 'Base'.
   Type '() => string | number' is not assignable to type '() => number'.
     Type 'string | number' is not assignable to type 'number'.
       Type 'string' is not assignable to type 'number'.
-tests/cases/compiler/baseClassImprovedMismatchErrors.ts(14,5): error TS2416: Property 'n' in type 'DerivedInterface' is not assignable to the same property in base type 'string | Base'.
+tests/cases/compiler/baseClassImprovedMismatchErrors.ts(14,5): error TS2416: Property 'n' in type 'DerivedInterface' is not assignable to the same property in base type 'Base'.
   Type 'string | DerivedInterface' is not assignable to type 'string | Base'.
     Type 'DerivedInterface' is not assignable to type 'string | Base'.
       Type 'DerivedInterface' is not assignable to type 'Base'.
         Types of property 'n' are incompatible.
           Type 'string | DerivedInterface' is not assignable to type 'string | Base'.
             Type 'DerivedInterface' is not assignable to type 'string | Base'.
               Type 'DerivedInterface' is not assignable to type 'Base'.
-tests/cases/compiler/baseClassImprovedMismatchErrors.ts(15,5): error TS2416: Property 'fn' in type 'DerivedInterface' is not assignable to the same property in base type '() => number'.
+tests/cases/compiler/baseClassImprovedMismatchErrors.ts(15,5): error TS2416: Property 'fn' in type 'DerivedInterface' is not assignable to the same property in base type 'Base'.
   Type '() => string | number' is not assignable to type '() => number'.
     Type 'string | number' is not assignable to type 'number'.
       Type 'string' is not assignable to type 'number'.
@@ -34,7 +34,7 @@ tests/cases/compiler/baseClassImprovedMismatchErrors.ts(15,5): error TS2416: Pro
     class Derived extends Base {
         n: Derived | string;
         ~
-!!! error TS2416: Property 'n' in type 'Derived' is not assignable to the same property in base type 'string | Base'.
+!!! error TS2416: Property 'n' in type 'Derived' is not assignable to the same property in base type 'Base'.
 !!! error TS2416:   Type 'string | Derived' is not assignable to type 'string | Base'.
 !!! error TS2416:     Type 'Derived' is not assignable to type 'string | Base'.
 !!! error TS2416:       Type 'Derived' is not assignable to type 'Base'.
@@ -44,7 +44,7 @@ tests/cases/compiler/baseClassImprovedMismatchErrors.ts(15,5): error TS2416: Pro
 !!! error TS2416:               Type 'Derived' is not assignable to type 'Base'.
         fn() {
         ~~
-!!! error TS2416: Property 'fn' in type 'Derived' is not assignable to the same property in base type '() => number'.
+!!! error TS2416: Property 'fn' in type 'Derived' is not assignable to the same property in base type 'Base'.
 !!! error TS2416:   Type '() => string | number' is not assignable to type '() => number'.
 !!! error TS2416:     Type 'string | number' is not assignable to type 'number'.
 !!! error TS2416:       Type 'string' is not assignable to type 'number'.
@@ -54,7 +54,7 @@ tests/cases/compiler/baseClassImprovedMismatchErrors.ts(15,5): error TS2416: Pro
     class DerivedInterface implements Base {
         n: DerivedInterface | string;
         ~
-!!! error TS2416: Property 'n' in type 'DerivedInterface' is not assignable to the same property in base type 'string | Base'.
+!!! error TS2416: Property 'n' in type 'DerivedInterface' is not assignable to the same property in base type 'Base'.
 !!! error TS2416:   Type 'string | DerivedInterface' is not assignable to type 'string | Base'.
 !!! error TS2416:     Type 'DerivedInterface' is not assignable to type 'string | Base'.
 !!! error TS2416:       Type 'DerivedInterface' is not assignable to type 'Base'.
@@ -64,7 +64,7 @@ tests/cases/compiler/baseClassImprovedMismatchErrors.ts(15,5): error TS2416: Pro
 !!! error TS2416:               Type 'DerivedInterface' is not assignable to type 'Base'.
         fn() {
         ~~
-!!! error TS2416: Property 'fn' in type 'DerivedInterface' is not assignable to the same property in base type '() => number'.
+!!! error TS2416: Property 'fn' in type 'DerivedInterface' is not assignable to the same property in base type 'Base'.
 !!! error TS2416:   Type '() => string | number' is not assignable to type '() => number'.
 !!! error TS2416:     Type 'string | number' is not assignable to type 'number'.
 !!! error TS2416:       Type 'string' is not assignable to type 'number'.

tests/baselines/reference/classIsSubtypeOfBaseType.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classIsSubtypeOfBaseType.ts(12,5): error TS2416: Property 'foo' in type 'Derived2' is not assignable to the same property in base type '{ bar: string; }'.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classIsSubtypeOfBaseType.ts(12,5): error TS2416: Property 'foo' in type 'Derived2' is not assignable to the same property in base type 'Base<{ bar: string; }>'.
   Type '{ bar?: string; }' is not assignable to type '{ bar: string; }'.
     Property 'bar' is optional in type '{ bar?: string; }' but required in type '{ bar: string; }'.
 
@@ -17,7 +17,7 @@ tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/cla
     class Derived2 extends Base<{ bar: string; }> {
         foo: {
         ~~~
-!!! error TS2416: Property 'foo' in type 'Derived2' is not assignable to the same property in base type '{ bar: string; }'.
+!!! error TS2416: Property 'foo' in type 'Derived2' is not assignable to the same property in base type 'Base<{ bar: string; }>'.
 !!! error TS2416:   Type '{ bar?: string; }' is not assignable to type '{ bar: string; }'.
 !!! error TS2416:     Property 'bar' is optional in type '{ bar?: string; }' but required in type '{ bar: string; }'.
             bar?: string; // error

tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.errors.txt

@@ -1,6 +1,6 @@
 tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassFunctionOverridesBaseClassAccessor.ts(2,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
 tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassFunctionOverridesBaseClassAccessor.ts(5,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassFunctionOverridesBaseClassAccessor.ts(11,5): error TS2416: Property 'x' in type 'Derived' is not assignable to the same property in base type 'number'.
+tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassFunctionOverridesBaseClassAccessor.ts(11,5): error TS2416: Property 'x' in type 'Derived' is not assignable to the same property in base type 'Base'.
   Type '() => number' is not assignable to type 'number'.
 tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassFunctionOverridesBaseClassAccessor.ts(11,5): error TS2426: Class 'Base' defines instance member accessor 'x', but extended class 'Derived' defines it as instance member function.
 
@@ -22,7 +22,7 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedClassFun
     class Derived extends Base {
         x() {
         ~
-!!! error TS2416: Property 'x' in type 'Derived' is not assignable to the same property in base type 'number'.
+!!! error TS2416: Property 'x' in type 'Derived' is not assignable to the same property in base type 'Base'.
 !!! error TS2416:   Type '() => number' is not assignable to type 'number'.
         ~
 !!! error TS2426: Class 'Base' defines instance member accessor 'x', but extended class 'Derived' defines it as instance member function.

tests/baselines/reference/destructuringParameterDeclaration2.errors.txt

@@ -35,7 +35,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(46,13): error TS2463: A binding pattern parameter cannot be optional in an implementation signature.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(47,13): error TS2463: A binding pattern parameter cannot be optional in an implementation signature.
 tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(56,8): error TS2463: A binding pattern parameter cannot be optional in an implementation signature.
-tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(57,5): error TS2416: Property 'd4' in type 'C4' is not assignable to the same property in base type '({ x, y, z }?: { x: any; y: any; z: any; }) => any'.
+tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(57,5): error TS2416: Property 'd4' in type 'C4' is not assignable to the same property in base type 'F2'.
   Type '({ x, y, c }: { x: any; y: any; c: any; }) => void' is not assignable to type '({ x, y, z }?: { x: any; y: any; z: any; }) => any'.
     Types of parameters '__0' and '__0' are incompatible.
       Type '{ x: any; y: any; z: any; }' is not assignable to type '{ x: any; y: any; c: any; }'.
@@ -159,7 +159,7 @@ tests/cases/conformance/es6/destructuring/destructuringParameterDeclaration2.ts(
 !!! error TS2463: A binding pattern parameter cannot be optional in an implementation signature.
         d4({x, y, c}) { }
         ~~
-!!! error TS2416: Property 'd4' in type 'C4' is not assignable to the same property in base type '({ x, y, z }?: { x: any; y: any; z: any; }) => any'.
+!!! error TS2416: Property 'd4' in type 'C4' is not assignable to the same property in base type 'F2'.
 !!! error TS2416:   Type '({ x, y, c }: { x: any; y: any; c: any; }) => void' is not assignable to type '({ x, y, z }?: { x: any; y: any; z: any; }) => any'.
 !!! error TS2416:     Types of parameters '__0' and '__0' are incompatible.
 !!! error TS2416:       Type '{ x: any; y: any; z: any; }' is not assignable to type '{ x: any; y: any; c: any; }'.

tests/baselines/reference/elaboratedErrors.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/compiler/elaboratedErrors.ts(11,3): error TS2416: Property 'read' in type 'WorkerFS' is not assignable to the same property in base type 'number'.
+tests/cases/compiler/elaboratedErrors.ts(11,3): error TS2416: Property 'read' in type 'WorkerFS' is not assignable to the same property in base type 'FileSystem'.
   Type 'string' is not assignable to type 'number'.
 tests/cases/compiler/elaboratedErrors.ts(20,1): error TS2322: Type 'Beta' is not assignable to type 'Alpha'.
   Property 'x' is missing in type 'Beta'.
@@ -21,7 +21,7 @@ tests/cases/compiler/elaboratedErrors.ts(25,1): error TS2322: Type 'Alpha' is no
     class WorkerFS implements FileSystem {
       read: string;
       ~~~~
-!!! error TS2416: Property 'read' in type 'WorkerFS' is not assignable to the same property in base type 'number'.
+!!! error TS2416: Property 'read' in type 'WorkerFS' is not assignable to the same property in base type 'FileSystem'.
 !!! error TS2416:   Type 'string' is not assignable to type 'number'.
     }
 

tests/baselines/reference/genericImplements.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/compiler/genericImplements.ts(9,5): error TS2416: Property 'f' in type 'X' is not assignable to the same property in base type '<T extends A>() => T'.
+tests/cases/compiler/genericImplements.ts(9,5): error TS2416: Property 'f' in type 'X' is not assignable to the same property in base type 'I'.
   Type '<T extends B>() => T' is not assignable to type '<T extends A>() => T'.
     Type 'B' is not assignable to type 'T'.
 
@@ -14,7 +14,7 @@ tests/cases/compiler/genericImplements.ts(9,5): error TS2416: Property 'f' in ty
     class X implements I {  
         f<T extends B>(): T { return undefined; }
         ~
-!!! error TS2416: Property 'f' in type 'X' is not assignable to the same property in base type '<T extends A>() => T'.
+!!! error TS2416: Property 'f' in type 'X' is not assignable to the same property in base type 'I'.
 !!! error TS2416:   Type '<T extends B>() => T' is not assignable to type '<T extends A>() => T'.
 !!! error TS2416:     Type 'B' is not assignable to type 'T'.
     } // { f: () => { b; } }