feat: Change the background color of block numbers when squiggling

Author: ouuan

include/internal/QCodeEditor.hpp

@@ -3,9 +3,6 @@
 // Qt
 #include <QTextEdit> // Required for inheritance
 
-// Standard
-#include <set>
-
 class QCompleter;
 class QLineNumberArea;
 class QSyntaxStyle;
@@ -22,13 +19,14 @@ class QCodeEditor : public QTextEdit
   public:
     /**
      * @brief The SeverityLevel enum
+     * @note the order should be: the bigger the more important
      */
     enum class SeverityLevel
     {
-        Error,
-        Warning,
+        Hint,
         Information,
-        Hint
+        Warning,
+        Error
     };
 
     /**
@@ -338,8 +336,10 @@ class QCodeEditor : public QTextEdit
      */
     struct SquiggleInformation
     {
+        SquiggleInformation() = default;
+
         SquiggleInformation(QPair<int, int> start, QPair<int, int> stop, QString text)
-            : m_startPos(start), m_stopPos(stop), m_tooltipText(std::move(text))
+            : m_startPos(start), m_stopPos(stop), m_tooltipText(text)
         {
         }
 
@@ -361,5 +361,5 @@ class QCodeEditor : public QTextEdit
 
     QList<QTextEdit::ExtraSelection> extra1, extra2, extra_squiggles;
 
-    std::vector<SquiggleInformation> m_squiggler;
+    QVector<SquiggleInformation> m_squiggler;
 };

include/internal/QLineNumberArea.hpp

@@ -3,7 +3,8 @@
 // Qt
 #include <QWidget> // Required for inheritance
 
-class QCodeEditor;
+#include <QCodeEditor>
+
 class QSyntaxStyle;
 
 /**
@@ -42,11 +43,17 @@ class QLineNumberArea : public QWidget
      */
     QSyntaxStyle *syntaxStyle() const;
 
+    void squiggle(QCodeEditor::SeverityLevel level, int from, int to);
+
+    void clearSquiggles();
+
   protected:
     void paintEvent(QPaintEvent *event) override;
 
   private:
     QSyntaxStyle *m_syntaxStyle;
 
     QCodeEditor *m_codeEditParent;
+
+    QMap<int, QCodeEditor::SeverityLevel> m_squiggles;
 };

src/internal/QCodeEditor.cpp

@@ -1,5 +1,3 @@
-#include <utility>
-
 // QCodeEditor
 #include <QCXXHighlighter>
 #include <QCodeEditor>
@@ -927,6 +925,8 @@ void QCodeEditor::squiggle(SeverityLevel level, QPair<int, int> start, QPair<int
 
     extra_squiggles.push_back({cursor, newcharfmt});
 
+    m_lineNumberArea->squiggle(level, start.first, stop.first);
+
     setExtraSelections(extra1 + extra2 + extra_squiggles);
 }
 
@@ -938,6 +938,8 @@ void QCodeEditor::clearSquiggle()
     m_squiggler.clear();
     extra_squiggles.clear();
 
+    m_lineNumberArea->clearSquiggles();
+
     setExtraSelections(extra1 + extra2);
 }
 

src/internal/QLineNumberArea.cpp

@@ -12,7 +12,7 @@
 #include <QTextEdit>
 
 QLineNumberArea::QLineNumberArea(QCodeEditor *parent)
-    : QWidget(parent), m_syntaxStyle(nullptr), m_codeEditParent(parent)
+    : QWidget(parent), m_syntaxStyle(nullptr), m_codeEditParent(parent), m_squiggles()
 {
 }
 
@@ -51,6 +51,21 @@ QSyntaxStyle *QLineNumberArea::syntaxStyle() const
     return m_syntaxStyle;
 }
 
+void QLineNumberArea::squiggle(QCodeEditor::SeverityLevel level, int from, int to)
+{
+    for (int i = from - 1; i < to; ++i)
+    {
+        m_squiggles[i] = qMax(m_squiggles[i], level);
+    }
+    update();
+}
+
+void QLineNumberArea::clearSquiggles()
+{
+    m_squiggles.clear();
+    update();
+}
+
 void QLineNumberArea::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
@@ -78,6 +93,30 @@ void QLineNumberArea::paintEvent(QPaintEvent *event)
         {
             QString number = QString::number(blockNumber + 1);
 
+            if (m_squiggles.contains(blockNumber))
+            {
+                QColor squiggleColor;
+                switch (m_squiggles[blockNumber])
+                {
+                case QCodeEditor::SeverityLevel::Error:
+                    squiggleColor = m_syntaxStyle->getFormat("Error").underlineColor();
+                    break;
+                case QCodeEditor::SeverityLevel::Warning:
+                    squiggleColor = m_syntaxStyle->getFormat("Warning").underlineColor();
+                    break;
+                case QCodeEditor::SeverityLevel::Information:
+                    squiggleColor = m_syntaxStyle->getFormat("Warning").underlineColor();
+                    break;
+                case QCodeEditor::SeverityLevel::Hint:
+                    squiggleColor = m_syntaxStyle->getFormat("Text").foreground().color();
+                    break;
+                default:
+                    Q_UNREACHABLE();
+                    break;
+                }
+                painter.fillRect(0, top, sizeHint().width(), m_codeEditParent->fontMetrics().height(), squiggleColor);
+            }
+
             auto isCurrentLine = m_codeEditParent->textCursor().blockNumber() == blockNumber;
             painter.setPen(isCurrentLine ? currentLine : otherLines);