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

CodeAssistant: add cancel to asynchronous processors

Browse Source 
Fixes crash when the processor reports a result after the code assistant
was destroyed.

Change-Id: I8588d3d6acad69f1ec6302e8ba09d642ebbb77f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-02-12 14:06:45 +01:00
parent 86fae567fa
commit 552ccd6a61
6 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,13 +278,14 @@ public:
IAssistProposal *perform(const AssistInterface *interface) override;
bool running() override;
bool needsRestart() const override { return true; }
void cancel() override;
private:
void handleCompletionResponse(const CompletionRequest::Response &response);
QPointer<QTextDocument> m_document;
QPointer<Client> m_client;
bool m_running = false;
MessageId m_currentRequest;
int m_pos = -1;
};
@@ -336,7 +337,7 @@ IAssistProposal *LanguageClientCompletionAssistProcessor::perform(const AssistIn
});
completionRequest.setParams(params);
m_client->sendContent(completionRequest);
m_running = true;
m_currentRequest = completionRequest.id();
m_document = interface->textDocument();
qCDebug(LOGLSPCOMPLETION) << QTime::currentTime()
<< " : request completions at " << m_pos
@@ -346,14 +347,22 @@ IAssistProposal *LanguageClientCompletionAssistProcessor::perform(const AssistIn
bool LanguageClientCompletionAssistProcessor::running()
{
return m_running;
return m_currentRequest.isValid();
}
void LanguageClientCompletionAssistProcessor::cancel()
{
if (running()) {
m_client->cancelRequest(m_currentRequest);
m_currentRequest = MessageId();
}
}
void LanguageClientCompletionAssistProcessor::handleCompletionResponse(
const CompletionRequest::Response &response)
{
qCDebug(LOGLSPCOMPLETION) << QTime::currentTime() << " : got completions";
m_running = false;
m_currentRequest = MessageId();
QTC_ASSERT(m_client, return);
if (auto error = response.error()) {
m_client->log(error.value());