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

CppEditor: Fix semantic highlighting

Browse Source 
... for the case where the first line with semantic tokens has multiple
tokens.
This was not considered in the algorithm and uncovered by
d6f5d07639.
Also improve variable names and comments.

Fixes: QTCREATORBUG-29218
Change-Id: I0a1927c21edd70a3a91efc902e7e6ad2c734c91f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2023-05-30 14:20:58 +02:00
parent cc3e940f09
commit 8241fc87b4
2 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/texteditor/semantichighlighter.cpp
View File

@@ -82,26 +82,28 @@ void SemanticHighlighter::incrementalApplyExtraAdditionalFormats(SyntaxHighlight
if (to <= from)
return;
const int firstResultBlockNumber = int(future.resultAt(from).line) - 1;
const int resultStartLine = future.resultAt(from).line;
int formattingStartLine = 1;
// blocks between currentBlockNumber and the last block with results will
// be cleaned of additional extra formats if they have no results
int currentBlockNumber = 0;
// Find the line on which to start formatting, where "formatting" means to either
// clear out formats from outdated document versions (if there is no current result
// on that line), or apply the format corresponding to the respective result.
// Note that if there are earlier results on the same line, we have to make sure they
// get re-applied by adapting the from variable accordingly.
for (int i = from - 1; i >= 0; --i) {
const HighlightingResult &result = future.resultAt(i);
const int blockNumber = int(result.line) - 1;
if (blockNumber < firstResultBlockNumber) {
// stop! found where last format stopped
currentBlockNumber = blockNumber + 1;
// add previous results for the same line to avoid undoing their formats
if (result.line == resultStartLine) {
from = i;
} else if (result.line < resultStartLine) {
formattingStartLine = result.line + 1;
from = i + 1;
break;
}
}
QTextDocument *doc = highlighter->document();
QTC_ASSERT(currentBlockNumber < doc->blockCount(), return);
QTextBlock currentBlock = doc->findBlockByNumber(currentBlockNumber);
QTC_ASSERT(formattingStartLine <= doc->blockCount(), return);
QTextBlock currentBlock = doc->findBlockByNumber(formattingStartLine - 1);
std::map<QTextBlock, QVector<QTextLayout::FormatRange>> formatRanges;
for (int i = from; i < to; ++i) {