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

ClangTool: Pass AnalyzeUnit to clang setup handler

Browse Source 
Change-Id: I4cfbe5c241fcf8d42e5ad597db1dd84bff439ec4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2024-01-12 22:33:16 +01:00
parent 27471f6c55
commit 89e446fb4d
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -762,14 +762,12 @@ Group ClangTool::runRecipe(const RunSettings &runSettings,
if (!diagnosticConfig.isEnabled(tool) && !runSettings.hasConfigFileForSourceFile(unit.file)) if (!diagnosticConfig.isEnabled(tool) && !runSettings.hasConfigFileForSourceFile(unit.file))
continue; continue;
const auto setupHandler = [this, unit, tool] { const auto setupHandler = [this, tool](const AnalyzeUnit &unit) {
const QString filePath = unit.file.toUserOutput(); const QString filePath = unit.file.toUserOutput();
m_runControl->postMessage(Tr::tr("Analyzing \"%1\" [%2].") m_runControl->postMessage(Tr::tr("Analyzing \"%1\" [%2].")
.arg(filePath, clangToolName(tool)), StdOutFormat); .arg(filePath, clangToolName(tool)), StdOutFormat);
return true; return true;
}; };
const AnalyzeInputData input{tool, runSettings, diagnosticConfig, tempDir->path(),
environment, unit};
const auto outputHandler = [this, runSettings](const AnalyzeOutputData &output) { const auto outputHandler = [this, runSettings](const AnalyzeOutputData &output) {
if (!output.success) { if (!output.success) {
qCDebug(LOG).noquote() << "Clang tool task finished with an error:" qCDebug(LOG).noquote() << "Clang tool task finished with an error:"
@@ -799,6 +797,8 @@ Group ClangTool::runRecipe(const RunSettings &runSettings,
} }
updateForCurrentState(); updateForCurrentState();
}; };
const AnalyzeInputData input{tool, runSettings, diagnosticConfig, tempDir->path(),
environment, unit};
tasks.append(clangToolTask(input, setupHandler, outputHandler)); tasks.append(clangToolTask(input, setupHandler, outputHandler));
} }
taskTree.setRecipe(tasks); taskTree.setRecipe(tasks);

2
src/plugins/clangtools/clangtoolrunner.cpp
View File

@@ -131,7 +131,7 @@ GroupItem clangToolTask(const AnalyzeInputData &input,
}; };
const auto onSetup = [storage, input, setupHandler] { const auto onSetup = [storage, input, setupHandler] {
if (setupHandler && !setupHandler()) if (setupHandler && !setupHandler(input.unit))
return SetupResult::StopWithError; return SetupResult::StopWithError;
ClangToolStorage *data = storage.activeStorage(); ClangToolStorage *data = storage.activeStorage();

2
src/plugins/clangtools/clangtoolrunner.h
View File

@@ -51,7 +51,7 @@ struct AnalyzeOutputData
QString errorDetails = {}; QString errorDetails = {};
}; };
using AnalyzeSetupHandler = std::function<bool()>; using AnalyzeSetupHandler = std::function<bool(const AnalyzeUnit &)>;
using AnalyzeOutputHandler = std::function<void(const AnalyzeOutputData &)>; using AnalyzeOutputHandler = std::function<void(const AnalyzeOutputData &)>;
Tasking::GroupItem clangToolTask(const AnalyzeInputData &input, Tasking::GroupItem clangToolTask(const AnalyzeInputData &input,

2
src/plugins/clangtools/documentclangtoolrunner.cpp
View File

@@ -212,7 +212,7 @@ void DocumentClangToolRunner::run()
unit, unit,
vfso().overlayFilePath().toString(), vfso().overlayFilePath().toString(),
diagnosticFilter}; diagnosticFilter};
const auto setupHandler = [this, executable] { const auto setupHandler = [this, executable](const AnalyzeUnit &) {
return !m_document->isModified() || isVFSOverlaySupported(executable); return !m_document->isModified() || isVFSOverlaySupported(executable);
}; };
const auto outputHandler = [this](const AnalyzeOutputData &output) { onDone(output); }; const auto outputHandler = [this](const AnalyzeOutputData &output) { onDone(output); };