#include "ircuser.h"
#include "uisettings.h"
+#include <QRegExp>
+
TabCompleter::TabCompleter(InputLine *inputLine_)
: QObject(inputLine_),
inputLine(inputLine_),
}
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())
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();
}
enabled = true;
}
- if (nextCompletion != completionList.end()) {
+ if (nextCompletion != completionMap.end()) {
// clear previous completion
for (int i = 0; i < lastCompletionLength; i++) {
inputLine->backspace();
// we're at the end of the list -> start over again
} else {
- nextCompletion = completionList.begin();
+ if(!completionMap.isEmpty()) {
+ nextCompletion = completionMap.begin();
+ complete();
+ }
}
}