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/codeassist/assistproposalitem.cpp
View File

@@ -135,12 +135,14 @@ bool AssistProposalItem::prematurelyApplies(const QChar &c) const
void AssistProposalItem::apply(TextEditorWidget *editorWidget, int basePosition) const
{
if (data().canConvert<QString>())
if (data().canConvert<QString>()) {
applySnippet(editorWidget, basePosition);
else if (data().canConvert<QuickFixOperation::Ptr>())
} else if (data().canConvert<QuickFixOperation::Ptr>()) {
applyQuickFix(editorWidget, basePosition);
else
} else {
applyContextualContent(editorWidget, basePosition);
editorWidget->encourageApply();
}
}
void AssistProposalItem::applyContextualContent(TextEditorWidget *editorWidget, int basePosition) const