summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2014-11-25 16:37:31 +0100
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2014-11-26 15:59:00 +0100
commitd927a80f2b5b41643f244715214b9d9eee4abc4d (patch)
tree0135d41dbbeb2861bec667dcb502168dadf91236
parentcb9727f0e910b82154616675874c4a452f2cfdca (diff)
downloadqt-creator-d927a80f2b5b41643f244715214b9d9eee4abc4d.tar.gz
TextEditor: Stop SnippetMode before invoking refactoring action
Task-number: QTCREATORBUG-13519 Change-Id: I206d83251c717dde419394658b5fdea8e5da48d3 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
-rw-r--r--src/plugins/texteditor/texteditor.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 1f6e6a4a95..0de6b93ee0 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -7076,6 +7076,12 @@ void TextEditorWidget::inSnippetMode(bool *active)
void TextEditorWidget::invokeAssist(AssistKind kind, IAssistProvider *provider)
{
+ if (kind == QuickFix && d->m_snippetOverlay->isVisible()) {
+ d->m_snippetOverlay->setVisible(false);
+ d->m_snippetOverlay->mangle();
+ d->m_snippetOverlay->clear();
+ }
+
bool previousMode = overwriteMode();
setOverwriteMode(false);
ensureCursorVisible();