From ed06abebd7eaa13c3153e2dcbdc1f5c03686ddd3 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Thu, 23 Aug 2012 11:27:39 +0200
Subject: [PATCH] scide: AutoCompleter - use more expressive variable names

Signed-off-by: Tim Blechmann <tim@klingt.org>
---
 .../sc-ide/widgets/code_editor/autocompleter.cpp   | 55 +++++++++++-----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/editors/sc-ide/widgets/code_editor/autocompleter.cpp b/editors/sc-ide/widgets/code_editor/autocompleter.cpp
index 013da4e69..93b9bf071 100644
--- a/editors/sc-ide/widgets/code_editor/autocompleter.cpp
+++ b/editors/sc-ide/widgets/code_editor/autocompleter.cpp
@@ -358,18 +358,18 @@ void AutoCompleter::triggerCompletion(bool forceShow)
     }
 
     QTextCursor cursor( mEditor->textCursor() );
-    int cursorPos = cursor.positionInBlock();
+    const int cursorPos = cursor.positionInBlock();
     QTextBlock block( cursor.block() );
     TokenIterator it( block, cursorPos - 1 );
 
     if (!it.isValid())
         return;
 
-    const Token & token = *it;
+    const Token & triggeringToken = *it;
 
-    if (token.type == Token::Class)
+    if (triggeringToken.type == Token::Class)
     {
-        if (token.length < 3)
+        if (triggeringToken.length < 3)
             return;
         mCompletion.type = ClassCompletion;
         mCompletion.pos = it.position();
@@ -381,60 +381,59 @@ void AutoCompleter::triggerCompletion(bool forceShow)
     }
     else {
         // Parse method call
+        TokenIterator classIt, dotIt, methodIt;
 
-        TokenIterator cit, dit, mit;
-
-        if (token.character == '.')
-        {
-            dit = it;
+        if (triggeringToken.character == '.') {
+            dotIt = it;
             --it;
             if (it.type() == Token::Class)
-                cit = it;
+                classIt = it;
             else
                 return;
-            TokenIterator it = dit.next();
-            if (tokenMaybeName(it.type())
-                && it.block() == dit.block()
-                && it->positionInBlock == dit->positionInBlock + 1)
-                    mit = it;
+
+            TokenIterator currentIt = dotIt.next();
+            if (tokenMaybeName(currentIt.type())
+                && currentIt.block() == dotIt.block()
+                && currentIt->positionInBlock == dotIt->positionInBlock + 1)
+                    methodIt = currentIt;
         }
-        else if (tokenMaybeName(token.type))
+        else if (tokenMaybeName(triggeringToken.type))
         {
-            mit = it;
+            methodIt = it;
             --it;
             if (it.isValid() && it->character == '.')
-                dit = it;
+                dotIt = it;
             else
                 return;
             --it;
             if (it.type() == Token::Class)
-                cit = it;
+                classIt = it;
         }
         else
             return;
 
-        if (!cit.isValid() && mit->length < 3)
+        if (!classIt.isValid() && methodIt->length < 3)
             return;
 
-        if (mit.isValid()) {
-            mCompletion.pos = mit.position();
-            mCompletion.len = mit->length;
-            mCompletion.text = tokenText(mit);
+        if (methodIt.isValid()) {
+            mCompletion.pos = methodIt.position();
+            mCompletion.len = methodIt->length;
+            mCompletion.text = tokenText(methodIt);
         }
         else {
-            mCompletion.pos = dit.position() + 1;
+            mCompletion.pos = dotIt.position() + 1;
             mCompletion.len = 0;
             mCompletion.text.clear();
         }
 
-        if (cit.isValid()) {
+        if (classIt.isValid()) {
             mCompletion.contextPos = mCompletion.pos;
-            mCompletion.base = tokenText(cit);
+            mCompletion.base = tokenText(classIt);
             mCompletion.type = ClassMethodCompletion;
         }
         else {
             mCompletion.contextPos = mCompletion.pos + 3;
-            mCompletion.base = tokenText(mit);
+            mCompletion.base = tokenText(methodIt);
             mCompletion.base.truncate(3);
             mCompletion.type = MethodCompletion;
         }
-- 
2.11.4.GIT