feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: update matching parenthesis in the editor

Browse Source 
... after updating the parenthesis in the layout

Task-number: QTCREATORBUG-26183
Change-Id: I346046fbc3932b94227c1ac5bee6b0d7c44651e1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2021-09-24 09:59:50 +02:00
parent 0524e9236f
commit 421e06393f
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/texteditor/textdocumentlayout.cpp
View File

@@ -387,12 +387,12 @@ TextDocumentLayout::~TextDocumentLayout()
void TextDocumentLayout::setParentheses(const QTextBlock &block, const Parentheses &parentheses)
{
if (parentheses.isEmpty()) {
if (TextBlockUserData *userData = textUserData(block))
userData->clearParentheses();
} else {
userData(block)->setParentheses(parentheses);
}
if (TextDocumentLayout::parentheses(block) == parentheses)
return;
userData(block)->setParentheses(parentheses);
if (auto layout = qobject_cast<TextDocumentLayout *>(block.document()->documentLayout()))
emit layout->parenthesesChanged(block);
}
Parentheses TextDocumentLayout::parentheses(const QTextBlock &block)
@@ -684,4 +684,18 @@ void TextDocumentLayout::FoldValidator::finalize()
}
}
QDebug operator<<(QDebug debug, const Parenthesis &parenthesis)
{
QDebugStateSaver saver(debug);
debug << (parenthesis.type == Parenthesis::Opened ? "Opening " : "Closing ") << parenthesis.chr
<< " at " << parenthesis.pos;
return debug;
}
bool Parenthesis::operator==(const Parenthesis &other) const
{
return pos == other.pos && chr == other.chr && source == other.source && type == other.type;
}
} // namespace TextEditor