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

ClangCodeModel: Replace a TODO item with a version check

Browse Source 
Change-Id: I22911b5bc5da3e905d1f31ac1bb19251058a5471
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-09-28 13:28:05 +02:00
parent 7b53ce3439
commit 94a59f15c6
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -2479,7 +2479,7 @@ static void semanticHighlighter(QFutureInterface<HighlightingResult> &future,
const QList<ExpandedSemanticToken> &tokens, const QList<ExpandedSemanticToken> &tokens,
const QString &docContents, const AstNode &ast, const QString &docContents, const AstNode &ast,
const QPointer<TextEditorWidget> &widget, const QPointer<TextEditorWidget> &widget,
int docRevision) int docRevision, const QVersionNumber &clangdVersion)
{ {
if (future.isCanceled()) { if (future.isCanceled()) {
future.reportFinished(); future.reportFinished();
@@ -2513,7 +2513,8 @@ static void semanticHighlighter(QFutureInterface<HighlightingResult> &future,
return false; return false;
}; };
const auto toResult = [&ast, &isOutputParameter](const ExpandedSemanticToken &token) { const auto toResult = [&ast, &isOutputParameter, &clangdVersion]
(const ExpandedSemanticToken &token) {
TextStyles styles; TextStyles styles;
if (token.type == "variable") { if (token.type == "variable") {
if (token.modifiers.contains("functionScope")) { if (token.modifiers.contains("functionScope")) {
@@ -2532,11 +2533,10 @@ static void semanticHighlighter(QFutureInterface<HighlightingResult> &future,
if (path.length() > 1) { if (path.length() > 1) {
const AstNode declNode = path.at(path.length() - 2); const AstNode declNode = path.at(path.length() - 2);
if (declNode.kind() == "Function" || declNode.kind() == "CXXMethod") { if (declNode.kind() == "Function" || declNode.kind() == "CXXMethod") {
if (clangdVersion < QVersionNumber(14)
// TODO: Remove this once we can assume clangd >= 14. && declNode.arcanaContains("' virtual")) {
if (declNode.arcanaContains("' virtual"))
styles.mainStyle = C_VIRTUAL_METHOD; styles.mainStyle = C_VIRTUAL_METHOD;
}
if (declNode.hasChildWithRole("statement")) if (declNode.hasChildWithRole("statement"))
styles.mixinStyles.push_back(C_FUNCTION_DEFINITION); styles.mixinStyles.push_back(C_FUNCTION_DEFINITION);
} }
@@ -2640,8 +2640,9 @@ void ClangdClient::Private::handleSemanticTokens(TextDocument *doc,
[doc](const IEditor *editor) { return editor->document() == doc; }); [doc](const IEditor *editor) { return editor->document() == doc; });
const auto editorWidget = TextEditorWidget::fromEditor(editor); const auto editorWidget = TextEditorWidget::fromEditor(editor);
const auto runner = [tokens, text = doc->document()->toPlainText(), ast, const auto runner = [tokens, text = doc->document()->toPlainText(), ast,
w = QPointer(editorWidget), rev = doc->document()->revision()] { w = QPointer(editorWidget), rev = doc->document()->revision(),
return Utils::runAsync(semanticHighlighter, tokens, text, ast, w, rev); clangdVersion = q->versionNumber()] {
return Utils::runAsync(semanticHighlighter, tokens, text, ast, w, rev, clangdVersion);
}; };
if (isTesting) { if (isTesting) {