From 1640b74dfb2d6708a93285f8d32e974d265ce1b5 Mon Sep 17 00:00:00 2001 From: Artem Sokolovskii Date: Thu, 21 Sep 2023 16:23:45 +0200 Subject: [PATCH] DAP: Fix the same name variables expanding Before when several variables had the same name it could be a cause that wrong variable will be expanded. Now the needed variables will be expanded. Change-Id: Icc945e573721d033db82cac85e2ed4dabb6ad25a Reviewed-by: hjk Reviewed-by: --- src/plugins/debugger/dap/dapengine.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp index 74a0623911d..c83a125b312 100644 --- a/src/plugins/debugger/dap/dapengine.cpp +++ b/src/plugins/debugger/dap/dapengine.cpp @@ -720,7 +720,10 @@ void DapEngine::refreshLocals(const QJsonArray &variables) for (auto variable : variables) { WatchItem *item = new WatchItem; const QString name = variable.toObject().value("name").toString(); - item->iname = "local." + name; + if (m_isFirstLayer) + item->iname = "local." + name; + else + item->iname = m_currentWatchItem->iname + "." + name; item->name = name; item->type = variable.toObject().value("type").toString(); item->value = variable.toObject().value("value").toString();