feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Lua: Fix multilevel tree traversal in connectHooks function

Browse Source 
Previously, only leaf nodes from the first branch of the tree were processed.
* Handled: root.branch1.leafA, root.branch1.leafB
* Skipped: root.branch2.leafC, etc.
This change ensures all branches are traversed so no leaf nodes are skipped.
The fix iterates over each key in the table and, for sub-tables, recursively
calls connectHooks instead of returning early.

Change-Id: I17182f4000e83e5d4747e71573d5ac2d6558d7e7
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Lukasz Papierkowski
2024-12-24 10:52:52 +01:00
committed by lie
parent 051eff6d5b
commit 8cce192dab
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/lua/luaengine.cpp
View File

@@ -230,18 +230,38 @@ expected_str<void> connectHooks(
qCDebug(logLuaEngine) << "connectHooks called with path: " << path; qCDebug(logLuaEngine) << "connectHooks called with path: " << path;
for (const auto &[k, v] : table) { for (const auto &[k, v] : table) {
qCDebug(logLuaEngine) << "Processing key: " << k.as<QString>(); if (k.get_type() != sol::type::string)
if (v.get_type() == sol::type::table) { return make_unexpected(
return connectHooks( Tr::tr("Non-string key encountered in Lua table at path \"%1\"").arg(path));
lua, v.as<sol::table>(), QStringList{path, k.as<QString>()}.join("."), guard);
} else if (v.get_type() == sol::type::function) { const auto keyName = k.as<QString>();
QString hookName = QStringList{path, k.as<QString>()}.join("."); const auto currentPath = QStringList{path, keyName}.join(".");
qCDebug(logLuaEngine) << "Connecting function to hook: " << hookName; qCDebug(logLuaEngine) << "Processing path:" << currentPath;
auto it = d->m_hooks.find(hookName);
if (it == d->m_hooks.end()) switch (v.get_type()) {
return make_unexpected(Tr::tr("No hook with the name \"%1\" found.").arg(hookName)); case sol::type::table: {
else auto result = connectHooks(lua, v.as<sol::table>(), currentPath, guard);
if (!result)
return result;
break;
}
case sol::type::function: {
qCDebug(logLuaEngine) << "Connecting function to hook:" << currentPath;
auto it = d->m_hooks.find(currentPath);
if (it == d->m_hooks.end()) {
return make_unexpected(
Tr::tr("No hook with the name \"%1\" found.").arg(currentPath));
}
it.value()(v.as<sol::function>(), guard); it.value()(v.as<sol::function>(), guard);
break;
}
default: {
return make_unexpected(Tr::tr("Unsupported value type \"%1\" at path \"%2\".")
.arg(static_cast<int>(v.get_type()))
.arg(currentPath));
}
} }
} }