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

TextEditor: Adjust extra selections when suggestions are visible

Browse Source 
Change-Id: Id914ce544b2289bff5403c8a673dceebbc517b54
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
David Schulz
2023-03-16 11:33:51 +01:00
parent 65e1baf5f7
commit bcd4c3f360
1 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4730,6 +4730,24 @@ void TextEditorWidgetPrivate::setupSelections(const PaintEventData &data,
PaintEventBlockData &blockData) const
{
QVector<QTextLayout::FormatRange> prioritySelections;
int deltaPos = -1;
int delta = 0;
if (m_suggestionBlock == data.block) {
if (QTextDocument *replacement = TextDocumentLayout::replacementDocument(
m_suggestionBlock)) {
deltaPos = TextDocumentLayout::replacementPosition(data.block);
const QString trailingText = data.block.text().mid(deltaPos);
if (!trailingText.isEmpty()) {
const int trailingIndex = replacement->firstBlock().text().indexOf(trailingText,
deltaPos);
if (trailingIndex >= 0)
delta = std::max(trailingIndex - deltaPos, 0);
}
}
}
for (int i = 0; i < data.context.selections.size(); ++i) {
const QAbstractTextDocumentLayout::Selection &range = data.context.selections.at(i);
const int selStart = range.cursor.selectionStart() - blockData.position;
@@ -4739,6 +4757,22 @@ void TextEditorWidgetPrivate::setupSelections(const PaintEventData &data,
QTextLayout::FormatRange o;
o.start = selStart;
o.length = selEnd - selStart;
o.format = range.format;
QTextLayout::FormatRange rest;
rest.start = -1;
if (deltaPos >= 0 && delta != 0) {
if (o.start >= deltaPos) {
o.start += delta;
} else if (o.start + o.length > deltaPos) {
// the format range starts before and ends after the position so we need to
// split the format into before and after the suggestion format ranges
rest.start = deltaPos + delta;
rest.length = o.length - (deltaPos - o.start);
rest.format = o.format;
o.length = deltaPos - o.start;
}
}
o.format = range.format;
if (data.textCursor.hasSelection() && data.textCursor == range.cursor
&& data.textCursor.anchor() == range.cursor.anchor()) {
@@ -4751,10 +4785,15 @@ void TextEditorWidgetPrivate::setupSelections(const PaintEventData &data,
|| (o.format.foreground().style() == Qt::NoBrush
&& o.format.underlineStyle() != QTextCharFormat::NoUnderline
&& o.format.background() == Qt::NoBrush)) {
if (q->selectionVisible(data.block.blockNumber()))
if (q->selectionVisible(data.block.blockNumber())) {
prioritySelections.append(o);
if (rest.start >= 0)
prioritySelections.append(rest);
}
} else {
blockData.selections.append(o);
if (rest.start >= 0)
blockData.selections.append(rest);
}
}
}