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

Merge remote-tracking branch 'origin/4.7' into 4.8

Browse Source 
Change-Id: I9d988b8b708d7908c6d1eab7d95d8bb1e68beeb8
This commit is contained in:
Eike Ziller
2018-09-28 11:03:39 +02:00
parent 327d5af311 b6b756e737
commit 20d7305318
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/texteditor/texteditor.cpp
View File

@@ -4579,7 +4579,6 @@ void TextEditorWidgetPrivate::paintReplacement(PaintEventData &data, QPainter &p
qreal top) const
{
QTextBlock nextBlock = data.block.next();
QTextBlock nextVisibleBlock = TextEditor::nextVisibleBlock(data.block, data.doc);
if (nextBlock.isValid() && !nextBlock.isVisible() && q->replacementVisible(data.block.blockNumber())) {
const bool selectThis = (data.textCursor.hasSelection()
@@ -4617,13 +4616,13 @@ void TextEditorWidgetPrivate::paintReplacement(PaintEventData &data, QPainter &p
replacement.prepend(nextBlock.text().trimmed().left(1));
}
data.block = nextVisibleBlock.previous();
if (!data.block.isValid())
data.block = data.doc->lastBlock();
QTextBlock nextVisibleBlock = TextEditor::nextVisibleBlock(data.block, data.doc);
if (!nextVisibleBlock.isValid())
nextVisibleBlock = data.doc->lastBlock();
if (TextBlockUserData *blockUserData = TextDocumentLayout::testUserData(data.block)) {
if (TextBlockUserData *blockUserData = TextDocumentLayout::testUserData(nextVisibleBlock)) {
if (blockUserData->foldingEndIncluded()) {
QString right = data.block.text().trimmed();
QString right = nextVisibleBlock.text().trimmed();
if (right.endsWith(QLatin1Char(';'))) {
right.chop(1);
right = right.trimmed();