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

LanguageClient: Fix passing proposals

Browse Source 
Pass the real proposals around instead of a copied
nullptr.

Change-Id: I1a8678bcbd5838113f6416b6f63d92d6cceceb3f
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2020-03-02 14:19:44 +01:00
parent 015d09a9e7
commit c7e2ba9c14
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@
#include <texteditor/codeassist/genericproposal.h> #include <texteditor/codeassist/genericproposal.h>
#include <texteditor/codeassist/genericproposalmodel.h> #include <texteditor/codeassist/genericproposalmodel.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/executeondestruction.h>
#include <utils/textutils.h> #include <utils/textutils.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
@@ -362,19 +361,18 @@ void LanguageClientCompletionAssistProcessor::cancel()
void LanguageClientCompletionAssistProcessor::handleCompletionResponse( void LanguageClientCompletionAssistProcessor::handleCompletionResponse(
const CompletionRequest::Response &response) const CompletionRequest::Response &response)
{ {
LanguageClientCompletionProposal *proposal = nullptr;
// We must report back to the code assistant under all circumstances // We must report back to the code assistant under all circumstances
Utils::ExecuteOnDestruction eod([this, proposal]() { setAsyncProposalAvailable(proposal); });
qCDebug(LOGLSPCOMPLETION) << QTime::currentTime() << " : got completions"; qCDebug(LOGLSPCOMPLETION) << QTime::currentTime() << " : got completions";
m_currentRequest = MessageId(); m_currentRequest = MessageId();
QTC_ASSERT(m_client, return); QTC_ASSERT(m_client, setAsyncProposalAvailable(nullptr); return);
if (auto error = response.error()) { if (auto error = response.error())
m_client->log(error.value()); m_client->log(error.value());
const Utils::optional<CompletionResult> &result = response.result();
if (!result || Utils::holds_alternative<std::nullptr_t>(*result)) {
setAsyncProposalAvailable(nullptr);
return; return;
} }
const Utils::optional<CompletionResult> &result = response.result();
if (!result || Utils::holds_alternative<std::nullptr_t>(*result))
return;
QList<CompletionItem> items; QList<CompletionItem> items;
if (Utils::holds_alternative<CompletionList>(*result)) { if (Utils::holds_alternative<CompletionList>(*result)) {
@@ -387,11 +385,12 @@ void LanguageClientCompletionAssistProcessor::handleCompletionResponse(
model->loadContent(Utils::transform(items, [](const CompletionItem &item){ model->loadContent(Utils::transform(items, [](const CompletionItem &item){
return static_cast<AssistProposalItemInterface *>(new LanguageClientCompletionItem(item)); return static_cast<AssistProposalItemInterface *>(new LanguageClientCompletionItem(item));
})); }));
proposal = new LanguageClientCompletionProposal(m_pos, model); LanguageClientCompletionProposal *proposal = new LanguageClientCompletionProposal(m_pos, model);
proposal->m_document = m_document; proposal->m_document = m_document;
proposal->m_pos = m_pos; proposal->m_pos = m_pos;
proposal->setFragile(true); proposal->setFragile(true);
proposal->setSupportsPrefix(false); proposal->setSupportsPrefix(false);
setAsyncProposalAvailable(proposal);
qCDebug(LOGLSPCOMPLETION) << QTime::currentTime() << " : " qCDebug(LOGLSPCOMPLETION) << QTime::currentTime() << " : "
<< items.count() << " completions handled"; << items.count() << " completions handled";
} }