From 6bad4bf5c6da055ebaabc062ca3c71daf19b5a3f Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@theqtcompany.com>
Date: Tue, 5 Apr 2016 14:33:25 +0200
Subject: [PATCH] Editor: Simplify cursor in snippet check.

Change-Id: I7f2c6a411122d83a118b22814acf50bb0b66d95e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/plugins/texteditor/texteditor.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 57b89fb5d8d..064d8bc1e09 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -2387,6 +2387,7 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e)
         // because AltGr maps to Alt + Ctrl
         QTextCursor cursor = textCursor();
         const QString &autoText = d->m_autoCompleter->autoComplete(cursor, eventText);
+        const bool cursorWithinSnippet = d->snippetCheckCursor(cursor);
 
         QChar electricChar;
         if (d->m_document->typingSettings().m_autoIndent) {
@@ -2398,10 +2399,6 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e)
             }
         }
 
-        bool cursorWithinSnippet = false;
-        if (d->m_snippetOverlay->isVisible())
-            cursorWithinSnippet = d->snippetCheckCursor(cursor);
-
         bool doEditBlock = !electricChar.isNull() || !autoText.isEmpty() || cursorWithinSnippet;
         if (doEditBlock)
             cursor.beginEditBlock();