luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-04-03 18:30:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix definition module name & location

Browse source
This commit is contained in:
checkraisefold 2024-10-27 19:59:10 -07:00
parent a251bc68a2
commit 4074d2a3d1
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Analysis/src/ConstraintGenerator.cpp
View file

@ -2844,6 +2844,7 @@ Inference ConstraintGenerator::check(const ScopePtr& scope, AstExprTable* expr,
ttv->state = TableState::Unsealed; ttv->state = TableState::Unsealed;
ttv->definitionModuleName = module->name; ttv->definitionModuleName = module->name;
ttv->definitionLocation = expr->location;
ttv->scope = scope.get(); ttv->scope = scope.get();
interiorTypes.back().push_back(ty); interiorTypes.back().push_back(ty);
@ -3301,7 +3302,13 @@ TypeId ConstraintGenerator::resolveTableType(const ScopePtr& scope, AstType* ty,
ice->ice("Unexpected property access " + std::to_string(int(astIndexer->access))); ice->ice("Unexpected property access " + std::to_string(int(astIndexer->access)));
} }
return arena->addType(TableType{props, indexer, scope->level, scope.get(), TableState::Sealed}); TypeId tableTy = arena->addType(TableType{props, indexer, scope->level, scope.get(), TableState::Sealed});
TableType* ttv = getMutable<TableType>(tableTy);
ttv->definitionModuleName = module->name;
ttv->definitionLocation = tab->location;
return tableTy;
} }
TypeId ConstraintGenerator::resolveFunctionType( TypeId ConstraintGenerator::resolveFunctionType(

11
Analysis/src/ConstraintSolver.cpp
View file

@ -1111,7 +1111,6 @@ bool ConstraintSolver::tryDispatch(const TypeAliasExpansionConstraint& c, NotNul
ttv->instantiatedTypeParams = typeArguments; ttv->instantiatedTypeParams = typeArguments;
ttv->instantiatedTypePackParams = packArguments; ttv->instantiatedTypePackParams = packArguments;
// TODO: Fill in definitionModuleName.
} }
bindResult(target); bindResult(target);
@ -1433,7 +1432,8 @@ bool ConstraintSolver::tryDispatch(const FunctionCheckConstraint& c, NotNull<con
} }
} }
} }
else if (expr->is<AstExprConstantBool>() || expr->is<AstExprConstantString>() || expr->is<AstExprConstantNumber>() || expr->is<AstExprConstantNil>()) else if (expr->is<AstExprConstantBool>() || expr->is<AstExprConstantString>() || expr->is<AstExprConstantNumber>() ||
expr->is<AstExprConstantNil>())
{ {
Unifier2 u2{arena, builtinTypes, constraint->scope, NotNull{&iceReporter}}; Unifier2 u2{arena, builtinTypes, constraint->scope, NotNull{&iceReporter}};
u2.unify(actualArgTy, expectedArgTy); u2.unify(actualArgTy, expectedArgTy);
@ -2326,12 +2326,7 @@ bool ConstraintSolver::tryDispatchIterableTable(TypeId iteratorTy, const Iterabl
return true; return true;
} }
bool ConstraintSolver::tryDispatchIterableFunction( bool ConstraintSolver::tryDispatchIterableFunction(TypeId nextTy, TypeId tableTy, const IterableConstraint& c, NotNull<const Constraint> constraint)
TypeId nextTy,
TypeId tableTy,
const IterableConstraint& c,
NotNull<const Constraint> constraint
)
{ {
const FunctionType* nextFn = get<FunctionType>(nextTy); const FunctionType* nextFn = get<FunctionType>(nextTy);
// If this does not hold, we should've never called `tryDispatchIterableFunction` in the first place. // If this does not hold, we should've never called `tryDispatchIterableFunction` in the first place.