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

LSP: rerequest completion if contents change while processing

Browse Source 
Task-number: QTCREATORBUG-21108
Change-Id: I6ca7920e7099dba0ba1bc953a2e6296bd86c1dc1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2018-09-20 14:31:50 +02:00
parent 279a11f46b
commit 5719adc47c
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/languageclient/languageclientcodeassist.cpp
View File

@@ -219,6 +219,7 @@ public:
LanguageClientCompletionAssistProcessor(BaseClient *client); LanguageClientCompletionAssistProcessor(BaseClient *client);
TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override; TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override;
bool running() override; bool running() override;
bool needsRestart() const override { return true; }
private: private:
void handleCompletionResponse(const Response<CompletionResult, LanguageClientNull> &response); void handleCompletionResponse(const Response<CompletionResult, LanguageClientNull> &response);

7
src/plugins/texteditor/codeassist/codeassistant.cpp
View File

@@ -245,10 +245,17 @@ void CodeAssistantPrivate::requestProposal(AssistReason reason,
case IAssistProvider::Asynchronous: { case IAssistProvider::Asynchronous: {
processor->setAsyncCompletionAvailableHandler( processor->setAsyncCompletionAvailableHandler(
[this, reason](IAssistProposal *newProposal){ [this, reason](IAssistProposal *newProposal){
if (m_asyncProcessor && m_asyncProcessor->needsRestart() && m_receivedContentWhileWaiting) {
delete newProposal;
m_receivedContentWhileWaiting = false;
invalidateCurrentRequestData();
requestProposal(reason, m_assistKind, m_requestProvider);
} else {
invalidateCurrentRequestData(); invalidateCurrentRequestData();
displayProposal(newProposal, reason); displayProposal(newProposal, reason);
emit q->finished(); emit q->finished();
}
}); });
// If there is a proposal, nothing asynchronous happened... // If there is a proposal, nothing asynchronous happened...

1
src/plugins/texteditor/codeassist/iassistprocessor.h
View File

@@ -50,6 +50,7 @@ public:
void setAsyncCompletionAvailableHandler(const AsyncCompletionsAvailableHandler &finalizer); void setAsyncCompletionAvailableHandler(const AsyncCompletionsAvailableHandler &finalizer);
virtual bool running() { return false; } virtual bool running() { return false; }
virtual bool needsRestart() const { return false; }
private: private:
AsyncCompletionsAvailableHandler m_asyncCompletionsAvailableHandler; AsyncCompletionsAvailableHandler m_asyncCompletionsAvailableHandler;