luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-05-04 10:33:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix table used for prop for metamethod

Browse source
This commit is contained in:
JohnnyMorganz 2022-08-27 15:57:54 +01:00
parent 54181fa86b
commit 03dd44bee5
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Analysis/src/TypeInfer.cpp
View file

@ -1659,6 +1659,7 @@ void TypeChecker::check(const ScopePtr& scope, const AstStatDeclareClass& declar
TypeId propTy = resolveType(scope, *prop.ty); TypeId propTy = resolveType(scope, *prop.ty);
bool assignToMetatable = isMetamethod(propName); bool assignToMetatable = isMetamethod(propName);
Luau::ClassTypeVar::Props& assignTo = assignToMetatable ? metatable->props : ctv->props;
// Function types always take 'self', but this isn't reflected in the // Function types always take 'self', but this isn't reflected in the
// parsed annotation. Add it here. // parsed annotation. Add it here.
@ -1674,16 +1675,13 @@ void TypeChecker::check(const ScopePtr& scope, const AstStatDeclareClass& declar
} }
} }
if (ctv->props.count(propName) == 0) if (assignTo.count(propName) == 0)
{ {
if (assignToMetatable) assignTo[propName] = {propTy};
metatable->props[propName] = {propTy};
else
ctv->props[propName] = {propTy};
} }
else else
{ {
TypeId currentTy = assignToMetatable ? metatable->props[propName].type : ctv->props[propName].type; TypeId currentTy = assignTo[propName].type;
// We special-case this logic to keep the intersection flat; otherwise we // We special-case this logic to keep the intersection flat; otherwise we
// would create a ton of nested intersection types. // would create a ton of nested intersection types.
@ -1693,19 +1691,13 @@ void TypeChecker::check(const ScopePtr& scope, const AstStatDeclareClass& declar
options.push_back(propTy); options.push_back(propTy);
TypeId newItv = addType(IntersectionTypeVar{std::move(options)}); TypeId newItv = addType(IntersectionTypeVar{std::move(options)});
if (assignToMetatable) assignTo[propName] = {newItv};
metatable->props[propName] = {newItv};
else
ctv->props[propName] = {newItv};
} }
else if (get<FunctionTypeVar>(currentTy)) else if (get<FunctionTypeVar>(currentTy))
{ {
TypeId intersection = addType(IntersectionTypeVar{{currentTy, propTy}}); TypeId intersection = addType(IntersectionTypeVar{{currentTy, propTy}});
if (assignToMetatable) assignTo[propName] = {intersection};
metatable->props[propName] = {intersection};
else
ctv->props[propName] = {intersection};
} }
else else
{ {