Fix formating of comments. Should not start with a linebreak

[frida/frida.git] / src / gui / widgets / BasicBlockWidget.cxx

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index de97c51d521c92b6cfc36d1871102a0b31cd221e..2a3f3b7d992f30f4f5089754a1016bf221ac13c7 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -55,13 +55,21 @@ void CustomQGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent* e
        QMenu menu;
        bool ok;
        uint64_t address = c.selectedText().toLongLong(&ok, 16);
+       QTextTable* table = c.currentTable();
        if (ok) {
                QAction* act = menu.addAction(c.selectedText() + " is a Function");
                QObject::connect(act, &QAction::triggered,
-                                [=]() {parent->mainwindow->requestNewFunctionByAddress(address);});
+                                [=]() {
+                                        parent->mainwindow->requestNewFunctionByAddress(address);
+                                        if (NULL == table) return;
+                                        int row = table->cellAt(c).row();
+                                        uint64_t insAddress = parent->instructions[row].getAddress();
+                                        Comment* comment = parent->block->getManager()->newLocalComment(insAddress, (Function*)0x23);
+                                        comment->setText("#F<" + c.selectedText().toStdString() + ">");
+                                        parent->block->getManager()->finishComment(comment);
+                                });
        }
 
-       QTextTable* table = c.currentTable();
        if (NULL != table) {
                int row = table->cellAt(c).row();
                QAction* globalComment = menu.addAction("Add global Comment");
@@ -253,12 +261,11 @@ void BasicBlockWidget::populateWidget() {
 }
 
 QString BasicBlockWidget::formatComments(Instruction* inst) {
-       QString comments;
+       QStringList comments;
        for (Comment* c: inst->comments()) {
-               comments += "<br />";
-               comments += QString(c->getText().c_str()).toHtmlEscaped();
+               comments << QString(c->getText().c_str()).toHtmlEscaped();
        }
-       return (comments == "" ? "" : ";; ") + comments.trimmed();
+       return (comments.empty() ? "" : ";; ") + comments.join("<br />").trimmed();
 }
 
 void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem*,