From e31accb84886cb7f60fcd359c9bb4b6a0dda4cd3 Mon Sep 17 00:00:00 2001 From: Leandro Melo Date: Tue, 21 Jun 2011 11:06:03 +0200 Subject: [PATCH] Revert "Completion: Apply perfect match whenever not invoked explicitly" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4959f53d2c54515de73cb40c8363cd7ce6d24e03. It seems that usability is better when upon a perfect match the completion popup stays when triggered either explicitly or by an activation character. After all, in general one should need to type something else (semicolon, parenthesis, etc.) anyway for the case of an activation character. This is also consistent with the behavior from previous releases. Change-Id: I1d50230affb1d0642f8f8bfd5cbac69dc52e44bd Reviewed-on: http://codereview.qt.nokia.com/536 Reviewed-by: Thorbjørn Lindeijer --- src/plugins/texteditor/codeassist/genericproposalwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 7ed8e665809..8ee8e26dc4b 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -425,7 +425,7 @@ bool GenericProposalWidget::updateAndCheck(const QString &prefix) if (!prefix.isEmpty()) m_d->m_model->filter(prefix); if (m_d->m_model->size() == 0 - || (m_d->m_reason != ExplicitlyInvoked && hasMatch(prefix, m_d->m_model))) { + || (m_d->m_reason == IdleEditor && hasMatch(prefix, m_d->m_model))) { abort(); return false; }