Skip to content

fix(57141): override keyword doesn't check symbol-key class members #57146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44852,7 +44852,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
hasAbstractModifier(member),
isStatic(member),
memberIsParameterProperty,
symbolName(declaredProp),
declaredProp,
reportErrors ? member : undefined,
);
}
Expand All @@ -44876,22 +44876,21 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
memberHasAbstractModifier: boolean,
memberIsStatic: boolean,
memberIsParameterProperty: boolean,
memberName: string,
member: Symbol,
errorNode?: Node,
): MemberOverrideStatus {
const isJs = isInJSFile(node);
const nodeInAmbientContext = !!(node.flags & NodeFlags.Ambient);
if (baseWithThis && (memberHasOverrideModifier || compilerOptions.noImplicitOverride)) {
const memberEscapedName = escapeLeadingUnderscores(memberName);
const thisType = memberIsStatic ? staticType : typeWithThis;
const baseType = memberIsStatic ? baseStaticType : baseWithThis;
const prop = getPropertyOfType(thisType, memberEscapedName);
const baseProp = getPropertyOfType(baseType, memberEscapedName);
const prop = getPropertyOfType(thisType, member.escapedName);
const baseProp = getPropertyOfType(baseType, member.escapedName);

const baseClassName = typeToString(baseWithThis);
if (prop && !baseProp && memberHasOverrideModifier) {
if (errorNode) {
const suggestion = getSuggestedSymbolForNonexistentClassMember(memberName, baseType); // Again, using symbol name: note that's different from `symbol.escapedName`
const suggestion = getSuggestedSymbolForNonexistentClassMember(symbolName(member), baseType); // Again, using symbol name: note that's different from `symbol.escapedName`
suggestion ?
error(
errorNode,
Expand Down Expand Up @@ -45037,7 +45036,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
hasAbstractModifier(member),
isStatic(member),
/*memberIsParameterProperty*/ false,
symbolName(memberSymbol),
memberSymbol,
);
}

Expand Down
13 changes: 13 additions & 0 deletions tests/baselines/reference/override21.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
override21.ts(5,14): error TS4113: This member cannot have an 'override' modifier because it is not declared in the base class 'A'.


==== override21.ts (1 errors) ====
const foo = Symbol();
class A { }

class B extends A {
override [foo]() { }
~~~~~
!!! error TS4113: This member cannot have an 'override' modifier because it is not declared in the base class 'A'.
}

18 changes: 18 additions & 0 deletions tests/baselines/reference/override21.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//// [tests/cases/conformance/override/override21.ts] ////

//// [override21.ts]
const foo = Symbol();
class A { }

class B extends A {
override [foo]() { }
}


//// [override21.js]
const foo = Symbol();
class A {
}
class B extends A {
[foo]() { }
}
19 changes: 19 additions & 0 deletions tests/baselines/reference/override21.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//// [tests/cases/conformance/override/override21.ts] ////

=== override21.ts ===
const foo = Symbol();
>foo : Symbol(foo, Decl(override21.ts, 0, 5))
>Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --))

class A { }
>A : Symbol(A, Decl(override21.ts, 0, 21))

class B extends A {
>B : Symbol(B, Decl(override21.ts, 1, 11))
>A : Symbol(A, Decl(override21.ts, 0, 21))

override [foo]() { }
>[foo] : Symbol(B[foo], Decl(override21.ts, 3, 19))
>foo : Symbol(foo, Decl(override21.ts, 0, 5))
}

20 changes: 20 additions & 0 deletions tests/baselines/reference/override21.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//// [tests/cases/conformance/override/override21.ts] ////

=== override21.ts ===
const foo = Symbol();
>foo : unique symbol
>Symbol() : unique symbol
>Symbol : SymbolConstructor

class A { }
>A : A

class B extends A {
>B : B
>A : A

override [foo]() { }
>[foo] : () => void
>foo : unique symbol
}

9 changes: 9 additions & 0 deletions tests/cases/conformance/override/override21.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// @target: esnext
// @noImplicitOverride: true

const foo = Symbol();
class A { }

class B extends A {
override [foo]() { }
}