fix: highlight current line and highlight bracket conflicts.

Change-Id: Ic9efd5c9e7a42deac510890d8f24789bd3b7d8bd
linuxdeepin · Dec 4, 2018 · 5db54ad · 5db54ad
1 parent bd13894
commit 5db54ad
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/src/dtextedit.cpp b/src/dtextedit.cpp
@@ -97,8 +97,7 @@ DTextEdit::DTextEdit(QPlainTextEdit *parent)
     // Init widgets.
     connect(this, &QPlainTextEdit::updateRequest, this, &DTextEdit::handleUpdateRequest);
     connect(this, &QPlainTextEdit::textChanged, this, &DTextEdit::updateLineNumber, Qt::QueuedConnection);
-    connect(this, &QPlainTextEdit::cursorPositionChanged, this, &DTextEdit::highlightCurrentLine);
-    connect(this, &QPlainTextEdit::cursorPositionChanged, this, &DTextEdit::cursorPositionChanged);
+    connect(this, &QPlainTextEdit::cursorPositionChanged, this, &DTextEdit::cursorPositionChanged, Qt::QueuedConnection);
     connect(document(), &QTextDocument::modificationChanged, this, &DTextEdit::setModified);
 
     // Init menu.
@@ -1401,6 +1400,7 @@ void DTextEdit::renderAllSelections()
     selections.append(m_keywordSelections);
     selections.append(m_cursorKeywordSelection);
     selections.append(m_wordUnderCursorSelection);
+    selections.append(m_bracketsSelections);
 
     setExtraSelections(selections);
 }
@@ -1898,9 +1898,12 @@ bool DTextEdit::setCursorKeywordSeletoin(int position, bool findNext)
 
 void DTextEdit::cursorPositionChanged()
 {
+    updateHighlightLineSelection();
+    m_bracketsSelections.clear();
     updateHighlightBrackets('(', ')');
     updateHighlightBrackets('{', '}');
     updateHighlightBrackets('[', ']');
+    renderAllSelections();
 }
 
 void DTextEdit::updateHighlightBrackets(const QChar &openChar, const QChar &closeChar)
@@ -1976,23 +1979,27 @@ void DTextEdit::updateHighlightBrackets(const QChar &openChar, const QChar &clos
                     bracketEndCursor = QTextCursor(doc);
                     bracketEndCursor.setPosition(position);
                     bracketEndCursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
-                    bracketEndCursor.setCharFormat(m_bracketMatchFormat);
                     break;
                 }
             }
 
             forward ? position++ : position--;
         }
-        bracketBeginCursor.setCharFormat(m_bracketMatchFormat);
+
+        QTextEdit::ExtraSelection startExtra;
+        startExtra.cursor = bracketBeginCursor;
+        startExtra.format = m_bracketMatchFormat;
+
+        QTextEdit::ExtraSelection endExtra;
+        endExtra.cursor = bracketEndCursor;
+        endExtra.format = m_bracketMatchFormat;
+
+        m_bracketsSelections.clear();
+        m_bracketsSelections << startExtra << endExtra;
     }
 
     m_brackets[openChar] = bracketBeginCursor;
     m_brackets[closeChar] = bracketEndCursor;
-
-    QTextEdit::ExtraSelection extra;
-    extra.format = m_bracketMatchFormat;
-    extra.cursor = cursor;
-    setExtraSelections(QList<QTextEdit::ExtraSelection>() << extra);
 }
 
 void DTextEdit::setThemeWithPath(const QString &path)

diff --git a/src/dtextedit.h b/src/dtextedit.h
@@ -212,6 +212,7 @@ public slots:
     QPropertyAnimation *m_scrollAnimation;
 
     QList<QTextEdit::ExtraSelection> m_keywordSelections;
+    QList<QTextEdit::ExtraSelection> m_bracketsSelections;
     QTextEdit::ExtraSelection m_currentLineSelection;
     QTextEdit::ExtraSelection m_cursorKeywordSelection;
     QTextEdit::ExtraSelection m_wordUnderCursorSelection;