From 861d24bbd87c2090e5adb84e620b711bebc30b9e Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 29 Jul 2021 13:39:14 +0200 Subject: [PATCH] Clangd: Make code model warnings less intrusive in fallback client Just like we do for project-less files in the non-clangd case. Change-Id: I88c9c856fb524c6eab8289b8890f7fb4d8dc8645 Reviewed-by: Christian Stenger --- src/plugins/clangcodemodel/clangtextmark.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp index 77ed1f2fa36..52b0d32f955 100644 --- a/src/plugins/clangcodemodel/clangtextmark.cpp +++ b/src/plugins/clangcodemodel/clangtextmark.cpp @@ -358,9 +358,12 @@ ClangdTextMark::ClangdTextMark(const FilePath &filePath, setPriority(isError ? TextEditor::TextMark::HighPriority : TextEditor::TextMark::NormalPriority); setIcon(isError ? Icons::CODEMODEL_ERROR.icon() : Icons::CODEMODEL_WARNING.icon()); - setLineAnnotation(diagnostic.message()); - setColor(isError ? Theme::CodeModel_Error_TextMarkColor - : Theme::CodeModel_Warning_TextMarkColor); + if (client->project()) { + setLineAnnotation(diagnostic.message()); + setColor(isError ? Theme::CodeModel_Error_TextMarkColor + : Theme::CodeModel_Warning_TextMarkColor); + ClangDiagnosticManager::addTask(m_diagnostic); + } // Copy to clipboard action QVector actions; @@ -387,8 +390,6 @@ ClangdTextMark::ClangdTextMark(const FilePath &filePath, } setActions(actions); - - ClangDiagnosticManager::addTask(m_diagnostic); } bool ClangdTextMark::addToolTipContent(QLayout *target) const