Fix(clearSquiggle failing on some cases)

In some cases the clear function failed because the stored start and
stop position of underline changes while not being updated in editor.
Now we select all document and apply default textFormat to clear the
underlines. It is much faster and better. squiggle Function has been
improved too, it now handles all (Valid) ranges that LSP will send to
highlight.

Author: coder3101

example/src/MainWindow.cpp

@@ -178,11 +178,11 @@ void MainWindow::setupWidgets()
     m_codeEditor->setCompleter  (m_completers[0].second);
     m_codeEditor->setHighlighter(new QCXXHighlighter);
 
-    m_codeEditor->squiggle(QCodeEditor::SeverityLevel::Warning, {3,2}, {13,5}, "unused variable");
-    m_codeEditor->squiggle(QCodeEditor::SeverityLevel::Error, {3,5}, {3,7}, "Big error");
+   // m_codeEditor->squiggle(QCodeEditor::SeverityLevel::Warning, {3,2}, {13,5}, "unused variable");
+    m_codeEditor->squiggle(QCodeEditor::SeverityLevel::Error, {7,0}, {8,0}, "Big error");
 
 
-    m_codeEditor->clearSquiggle();
+    //m_codeEditor->clearSquiggle();
 
     QStringList list;
     // Code samples

include/internal/QCodeEditor.hpp

@@ -126,21 +126,14 @@ class QCodeEditor : public QTextEdit
     QCompleter *completer() const;
 
     /**
-     * @brief Method to put a squiggly line (underline) for error/warning/information in code editor.
-     * @param level The severity of the squiggle, determines the color of squiggle.
-     * @param lineNumber The line number to squiggle.
-     * @param startSquiggle The start position in the line where squiggly line begins.
-     * @param stopSquiggle The stop position in the line where squiggly line stops.
-     * @param tooltipMessage The tooltip message to show when the squiggle is under cursor.
+     * @brief squiggle Puts a underline squiggle under text ranges in Editor
+     * @param level defines the color of the underline depending upon the severity
+     * @param tooltipMessage The tooltip hover message to show when over selection.
+     * @note QPair<int, int>: first -> Line number in 1-based indexing
+     *                        second -> Character number in 0-based indexing
      */
     void squiggle(SeverityLevel level, QPair<int,int>, QPair<int, int>, QString tooltipMessage);
 
-    /**
-     * @brief eraseSquiggle, Undo what was done by the function call `squiggle`.
-     * @note This function will erase all squiggles from a line number.
-     * @param lineNumber The line number to undo squiggle and tooltip from.
-     */
-    void eraseSquiggle(int lineNumber);
 
     /**
      * @brief clearSquiggle, Clears complete squiggle from editor
@@ -349,8 +342,6 @@ class QCodeEditor : public QTextEdit
         QPair<int,int> m_startPos;
         QPair<int,int> m_stopPos;
         QString m_tooltipText;
-        QTextCharFormat originalFormat;
-
     };
 
     QStyleSyntaxHighlighter *m_highlighter;

src/internal/QCodeEditor.cpp

@@ -852,6 +852,7 @@ QCompleter *QCodeEditor::completer() const
 void QCodeEditor::squiggle(SeverityLevel level, QPair<int, int> start, QPair<int, int> stop,
                            QString tooltipMessage)
 {
+
     if(stop < start) return;
 
     SquiggleInformation info(start, stop, std::move(tooltipMessage));
@@ -864,22 +865,16 @@ void QCodeEditor::squiggle(SeverityLevel level, QPair<int, int> start, QPair<int
     cursor.movePosition(QTextCursor::NextBlock, QTextCursor::MoveAnchor, start.first - 1);
     cursor.movePosition(QTextCursor::StartOfBlock);
     cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::MoveAnchor, start.second);
-    int currentLine = start.first;
 
-    while(currentLine != stop.first)
-    {
-        cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
-        cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
-        currentLine++;
-    }
+    if(stop.first > start.first)
+        cursor.movePosition(QTextCursor::NextBlock, QTextCursor::KeepAnchor, stop.first - start.first);
 
-    cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor, stop.second - 1);
+    cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
+    cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor, stop.second);
 
     setTextCursor(cursor); // added
     QTextCharFormat defcharfmt = currentCharFormat();
 
-    m_squiggler[m_squiggler.size()-1].originalFormat = defcharfmt;
-
     QTextCharFormat newcharfmt = defcharfmt;
     newcharfmt.setFontUnderline(true);
 
@@ -918,36 +913,19 @@ void QCodeEditor::clearSquiggle()
     if(m_squiggler.empty()) return;
 
     auto originalCursor = textCursor();
-    std::reverse(m_squiggler.begin(), m_squiggler.end());
-    for(const auto& e : m_squiggler)
-    {
-        QPair<int, int> start;
-        QPair<int, int> stop;
-        start = e.m_startPos;
-        stop = e.m_stopPos;
+    auto cursor = textCursor();
 
-        auto originalCursor = textCursor(); // use to restore to original position
-        auto cursor = textCursor();         // use to underline
+    cursor.select(QTextCursor::SelectionType::Document);
 
-        cursor.movePosition(QTextCursor::Start);
-        cursor.movePosition(QTextCursor::NextBlock, QTextCursor::MoveAnchor, start.first - 1);
-        cursor.movePosition(QTextCursor::StartOfBlock);
-        cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::MoveAnchor, start.second);
-        int currentLine = start.first;
+    setTextCursor(cursor);
+    setCurrentCharFormat(QTextCharFormat());
+    setTextCursor(originalCursor);
 
-        while(currentLine != stop.first)
-        {
-            cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
-            cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
-            currentLine++;
-        }
 
-        cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor, stop.second - 1);
-        setTextCursor(cursor); // added
-        setCurrentCharFormat(e.originalFormat); // restore original format
-        setTextCursor(originalCursor);
 
-    }
+    if (m_highlighter != nullptr)
+        m_highlighter->rehighlight();
+
     m_squiggler.clear();
 
 }