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

ClangTools: Allow applying fixits

Browse Source 
Add a new column to the view that allows to check diagnostics with
fixits. The checked fixits can then be applied with the also new "Apply
Fixits" button in the toolbar.

Some corner cases are not yet handled:
 * File is open in editor
 * File changed in the mean time

Change-Id: I3d3f353a4150699a0d082f2a4348e331a4213bcf
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-05-15 14:31:48 +02:00
parent 1773b4d8b5
commit 26b09af277
10 changed files with 126 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,19 +42,6 @@
namespace ClangTools {
namespace Internal {
class DiagnosticItem : public Utils::TreeItem
{
public:
DiagnosticItem(const Diagnostic &diag);
Diagnostic diagnostic() const { return m_diagnostic; }
private:
QVariant data(int column, int role) const override;
const Diagnostic m_diagnostic;
};
class ExplainingStepItem : public Utils::TreeItem
{
public:
@@ -69,7 +56,7 @@ private:
ClangToolsDiagnosticModel::ClangToolsDiagnosticModel(QObject *parent)
: Utils::TreeModel<>(parent)
{
setHeader({tr("Issue"), tr("Location")});
setHeader({tr("Issue"), tr("Location"), tr("Fixits")});
}
void ClangToolsDiagnosticModel::addDiagnostics(const QList<Diagnostic> &diagnostics)
@@ -225,6 +212,13 @@ DiagnosticItem::DiagnosticItem(const Diagnostic &diag) : m_diagnostic(diag)
appendChild(new ExplainingStepItem(s));
}
Qt::ItemFlags DiagnosticItem::flags(int column) const
{
if (column == DiagnosticView::FixItColumn && m_diagnostic.hasFixits)
return TreeItem::flags(column) | Qt::ItemIsUserCheckable;
return TreeItem::flags(column);
}
static QVariant locationData(int role, const Debugger::DiagnosticLocation &location)
{
switch (role) {
@@ -255,6 +249,12 @@ QVariant DiagnosticItem::data(int column, int role) const
if (column == Debugger::DetailedErrorView::LocationColumn)
return locationData(role, m_diagnostic.location);
if (column == DiagnosticView::FixItColumn) {
if (role == Qt::CheckStateRole)
return m_applyFixits ? Qt::Checked : Qt::Unchecked;
return QVariant();
}
// DiagnosticColumn
switch (role) {
case Debugger::DetailedErrorView::FullTextRole:
@@ -272,6 +272,17 @@ QVariant DiagnosticItem::data(int column, int role) const
}
}
bool DiagnosticItem::setData(int column, const QVariant &data, int role)
{
if (column == DiagnosticView::FixItColumn && role == Qt::CheckStateRole) {
m_applyFixits = data.value<Qt::CheckState>() == Qt::Checked ? true : false;
update();
return true;
}
return Utils::TreeItem::setData(column, data, role);
}
ExplainingStepItem::ExplainingStepItem(const ExplainingStep &step) : m_step(step)
{
}
@@ -281,6 +292,9 @@ QVariant ExplainingStepItem::data(int column, int role) const
if (column == Debugger::DetailedErrorView::LocationColumn)
return locationData(role, m_step.location);
if (column == DiagnosticView::FixItColumn)
return QVariant();
// DiagnosticColumn
switch (role) {
case Debugger::DetailedErrorView::FullTextRole: