Commit 395ba987 authored by Leandro Melo's avatar Leandro Melo Committed by Leandro T. C. Melo
Browse files

CodeAssist: Relax a bit premature match

In a relatively recent commit (99fee33f)
premature match was setup to work only on explicit invocations. However
this has shown to be too strict. Therefore, it's now a bit relaxed (not
as much as before): If the current item ends with the typed character we
assume  this is intenional - general premature matches do not end with
identifier characters anyway.

Note: Leaving only the last character as the condition is not an option
since sometimes they are not shown in the proposal description.

This patch also lifts the text method to IAssistProposalItem since
it's reasonable the every proposal must have at least some description.

Change-Id: I2ef7de2b7f978ce7059cce50175137a03315f495
Reviewed-on: http://codereview.qt.nokia.com/675

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarChristian Kamm <christian.d.kamm@nokia.com>
parent a457124c
......@@ -61,7 +61,7 @@ void BasicProposalItem::setText(const QString &text)
m_text = text;
}
const QString &BasicProposalItem::text() const
QString BasicProposalItem::text() const
{
return m_text;
}
......
......@@ -52,7 +52,7 @@ public:
const QIcon &icon() const;
void setText(const QString &text);
const QString &text() const;
virtual QString text() const;
void setDetail(const QString &detail);
const QString &detail() const;
......
......@@ -604,12 +604,12 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e)
if (ke->text().length() == 1
&& m_d->m_completionListView->currentIndex().isValid()
&& m_d->m_reason == ExplicitlyInvoked
&& qApp->focusWidget() == o) {
const QChar &typedChar = ke->text().at(0);
IAssistProposalItem *item =
m_d->m_model->proposalItem(m_d->m_completionListView->currentIndex().row());
if (item->prematurelyApplies(typedChar)) {
if (item->prematurelyApplies(typedChar)
&& (m_d->m_reason == ExplicitlyInvoked || item->text().endsWith(typedChar))) {
abort();
emit proposalItemActivated(item);
return true;
......
......@@ -35,9 +35,7 @@
#include <texteditor/texteditor_global.h>
QT_BEGIN_NAMESPACE
class QChar;
QT_END_NAMESPACE
#include <QtCore/QString>
namespace TextEditor {
......@@ -49,6 +47,7 @@ public:
IAssistProposalItem();
virtual ~IAssistProposalItem();
virtual QString text() const = 0;
virtual bool implicitlyApplies() const = 0;
virtual bool prematurelyApplies(const QChar &c) const = 0;
virtual void apply(BaseTextEditor *editor, int basePosition) const = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment