diff options
author | David Schulz <david.schulz@qt.io> | 2020-05-14 08:15:39 +0200 |
---|---|---|
committer | David Schulz <david.schulz@qt.io> | 2020-05-14 09:46:55 +0000 |
commit | f3407bb0ca5ca06a2b64e993c9d270774facfebc (patch) | |
tree | 27a8ab03f4ede8afac7a5887bc6023a3fd176232 /src/plugins/languageclient/languageclientfunctionhint.cpp | |
parent | 32d29f5a11d38324ae0a1f82e874c8f1c8d6b250 (diff) |
LSP: fix codeassists running check
Since MessageId is always valid (needs to be fixed separately)
use an optional to store whether we have a request running.
Change-Id: I7a1f136a09d776b33509bc914247d11076abeaa5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/languageclient/languageclientfunctionhint.cpp')
-rw-r--r-- | src/plugins/languageclient/languageclientfunctionhint.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/languageclient/languageclientfunctionhint.cpp b/src/plugins/languageclient/languageclientfunctionhint.cpp index e49f5fc99cb..37635799e88 100644 --- a/src/plugins/languageclient/languageclientfunctionhint.cpp +++ b/src/plugins/languageclient/languageclientfunctionhint.cpp @@ -57,7 +57,9 @@ private: QString FunctionHintProposalModel::text(int index) const { - return m_sigis.signatures().size() > index ? m_sigis.signatures().at(index).label() : QString(); + if (index < 0 || m_sigis.signatures().size() >= index) + return {}; + return m_sigis.signatures().at(index).label(); } class FunctionHintProcessor : public IAssistProcessor @@ -65,7 +67,7 @@ class FunctionHintProcessor : public IAssistProcessor public: explicit FunctionHintProcessor(Client *client) : m_client(client) {} IAssistProposal *perform(const AssistInterface *interface) override; - bool running() override { return m_currentRequest.isValid(); } + bool running() override { return m_currentRequest.has_value(); } bool needsRestart() const override { return true; } void cancel() override; @@ -73,7 +75,7 @@ private: void handleSignatureResponse(const SignatureHelpRequest::Response &response); QPointer<Client> m_client; - MessageId m_currentRequest; + Utils::optional<MessageId> m_currentRequest; int m_pos = -1; }; @@ -95,15 +97,15 @@ IAssistProposal *FunctionHintProcessor::perform(const AssistInterface *interface void FunctionHintProcessor::cancel() { if (running()) { - m_client->cancelRequest(m_currentRequest); + m_client->cancelRequest(m_currentRequest.value()); m_client->removeAssistProcessor(this); - m_currentRequest = MessageId(); + m_currentRequest.reset(); } } void FunctionHintProcessor::handleSignatureResponse(const SignatureHelpRequest::Response &response) { - m_currentRequest = MessageId(); + m_currentRequest.reset(); if (auto error = response.error()) m_client->log(error.value()); m_client->removeAssistProcessor(this); |