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

ClangTools: Pimp child diagnostics

Browse Source 
* Remove the artificial numbering
 * Use a nicer icon for notes as we mostly get these

Change-Id: Ic1022e3e2eec8512a1e80638d092c8be886aa6da
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-01-24 15:39:15 +01:00
parent 9a5de9cdcd
commit 0299e66c05
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
View File

@@ -37,8 +37,6 @@
#include <QFileInfo> #include <QFileInfo>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <cmath>
static Q_LOGGING_CATEGORY(LOG, "qtc.clangtools.model", QtWarningMsg) static Q_LOGGING_CATEGORY(LOG, "qtc.clangtools.model", QtWarningMsg)
namespace ClangTools { namespace ClangTools {
@@ -341,7 +339,7 @@ static QVariant iconData(const QString &type)
if (type == "error" || type == "fatal") if (type == "error" || type == "fatal")
return Utils::Icons::CODEMODEL_ERROR.icon(); return Utils::Icons::CODEMODEL_ERROR.icon();
if (type == "note") if (type == "note")
return Utils::Icons::BOOKMARK.icon(); return Utils::Icons::INFO.icon();
if (type == "fix-it") if (type == "fix-it")
return Utils::Icons::CODEMODEL_FIXIT.icon(); return Utils::Icons::CODEMODEL_FIXIT.icon();
return QVariant(); return QVariant();
@@ -445,6 +443,15 @@ ExplainingStepItem::ExplainingStepItem(const ExplainingStep &step) : m_step(step
{ {
} }
// We expect something like "note: ..."
static QVariant iconForExplainingStepMessage(const QString &message)
{
const int index = message.indexOf(':');
if (index == -1)
return QVariant();
return iconData(message.mid(0, index));
}
QVariant ExplainingStepItem::data(int column, int role) const QVariant ExplainingStepItem::data(int column, int role) const
{ {
if (column == Debugger::DetailedErrorView::LocationColumn) if (column == Debugger::DetailedErrorView::LocationColumn)
@@ -459,19 +466,12 @@ QVariant ExplainingStepItem::data(int column, int role) const
return fullText(static_cast<DiagnosticItem *>(parent())->diagnostic()); return fullText(static_cast<DiagnosticItem *>(parent())->diagnostic());
case ClangToolsDiagnosticModel::DiagnosticRole: case ClangToolsDiagnosticModel::DiagnosticRole:
return QVariant::fromValue(static_cast<DiagnosticItem *>(parent())->diagnostic()); return QVariant::fromValue(static_cast<DiagnosticItem *>(parent())->diagnostic());
case Qt::DisplayRole: { case Qt::DisplayRole:
const int row = indexInParent() + 1; return m_step.message;
const int padding = static_cast<int>(std::log10(parent()->childCount()))
- static_cast<int>(std::log10(row));
return QString::fromLatin1("%1%2: %3")
.arg(QString(padding, QLatin1Char(' ')))
.arg(row)
.arg(m_step.message);
}
case Qt::ToolTipRole: case Qt::ToolTipRole:
return createExplainingStepToolTipString(m_step); return createExplainingStepToolTipString(m_step);
case Qt::DecorationRole: case Qt::DecorationRole:
return (m_step.message.startsWith("fix-it:")) ? iconData("fix-it") : QVariant(); return iconForExplainingStepMessage(m_step.message);
default: default:
return QVariant(); return QVariant();
} }