Fix excessive KPassivePopup usage in case of debugger errors

- Group duplicate error messages
- Port to KNotification
- This fixes a kwin_x11 crash for some X11 drivers

app/kdevelop.notifyrc

@@ -532,6 +532,13 @@ Comment[x-test]=xxA Breakpoint has been hit by the debuggerxx
 Comment[zh_CN]=调试器命中了一个断点
 Comment[zh_TW]=除錯器進行遇到中斷點
 
+[Event/BreakpointError]
+Contexts=debugger
+Action=Popup
+IconName=script-error
+Name=Breakpoint Error
+Comment=An error was reported by the debugger
+
 [Event/WatchpointHit]
 Contexts=debugger
 Action=Popup

kdevplatform/debugger/breakpoint/breakpointwidget.cpp

@@ -31,7 +31,7 @@
 #include <QContextMenuEvent>
 
 #include <KLocalizedString>
-#include <KPassivePopup>
+#include <KNotification>
 
 #include "breakpointdetails.h"
 #include "../breakpoint/breakpoint.h"
@@ -64,6 +64,8 @@ public:
     QAction* breakpointEnableAllAction = nullptr;
     QAction* breakpointRemoveAll = nullptr;
     QAbstractProxyModel* proxyModel = nullptr;
+    QMap<QString, size_t> breakpointErrorMessages;
+    bool breakpointErrorMessageVisibile = false;
 };
 
 BreakpointWidget::BreakpointWidget(IDebugController *controller, QWidget *parent)
@@ -314,25 +316,53 @@ void BreakpointWidget::breakpointHit(int row)
 
 void BreakpointWidget::breakpointError(int row, const QString& msg)
 {
+    Q_UNUSED(row);
+
     Q_D(BreakpointWidget);
 
-    // FIXME: we probably should prevent this error notification during
-    // initial setting of breakpoint, to avoid a cloud of popups.
-    if (!d->breakpointsView->isVisible())
+    // if the error popup is still visible only queue the message, to avoid spam
+    if (d->breakpointErrorMessageVisibile) {
+        d->breakpointErrorMessages[msg]++;
         return;
+    }
+
+    showBreakpointError(msg);
+}
+
+void BreakpointWidget::breakpointErrorPopupClosed()
+{
+    Q_D(BreakpointWidget);
+
+    d->breakpointErrorMessageVisibile = false;
+
+    if (d->breakpointErrorMessages.isEmpty()) {
+        // no messages queued, do nothing
+        return;
+    }
+
+    QString errorMsg;
+
+    for (auto it = d->breakpointErrorMessages.constBegin(); it != d->breakpointErrorMessages.constEnd(); ++it) {
+        if (!errorMsg.isEmpty()) {
+            errorMsg += QLatin1Char('\n');
+        }
+        errorMsg += i18np("%2", "%2 (repeated %1 times)", it.value(), it.key());
+    }
+
+    d->breakpointErrorMessages.clear();
+
+    showBreakpointError(errorMsg);
+}
+
+void BreakpointWidget::showBreakpointError(const QString& msg)
+{
+    Q_D(BreakpointWidget);
 
-    const QModelIndex index = d->proxyModel->mapFromSource(
-        d->debugController->breakpointModel()->index(row, BreakpointModel::LocationColumn));
-    QPoint p = d->breakpointsView->visualRect(index).topLeft();
-    p = d->breakpointsView->mapToGlobal(p);
-
-    auto* pop = new KPassivePopup(d->breakpointsView);
-    pop->setPopupStyle(KPassivePopup::Boxed);
-    pop->setAutoDelete(true);
-    // FIXME: the icon, too.
-    pop->setView(QString(), msg);
-    pop->setTimeout(-1);
-    pop->show(p);
+    auto * const errorPopup = new KNotification(QStringLiteral("BreakpointError"), d->breakpointsView);
+    connect(errorPopup, &KNotification::closed, this, &BreakpointWidget::breakpointErrorPopupClosed);
+    errorPopup->setText(msg);
+    errorPopup->sendEvent();
+    d->breakpointErrorMessageVisibile = true;
 }
 
 void BreakpointWidget::slotOpenFile(const QModelIndex& breakpointIdx)

kdevplatform/debugger/breakpoint/breakpointwidget.h

@@ -50,6 +50,8 @@ private:
 
     void edit(KDevelop::Breakpoint *n);
 
+    void showBreakpointError(const QString& msg);
+
 private Q_SLOTS:
     void slotAddBlankBreakpoint();
     void slotAddBlankWatchpoint();
@@ -60,6 +62,7 @@ private Q_SLOTS:
     void slotDataInserted(int column, const QVariant& value);
     void slotOpenFile(const QModelIndex& breakpointIdx);
     void breakpointError(int row, const QString& msg);
+    void breakpointErrorPopupClosed();
     void breakpointHit(int row);
     void slotDisableAllBreakpoints();
     void slotEnableAllBreakpoints();