fixing tabcompleter crash in non channel buffers... ooooops

[quassel.git] / src / uisupport / tabcompleter.cpp

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index 3493b29..cd82ee2 100644 (file)
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -27,6 +27,9 @@
 #include "network.h"
 #include "ircchannel.h"
 #include "ircuser.h"
+#include "uisettings.h"
+
+#include <QRegExp>
 
 TabCompleter::TabCompleter(InputLine *inputLine_)
   : QObject(inputLine_),
@@ -34,11 +37,14 @@ TabCompleter::TabCompleter(InputLine *inputLine_)
     enabled(false),
     nickSuffix(": ")
 {
+  inputLine->installEventFilter(this);
 }
 
 void TabCompleter::buildCompletionList() {
-  completionList.clear();
-  nextCompletion = completionList.begin();
+  // ensure a safe state in case we return early.
+  completionMap.clear();
+  nextCompletion = completionMap.begin();
+
   // this is the first time tab is pressed -> build up the completion list and it's iterator
   QModelIndex currentIndex = Client::bufferModel()->currentIndex();
   if(!currentIndex.data(NetworkModel::BufferIdRole).isValid())
@@ -64,16 +70,16 @@ void TabCompleter::buildCompletionList() {
          this, SLOT(ircUserJoinedOrParted(IrcUser *)));
   */
 
-  completionList.clear();
   QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
-  completionList.clear();
+  QRegExp regex(QString("^[^a-zA-Z]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive);
+
   foreach(IrcUser *ircUser, channel->ircUsers()) {
-    if(ircUser->nick().toLower().startsWith(tabAbbrev.toLower())) {
-      completionList << ircUser->nick();
+    if(regex.indexIn(ircUser->nick()) > -1) {
+      completionMap[ircUser->nick().toLower()] = ircUser->nick();
     }
   }
-  completionList.sort();
-  nextCompletion = completionList.begin();
+
+  nextCompletion = completionMap.begin();
   lastCompletionLength = tabAbbrev.length();
 }
 
@@ -83,12 +89,15 @@ void TabCompleter::ircUserJoinedOrParted(IrcUser *ircUser) {
 }
 
 void TabCompleter::complete() {
+  UiSettings uiSettings;
+  nickSuffix = uiSettings.value("CompletionSuffix", QString(": ")).toString();
+  
   if(!enabled) {
     buildCompletionList();
     enabled = true;
   }
   
-  if (nextCompletion != completionList.end()) {
+  if (nextCompletion != completionMap.end()) {
     // clear previous completion
     for (int i = 0; i < lastCompletionLength; i++) {
       inputLine->backspace();
@@ -109,7 +118,10 @@ void TabCompleter::complete() {
 
   // we're at the end of the list -> start over again
   } else {
-    nextCompletion = completionList.begin();
+    if(!completionMap.isEmpty()) {
+      nextCompletion = completionMap.begin();
+      complete();
+    }
   }
   
 }
@@ -118,3 +130,18 @@ void TabCompleter::reset() {
   enabled = false;
 }
 
+bool TabCompleter::eventFilter(QObject *obj, QEvent *event) {
+  if(obj != inputLine || event->type() != QEvent::KeyPress)
+    return QObject::eventFilter(obj, event);
+
+  QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+  
+  if(keyEvent->key() == Qt::Key_Tab) {
+    complete();
+    return true;
+  } else {
+    reset();
+    return false;
+  }
+}
+