aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/debugger/breakhandler.cpp2
-rw-r--r--src/plugins/debugger/dap/cmakedapengine.cpp31
-rw-r--r--src/plugins/debugger/dap/cmakedapengine.h8
-rw-r--r--src/plugins/debugger/dap/dapclient.cpp2
-rw-r--r--src/plugins/debugger/dap/dapclient.h1
-rw-r--r--src/plugins/debugger/dap/dapengine.cpp150
-rw-r--r--src/plugins/debugger/dap/dapengine.h2
-rw-r--r--src/plugins/debugger/dap/gdbdapengine.cpp5
-rw-r--r--src/plugins/debugger/dap/gdbdapengine.h2
-rw-r--r--src/plugins/debugger/dap/pydapengine.cpp26
-rw-r--r--src/plugins/debugger/dap/pydapengine.h5
11 files changed, 116 insertions, 118 deletions
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 53696f8e910..74626fbc863 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1241,7 +1241,7 @@ static bool isAllowedTransition(BreakpointState from, BreakpointState to)
void BreakpointItem::gotoState(BreakpointState target, BreakpointState assumedCurrent)
{
- QTC_ASSERT(m_state == assumedCurrent, qDebug() << m_state);
+ QTC_ASSERT(m_state == assumedCurrent, qDebug() << target << m_state);
setState(target);
}
diff --git a/src/plugins/debugger/dap/cmakedapengine.cpp b/src/plugins/debugger/dap/cmakedapengine.cpp
index 2c6400b0feb..3e7a23cb243 100644
--- a/src/plugins/debugger/dap/cmakedapengine.cpp
+++ b/src/plugins/debugger/dap/cmakedapengine.cpp
@@ -142,6 +142,11 @@ void CMakeDapEngine::setupEngine()
});
}
+bool CMakeDapEngine::acceptsBreakpoint(const BreakpointParameters &bp) const
+{
+ return bp.fileName.endsWith(".txt") || bp.fileName.endsWith(".cmake");
+}
+
bool CMakeDapEngine::hasCapability(unsigned cap) const
{
return cap & (ReloadModuleCapability
@@ -151,32 +156,6 @@ bool CMakeDapEngine::hasCapability(unsigned cap) const
/*| RunToLineCapability*/); // disable while the #25176 bug is not fixed
}
-void CMakeDapEngine::insertBreakpoint(const Breakpoint &bp)
-{
- DapEngine::insertBreakpoint(bp);
- notifyBreakpointInsertOk(bp); // Needed for CMake support issue:25176
-}
-
-void CMakeDapEngine::removeBreakpoint(const Breakpoint &bp)
-{
- DapEngine::removeBreakpoint(bp);
- notifyBreakpointRemoveOk(bp); // Needed for CMake support issue:25176
-}
-
-void CMakeDapEngine::updateBreakpoint(const Breakpoint &bp)
-{
- DapEngine::updateBreakpoint(bp);
-
- /* Needed for CMake support issue:25176 */
- BreakpointParameters parameters = bp->requestedParameters();
- if (parameters.enabled != bp->isEnabled()) {
- parameters.pending = false;
- bp->setParameters(parameters);
- }
- notifyBreakpointChangeOk(bp);
- /* Needed for CMake support issue:25176 */
-}
-
const QLoggingCategory &CMakeDapEngine::logCategory()
{
static const QLoggingCategory logCategory = QLoggingCategory("qtc.dbg.dapengine.cmake",
diff --git a/src/plugins/debugger/dap/cmakedapengine.h b/src/plugins/debugger/dap/cmakedapengine.h
index c7d02e3b858..c5464908979 100644
--- a/src/plugins/debugger/dap/cmakedapengine.h
+++ b/src/plugins/debugger/dap/cmakedapengine.h
@@ -15,14 +15,8 @@ public:
private:
void setupEngine() override;
- /* Needed for CMake support issue:25176 */
- void insertBreakpoint(const Breakpoint &bp) override;
- void updateBreakpoint(const Breakpoint &bp) override;
- void removeBreakpoint(const Breakpoint &bp) override;
- /* Needed for CMake support issue:25176 */
-
+ bool acceptsBreakpoint(const BreakpointParameters &bp) const override;
bool hasCapability(unsigned cap) const override;
-
const QLoggingCategory &logCategory() override;
};
diff --git a/src/plugins/debugger/dap/dapclient.cpp b/src/plugins/debugger/dap/dapclient.cpp
index f63d45b2bb9..b1fa0ad1f85 100644
--- a/src/plugins/debugger/dap/dapclient.cpp
+++ b/src/plugins/debugger/dap/dapclient.cpp
@@ -224,6 +224,8 @@ void DapClient::emitSignals(const QJsonDocument &doc)
type = DapResponseType::Pause;
} else if (command == "evaluate") {
type = DapResponseType::Evaluate;
+ } else if (command == "setBreakpoints") {
+ type = DapResponseType::SetBreakpoints;
}
emit responseReady(type, ob);
return;
diff --git a/src/plugins/debugger/dap/dapclient.h b/src/plugins/debugger/dap/dapclient.h
index d2a6f52bb22..b0cd30a8b26 100644
--- a/src/plugins/debugger/dap/dapclient.h
+++ b/src/plugins/debugger/dap/dapclient.h
@@ -52,6 +52,7 @@ enum class DapResponseType
StepOver,
Pause,
Evaluate,
+ SetBreakpoints,
Unknown
};
diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp
index b39e664f211..e71c2aa4c9f 100644
--- a/src/plugins/debugger/dap/dapengine.cpp
+++ b/src/plugins/debugger/dap/dapengine.cpp
@@ -325,19 +325,27 @@ void DapEngine::insertBreakpoint(const Breakpoint &bp)
QTC_CHECK(bp->state() == BreakpointInsertionRequested);
notifyBreakpointInsertProceeding(bp);
+ BreakpointParameters parameters = bp->requestedParameters();
+ if (!parameters.enabled) { // hack for disabling breakpoints
+ parameters.pending = false;
+ bp->setParameters(parameters);
+ notifyBreakpointInsertOk(bp);
+ return;
+ }
+
dapInsertBreakpoint(bp);
}
void DapEngine::dapInsertBreakpoint(const Breakpoint &bp)
{
- bp->setResponseId(QString::number(m_nextBreakpointId++));
const BreakpointParameters &params = bp->requestedParameters();
QJsonArray breakpoints;
for (const auto &breakpoint : breakHandler()->breakpoints()) {
const BreakpointParameters &bpParams = breakpoint->requestedParameters();
QJsonObject jsonBp = createBreakpoint(bpParams);
- if (!jsonBp.isEmpty() && params.fileName.path() == bpParams.fileName.path()) {
+ if (!jsonBp.isEmpty() && params.fileName.path() == bpParams.fileName.path()
+ && bpParams.enabled) {
breakpoints.append(jsonBp);
}
}
@@ -376,7 +384,8 @@ void DapEngine::dapRemoveBreakpoint(const Breakpoint &bp)
QJsonArray breakpoints;
for (const auto &breakpoint : breakHandler()->breakpoints()) {
const BreakpointParameters &bpParams = breakpoint->requestedParameters();
- if (breakpoint->responseId() != bp->responseId() && params.fileName == bpParams.fileName) {
+ if (breakpoint->responseId() != bp->responseId() && params.fileName == bpParams.fileName
+ && bpParams.enabled) {
QJsonObject jsonBp = createBreakpoint(bpParams);
breakpoints.append(jsonBp);
}
@@ -599,6 +608,9 @@ void DapEngine::handleResponse(DapResponseType type, const QJsonObject &response
case DapResponseType::Evaluate:
handleEvaluateResponse(response);
break;
+ case DapResponseType::SetBreakpoints:
+ handleBreakpointResponse(response);
+ break;
default:
showMessage("UNKNOWN RESPONSE:" + command);
};
@@ -693,6 +705,90 @@ void DapEngine::handleEvaluateResponse(const QJsonObject &response)
m_variablesHandler->handleNext();
}
+void DapEngine::handleBreakpointResponse(const QJsonObject &response)
+{
+ const QJsonObject body = response.value("body").toObject();
+ QJsonArray breakpoints = body.value("breakpoints").toArray();
+
+ QHash<QString, QJsonObject> map;
+ for (QJsonValueRef jsonbp : breakpoints) {
+ QJsonObject breakpoint = jsonbp.toObject();
+ QString fileName = breakpoint.value("source").toObject().value("path").toString();
+ int line = breakpoint.value("line").toInt();
+
+ map.insert(fileName + ":" + QString::number(line), breakpoint);
+ }
+
+ const Breakpoints bps = breakHandler()->breakpoints();
+ for (const Breakpoint &bp : bps) {
+ BreakpointParameters parameters = bp->requestedParameters();
+ QString mapKey = parameters.fileName.toString() + ":"
+ + QString::number(parameters.textPosition.line);
+ if (map.find(mapKey) != map.end()) {
+ if (bp->state() == BreakpointRemoveProceeding) {
+ notifyBreakpointRemoveFailed(bp);
+ } else if (bp->state() == BreakpointInsertionProceeding
+ && !map.value(mapKey).value("verified").toBool()) {
+ notifyBreakpointInsertFailed(bp);
+ } else if (bp->state() == BreakpointInsertionProceeding) {
+ parameters.pending = false;
+ bp->setParameters(parameters);
+ notifyBreakpointInsertOk(bp);
+ }
+ if (!bp.isNull())
+ bp->setResponseId(QString::number(map.value(mapKey).value("id").toInt()));
+ map.remove(mapKey);
+ } else {
+ if (bp->state() == BreakpointRemoveProceeding) {
+ notifyBreakpointRemoveOk(bp);
+ }
+ }
+
+ if (!bp.isNull() && bp->state() == BreakpointUpdateProceeding) {
+ BreakpointParameters parameters = bp->requestedParameters();
+ if (parameters.enabled != bp->isEnabled()) {
+ parameters.pending = false;
+ bp->setParameters(parameters);
+ notifyBreakpointChangeOk(bp);
+ continue;
+ }
+ }
+ }
+
+ for (const Breakpoint &bp : breakHandler()->breakpoints()) {
+ if (bp->state() == BreakpointInsertionProceeding) {
+ if (!bp->isEnabled())
+ continue;
+
+ QString path = bp->requestedParameters().fileName.toString();
+ int line = bp->requestedParameters().textPosition.line;
+
+ QJsonObject jsonBreakpoint;
+ QString key;
+ for (QString bpKey : map.keys()) {
+ QJsonObject breakpoint = map.value(bpKey);
+ if (path == bp->requestedParameters().fileName.toString()
+ && abs(breakpoint.value("line").toInt() - line)
+ < abs(jsonBreakpoint.value("line").toInt() - line)) {
+ jsonBreakpoint = breakpoint;
+ key = bpKey;
+ }
+ }
+
+ if (!jsonBreakpoint.isEmpty() && jsonBreakpoint.value("verified").toBool()) {
+ BreakpointParameters parameters = bp->requestedParameters();
+ parameters.pending = false;
+ parameters.textPosition.line = jsonBreakpoint.value("line").toInt();
+ parameters.textPosition.column = jsonBreakpoint.value("column").toInt();
+ bp->setParameters(parameters);
+ bp->setResponseId(QString::number(jsonBreakpoint.value("id").toInt()));
+ notifyBreakpointInsertOk(bp);
+ map.remove(key);
+ }
+ }
+ }
+}
+
void DapEngine::handleEvent(DapEventType type, const QJsonObject &event)
{
const QString eventType = event.value("event").toString();
@@ -716,9 +812,6 @@ void DapEngine::handleEvent(DapEventType type, const QJsonObject &event)
if (body.value("reason").toString() == "started" && body.value("threadId").toInt() == 1)
claimInitialBreakpoints();
break;
- case DapEventType::DapBreakpoint:
- handleBreakpointEvent(event);
- break;
case DapEventType::Output: {
const QString category = body.value("category").toString();
const QString output = body.value("output").toString();
@@ -761,51 +854,6 @@ void DapEngine::handleStoppedEvent(const QJsonObject &event)
m_dapClient->threads();
}
-void DapEngine::handleBreakpointEvent(const QJsonObject &event)
-{
- const QJsonObject body = event.value("body").toObject();
- QJsonObject breakpoint = body.value("breakpoint").toObject();
-
- Breakpoint bp = breakHandler()->findBreakpointByResponseId(
- QString::number(breakpoint.value("id").toInt()));
- qCDebug(logCategory()) << "breakpoint id :" << breakpoint.value("id").toInt();
-
- if (bp) {
- BreakpointParameters parameters = bp->requestedParameters();
- if (parameters.enabled != bp->isEnabled()) {
- parameters.pending = false;
- bp->setParameters(parameters);
- notifyBreakpointChangeOk(bp);
- return;
- }
- }
-
- if (body.value("reason").toString() == "new") {
- if (breakpoint.value("verified").toBool()) {
- notifyBreakpointInsertOk(bp);
- const BreakpointParameters &params = bp->requestedParameters();
- if (params.oneShot)
- continueInferior();
- qCDebug(logCategory()) << "breakpoint inserted";
- } else {
- notifyBreakpointInsertFailed(bp);
- qCDebug(logCategory()) << "breakpoint insertion failed";
- }
- return;
- }
-
- if (body.value("reason").toString() == "removed") {
- if (breakpoint.value("verified").toBool()) {
- notifyBreakpointRemoveOk(bp);
- qCDebug(logCategory()) << "breakpoint removed";
- } else {
- notifyBreakpointRemoveFailed(bp);
- qCDebug(logCategory()) << "breakpoint remove failed";
- }
- return;
- }
-}
-
void DapEngine::refreshLocals(const QJsonArray &variables)
{
WatchItem *currentItem = watchHandler()->findItem(m_variablesHandler->currentItem().iname);
diff --git a/src/plugins/debugger/dap/dapengine.h b/src/plugins/debugger/dap/dapengine.h
index 6f0ae730c17..732a5b53931 100644
--- a/src/plugins/debugger/dap/dapengine.h
+++ b/src/plugins/debugger/dap/dapengine.h
@@ -128,9 +128,9 @@ protected:
void handleScopesResponse(const QJsonObject &response);
void handleThreadsResponse(const QJsonObject &response);
void handleEvaluateResponse(const QJsonObject &response);
+ void handleBreakpointResponse(const QJsonObject &response);
void handleEvent(DapEventType type, const QJsonObject &event);
- void handleBreakpointEvent(const QJsonObject &event);
void handleStoppedEvent(const QJsonObject &event);
void updateAll() override;
diff --git a/src/plugins/debugger/dap/gdbdapengine.cpp b/src/plugins/debugger/dap/gdbdapengine.cpp
index 3934aebe9d8..fd944e91151 100644
--- a/src/plugins/debugger/dap/gdbdapengine.cpp
+++ b/src/plugins/debugger/dap/gdbdapengine.cpp
@@ -161,6 +161,11 @@ void GdbDapEngine::setupEngine()
m_dapClient->dataProvider()->start();
}
+bool GdbDapEngine::acceptsBreakpoint(const BreakpointParameters &bp) const
+{
+ return bp.fileName.endsWith(".cpp") || bp.fileName.endsWith(".h");
+}
+
const QLoggingCategory &GdbDapEngine::logCategory()
{
static const QLoggingCategory logCategory = QLoggingCategory("qtc.dbg.dapengine.gdb",
diff --git a/src/plugins/debugger/dap/gdbdapengine.h b/src/plugins/debugger/dap/gdbdapengine.h
index 3638a6d3aba..29634a9da14 100644
--- a/src/plugins/debugger/dap/gdbdapengine.h
+++ b/src/plugins/debugger/dap/gdbdapengine.h
@@ -19,7 +19,7 @@ private:
void handleDapConfigurationDone() override;
bool isLocalAttachEngine() const;
-
+ bool acceptsBreakpoint(const BreakpointParameters &bp) const override;
const QLoggingCategory &logCategory() override;
};
diff --git a/src/plugins/debugger/dap/pydapengine.cpp b/src/plugins/debugger/dap/pydapengine.cpp
index 4bbb479126f..37b5712b518 100644
--- a/src/plugins/debugger/dap/pydapengine.cpp
+++ b/src/plugins/debugger/dap/pydapengine.cpp
@@ -204,32 +204,6 @@ bool PyDapEngine::acceptsBreakpoint(const BreakpointParameters &bp) const
return bp.fileName.endsWith(".py");
}
-void PyDapEngine::insertBreakpoint(const Breakpoint &bp)
-{
- DapEngine::insertBreakpoint(bp);
- notifyBreakpointInsertOk(bp); // Needed for Python support issue:1386
-}
-
-void PyDapEngine::removeBreakpoint(const Breakpoint &bp)
-{
- DapEngine::removeBreakpoint(bp);
- notifyBreakpointRemoveOk(bp); // Needed for Python support issue:1386
-}
-
-void PyDapEngine::updateBreakpoint(const Breakpoint &bp)
-{
- DapEngine::updateBreakpoint(bp);
-
- /* Needed for Python support issue:1386 */
- BreakpointParameters parameters = bp->requestedParameters();
- if (parameters.enabled != bp->isEnabled()) {
- parameters.pending = false;
- bp->setParameters(parameters);
- }
- notifyBreakpointChangeOk(bp);
- /* Needed for Python support issue:1386 */
-}
-
bool PyDapEngine::isLocalAttachEngine() const
{
return runParameters().startMode == AttachToLocalProcess;
diff --git a/src/plugins/debugger/dap/pydapengine.h b/src/plugins/debugger/dap/pydapengine.h
index 2c5f53e63a9..fb2bd4be7b5 100644
--- a/src/plugins/debugger/dap/pydapengine.h
+++ b/src/plugins/debugger/dap/pydapengine.h
@@ -20,11 +20,6 @@ private:
bool isLocalAttachEngine() const;
bool acceptsBreakpoint(const BreakpointParameters &bp) const override;
- /* Needed for Python support issue:1386 */
- void insertBreakpoint(const Breakpoint &bp) override;
- void updateBreakpoint(const Breakpoint &bp) override;
- void removeBreakpoint(const Breakpoint &bp) override;
- /* Needed for Python support issue:1386 */
const QLoggingCategory &logCategory() override;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-29 01:02:04 +0000