ClangToolRunWorker: Move logging of started tools into runner creator

Runner creator is being called just before it's about to be run.
Get rid of unneeded ClangToolRunner::fileToAnalyze() now.

Change-Id: I51e49597f38919a7174495df3db6b2adc5109a21
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Jarek Kobus
2023-01-11 21:11:02 +01:00
parent 64b9728a68
commit a9c675d88d
2 changed files with 4 additions and 8 deletions

View File

@@ -265,15 +265,9 @@ void ClangToolRunWorker::analyzeNextFile()
} }
const RunnerCreator runnerCreator = m_runnerCreators.takeFirst(); const RunnerCreator runnerCreator = m_runnerCreators.takeFirst();
ClangToolRunner *runner = runnerCreator(); ClangToolRunner *runner = runnerCreator();
m_runners.insert(runner); m_runners.insert(runner);
if (!runner->run()) {
if (runner->run()) {
const QString filePath = FilePath::fromString(runner->fileToAnalyze()).toUserOutput();
appendMessage(tr("Analyzing \"%1\" [%2].").arg(filePath, runner->name()),
Utils::StdOutFormat);
} else {
reportFailure(tr("Failed to start runner \"%1\".").arg(runner->name())); reportFailure(tr("Failed to start runner \"%1\".").arg(runner->name()));
stop(); stop();
} }
@@ -374,6 +368,9 @@ ClangToolRunner *ClangToolRunWorker::createRunner(ClangToolType tool, const Anal
onDone(output); onDone(output);
handleFinished(runner); handleFinished(runner);
}); });
const QString filePath = FilePath::fromString(unit.file).toUserOutput();
appendMessage(tr("Analyzing \"%1\" [%2].").arg(filePath, runner->name()),
Utils::StdOutFormat);
return runner; return runner;
} }

View File

@@ -53,7 +53,6 @@ public:
ClangToolRunner(const AnalyzeInputData &input, QObject *parent = nullptr); ClangToolRunner(const AnalyzeInputData &input, QObject *parent = nullptr);
QString name() const { return m_name; } QString name() const { return m_name; }
QString fileToAnalyze() const { return m_input.unit.file; }
// compilerOptions is expected to contain everything except: // compilerOptions is expected to contain everything except:
// (1) file to analyze // (1) file to analyze