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

ClangCodeModel: Check doc revision when highlighting with clangd

Browse Source 
Change-Id: I981d375e3656e89bb66516218e3f4e33ee8bbb9e
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-10-22 15:06:46 +02:00
parent 2eb50afd9c
commit 6f26a1545c
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/languageclient/semantichighlightsupport.cpp
View File

@@ -451,8 +451,9 @@ void SemanticTokenSupport::highlight(const Utils::FilePath &filePath)
SyntaxHighlighter *highlighter = doc->syntaxHighlighter();
if (!highlighter)
return;
const QList<SemanticToken> tokens = m_tokens.value(filePath).tokens.toTokens(m_tokenTypes,
m_tokenModifiers);
const VersionedTokens versionedTokens = m_tokens.value(filePath);
const QList<SemanticToken> tokens = versionedTokens.tokens
.toTokens(m_tokenTypes, m_tokenModifiers);
if (m_tokensHandler) {
int line = 1;
int column = 1;
@@ -477,7 +478,7 @@ void SemanticTokenSupport::highlight(const Utils::FilePath &filePath)
expandedToken.length = token.length;
expandedTokens << expandedToken;
};
m_tokensHandler(doc, expandedTokens);
m_tokensHandler(doc, expandedTokens, versionedTokens.version);
return;
}
int line = 1;