feat: [debugger] add functional of "run to line"

Log: as title
linuxdeepin · Aug 14, 2024 · e292385 · e292385
1 parent 529b658
commit e292385
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 10 deletions.
diff --git a/src/common/util/eventdefinitions.h b/src/common/util/eventdefinitions.h
@@ -78,6 +78,7 @@ OPI_OBJECT(editor,
            //right-cliked menu,  Related to debugging
            OPI_INTERFACE(setBreakpointCondition, "fileName", "line")
            OPI_INTERFACE(jumpToLine, "fileName", "line")
+           OPI_INTERFACE(runToLine, "fileName", "line")
            OPI_INTERFACE(contextMenu, "menu")
            OPI_INTERFACE(marginMenu, "menu")
            )

diff --git a/src/plugins/codeeditor/gui/private/texteditor_p.cpp b/src/plugins/codeeditor/gui/private/texteditor_p.cpp
@@ -342,6 +342,7 @@ void TextEditorPrivate::showMarginMenu()
     if (debuggerService->getDebugState() == AbstractDebugger::RunState::kStopped) {
         menu.addSeparator();
         menu.addAction(tr("jump to %1 line").arg(line + 1), q, [this, line] { editor.jumpToLine(fileName, line + 1); });
+        menu.addAction(tr("run to %1 line").arg(line + 1), q, [this, line] { editor.runToLine(fileName, line + 1); });
     }
 
     // notify other plugin to add action.

diff --git a/src/plugins/debugger/dap/dapdebugger.cpp b/src/plugins/debugger/dap/dapdebugger.cpp
@@ -463,6 +463,25 @@ void DAPDebugger::jumpToLine(const QString &filePath, int lineNumber)
     }
 }
 
+void DAPDebugger::runToLine(const QString &filePath, int lineNumber)
+{
+    if (!d->currentSession)
+        return;
+
+    if (d->runState == kStopped) {
+        dap::array<IBreakpointData> rawBreakpoints;
+        IBreakpointData bpData;
+        bpData.id = QUuid::createUuid().toString().toStdString();
+        bpData.lineNumber = lineNumber;
+        bpData.enabled = true;
+        bpData.hitCondition = "1";
+        rawBreakpoints.push_back(bpData);
+
+        debugService->addBreakpoints(filePath, rawBreakpoints, d->currentSession);
+        continueDebug();
+    }
+}
+
 void DAPDebugger::evaluateWatchVariable(const QString &expression)
 {
     IVariable var;
@@ -837,6 +856,11 @@ void DAPDebugger::handleEvents(const dpf::Event &event)
         int line = event.property("line").toInt();
 
         jumpToLine(filePath, line);
+    } else if (event.data() == editor.runToLine.name) {
+        QString filePath = event.property("fileName").toString();
+        int line = event.property("line").toInt();
+
+        runToLine(filePath, line);
     }
 }
 

diff --git a/src/plugins/debugger/dap/dapdebugger.h b/src/plugins/debugger/dap/dapdebugger.h
@@ -107,6 +107,7 @@ public slots:
     void switchBreakpointsStatus(const QString &filePath, int lineNumber, bool enabled);
     void setBreakpointCondition(const QString &filePath, int lineNumber, const QString &expression);
     void jumpToLine(const QString &filePath, int lineNumber);
+    void runToLine(const QString &filePath, int lineNumber);
     void evaluateWatchVariable(const QString &expression);
 
     bool getLocals(dap::integer frameId, IVariables *out);

diff --git a/src/plugins/debugger/dap/debugsession.cpp b/src/plugins/debugger/dap/debugsession.cpp
@@ -509,6 +509,10 @@ void DebugSession::sendBreakpoints(const QString &sourcePath, dap::array<IBreakp
         SourceBreakpoint bt;
         bt.line = it.lineNumber;
         bt.condition = it.condition;
+        if (it.hitCondition.has_value()) {
+            bt.hitCondition = it.hitCondition;
+            model->removeBreakpoint(sourcePath, bt.line);
+        }
         breakpoints.push_back(bt);
     }
 

diff --git a/src/tools/debugadapter/dapsession.cpp b/src/tools/debugadapter/dapsession.cpp
@@ -789,6 +789,7 @@ InitializeResponse DapSession::handleInitializeReq(const InitializeRequest &requ
     response.supportsCompletionsRequest = true;
     response.supportsDisassembleRequest = true;
     response.supportsGotoTargetsRequest = true;
+    response.supportsHitConditionalBreakpoints = true;
 
     Log("--> Server sent initialize response to client\n")
     return response;

diff --git a/src/tools/debugadapter/debugger/debugger.h b/src/tools/debugadapter/debugger/debugger.h
@@ -24,7 +24,7 @@ class Debugger : public QObject
 
     virtual void updateBreakpoints(const QString &file, const QList<dap::SourceBreakpoint> &sourceBps) = 0;
     virtual QString breakRemoveAll() = 0;
-    virtual QString breakInsert(const QString& path, const QString &condition = "") = 0;
+    virtual QString breakInsert(const QString& path, const QString &condition = "", bool isTemp = false) = 0;
     virtual QString breakRemove(int bpid) = 0;
 
     virtual void pause() = 0;

diff --git a/src/tools/debugadapter/debugger/gdbmi/gdbdebugger.cpp b/src/tools/debugadapter/debugger/gdbmi/gdbdebugger.cpp
@@ -115,9 +115,11 @@ QString GDBDebugger::breakRemoveAll()
     return ("-break-delete");
 }
 
