Skip to content

fix: [debugger] Error in displaying QList member variables #1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-mozart merged 1 commit into from
Jan 6, 2025
Merged

fix: [debugger] Error in displaying QList member variables #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/scripts/prettyprinters/qt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ def __init__(self, nodetype, d):

self.externalStorage = isLarge or isStatic #see QList::Node::t()


def __iter__(self):
return self

Expand Down
16 changes: 14 additions & 2 deletions src/tools/debugadapter/debugger/gdbmi/gdbdebugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ void GDBDebugger::addVariablesWatched(const QList<gdbmi::Variable *> &variableLi
}
}

void GDBDebugger::parseChildVariable(const QString &evaluateName, const gdbmi::Variable *parentVariable)
void GDBDebugger::parseChildVariable(const QString &evaluateName, gdbmi::Variable *parentVariable)
{
d->runningCommand++;
DebugManager::instance()->commandAndResponse(QString { "-var-list-children --all-values %1" }.arg(evaluateName), [=](const QVariant &r) {
Expand All @@ -781,10 +781,22 @@ void GDBDebugger::parseChildVariable(const QString &evaluateName, const gdbmi::V
parseChildVariable(childMap.value("name").toString(), parentVariable);
} else {
auto var = gdbmi::Variable::parseMap(childMap);
if (var->dynamic)
parseChildVariable(var->name, var);

var->name = childMap.value("exp").toString();
var->hasMore = (var->dynamic && var->hasMore) || var->numChild;
if(var->hasMore)
if (var->hasMore)
var->childRefrence = ++d->reference;
else if (var->value == "{...}") // var has no children and it`s value is {...}. ignore it
var->value = "";

if (!parentVariable->hasMore) {
parentVariable->childRefrence = ++d->reference;
parentVariable->hasMore = true;
if (parentVariable->value.isEmpty())
parentVariable->value = "{...}";
}
d->variableListByReference.insert(parentVariable->childRefrence, var);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/tools/debugadapter/debugger/gdbmi/gdbdebugger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public slots:
void sendLibraryUnloadedNotify(const gdbmi::Library &library, bool print);
void parseDisassembleData(const gdbmi::Record &record);
void addVariablesWatched(const QList<gdbmi::Variable *> &variableList, int reference);
void parseChildVariable(const QString &evaluateName , const gdbmi::Variable *parentVariable);
void parseChildVariable(const QString &evaluateName , gdbmi::Variable *parentVariable);
void evaluateValue(gdbmi::Variable *variable);
void resetVariables();
void checkVariablesLocker();
Expand Down
2 changes: 1 addition & 1 deletion src/tools/debugadapter/debugger/gdbmi/gdbmi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ gdbmi::Variable *gdbmi::Variable::parseMap(const QVariantMap &data)
v->value = data.value("value").toString();
v->type = data.value("type").toString();
v->threadId = data.value("thread-id").toString();
v->hasMore = data.value("has_more", true).toBool();
v->hasMore = data.value("has_more", false).toBool();
v->dynamic = data.value("dynamic", false).toBool();
v->displayhint = data.value("displayhint").toString();
return v;
Expand Down
Loading