diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c99fc446f5d..683874e2d10 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -47397,7 +47397,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const errorMessage = overriddenInstanceProperty ? Diagnostics._0_is_defined_as_an_accessor_in_class_1_but_is_overridden_here_in_2_as_an_instance_property : Diagnostics._0_is_defined_as_a_property_in_class_1_but_is_overridden_here_in_2_as_an_accessor; - error(getNameOfDeclaration(derived.valueDeclaration) || derived.valueDeclaration, errorMessage, symbolToString(base), typeToString(getDeclaredTypeOfSymbol(base.parent!)), typeToString(type)); + error(getNameOfDeclaration(derived.valueDeclaration) || derived.valueDeclaration, errorMessage, symbolToString(base), typeToString(baseType), typeToString(type)); } else if (useDefineForClassFields) { const uninitialized = derived.declarations?.find(d => d.kind === SyntaxKind.PropertyDeclaration && !(d as PropertyDeclaration).initializer); diff --git a/tests/baselines/reference/accessorsOverrideProperty10.errors.txt b/tests/baselines/reference/accessorsOverrideProperty10.errors.txt index 9ba82aa7b4f..e8d21e95ebf 100644 --- a/tests/baselines/reference/accessorsOverrideProperty10.errors.txt +++ b/tests/baselines/reference/accessorsOverrideProperty10.errors.txt @@ -1,4 +1,4 @@ -accessorsOverrideProperty10.ts(6,7): error TS2611: 'x' is defined as a property in class 'A', but is overridden here in 'C' as an accessor. +accessorsOverrideProperty10.ts(6,7): error TS2611: 'x' is defined as a property in class 'B', but is overridden here in 'C' as an accessor. ==== accessorsOverrideProperty10.ts (1 errors) ==== @@ -9,7 +9,7 @@ accessorsOverrideProperty10.ts(6,7): error TS2611: 'x' is defined as a property class C extends B { get x() { ~ -!!! error TS2611: 'x' is defined as a property in class 'A', but is overridden here in 'C' as an accessor. +!!! error TS2611: 'x' is defined as a property in class 'B', but is overridden here in 'C' as an accessor. return 2; } } diff --git a/tests/baselines/reference/propertyOverridesAccessors6.errors.txt b/tests/baselines/reference/propertyOverridesAccessors6.errors.txt index cda1185c865..124e367bf5a 100644 --- a/tests/baselines/reference/propertyOverridesAccessors6.errors.txt +++ b/tests/baselines/reference/propertyOverridesAccessors6.errors.txt @@ -1,4 +1,4 @@ -propertyOverridesAccessors6.ts(8,3): error TS2610: 'x' is defined as an accessor in class 'A', but is overridden here in 'C' as an instance property. +propertyOverridesAccessors6.ts(8,3): error TS2610: 'x' is defined as an accessor in class 'B', but is overridden here in 'C' as an instance property. ==== propertyOverridesAccessors6.ts (1 errors) ==== @@ -11,6 +11,6 @@ propertyOverridesAccessors6.ts(8,3): error TS2610: 'x' is defined as an accessor class C extends B { x = 1; ~ -!!! error TS2610: 'x' is defined as an accessor in class 'A', but is overridden here in 'C' as an instance property. +!!! error TS2610: 'x' is defined as an accessor in class 'B', but is overridden here in 'C' as an instance property. } \ No newline at end of file