-QString GDBDebugger::breakInsert(const QString &path, const QString &condition)
+QString GDBDebugger::breakInsert(const QString &path, const QString &condition, bool isTemp)
 {
-    if (condition.isEmpty())
+    if (isTemp)
+        return QString{"-break-insert -t -f %1"}.arg(path);
+    else if (condition.isEmpty())
         return QString{"-break-insert -f %1"}.arg(path);
     else
         return QString{"-break-insert -c \"%1\" -f %2"}.arg(condition, path);
@@ -193,10 +195,14 @@ void GDBDebugger::updateBreakpoints(const QString &file, const QList<dap::Source
 {
     QSet<int> curLines;
     QMap<int, QString> lineConditionMap;
+    QSet<int> tempBreakPoints;
 
     for (auto bp : sourceBps) {
         QString condition = bp.condition.has_value() ? QString::fromStdString(bp.condition.value()) : "";
-        lineConditionMap.insert(bp.line, condition);
+        if (bp.hitCondition.has_value() && bp.hitCondition.value() == "1")
+            tempBreakPoints.insert(bp.line);
+        else
+            lineConditionMap.insert(bp.line, condition);
     }
 
     //remove canceled bp   and   bp which have condition (to update)
@@ -229,6 +235,12 @@ void GDBDebugger::updateBreakpoints(const QString &file, const QList<dap::Source
             }
         }
     }
+
+    // append temp breakpoints
+    for (const auto &bpLine : tempBreakPoints) {
+        auto filePath = file + ":" + QString::number(bpLine);
+        DebugManager::instance()->breakInsert(filePath, "", true);
+    }
 }
 
 void GDBDebugger::parseBreakPoint(const QVariant& var)

diff --git a/src/tools/debugadapter/debugger/gdbmi/gdbdebugger.h b/src/tools/debugadapter/debugger/gdbmi/gdbdebugger.h
@@ -27,7 +27,7 @@ class GDBDebugger : public Debugger
     QString quit() override;
     QString kill() override;
 
-    QString breakInsert(const QString& path, const QString &condition = "") override;
+    QString breakInsert(const QString& path, const QString &condition = "", bool isTemp = false) override;
     QString breakRemove(int bpid) override;
     QString breakRemoveAll() override;
 

diff --git a/src/tools/debugadapter/debugger/javascript/jsdebugger.cpp b/src/tools/debugadapter/debugger/javascript/jsdebugger.cpp
@@ -67,7 +67,7 @@ void JSDebugger::updateBreakpoints(const QString &file, const QList<dap::SourceB
     }
 }
 
-QString JSDebugger::breakInsert(const QString &path, const QString &condition)
+QString JSDebugger::breakInsert(const QString &path, const QString &condition, bool isTemp)
 {
     Q_UNUSED(condition)
     return ".break " + path;

diff --git a/src/tools/debugadapter/debugger/javascript/jsdebugger.h b/src/tools/debugadapter/debugger/javascript/jsdebugger.h
@@ -25,7 +25,7 @@ class JSDebugger : public Debugger
     QString kill() override;
 
     void updateBreakpoints(const QString &file, const QList<dap::SourceBreakpoint> &sourceBps) override;
-    QString breakInsert(const QString& path, const QString &condition = "") override;
+    QString breakInsert(const QString& path, const QString &condition = "", bool isTemp = false) override;
     QString breakRemove(int bpid) override;
     QString breakRemoveAll() override;
 

diff --git a/src/tools/debugadapter/debugmanager.cpp b/src/tools/debugadapter/debugmanager.cpp
@@ -237,9 +237,9 @@ void DebugManager::breakRemoveAll()
     }, true);
 }
 
-void DebugManager::breakInsert(const QString &path, const QString &condition)
+void DebugManager::breakInsert(const QString &path, const QString &condition, bool isTemp)
 {
-    commandAndResponse(d->debugger->breakInsert(path, condition), [this](const QVariant& r) {
+    commandAndResponse(d->debugger->breakInsert(path, condition, isTemp), [this](const QVariant& r) {
         d->debugger->parseBreakPoint(r);
     }, true);
 }

diff --git a/src/tools/debugadapter/debugmanager.h b/src/tools/debugadapter/debugmanager.h
@@ -44,7 +44,7 @@ class DebugManager : public QObject
 
     void updateBreakpoints(const QString &file, const QList<dap::SourceBreakpoint> &sourceBps);
     void breakRemoveAll();
-    void breakInsert(const QString& path, const QString &condition = "");
+    void breakInsert(const QString& path, const QString &condition = "", bool isTemp = false);
     void removeBreakpointInFile(const QString &filePath);
     void breakRemove(int bpid);