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

DAP: Fix breakpoint behavior

Browse Source 
Before adding and removing breakpoints when debugging is running
didn't work for cmake debugging. Fixes that.

Change-Id: I59fd4ec3905365647b552753bc06da855e83ac7c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Artem Sokolovskii
2023-08-03 13:23:03 +02:00
parent 7e572841f7
commit 8b0b190b49
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,7 +132,14 @@ public:
bool isRunning() const override { return m_socket.isOpen(); } bool isRunning() const override { return m_socket.isOpen(); }
void writeRaw(const QByteArray &data) override { m_socket.write(data); } void writeRaw(const QByteArray &data) override { m_socket.write(data); }
void kill() override { m_socket.disconnectFromServer(); } void kill() override {
if (m_socket.isOpen())
m_socket.disconnectFromServer();
else {
m_socket.abort();
emit done();
}
}
QByteArray readAllStandardOutput() override { return m_socket.readAll(); } QByteArray readAllStandardOutput() override { return m_socket.readAll(); }
QString readAllStandardError() override { return QString(); } QString readAllStandardError() override { return QString(); }
int exitCode() const override { return 0; } int exitCode() const override { return 0; }
@@ -253,7 +260,6 @@ void DapEngine::setupEngine()
if (currentPerspective->parentPerspectiveId() == Constants::CMAKE_PERSPECTIVE_ID) { if (currentPerspective->parentPerspectiveId() == Constants::CMAKE_PERSPECTIVE_ID) {
qCDebug(dapEngineLog) << "build system name" << ProjectExplorer::ProjectTree::currentBuildSystem()->name(); qCDebug(dapEngineLog) << "build system name" << ProjectExplorer::ProjectTree::currentBuildSystem()->name();
m_nextBreakpointId = 0;
m_dataGenerator = std::make_unique<LocalSocketDataProvider>( m_dataGenerator = std::make_unique<LocalSocketDataProvider>(
TemporaryDirectory::masterDirectoryPath() + "/cmake-dap.sock"); TemporaryDirectory::masterDirectoryPath() + "/cmake-dap.sock");
connectDataGeneratorSignals(); connectDataGeneratorSignals();
@@ -541,6 +547,7 @@ void DapEngine::insertBreakpoint(const Breakpoint &bp)
}} }}
}); });
notifyBreakpointChangeOk(bp);
qCDebug(dapEngineLog) << "insertBreakpoint" << bp->modelId() << bp->responseId(); qCDebug(dapEngineLog) << "insertBreakpoint" << bp->modelId() << bp->responseId();
} }
@@ -594,6 +601,7 @@ void DapEngine::removeBreakpoint(const Breakpoint &bp)
}); });
qCDebug(dapEngineLog) << "removeBreakpoint" << bp->modelId() << bp->responseId(); qCDebug(dapEngineLog) << "removeBreakpoint" << bp->modelId() << bp->responseId();
notifyBreakpointRemoveOk(bp);
} }
void DapEngine::loadSymbols(const Utils::FilePath &/*moduleName*/) void DapEngine::loadSymbols(const Utils::FilePath &/*moduleName*/)