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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Change-Id: Ica0d173a08ff3f0296e875aa324d5bb6974bd90f
This commit is contained in:
Eike Ziller
2020-01-08 07:13:32 +01:00
parent 8e5b587b3d cd5f070844
commit 69bcf7ca60
36 changed files with 763 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/highlighter.cpp
View File

@@ -301,8 +301,10 @@ static bool isClosingParenthesis(QChar c)
void Highlighter::highlightBlock(const QString &text)
{
if (!definition().isValid())
if (!definition().isValid()) {
formatSpaces(text);
return;
}
QTextBlock block = currentBlock();
KSyntaxHighlighting::State state;
TextDocumentLayout::setBraceDepth(block, TextDocumentLayout::braceDepth(block.previous()));