diff options
author | David Schulz <david.schulz@qt.io> | 2020-10-19 13:47:27 +0200 |
---|---|---|
committer | David Schulz <david.schulz@qt.io> | 2020-10-19 15:56:47 +0000 |
commit | a962a08b1ae2d600ec77f8efddb75a8402a8d084 (patch) | |
tree | 088bdaf7f0dc55ab660bad93fbbc033ffaa45f2a | |
parent | b0d4414dfcc931b1e93ff4b814b9a9265331b1ea (diff) |
Editor: fix completion character completions
Cleanup the proposal after an item is activated even if the proposal
widget is not visible anymore. Otherwise we might wrongly cleanup a
proposal that was triggered by a completion character while a completion
list was already open.
Change-Id: Ie95247de09313c5816cffd9a865b05183db02354
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r-- | src/plugins/texteditor/codeassist/codeassistant.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp index 815be89bba..05f3c8ae17 100644 --- a/src/plugins/texteditor/codeassist/codeassistant.cpp +++ b/src/plugins/texteditor/codeassist/codeassistant.cpp @@ -485,9 +485,10 @@ void CodeAssistantPrivate::destroyContext() if (isWaitingForProposal()) { cancelCurrentRequest(); - } else if (isDisplayingProposal()) { + } else if (m_proposalWidget) { m_editorWidget->keepAutoCompletionHighlight(false); - m_proposalWidget->closeProposal(); + if (m_proposalWidget->isVisible()) + m_proposalWidget->closeProposal(); disconnect(m_proposalWidget, &QObject::destroyed, this, &CodeAssistantPrivate::finalizeProposal); finalizeProposal(); |