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

LanguageClient: fix restart check for stdio clients

Browse Source 
Change-Id: I4acb61b48b7ac18423b2e106f1f9ea9b3f7ccb70
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-03-11 07:33:07 +01:00
parent 7f0589ef59
commit bbbf727272
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/languageclient/client.cpp
View File

@@ -775,6 +775,11 @@ const DynamicCapabilities &Client::dynamicCapabilities() const
return m_dynamicCapabilities; return m_dynamicCapabilities;
} }
const BaseClientInterface *Client::clientInterface() const
{
return m_clientInterface.data();
}
void Client::log(const ShowMessageParams &message, void Client::log(const ShowMessageParams &message,
Core::MessageManager::PrintToOutputPaneFlag flag) Core::MessageManager::PrintToOutputPaneFlag flag)
{ {

1
src/plugins/languageclient/client.h
View File

@@ -147,6 +147,7 @@ public:
const LanguageServerProtocol::ServerCapabilities &capabilities() const; const LanguageServerProtocol::ServerCapabilities &capabilities() const;
const DynamicCapabilities &dynamicCapabilities() const; const DynamicCapabilities &dynamicCapabilities() const;
const BaseClientInterface *clientInterface() const;
signals: signals:
void initialized(LanguageServerProtocol::ServerCapabilities capabilities); void initialized(LanguageServerProtocol::ServerCapabilities capabilities);

2
src/plugins/languageclient/languageclientinterface.cpp
View File

@@ -110,7 +110,7 @@ StdIOClientInterface::~StdIOClientInterface()
Utils::SynchronousProcess::stopProcess(m_process); Utils::SynchronousProcess::stopProcess(m_process);
} }
bool StdIOClientInterface::needsRestart(const StdIOSettings *settings) bool StdIOClientInterface::needsRestart(const StdIOSettings *settings) const
{ {
return m_executable != settings->m_executable || m_arguments != settings->m_arguments; return m_executable != settings->m_executable || m_arguments != settings->m_arguments;
} }

2
src/plugins/languageclient/languageclientinterface.h
View File

@@ -74,7 +74,7 @@ public:
StdIOClientInterface &operator=(const StdIOClientInterface &) = delete; StdIOClientInterface &operator=(const StdIOClientInterface &) = delete;
StdIOClientInterface &operator=(StdIOClientInterface &&) = delete; StdIOClientInterface &operator=(StdIOClientInterface &&) = delete;
bool needsRestart(const StdIOSettings *settings); bool needsRestart(const StdIOSettings *settings) const;
bool start() override; bool start() override;

4
src/plugins/languageclient/languageclientsettings.cpp
View File

@@ -473,7 +473,9 @@ bool StdIOSettings::needsRestart() const
{ {
if (BaseSettings::needsRestart()) if (BaseSettings::needsRestart())
return true; return true;
if (auto stdIOInterface = qobject_cast<StdIOClientInterface *>(m_client)) if (m_client.isNull())
return false;
if (auto stdIOInterface = qobject_cast<const StdIOClientInterface *>(m_client->clientInterface()))
return stdIOInterface->needsRestart(this); return stdIOInterface->needsRestart(this);
return false; return false;
} }