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

Debugger: Fix handling breakpoints of same file names

Browse Source 
...while qml debugging.

Fixes: QTCREATORBUG-24803
Change-Id: Ieedeb13236f8129a1f6d445de5218462c8d0676a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2022-06-14 11:34:02 +02:00
parent 601cb16893
commit 3341fa827f
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -47,6 +47,9 @@
#include <coreplugin/helpmanager.h> #include <coreplugin/helpmanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/projecttree.h>
#include <qmljseditor/qmljseditorconstants.h> #include <qmljseditor/qmljseditorconstants.h>
#include <qmljs/qmljsmodelmanagerinterface.h> #include <qmljs/qmljsmodelmanagerinterface.h>
#include <qmldebug/qmldebugconnection.h> #include <qmldebug/qmldebugconnection.h>
@@ -1384,6 +1387,17 @@ void QmlEnginePrivate::scripts(int types, const QList<int> ids, bool includeSour
runCommand(cmd); runCommand(cmd);
} }
static QString targetFile(const FilePath &original)
{
auto projectTree = ProjectExplorer::ProjectTree::instance();
auto node = projectTree->nodeForFile(original);
if (auto resourceNode = dynamic_cast<ProjectExplorer::ResourceFileNode *>(node))
return QLatin1String("qrc:") + resourceNode->qrcPath();
return original.fileName();
}
void QmlEnginePrivate::setBreakpoint(const QString type, const QString target, void QmlEnginePrivate::setBreakpoint(const QString type, const QString target,
bool enabled, int line, int column, bool enabled, int line, int column,
const QString condition, int ignoreCount) const QString condition, int ignoreCount)
@@ -1413,7 +1427,7 @@ void QmlEnginePrivate::setBreakpoint(const QString type, const QString target,
cmd.arg(ENABLED, enabled); cmd.arg(ENABLED, enabled);
if (type == SCRIPTREGEXP) if (type == SCRIPTREGEXP)
cmd.arg(TARGET, Utils::FilePath::fromString(target).fileName()); cmd.arg(TARGET, targetFile(FilePath::fromString(target)));
else else
cmd.arg(TARGET, target); cmd.arg(TARGET, target);
@@ -1841,6 +1855,12 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
QList<Breakpoint> v8Breakpoints; QList<Breakpoint> v8Breakpoints;
const QVariantList v8BreakpointIdList = breakData.value("breakpoints").toList(); const QVariantList v8BreakpointIdList = breakData.value("breakpoints").toList();
// skip debug break if no breakpoint - likely stopped in another file with same naming
if (v8BreakpointIdList.isEmpty()) {
inferiorStop = false;
continueDebugging(Continue);
}
for (const QVariant &breakpointId : v8BreakpointIdList) { for (const QVariant &breakpointId : v8BreakpointIdList) {
const QString responseId = QString::number(breakpointId.toInt()); const QString responseId = QString::number(breakpointId.toInt());
Breakpoint bp = engine->breakHandler()->findBreakpointByResponseId(responseId); Breakpoint bp = engine->breakHandler()->findBreakpointByResponseId(responseId);