Skip to content

Commit c4a504b

Browse files
sandersnsandersn
authored
Prototype assignments count as method-like (microsoft#23137)
* Prototype assignments count as method-like For the purposes of reporting prototype/instance property conflicts * Fix lint
1 parent 04db4ae commit c4a504b

4 files changed

Lines changed: 109 additions & 8 deletions

File tree

‎src/compiler/checker.ts‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6503,7 +6503,7 @@ namespace ts {
65036503
(modifiers & ModifierFlags.Protected ? CheckFlags.ContainsProtected : 0) |
65046504
(modifiers & ModifierFlags.Private ? CheckFlags.ContainsPrivate : 0) |
65056505
(modifiers & ModifierFlags.Static ? CheckFlags.ContainsStatic : 0);
6506-
if (!isMethodLike(prop)) {
6506+
if (!isPrototypeProperty(prop)) {
65076507
syntheticFlag = CheckFlags.SyntheticProperty;
65086508
}
65096509
}
@@ -16236,8 +16236,19 @@ namespace ts {
1623616236
return s.valueDeclaration ? getCombinedNodeFlags(s.valueDeclaration) : 0;
1623716237
}
1623816238

16239-
function isMethodLike(symbol: Symbol) {
16240-
return !!(symbol.flags & SymbolFlags.Method || getCheckFlags(symbol) & CheckFlags.SyntheticMethod);
16239+
/**
16240+
* Return whether this symbol is a member of a prototype somewhere
16241+
* Note that this is not tracked well within the compiler, so the answer may be incorrect.
16242+
*/
16243+
function isPrototypeProperty(symbol: Symbol) {
16244+
if (symbol.flags & SymbolFlags.Method || getCheckFlags(symbol) & CheckFlags.SyntheticMethod) {
16245+
return true;
16246+
}
16247+
if (isInJavaScriptFile(symbol.valueDeclaration)) {
16248+
const parent = symbol.valueDeclaration.parent;
16249+
return parent && isBinaryExpression(parent) &&
16250+
getSpecialPropertyAssignmentKind(parent) === SpecialPropertyAssignmentKind.PrototypeProperty;
16251+
}
1624116252
}
1624216253

1624316254
/**
@@ -23677,25 +23688,25 @@ namespace ts {
2367723688
continue;
2367823689
}
2367923690

23680-
if (isMethodLike(base) && isMethodLike(derived) || base.flags & SymbolFlags.PropertyOrAccessor && derived.flags & SymbolFlags.PropertyOrAccessor) {
23691+
if (isPrototypeProperty(base) && isPrototypeProperty(derived) || base.flags & SymbolFlags.PropertyOrAccessor && derived.flags & SymbolFlags.PropertyOrAccessor) {
2368123692
// method is overridden with method or property/accessor is overridden with property/accessor - correct case
2368223693
continue;
2368323694
}
2368423695

2368523696
let errorMessage: DiagnosticMessage;
23686-
if (isMethodLike(base)) {
23697+
if (isPrototypeProperty(base)) {
2368723698
if (derived.flags & SymbolFlags.Accessor) {
2368823699
errorMessage = Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor;
2368923700
}
2369023701
else {
2369123702
errorMessage = Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property;
2369223703
}
2369323704
}
23694-
else if (base.flags & SymbolFlags.Property) {
23695-
errorMessage = Diagnostics.Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function;
23705+
else if (base.flags & SymbolFlags.Accessor) {
23706+
errorMessage = Diagnostics.Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function;
2369623707
}
2369723708
else {
23698-
errorMessage = Diagnostics.Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function;
23709+
errorMessage = Diagnostics.Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function;
2369923710
}
2370023711

2370123712
error(getNameOfDeclaration(derived.valueDeclaration) || derived.valueDeclaration, errorMessage, typeToString(baseType), symbolToString(base), typeToString(type));

‎tests/baselines/reference/typeFromPropertyAssignment23.symbols‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,38 @@ D.prototype.foo = () => {
4040
this.n = 'not checked, so no error'
4141
}
4242

43+
// post-class prototype assignments are trying to show that these properties are abstract
44+
class Module {
45+
>Module : Symbol(Module, Decl(a.js, 17, 1))
46+
}
47+
Module.prototype.identifier = undefined
48+
>Module.prototype.identifier : Symbol(Module.identifier, Decl(a.js, 21, 1))
49+
>Module.prototype : Symbol(Module.identifier, Decl(a.js, 21, 1))
50+
>Module : Symbol(Module, Decl(a.js, 17, 1))
51+
>prototype : Symbol(Module.prototype)
52+
>identifier : Symbol(Module.identifier, Decl(a.js, 21, 1))
53+
>undefined : Symbol(undefined)
54+
55+
Module.prototype.size = null
56+
>Module.prototype.size : Symbol(Module.size, Decl(a.js, 22, 39))
57+
>Module.prototype : Symbol(Module.size, Decl(a.js, 22, 39))
58+
>Module : Symbol(Module, Decl(a.js, 17, 1))
59+
>prototype : Symbol(Module.prototype)
60+
>size : Symbol(Module.size, Decl(a.js, 22, 39))
61+
62+
class NormalModule extends Module {
63+
>NormalModule : Symbol(NormalModule, Decl(a.js, 23, 28))
64+
>Module : Symbol(Module, Decl(a.js, 17, 1))
65+
66+
identifier() {
67+
>identifier : Symbol(NormalModule.identifier, Decl(a.js, 25, 35))
68+
69+
return 'normal'
70+
}
71+
size() {
72+
>size : Symbol(NormalModule.size, Decl(a.js, 28, 5))
73+
74+
return 0
75+
}
76+
}
77+

‎tests/baselines/reference/typeFromPropertyAssignment23.types‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,43 @@ D.prototype.foo = () => {
5151
>'not checked, so no error' : "not checked, so no error"
5252
}
5353

54+
// post-class prototype assignments are trying to show that these properties are abstract
55+
class Module {
56+
>Module : Module
57+
}
58+
Module.prototype.identifier = undefined
59+
>Module.prototype.identifier = undefined : undefined
60+
>Module.prototype.identifier : any
61+
>Module.prototype : Module
62+
>Module : typeof Module
63+
>prototype : Module
64+
>identifier : any
65+
>undefined : undefined
66+
67+
Module.prototype.size = null
68+
>Module.prototype.size = null : null
69+
>Module.prototype.size : any
70+
>Module.prototype : Module
71+
>Module : typeof Module
72+
>prototype : Module
73+
>size : any
74+
>null : null
75+
76+
class NormalModule extends Module {
77+
>NormalModule : NormalModule
78+
>Module : Module
79+
80+
identifier() {
81+
>identifier : () => string
82+
83+
return 'normal'
84+
>'normal' : "normal"
85+
}
86+
size() {
87+
>size : () => number
88+
89+
return 0
90+
>0 : 0
91+
}
92+
}
93+

‎tests/cases/conformance/salsa/typeFromPropertyAssignment23.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,18 @@ class D extends B { }
2020
D.prototype.foo = () => {
2121
this.n = 'not checked, so no error'
2222
}
23+
24+
// post-class prototype assignments are trying to show that these properties are abstract
25+
class Module {
26+
}
27+
Module.prototype.identifier = undefined
28+
Module.prototype.size = null
29+
30+
class NormalModule extends Module {
31+
identifier() {
32+
return 'normal'
33+
}
34+
size() {
35+
return 0
36+
}
37+
}

0 commit comments

Comments
 (0)