LanguageServer: Use Utils::CommandLine in StdIOClientInterface

Change-Id: Ic2516387d7308bfad05cef54467c417cc47a7655
Reviewed-by: David Schulz <david.schulz@qt.io>

src/plugins/android/javalanguageserver.cpp

@@ -192,10 +192,10 @@ private:
 LanguageClient::BaseClientInterface *JLSSettings::createInterface() const
 {
     auto interface = new JLSInterface();
-    interface->setExecutable(m_executable);
+    CommandLine cmd{m_executable};
-    QString arguments = this->arguments();
+    cmd.addArgs(arguments(), CommandLine::Raw);
-    arguments += QString(" -data \"%1\"").arg(interface->workspaceDir());
+    cmd.addArgs({"-data", interface->workspaceDir()});
-    interface->setArguments(arguments);
+    interface->setCommandLine(cmd);
     return interface;
 }
 

src/plugins/clangcodemodel/clangdclient.cpp

@@ -41,14 +41,14 @@ static QString indexingToken() { return "backgroundIndexProgress"; }
 
 static BaseClientInterface *clientInterface(const Utils::FilePath &jsonDbDir)
 {
-    QString clangdArgs = "--index --background-index --limit-results=0";
+    Utils::CommandLine cmd{CppTools::codeModelSettings()->clangdFilePath(),
+                           {"--index", "--background-index", "--limit-results=0"}};
     if (!jsonDbDir.isEmpty())
-        clangdArgs += " --compile-commands-dir=" + jsonDbDir.toString();
+        cmd.addArg("--compile-commands-dir=" + jsonDbDir.toString());
     if (clangdLog().isDebugEnabled())
-        clangdArgs += " --log=verbose --pretty";
+        cmd.addArgs({"--log=verbose", "--pretty"});
     const auto interface = new StdIOClientInterface;
-    interface->setExecutable(CppTools::codeModelSettings()->clangdFilePath().toString());
+    interface->setCommandLine(cmd);
-    interface->setArguments(clangdArgs);
     return interface;
 }
 

src/plugins/languageclient/languageclientinterface.cpp

@@ -111,14 +111,9 @@ bool StdIOClientInterface::start()
     return true;
 }
 
-void StdIOClientInterface::setExecutable(const QString &executable)
+void StdIOClientInterface::setCommandLine(const Utils::CommandLine &cmd)
 {
-    m_process.setProgram(executable);
+    m_process.setCommand(cmd);
-}
-
-void StdIOClientInterface::setArguments(const QString &arguments)
-{
-    m_process.setArguments(Utils::QtcProcess::splitArgs(arguments));
 }
 
 void StdIOClientInterface::setWorkingDirectory(const QString &workingDirectory)

src/plugins/languageclient/languageclientinterface.h

@@ -79,8 +79,7 @@ public:
     bool start() override;
 
     // These functions only have an effect if they are called before start
-    void setExecutable(const QString &executable);
+    void setCommandLine(const Utils::CommandLine &cmd);
-    void setArguments(const QString &arguments);
     void setWorkingDirectory(const QString &workingDirectory);
 
 protected:

src/plugins/languageclient/languageclientsettings.cpp

@@ -736,8 +736,7 @@ Utils::CommandLine StdIOSettings::command() const
 BaseClientInterface *StdIOSettings::createInterface() const
 {
     auto interface = new StdIOClientInterface;
-    interface->setExecutable(m_executable);
+    interface->setCommandLine(command());
-    interface->setArguments(arguments());
     return interface;
 }