X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ftabcompleter.cpp;h=88c2f0c6c1e2fe870800d257f72d95505f4845af;hp=2b60cdd6a2930ea367f8a9c86435790880a57e5e;hb=412b5319d090f122ae8c99be6578bc25023c8f24;hpb=bc00bc7bc6137f5f14e53fbaac6c4a0ccdffd8a3

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index 2b60cdd6..88c2f0c6 100644
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -20,13 +20,13 @@
 
 #include "tabcompleter.h"
 
-#include "inputline.h"
-#include "client.h"
 #include "buffermodel.h"
-#include "networkmodel.h"
-#include "network.h"
+#include "client.h"
 #include "ircchannel.h"
 #include "ircuser.h"
+#include "multilineedit.h"
+#include "network.h"
+#include "networkmodel.h"
 #include "uisettings.h"
 
 #include <QRegExp>
@@ -34,19 +34,19 @@
 const Network *TabCompleter::_currentNetwork;
 BufferId TabCompleter::_currentBufferId;
 
-TabCompleter::TabCompleter(InputLine *inputLine_)
-  : QObject(inputLine_),
-    inputLine(inputLine_),
-    enabled(false),
-    nickSuffix(": ")
+TabCompleter::TabCompleter(MultiLineEdit *_lineEdit)
+  : QObject(_lineEdit),
+    _lineEdit(_lineEdit),
+    _enabled(false),
+    _nickSuffix(": ")
 {
-  inputLine->installEventFilter(this);
+  _lineEdit->installEventFilter(this);
 }
 
 void TabCompleter::buildCompletionList() {
   // ensure a safe state in case we return early.
-  completionMap.clear();
-  nextCompletion = completionMap.begin();
+  _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();
@@ -61,8 +61,8 @@ void TabCompleter::buildCompletionList() {
   if(!_currentNetwork)
     return;
 
-  QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
-  QRegExp regex(QString("^[^a-zA-Z]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive);
+  QString tabAbbrev = _lineEdit->text().left(_lineEdit->cursorPosition()).section(QRegExp("[^\\w\\d-_\\[\\]{}|`^.\\\\]"),-1,-1);
+  QRegExp regex(QString("^[-_\\[\\]{}|`^.\\\\]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive);
 
   switch(static_cast<BufferInfo::Type>(currentIndex.data(NetworkModel::BufferTypeRole).toInt())) {
   case BufferInfo::ChannelBuffer:
@@ -72,68 +72,68 @@ void TabCompleter::buildCompletionList() {
         return;
       foreach(IrcUser *ircUser, channel->ircUsers()) {
         if(regex.indexIn(ircUser->nick()) > -1)
-          completionMap[ircUser->nick().toLower()] = ircUser->nick();
+          _completionMap[ircUser->nick().toLower()] = ircUser->nick();
       }
     }
     break;
   case BufferInfo::QueryBuffer:
     if(regex.indexIn(bufferName) > -1)
-      completionMap[bufferName.toLower()] = bufferName;
+      _completionMap[bufferName.toLower()] = bufferName;
   case BufferInfo::StatusBuffer:
     if(!_currentNetwork->myNick().isEmpty() && regex.indexIn(_currentNetwork->myNick()) > -1)
-      completionMap[_currentNetwork->myNick().toLower()] = _currentNetwork->myNick();
+      _completionMap[_currentNetwork->myNick().toLower()] = _currentNetwork->myNick();
     break;
   default:
     return;
   }
 
-  nextCompletion = completionMap.begin();
-  lastCompletionLength = tabAbbrev.length();
+  _nextCompletion = _completionMap.begin();
+  _lastCompletionLength = tabAbbrev.length();
 }
 
 void TabCompleter::complete() {
   TabCompletionSettings s;
-  nickSuffix = s.completionSuffix();
+  _nickSuffix = s.completionSuffix();
 
-  if(!enabled) {
+  if(!_enabled) {
     buildCompletionList();
-    enabled = true;
+    _enabled = true;
   }
 
-  if (nextCompletion != completionMap.end()) {
+  if (_nextCompletion != _completionMap.end()) {
     // clear previous completion
-    for (int i = 0; i < lastCompletionLength; i++) {
-      inputLine->backspace();
+    for (int i = 0; i < _lastCompletionLength; i++) {
+      _lineEdit->backspace();
     }
 
     // insert completion
-    inputLine->insert(*nextCompletion);
+    _lineEdit->insert(*_nextCompletion);
 
     // remember charcount to delete next time and advance to next completion
-    lastCompletionLength = nextCompletion->length();
-    nextCompletion++;
+    _lastCompletionLength = _nextCompletion->length();
+    _nextCompletion++;
 
     // we're completing the first word of the line
-    if(inputLine->cursorPosition() == lastCompletionLength) {
-      inputLine->insert(nickSuffix);
-      lastCompletionLength += nickSuffix.length();
+    if(_lineEdit->cursorPosition() == _lastCompletionLength) {
+      _lineEdit->insert(_nickSuffix);
+      _lastCompletionLength += _nickSuffix.length();
     }
 
   // we're at the end of the list -> start over again
   } else {
-    if(!completionMap.isEmpty()) {
-      nextCompletion = completionMap.begin();
+    if(!_completionMap.isEmpty()) {
+      _nextCompletion = _completionMap.begin();
       complete();
     }
   }
 }
 
 void TabCompleter::reset() {
-  enabled = false;
+  _enabled = false;
 }
 
 bool TabCompleter::eventFilter(QObject *obj, QEvent *event) {
-  if(obj != inputLine || event->type() != QEvent::KeyPress)
+  if(obj != _lineEdit || event->type() != QEvent::KeyPress)
     return QObject::eventFilter(obj, event);
 
   QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);