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

Utils: Make process results accessible through QtcProcess object

Browse Source 
The result is fully stored in the object anyway. Using the extra
SynchronousProcessResponse structure only causes copies of
the data and complicates access on the user side in
a lot of cases.

The result bits are now also accessible individually.

There's obvious room for follow-up changes on the topic, e.g.
ShellCommand::runCommand's parameter list could shrink to
just a SynchronousProcess parameter.

Change-Id: I45aa7eb23832340be06905929280c012e1217263
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-05-12 14:25:50 +02:00
parent f23b27ded6
commit 55f768e1b0
54 changed files with 747 additions and 706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -189,9 +189,8 @@ bool CMakeTool::isValid() const
return m_introspection->m_didRun && !m_introspection->m_fileApis.isEmpty();
}
Utils::SynchronousProcessResponse CMakeTool::run(const QStringList &args, int timeoutS) const
void CMakeTool::runCMake(Utils::SynchronousProcess &cmake, const QStringList &args, int timeoutS) const
{
Utils::SynchronousProcess cmake;
cmake.setTimeoutS(timeoutS);
cmake.setDisableUnixTerminal();
Utils::Environment env = Utils::Environment::systemEnvironment();
@@ -199,7 +198,7 @@ Utils::SynchronousProcessResponse CMakeTool::run(const QStringList &args, int ti
cmake.setEnvironment(env);
cmake.setTimeOutMessageBoxEnabled(false);
return cmake.runBlocking({cmakeExecutable(), args});
cmake.runBlocking({cmakeExecutable(), args});
}
QVariantMap CMakeTool::toMap() const
@@ -280,22 +279,22 @@ TextEditor::Keywords CMakeTool::keywords()
return {};
if (m_introspection->m_functions.isEmpty() && m_introspection->m_didRun) {
Utils::SynchronousProcessResponse response;
response = run({"--help-command-list"}, 5);
if (response.result == Utils::SynchronousProcessResponse::Finished)
m_introspection->m_functions = response.stdOut().split('\n');
Utils::SynchronousProcess proc;
runCMake(proc, {"--help-command-list"}, 5);
if (proc.result() == Utils::QtcProcess::Finished)
m_introspection->m_functions = proc.stdOut().split('\n');
response = run({"--help-commands"}, 5);
if (response.result == Utils::SynchronousProcessResponse::Finished)
parseFunctionDetailsOutput(response.stdOut());
runCMake(proc, {"--help-commands"}, 5);
if (proc.result() == Utils::QtcProcess::Finished)
parseFunctionDetailsOutput(proc.stdOut());
response = run({"--help-property-list"}, 5);
if (response.result == Utils::SynchronousProcessResponse::Finished)
m_introspection->m_variables = parseVariableOutput(response.stdOut());
runCMake(proc, {"--help-property-list"}, 5);
if (proc.result() == Utils::QtcProcess::Finished)
m_introspection->m_variables = parseVariableOutput(proc.stdOut());
response = run({"--help-variable-list"}, 5);
if (response.result == Utils::SynchronousProcessResponse::Finished) {
m_introspection->m_variables.append(parseVariableOutput(response.stdOut()));
runCMake(proc, {"--help-variable-list"}, 5);
if (proc.result() == Utils::QtcProcess::Finished) {
m_introspection->m_variables.append(parseVariableOutput(proc.stdOut()));
m_introspection->m_variables = Utils::filteredUnique(m_introspection->m_variables);
Utils::sort(m_introspection->m_variables);
}
@@ -486,11 +485,12 @@ QStringList CMakeTool::parseVariableOutput(const QString &output)
void CMakeTool::fetchFromCapabilities() const
{
Utils::SynchronousProcessResponse response = run({"-E", "capabilities"});
Utils::SynchronousProcess cmake;
runCMake(cmake, {"-E", "capabilities"});
if (response.result == Utils::SynchronousProcessResponse::Finished) {
if (cmake.result() == Utils::QtcProcess::Finished) {
m_introspection->m_didRun = true;
parseFromCapabilities(response.stdOut());
parseFromCapabilities(cmake.stdOut());
} else {
m_introspection->m_didRun = false;
}