Skip to content
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

fix #2727 Type checker does not detect a signature mismatch #2728

Merged
merged 3 commits into from
Oct 1, 2023
Merged
Show file tree
Hide file tree
Changes from 2 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
11 changes: 6 additions & 5 deletions src/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6609,17 +6609,18 @@ export class Compiler extends DiagnosticEmitter {
for (let i = 0, k = overrideInstances.length; i < k; ++i) {
let overrideInstance = overrideInstances[i];
if (!overrideInstance.is(CommonFlags.Compiled)) continue; // errored
let overrideType = overrideInstance.type;
let originalType = instance.type;
if (!overrideType.isAssignableTo(originalType)) {

const overrideSignature = overrideInstance.signature;
const originalSignature = instance.signature;
Changqing-JING marked this conversation as resolved.
Show resolved Hide resolved

if (!overrideSignature.isAssignableTo(originalSignature, true)) {
this.error(
DiagnosticCode.Type_0_is_not_assignable_to_type_1,
overrideInstance.identifierNode.range, overrideType.toString(), originalType.toString()
overrideInstance.identifierNode.range, overrideSignature.toString(), originalSignature.toString()
);
continue;
}
// TODO: additional optional parameters are not permitted by `isAssignableTo` yet
let overrideSignature = overrideInstance.signature;
let overrideParameterTypes = overrideSignature.parameterTypes;
let overrideNumParameters = overrideParameterTypes.length;
let paramExprs = new Array<ExpressionRef>(1 + overrideNumParameters);
Expand Down
21 changes: 7 additions & 14 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1051,22 +1051,15 @@ export class Signature {
isAssignableTo(target: Signature, checkCompatibleOverride: bool = false): bool {
let thisThisType = this.thisType;
let targetThisType = target.thisType;
if (checkCompatibleOverride) {
// check kind of `this` type
if (thisThisType) {
if (!targetThisType || !thisThisType.canExtendOrImplement(targetThisType)) {
return false;
}
} else if (targetThisType) {
return false;
}
} else {
// check `this` type (invariant)
if (thisThisType) {
if (targetThisType != targetThisType) return false;
} else if (targetThisType) {

if (thisThisType != null && targetThisType != null){
CountBleck marked this conversation as resolved.
Show resolved Hide resolved
const compatibleThisType = checkCompatibleOverride ? thisThisType.canExtendOrImplement(targetThisType)
: targetThisType.isAssignableTo(thisThisType);
if (!compatibleThisType) {
return false;
}
}else if (thisThisType || targetThisType){
return false;
Changqing-JING marked this conversation as resolved.
Show resolved Hide resolved
}

// check rest parameter
Expand Down
8 changes: 8 additions & 0 deletions tests/compiler/class-member-function-as-parameter.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"asc_flags": [],
"stderr": [
"TS2322: Type '() => void' is not assignable to type '(this: class-member-function-as-parameter/A) => void'.",
"TS2322: Type '(this: class-member-function-as-parameter/B) => void' is not assignable to type '(this: class-member-function-as-parameter/A) => void'.",
"EOF"
]
}
15 changes: 15 additions & 0 deletions tests/compiler/class-member-function-as-parameter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
class A {
foo(): void { }
}
class B extends A {
foo(): void { }
}
function foo(): void { }
function consumeA(callback: (this: A) => void): void { }
function consumeB(callback: (this: B) => void): void { }
const a = new A();
const b = new B();
consumeB(a.foo); // shouldn't error
consumeA(foo); // should error
consumeA(b.foo); // should error
ERROR("EOF");
Changqing-JING marked this conversation as resolved.
Show resolved Hide resolved