diff options
| author | David Schulz <david.schulz@qt.io> | 2023-01-04 10:18:59 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-01-11 09:29:27 +0000 |
| commit | 91b527427612d8a898746d13ec48a6fb15c1d335 (patch) | |
| tree | 96fd33e493857b31e9aa600a8836b03dd49d5f26 | |
| parent | 647287ee0cb3ade4812db04cc42b5107ea44a0b5 (diff) | |
ClangCodeModel: do not highlight tokens as Text
Fixes: QTCREATORBUG-28639
Fixes: QTCREATORBUG-28637
Change-Id: Idfcfc6c61db9d5449ab14eda566ce704160bac54
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
| -rw-r--r-- | src/plugins/clangcodemodel/clangdsemantichighlighting.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp b/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp index 322a21058f..e40f68d910 100644 --- a/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp +++ b/src/plugins/clangcodemodel/clangdsemantichighlighting.cpp @@ -366,6 +366,10 @@ void doSemanticHighlighting( const QList<BlockRange> ifdefedOutBlocks = cleanupDisabledCode(results, &doc, docContents); ExtraHighlightingResultsCollector(future, results, filePath, ast, &doc, docContents, clangdVersion).collect(); + Utils::erase(results, [](const HighlightingResult &res) { + // QTCREATORBUG-28639 + return res.textStyles.mainStyle == C_TEXT && res.textStyles.mixinStyles.empty(); + }); if (!future.isCanceled()) { qCInfo(clangdLogHighlight) << "reporting" << results.size() << "highlighting results"; QMetaObject::invokeMethod(textDocument, [textDocument, ifdefedOutBlocks, docRevision] { |