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

ClangCodeModel: Fix displaying ifdef'ed regions

Browse Source 
... that are started by an indented preprocessor directive.
clangd potentially sends regions not starting at line boundaries (in
this case erroneously, but potentially also on purpose), which
TextDocument::setIfdefedOutBlocks() does not expect.

Fixes: QTCREATORBUG-31204
Change-Id: I9126263b9501edbbab1fbc22cc59c5ee1ae814c2
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2024-07-09 12:48:47 +02:00
parent 4e40c6b2b4
commit 1c272072e5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangdsemantichighlighting.cpp
View File

@@ -259,7 +259,7 @@ void handleInactiveRegions(LanguageClient::Client *client, const JsonRpcMessage
const QList<Range> inactiveRegions = params->inactiveRegions();
QList<BlockRange> ifdefedOutBlocks;
for (const Range &r : inactiveRegions) {
const int startPos = r.start().toPositionInDocument(doc->document());
const int startPos = Position(r.start().line(), 0).toPositionInDocument(doc->document());
const int endPos = r.end().toPositionInDocument(doc->document()) + 1;
ifdefedOutBlocks.emplaceBack(startPos, endPos);
}