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

ClangTools: Fix state of the "Apply Fixits" button

Browse Source 
* Disable the button when (re-)running an analysis.
* Ensure the button stays disabled when a file is saved.

Change-Id: I1140dd3938de554ea83d33c5bb490be3468d7db0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-10-28 09:00:46 +01:00
parent c698a6ed0c
commit fdd3262cab
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/clangtools/clangtool.cpp
View File

@@ -495,12 +495,13 @@ void ClangTool::startTool(ClangTool::FileSelection fileSelection,
}); });
m_perspective.select(); m_perspective.select();
m_diagnosticModel->clear(); m_diagnosticModel->clear();
setToolBusy(true);
m_diagnosticFilterModel->setProject(project); m_diagnosticFilterModel->setProject(project);
m_applyFixitsButton->setEnabled(false);
m_running = true; m_running = true;
setToolBusy(true);
handleStateUpdate(); handleStateUpdate();
updateRunActions(); updateRunActions();

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

@@ -101,10 +101,10 @@ QDebug operator<<(QDebug debug, const Diagnostic &d)
void ClangToolsDiagnosticModel::addDiagnostics(const Diagnostics &diagnostics) void ClangToolsDiagnosticModel::addDiagnostics(const Diagnostics &diagnostics)
{ {
const auto onFixitStatusChanged = [this](FixitStatus newStatus) { const auto onFixitStatusChanged = [this](FixitStatus oldStatus, FixitStatus newStatus) {
if (newStatus == FixitStatus::Scheduled) if (newStatus == FixitStatus::Scheduled)
++m_fixItsToApplyCount; ++m_fixItsToApplyCount;
else else if (oldStatus == FixitStatus::Scheduled)
--m_fixItsToApplyCount; --m_fixItsToApplyCount;
emit fixItsToApplyCountChanged(m_fixItsToApplyCount); emit fixItsToApplyCountChanged(m_fixItsToApplyCount);
}; };
@@ -463,7 +463,7 @@ void DiagnosticItem::setFixItStatus(const FixitStatus &status)
m_fixitStatus = status; m_fixitStatus = status;
update(); update();
if (m_onFixitStatusChanged && status != oldStatus) if (m_onFixitStatusChanged && status != oldStatus)
m_onFixitStatusChanged(status); m_onFixitStatusChanged(oldStatus, status);
} }
void DiagnosticItem::setFixitOperations(const ReplacementOperations &replacements) void DiagnosticItem::setFixitOperations(const ReplacementOperations &replacements)

5
src/plugins/clangtools/clangtoolsdiagnosticmodel.h
View File

@@ -71,8 +71,9 @@ private:
class DiagnosticItem : public Utils::TreeItem class DiagnosticItem : public Utils::TreeItem
{ {
public: public:
using OnFixitStatusChanged = std::function<void(FixitStatus newStatus)>; using OnFixitStatusChanged = std::function<void(FixitStatus oldStatus, FixitStatus newStatus)>;
DiagnosticItem(const Diagnostic &diag, const OnFixitStatusChanged &onFixitStatusChanged, DiagnosticItem(const Diagnostic &diag,
const OnFixitStatusChanged &onFixitStatusChanged,
ClangToolsDiagnosticModel *parent); ClangToolsDiagnosticModel *parent);
~DiagnosticItem() override; ~DiagnosticItem() override;