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

ClangCodeModel: Provide highlighting via clangd

Browse Source 
Note that we lose the highlighting for virtual function calls. We need
to amend clangd to add the respective information to its semantic tokens
message.
Also, Qt properties are no longer highlighted as class members. We'll
investigate how to best restore this feature.

Change-Id: I403712aada3d7a8e1c7b7c1277f43f7f64f8450b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-06-09 09:47:26 +02:00
parent db053c49ad
commit 68846a7729
16 changed files with 2274 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,6 +273,8 @@ void addModifiers(int key,
void SemanticTokenSupport::setLegend(const LanguageServerProtocol::SemanticTokensLegend &legend)
{
m_tokenTypeStrings = legend.tokenTypes();
m_tokenModifierStrings = legend.tokenModifiers();
m_tokenTypes = Utils::transform(legend.tokenTypes(), [&](const QString &tokenTypeString){
return m_tokenTypesMap.value(tokenTypeString, -1);
});
@@ -424,6 +426,35 @@ void SemanticTokenSupport::highlight(const Utils::FilePath &filePath)
SyntaxHighlighter *highlighter = doc->syntaxHighlighter();
if (!highlighter)
return;
const QList<SemanticToken> tokens = m_tokens.value(filePath).toTokens(m_tokenTypes,
m_tokenModifiers);
if (m_tokensHandler) {
int line = 1;
int column = 1;
QList<ExpandedSemanticToken> expandedTokens;
for (const SemanticToken &token : tokens) {
line += token.deltaLine;
if (token.deltaLine != 0) // reset the current column when we change the current line
column = 1;
column += token.deltaStart;
if (token.tokenIndex >= m_tokenTypeStrings.length())
continue;
ExpandedSemanticToken expandedToken;
expandedToken.type = m_tokenTypeStrings.at(token.tokenIndex);
int modifiers = token.rawTokenModifiers;
for (int bitPos = 0; modifiers && bitPos < m_tokenModifierStrings.length();
++bitPos, modifiers >>= 1) {
if (modifiers & 0x1)
expandedToken.modifiers << m_tokenModifierStrings.at(bitPos);
}
expandedToken.line = line;
expandedToken.column = column;
expandedToken.length = token.length;
expandedTokens << expandedToken;
};
m_tokensHandler(doc, expandedTokens);
return;
}
int line = 1;
int column = 1;
auto toResult = [&](const SemanticToken &token){
@@ -434,8 +465,6 @@ void SemanticTokenSupport::highlight(const Utils::FilePath &filePath)
const int tokenKind = token.tokenType << tokenTypeBitOffset | token.tokenModifiers;
return HighlightingResult(line, column, token.length, tokenKind);
};
const QList<SemanticToken> tokens = m_tokens.value(filePath).toTokens(m_tokenTypes,
m_tokenModifiers);
const HighlightingResults results = Utils::transform(tokens, toResult);
SemanticHighlighter::setExtraAdditionalFormats(highlighter, results, m_formatHash);
}