From: Stefan Schimanski <sts@lyx.org>
Date: Sun, 16 Nov 2008 17:02:40 +0000 (+0000)
Subject: * complete-accept directly completes if the completion is unique
X-Git-Tag: 2.0.0~7708
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ac14102b7945ad7d57e99f239c0a544a1f0b6963;p=lyx.git

* complete-accept directly completes if the completion is unique

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27564 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index a110bb21e0..776536acd1 100644
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -234,6 +234,24 @@ bool GuiCompleter::inlinePossible(Cursor const & cur) const
 }
 
 
+bool GuiCompleter::uniqueCompletionAvailable() const
+{
+	if (!modelActive_)
+		return false;
+
+	size_t n = popup()->model()->rowCount();
+	if (n > 1 || n == 0)
+		return false;
+
+	// if there is exactly one, we have to check whether it is a 
+	// real completion, i.e. longer than the current prefix.
+	if (completionPrefix() == currentCompletion())
+		return false;
+
+	return true;
+}
+
+
 bool GuiCompleter::completionAvailable() const
 {
 	if (!modelActive_)
@@ -638,7 +656,7 @@ void GuiCompleter::tab()
 	cur.updateFlags(Update::None);
 	
 	// check that inline completion is active
-	if (!inlineVisible()) {
+	if (!inlineVisible() && !uniqueCompletionAvailable()) {
 		// try to activate the inline completion
 		if (cur.inset().inlineCompletionSupported(cur)) {
 			showInline();
@@ -660,6 +678,9 @@ void GuiCompleter::tab()
 		return;
 	}
 	
+	// Make undo possible
+	cur.recordUndo();
+
 	// If completion is active, at least complete by one character
 	docstring prefix = cur.inset().completionPrefix(cur);
 	docstring completion = qstring_to_ucs4(currentCompletion());
@@ -802,7 +823,7 @@ docstring GuiCompleter::longestUniqueCompletion() const
 	if (n == 0)
 		return docstring();
 	QString s = model.data(model.index(0, 0), Qt::EditRole).toString();
-	
+
 	if (modelSorting() == QCompleter::UnsortedModel) {
 		// For unsorted model we cannot do more than iteration.
 		// Iterate through the completions and cut off where s differs
@@ -851,6 +872,8 @@ void GuiCompleter::popupActivated(const QString & completion)
 	Cursor cur = gui_->bufferView().cursor();
 	cur.updateFlags(Update::None);
 	
+	cur.recordUndo();
+
 	docstring prefix = cur.inset().completionPrefix(cur);
 	docstring postfix = qstring_to_ucs4(completion.mid(prefix.length()));
 	cur.inset().insertCompletion(cur, postfix, true);
diff --git a/src/frontends/qt4/GuiCompleter.h b/src/frontends/qt4/GuiCompleter.h
index 46f9a15878..2a17c842e6 100644
--- a/src/frontends/qt4/GuiCompleter.h
+++ b/src/frontends/qt4/GuiCompleter.h
@@ -70,6 +70,8 @@ public:
 	QString currentCompletion() const;
 	///
 	docstring longestUniqueCompletion() const;
+	///
+	bool uniqueCompletionAvailable() const;
 	
 public Q_SLOTS:
 	/// Show the popup.