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

ProjectExplorer: Copy more RunConfiguration data to RunControl

Browse Source 
The aspects are now responsible for defining what data needs
to be copied and also to provide a suitable interface (kind
of source-compatible to direct use) for access.

The important change here is that RunControl::aspect(...) doesn't
need to access RunControl::runConfiguration() in fully aspectified
RunConfigurations anymore. In not-fully aspectified the runConfig
access is moved to the user code to make the problem visible there.
Long term, aspectification should be finished.

As an additional benefit, the resolving of macros etc can
now be done at the correct time.

Change-Id: I690d9f8f696ce9b4efd42082ba3f81b514efcb77
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2022-04-08 11:35:54 +02:00
parent 24b4a7be74
commit 530b9ae85a
33 changed files with 282 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -351,6 +351,7 @@ public:
Utils::Icon icon;
const MacroExpander *macroExpander = nullptr;
QPointer<RunConfiguration> runConfiguration; // Not owned. Avoid use.
AspectContainerData aspectData;
QString buildKey;
QMap<Utils::Id, QVariantMap> settingsData;
Utils::Id runConfigId;
@@ -390,7 +391,9 @@ void RunControl::setRunConfiguration(RunConfiguration *runConfig)
d->runnable = runConfig->runnable();
d->displayName = runConfig->expandedDisplayName();
d->buildKey = runConfig->buildKey();
d->settingsData = runConfig->aspectData();
d->settingsData = runConfig->settingsData();
runConfig->storeAspectData(&d->aspectData);
setTarget(runConfig->target());
@@ -857,9 +860,8 @@ void RunControlPrivate::showError(const QString &msg)
void RunControl::setupFormatter(OutputFormatter *formatter) const
{
QList<Utils::OutputLineParser *> parsers = OutputFormatterFactory::createFormatters(target());
if (const auto customParsersAspect
= (runConfiguration() ? runConfiguration()->aspect<CustomParsersAspect>() : nullptr)) {
for (const Utils::Id id : customParsersAspect->parsers()) {
if (const auto customParsersAspect = aspect<CustomParsersAspect>()) {
for (const Id id : qAsConst(customParsersAspect->parsers)) {
if (CustomParser * const parser = CustomParser::createFromId(id))
parsers << parser;
}
@@ -938,12 +940,17 @@ const MacroExpander *RunControl::macroExpander() const
return d->macroExpander;
}
BaseAspect *RunControl::aspect(Utils::Id id) const
const BaseAspect::Data *RunControl::aspect(Id instanceId) const
{
return d->runConfiguration ? d->runConfiguration->aspect(id) : nullptr;
return d->aspectData.aspect(instanceId);
}
QVariantMap RunControl::settingsData(Utils::Id id) const
const BaseAspect::Data *RunControl::aspect(BaseAspect::Data::ClassId classId) const
{
return d->aspectData.aspect(classId);
}
QVariantMap RunControl::settingsData(Id id) const
{
return d->settingsData.value(id);
}
@@ -1181,9 +1188,9 @@ SimpleTargetRunner::SimpleTargetRunner(RunControl *runControl)
{
setId("SimpleTargetRunner");
if (auto terminalAspect = runControl->aspect<TerminalAspect>())
m_useTerminal = terminalAspect->useTerminal();
m_useTerminal = terminalAspect->useTerminal;
if (auto runAsRootAspect = runControl->aspect<RunAsRootAspect>())
m_runAsRoot = runAsRootAspect->value();
m_runAsRoot = runAsRootAspect->value;
}
void SimpleTargetRunner::start()