From 81f342ea00caf3526c506249e57247644e5a3618 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 3 May 2019 08:46:38 +0200 Subject: [PATCH] TextEditor: Fix including folding end Instead of the first visible block we need to check the last invisible block whether we should add the folding end text to the fold replacement. Introduced in b6b756e737ace6819d322b6523b3f5d1ab12ebbd Change-Id: Id93403a14145c09069281d32d5b622bad80c4ae6 Reviewed-by: Eike Ziller --- src/plugins/texteditor/texteditor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index ca6510266c4..59926e31ea7 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -4717,13 +4717,13 @@ void TextEditorWidgetPrivate::paintReplacement(PaintEventData &data, QPainter &p replacement.prepend(nextBlock.text().trimmed().at(0)); } - QTextBlock nextVisibleBlock = TextEditor::nextVisibleBlock(data.block, data.doc); - if (!nextVisibleBlock.isValid()) - nextVisibleBlock = data.doc->lastBlock(); + QTextBlock lastInvisibleBlock = TextEditor::nextVisibleBlock(data.block, data.doc).previous(); + if (!lastInvisibleBlock.isValid()) + lastInvisibleBlock = data.doc->lastBlock(); - if (TextBlockUserData *blockUserData = TextDocumentLayout::testUserData(nextVisibleBlock)) { + if (TextBlockUserData *blockUserData = TextDocumentLayout::testUserData(lastInvisibleBlock)) { if (blockUserData->foldingEndIncluded()) { - QString right = nextVisibleBlock.text().trimmed(); + QString right = lastInvisibleBlock.text().trimmed(); if (right.endsWith(QLatin1Char(';'))) { right.chop(1); right = right.trimmed();