From 15750db4340de6ab01cd6bc4c1ead68faea27e0e Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Tue, 4 Jul 2017 10:49:04 +0200
Subject: [PATCH] Editor: Correctly reset cursor for automatically inserted
 text

Change-Id: I7f9eee035cf3b85321de6d3f2a7a1d62e4e58376
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/texteditor/texteditor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 0e64e0c61ff..8d60e286f73 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -4961,7 +4961,7 @@ void TextEditorWidgetPrivate::updateHighlights()
                 return !m_autoCompleteHighlightPos.isEmpty()
                         && m_autoCompleteHighlightPos.last() != cursor;
             };
-            if (!m_keepAutoCompletionHighlight && !q->hasFocus() && popAutoCompletion()) {
+            if ((!m_keepAutoCompletionHighlight && !q->hasFocus()) || popAutoCompletion()) {
                 while (popAutoCompletion())
                     m_autoCompleteHighlightPos.pop_back();
                 updateAutoCompleteHighlight();