feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Fix code completion and pasting in snippets.

Browse Source 
Fixes case 2 and 3 of QTCREATORBUG-14633.

Task-number: QTCREATORBUG-14633
Change-Id: I19bf3c81c26f8a89a508591b0e7264251e0e6254
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Takumi ASAKI
2015-07-01 13:18:49 +09:00
committed by David Schulz
parent 9c8eeaccd0
commit 5088f07f39
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/texteditor.cpp
View File

@@ -6349,6 +6349,13 @@ void TextEditorWidget::unCommentSelection()
Utils::unCommentSelection(this, d->m_commentDefinition);
}
void TextEditorWidget::encourageApply()
{
if (!d->m_snippetOverlay->isVisible() || d->m_snippetOverlay->isEmpty())
return;
d->m_snippetOverlay->updateEquivalentSelections(textCursor());
}
void TextEditorWidget::showEvent(QShowEvent* e)
{
triggerPendingUpdates();
@@ -6584,6 +6591,7 @@ void TextEditorWidget::copy()
void TextEditorWidget::paste()
{
QPlainTextEdit::paste();
encourageApply();
}
void TextEditorWidgetPrivate::collectToCircularClipboard()