From a36bdfc8588518e78eb1ac7b470b233ce75edf12 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Wed, 23 Sep 2020 09:05:59 +0200
Subject: [PATCH] Revert "CodeAssist: Avoid pointless completion request after
 accepting item"

is replaced by 23d63dcc8bf318a5fc716b440c286b360b52ed50

This reverts commit 44b71f7a1669c1021e19bc1b34aea806a60f65a1.

Change-Id: Ib5adaab4a962a54495b48e6b88ab164046526c37
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../texteditor/codeassist/codeassistant.cpp     | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index 706c2763b80..117ba67717c 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -105,7 +105,6 @@ private:
     IAssistProposalWidget *m_proposalWidget = nullptr;
     QScopedPointer<IAssistProposal> m_proposal;
     bool m_receivedContentWhileWaiting = false;
-    bool m_proposalItemProcessed = false;
     QTimer m_automaticProposalTimer;
     CompletionSettings m_settings;
     int m_abortedBasePosition = -1;
@@ -194,13 +193,6 @@ void CodeAssistantPrivate::requestProposal(AssistReason reason,
     if (m_editorWidget->hasBlockSelection())
         return; // TODO
 
-    if (m_proposalItemProcessed
-            && reason == IdleEditor
-            && m_assistKind == TextEditor::Completion
-            && !identifyActivationSequence()) {
-        return;
-    }
-
     if (!provider) {
         if (kind == Completion)
             provider = m_editorWidget->textDocument()->completionAssistProvider();
@@ -373,15 +365,6 @@ void CodeAssistantPrivate::processProposalItem(AssistProposalItemInterface *prop
     proposalItem->apply(manipulator, m_proposal->basePosition());
     destroyContext();
     m_editorWidget->encourageApply();
-    m_proposalItemProcessed = true;
-
-    auto connection = std::make_shared<QMetaObject::Connection>();
-    *connection = connect(m_editorWidget->textDocument(),
-                          &Core::IDocument::contentsChanged,
-                          this, [this, connection] {
-        m_proposalItemProcessed = false;
-        disconnect(*connection);
-    });
 }
 
 void CodeAssistantPrivate::handlePrefixExpansion(const QString &newPrefix)