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

CodeAssist: Expand prefix only when it's a completion

Browse Source 
Quickfixes, for instance, should not be expanded.

Change-Id: I832ea11c5a270ee290441aca0d2c7231d0ced013
Reviewed-on: http://codereview.qt.nokia.com/674
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Leandro Melo
2011-06-23 15:04:01 +02:00
committed by Leandro T. C. Melo
parent 42c9175d19
commit a457124c54
6 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/texteditor/codeassist/genericproposalwidget.cpp
View File

@@ -241,6 +241,7 @@ public:
bool m_isSynchronized;
bool m_explicitlySelected;
AssistReason m_reason;
AssistKind m_kind;
bool m_justInvoked;
QPointer<GenericProposalInfoFrame> m_infoFrame;
QTimer m_infoTimer;
@@ -349,6 +350,11 @@ void GenericProposalWidget::setReason(AssistReason reason)
m_d->m_justInvoked = true;
}
void GenericProposalWidget::setKind(AssistKind kind)
{
m_d->m_kind = kind;
}
void GenericProposalWidget::setUnderlyingWidget(const QWidget *underlyingWidget)
{
setFont(underlyingWidget->font());
@@ -452,6 +458,7 @@ bool GenericProposalWidget::updateAndCheck(const QString &prefix)
}
if (TextEditorSettings::instance()->completionSettings().m_partiallyComplete
&& m_d->m_kind == Completion
&& m_d->m_justInvoked
&& m_d->m_isSynchronized) {
if (m_d->m_model->size() == 1) {