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

LSP: workaround msvc 2017 bug

Browse Source 
Change-Id: I6a6fbfc1a582d83df3f3cf489236c7ca4c6626f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2020-07-13 13:52:27 +02:00
parent c2f51b7797
commit ca0f504c0e
16 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,7 +336,6 @@ IAssistProposal *LanguageClientCompletionAssistProcessor::perform(const AssistIn
}
if (m_postponedUpdateConnection)
QObject::disconnect(m_postponedUpdateConnection);
CompletionRequest completionRequest;
CompletionParams::CompletionContext context;
if (interface->reason() == ActivationCharacter) {
context.setTriggerKind(CompletionParams::TriggerCharacter);
@@ -346,7 +345,7 @@ IAssistProposal *LanguageClientCompletionAssistProcessor::perform(const AssistIn
} else {
context.setTriggerKind(CompletionParams::Invoked);
}
auto params = completionRequest.params().value_or(CompletionParams());
CompletionParams params;
int line;
int column;
if (!Utils::Text::convertPosition(interface->textDocument(), m_pos, &line, &column))
@@ -357,10 +356,10 @@ IAssistProposal *LanguageClientCompletionAssistProcessor::perform(const AssistIn
params.setContext(context);
params.setTextDocument(
DocumentUri::fromFilePath(Utils::FilePath::fromString(interface->fileName())));
CompletionRequest completionRequest(params);
completionRequest.setResponseCallback([this](auto response) {
this->handleCompletionResponse(response);
});
completionRequest.setParams(params);
m_client->sendContent(completionRequest);
m_client->addAssistProcessor(this);
m_currentRequest = completionRequest.id();