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

Clang: Do not show diagnostic category in inline annotations and issues pane

Browse Source 
For build system diagnostics they are not displayed either.

Also, the error/warning is already encoded in the icon and the color.

However, the category is still shown in the tooltip.

Change-Id: I190ab17691c32786cefc20d058010c65cda5ace9
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-05-09 15:12:01 +02:00
parent 851d56cda2
commit 6b70c27e3b
5 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/clangcodemodel/clangtextmark.cpp
View File

@@ -27,6 +27,7 @@
#include "clangconstants.h"
#include "clangdiagnostictooltipwidget.h"
#include "clangutils.h"
#include <utils/utilsicons.h>
#include <utils/qtcassert.h>
@@ -75,20 +76,20 @@ ClangTextMark::ClangTextMark(const FileName &fileName,
, m_removedFromEditorHandler(removedHandler)
{
const bool warning = isWarningOrNote(diagnostic.severity);
setColor(warning ? Utils::Theme::ClangCodeModel_Warning_TextMarkColor
: Utils::Theme::ClangCodeModel_Error_TextMarkColor);
setColor(warning ? ::Utils::Theme::ClangCodeModel_Warning_TextMarkColor
: ::Utils::Theme::ClangCodeModel_Error_TextMarkColor);
setDefaultToolTip(warning ? QApplication::translate("Clang Code Model Marks", "Code Model Warning")
: QApplication::translate("Clang Code Model Marks", "Code Model Error"));
setPriority(warning ? TextEditor::TextMark::NormalPriority
: TextEditor::TextMark::HighPriority);
updateIcon();
if (showLineAnnotations)
setLineAnnotation(diagnostic.text.toString());
setLineAnnotation(Utils::diagnosticCategoryPrefixRemoved(diagnostic.text.toString()));
}
void ClangTextMark::updateIcon(bool valid)
{
using namespace Utils::Icons;
using namespace ::Utils::Icons;
if (isWarningOrNote(m_diagnostic.severity))
setIcon(valid ? CODEMODEL_WARNING.icon() : CODEMODEL_DISABLED_WARNING.icon());
else