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

Fix a few style changes that went out-of-sync

Browse source
This commit is contained in:
Vyacheslav Egorov 2023-01-20 14:18:59 +02:00
parent 7a43ae3b37
commit b0b7dfb714
1 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Analysis/src/ToString.cpp
View file

@ -310,8 +310,7 @@ struct TypeStringifier
} }
Luau::visit( Luau::visit(
[this, tv](auto&& t) [this, tv](auto&& t) {
{
return (*this)(tv, t); return (*this)(tv, t);
}, },
tv->ty); tv->ty);
@ -907,8 +906,7 @@ struct TypePackStringifier
} }
Luau::visit( Luau::visit(
[this, tp](auto&& t) [this, tp](auto&& t) {
{
return (*this)(tp, t); return (*this)(tp, t);
}, },
tp->ty); tp->ty);
@ -1058,11 +1056,9 @@ static void assignCycleNames(const std::set<TypeId>& cycles, const std::set<Type
if (auto ttv = get<TableType>(follow(cycleTy)); !exhaustive && ttv && (ttv->syntheticName || ttv->name)) if (auto ttv = get<TableType>(follow(cycleTy)); !exhaustive && ttv && (ttv->syntheticName || ttv->name))
{ {
// If we have a cycle type in type parameters, assign a cycle name for this named table // If we have a cycle type in type parameters, assign a cycle name for this named table
if (std::find_if(ttv->instantiatedTypeParams.begin(), ttv->instantiatedTypeParams.end(), if (std::find_if(ttv->instantiatedTypeParams.begin(), ttv->instantiatedTypeParams.end(), [&](auto&& el) {
[&](auto&& el) return cycles.count(follow(el));
{ }) != ttv->instantiatedTypeParams.end())
return cycles.count(follow(el));
}) != ttv->instantiatedTypeParams.end())
cycleNames[cycleTy] = ttv->name ? *ttv->name : *ttv->syntheticName; cycleNames[cycleTy] = ttv->name ? *ttv->name : *ttv->syntheticName;
continue; continue;
@ -1157,11 +1153,9 @@ ToStringResult toStringDetailed(TypeId ty, ToStringOptions& opts)
state.exhaustive = true; state.exhaustive = true;
std::vector<std::pair<TypeId, std::string>> sortedCycleNames{state.cycleNames.begin(), state.cycleNames.end()}; std::vector<std::pair<TypeId, std::string>> sortedCycleNames{state.cycleNames.begin(), state.cycleNames.end()};
std::sort(sortedCycleNames.begin(), sortedCycleNames.end(), std::sort(sortedCycleNames.begin(), sortedCycleNames.end(), [](const auto& a, const auto& b) {
[](const auto& a, const auto& b) return a.second < b.second;
{ });
return a.second < b.second;
});
bool semi = false; bool semi = false;
for (const auto& [cycleTy, name] : sortedCycleNames) for (const auto& [cycleTy, name] : sortedCycleNames)
@ -1172,8 +1166,7 @@ ToStringResult toStringDetailed(TypeId ty, ToStringOptions& opts)
state.emit(name); state.emit(name);
state.emit(" = "); state.emit(" = ");
Luau::visit( Luau::visit(
[&tvs, cycleTy = cycleTy](auto&& t) [&tvs, cycleTy = cycleTy](auto&& t) {
{
return tvs(cycleTy, t); return tvs(cycleTy, t);
}, },
cycleTy->ty); cycleTy->ty);
@ -1254,11 +1247,9 @@ ToStringResult toStringDetailed(TypePackId tp, ToStringOptions& opts)
state.exhaustive = true; state.exhaustive = true;
std::vector<std::pair<TypeId, std::string>> sortedCycleNames{state.cycleNames.begin(), state.cycleNames.end()}; std::vector<std::pair<TypeId, std::string>> sortedCycleNames{state.cycleNames.begin(), state.cycleNames.end()};
std::sort(sortedCycleNames.begin(), sortedCycleNames.end(), std::sort(sortedCycleNames.begin(), sortedCycleNames.end(), [](const auto& a, const auto& b) {
[](const auto& a, const auto& b) return a.second < b.second;
{ });
return a.second < b.second;
});
bool semi = false; bool semi = false;
for (const auto& [cycleTy, name] : sortedCycleNames) for (const auto& [cycleTy, name] : sortedCycleNames)
@ -1269,8 +1260,7 @@ ToStringResult toStringDetailed(TypePackId tp, ToStringOptions& opts)
state.emit(name); state.emit(name);
state.emit(" = "); state.emit(" = ");
Luau::visit( Luau::visit(
[&tvs, cycleTy = cycleTy](auto t) [&tvs, cycleTy = cycleTy](auto t) {
{
return tvs(cycleTy, t); return tvs(cycleTy, t);
}, },
cycleTy->ty); cycleTy->ty);