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

DAP: Add locals lazy loading

Browse Source 
Change-Id: I49c6d9fce8c6f45f1ec4cb3b6c1733d93202bc0f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Artem Sokolovskii
2023-08-30 14:41:33 +02:00
parent be6b83ec4a
commit 53718bcf1d
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/debugger/dap/dapengine.cpp
View File

@@ -413,8 +413,9 @@ void DapEngine::assignValueInDebugger(WatchItem *, const QString &/*expression*/
void DapEngine::updateItem(const QString &iname)
{
Q_UNUSED(iname)
updateAll();
WatchItem *item = watchHandler()->findItem(iname);
m_currentWatchItem = item;
m_dapClient->variables(item->variablesReference);
}
QString DapEngine::errorMessage(QProcess::ProcessError error) const
@@ -554,6 +555,9 @@ void DapEngine::handleScopesResponse(const QJsonObject &response)
if (name == "Locals") { // Fix for several scopes
watchHandler()->removeAllData();
watchHandler()->notifyUpdateStarted();
m_watchItems.clear();
watchHandler()->cleanup();
m_dapClient->variables(variablesReference);
}
}
@@ -707,31 +711,25 @@ void DapEngine::refreshLocals(const QJsonArray &variables)
item->address = variable.toObject().value("address").toInt();
item->type = variable.toObject().value("type").toString();
const int variablesReference = variable.toObject().value("variablesReference").toInt();
item->variablesReference = variablesReference;
if (variablesReference > 0)
item->wantsChildren = true;
qCDebug(dapEngineLog) << "variable" << name << item->hexAddress();
if (isFirstLayer)
m_watchItems.append(item);
else
m_currentWatchItem->appendChild(item);
const int variablesReference = variable.toObject().value("variablesReference").toInt();
if (variablesReference > 0)
m_variablesReferenceQueue.push({variablesReference, item});
}
if (m_variablesReferenceQueue.empty()) {
if (isFirstLayer) {
for (auto item : m_watchItems)
watchHandler()->insertItem(item);
m_watchItems.clear();
} else
watchHandler()->updateWatchExpression(m_currentWatchItem, "");
watchHandler()->notifyUpdateFinished();
return;
}
const auto front = m_variablesReferenceQueue.front();
m_variablesReferenceQueue.pop();
m_dapClient->variables(front.first);
m_currentWatchItem = front.second;
watchHandler()->notifyUpdateFinished();
}
void DapEngine::refreshStack(const QJsonArray &stackFrames)