From d5d7b1d19262780c5350a234ef27abbc3378335a Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 16 Mar 2023 10:39:37 +0100
Subject: [PATCH] TextEditor: avoid showing suggestion and completion
 simultaneously

If the use erxplicitly requested the completion hide the suggestion
otherwise ignore the completion.

Change-Id: I52485e322b0521b0af10ae6945437bf96642ad89
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
---
 src/plugins/texteditor/codeassist/codeassistant.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index b092d69bc04..b81161dd6a7 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -252,6 +252,14 @@ void CodeAssistantPrivate::displayProposal(IAssistProposal *newProposal, AssistR
         return;
     }
 
+    if (m_editorWidget->suggestionVisible()) {
+        if (reason != ExplicitlyInvoked) {
+            destroyContext();
+            return;
+        }
+        m_editorWidget->clearSuggestion();
+    }
+
     const QString prefix = m_editorWidget->textAt(basePosition,
                                                   m_editorWidget->position() - basePosition);
     if (!newProposal->hasItemsToPropose(prefix, reason)) {