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

ClangTools: lower priority of warning marks

Browse Source 
In order to not overwrite errors reported by clangd lower the priority
of clang tool marks if they only contain a warning.

Change-Id: Ida1c39ab11aaeb0c70f674c53762fa2707bec766
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2023-06-21 15:21:36 +02:00
parent e419dbbb78
commit e2f957b184
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/clangtools/diagnosticmark.cpp
View File

@@ -15,6 +15,7 @@
#include <QAction> #include <QAction>
using namespace TextEditor; using namespace TextEditor;
using namespace Utils;
namespace ClangTools { namespace ClangTools {
namespace Internal { namespace Internal {
@@ -22,37 +23,35 @@ namespace Internal {
DiagnosticMark::DiagnosticMark(const Diagnostic &diagnostic, TextDocument *document) DiagnosticMark::DiagnosticMark(const Diagnostic &diagnostic, TextDocument *document)
: TextMark(document, : TextMark(document,
diagnostic.location.line, diagnostic.location.line,
{Tr::tr("Clang Tools"), Utils::Id(Constants::DIAGNOSTIC_MARK_ID)}) {Tr::tr("Clang Tools"), Id(Constants::DIAGNOSTIC_MARK_ID)})
, m_diagnostic(diagnostic) , m_diagnostic(diagnostic)
{ {
setSettingsPage(Constants::SETTINGS_PAGE_ID); setSettingsPage(Constants::SETTINGS_PAGE_ID);
if (diagnostic.type == "error" || diagnostic.type == "fatal") const bool isError = diagnostic.type == "error" || diagnostic.type == "fatal";
setColor(Utils::Theme::CodeModel_Error_TextMarkColor); setColor(isError ? Theme::CodeModel_Error_TextMarkColor : Theme::CodeModel_Error_TextMarkColor);
else setPriority(isError ? TextEditor::TextMark::HighPriority : TextEditor::TextMark::NormalPriority);
setColor(Utils::Theme::CodeModel_Warning_TextMarkColor);
setPriority(TextEditor::TextMark::HighPriority);
QIcon markIcon = diagnostic.icon(); QIcon markIcon = diagnostic.icon();
setIcon(markIcon.isNull() ? Utils::Icons::CODEMODEL_WARNING.icon() : markIcon); setIcon(markIcon.isNull() ? Icons::CODEMODEL_WARNING.icon() : markIcon);
setToolTip(createDiagnosticToolTipString(diagnostic, std::nullopt, true)); setToolTip(createDiagnosticToolTipString(diagnostic, std::nullopt, true));
setLineAnnotation(diagnostic.description); setLineAnnotation(diagnostic.description);
setActionsProvider([diagnostic] { setActionsProvider([diagnostic] {
// Copy to clipboard action // Copy to clipboard action
QList<QAction *> actions; QList<QAction *> actions;
QAction *action = new QAction(); QAction *action = new QAction();
action->setIcon(QIcon::fromTheme("edit-copy", Utils::Icons::COPY.icon())); action->setIcon(QIcon::fromTheme("edit-copy", Icons::COPY.icon()));
action->setToolTip(Tr::tr("Copy to Clipboard")); action->setToolTip(Tr::tr("Copy to Clipboard"));
QObject::connect(action, &QAction::triggered, [diagnostic] { QObject::connect(action, &QAction::triggered, [diagnostic] {
const QString text = createFullLocationString(diagnostic.location) const QString text = createFullLocationString(diagnostic.location)
+ ": " + ": "
+ diagnostic.description; + diagnostic.description;
Utils::setClipboardAndSelection(text); setClipboardAndSelection(text);
}); });
actions << action; actions << action;
// Disable diagnostic action // Disable diagnostic action
action = new QAction(); action = new QAction();
action->setIcon(Utils::Icons::BROKEN.icon()); action->setIcon(Icons::BROKEN.icon());
action->setToolTip(Tr::tr("Disable Diagnostic")); action->setToolTip(Tr::tr("Disable Diagnostic"));
QObject::connect(action, &QAction::triggered, [diagnostic] { disableChecks({diagnostic}); }); QObject::connect(action, &QAction::triggered, [diagnostic] { disableChecks({diagnostic}); });
actions << action; actions << action;
@@ -70,10 +69,10 @@ void DiagnosticMark::disable()
return; return;
m_enabled = false; m_enabled = false;
if (m_diagnostic.type == "error" || m_diagnostic.type == "fatal") if (m_diagnostic.type == "error" || m_diagnostic.type == "fatal")
setIcon(Utils::Icons::CODEMODEL_DISABLED_ERROR.icon()); setIcon(Icons::CODEMODEL_DISABLED_ERROR.icon());
else else
setIcon(Utils::Icons::CODEMODEL_DISABLED_WARNING.icon()); setIcon(Icons::CODEMODEL_DISABLED_WARNING.icon());
setColor(Utils::Theme::Color::IconsDisabledColor); setColor(Theme::Color::IconsDisabledColor);
} }
bool DiagnosticMark::enabled() const bool DiagnosticMark::enabled() const