diff options
author | David Schulz <david.schulz@qt.io> | 2019-05-15 14:55:55 +0200 |
---|---|---|
committer | David Schulz <david.schulz@qt.io> | 2019-05-17 09:01:29 +0000 |
commit | 10611f2af959875e45e7eba608048fce4e1364ae (patch) | |
tree | 2bd16c76ba85adfa7cf39661736aa1a702b73516 /src/plugins/languageclient | |
parent | c238fc88b17c1ae1a66afe85d4c977b08a314f8a (diff) |
LanguageClient: always set client capabilities
Not just if a project is currently set.
Change-Id: I07b19695464025a9d039364ff1611aa39e8e1a9b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/languageclient')
-rw-r--r-- | src/plugins/languageclient/client.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp index e7dda1ac573..c2ce4cc9d4d 100644 --- a/src/plugins/languageclient/client.cpp +++ b/src/plugins/languageclient/client.cpp @@ -219,16 +219,15 @@ void Client::initialize() QTC_ASSERT(m_state == Uninitialized, return); qCDebug(LOGLSPCLIENT) << "initializing language server " << m_displayName; auto initRequest = new InitializeRequest(); + auto params = initRequest->params().value_or(InitializeParams()); + params.setCapabilities(generateClientCapabilities()); if (m_project) { - auto params = initRequest->params().value_or(InitializeParams()); - params.setCapabilities(generateClientCapabilities()); params.setRootUri(DocumentUri::fromFileName(m_project->projectDirectory())); - initRequest->setParams(params); params.setWorkSpaceFolders(Utils::transform(SessionManager::projects(), [](Project *pro){ return WorkSpaceFolder(pro->projectDirectory().toString(), pro->displayName()); })); - initRequest->setParams(params); } + initRequest->setParams(params); initRequest->setResponseCallback([this](const InitializeRequest::Response &initResponse){ intializeCallback(initResponse); }); |