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

ClangTools: Fix saving files before analyzing

Browse Source 
...in current file mode.

Change-Id: Iae2ca9dc0ba5325f485943deb7fd93b3e9b419fe
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-08-30 16:15:43 +02:00
parent 1fad60153e
commit 1e0523423a
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/clangtools/clangtoolruncontrol.cpp
View File

@@ -128,18 +128,11 @@ public:
setId("ProjectBuilder"); setId("ProjectBuilder");
} }
void setEnabled(bool enabled) { m_enabled = enabled; }
bool success() const { return m_success; } bool success() const { return m_success; }
private: private:
void start() final void start() final
{ {
if (!m_enabled) {
ProjectExplorerPlugin::saveModifiedFiles();
onBuildFinished(true);
return;
}
Target *target = runControl()->target(); Target *target = runControl()->target();
QTC_ASSERT(target, reportFailure(); return); QTC_ASSERT(target, reportFailure(); return);
@@ -185,7 +178,6 @@ private:
} }
private: private:
bool m_enabled = true;
bool m_success = false; bool m_success = false;
}; };
@@ -243,10 +235,9 @@ ClangToolRunWorker::ClangToolRunWorker(RunControl *runControl,
setId("ClangTidyClazyRunner"); setId("ClangTidyClazyRunner");
setSupportsReRunning(false); setSupportsReRunning(false);
if (!preventBuild) { if (!preventBuild && ClangToolsSettings::instance()->savedBuildBeforeAnalysis()) {
m_projectBuilder = new ProjectBuilder(runControl); m_projectBuilder = new ProjectBuilder(runControl);
addStartDependency(m_projectBuilder); addStartDependency(m_projectBuilder);
m_projectBuilder->setEnabled(ClangToolsSettings::instance()->savedBuildBeforeAnalysis());
} }
Target *target = runControl->target(); Target *target = runControl->target();
@@ -283,6 +274,7 @@ QList<RunnerCreator> ClangToolRunWorker::runnerCreators()
void ClangToolRunWorker::start() void ClangToolRunWorker::start()
{ {
TaskHub::clearTasks(Debugger::Constants::ANALYZERTASK_ID); TaskHub::clearTasks(Debugger::Constants::ANALYZERTASK_ID);
ProjectExplorerPlugin::saveModifiedFiles();
if (ClangToolsSettings::instance()->savedBuildBeforeAnalysis()) { if (ClangToolsSettings::instance()->savedBuildBeforeAnalysis()) {
if (m_projectBuilder && !m_projectBuilder->success()) { if (m_projectBuilder && !m_projectBuilder->success()) {