From e394eb6a5c7b82dc651fad1941bf033717104499 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Mon, 5 Oct 2020 22:03:15 +0300
Subject: [PATCH] ComposeTokenizer: try to fix test

---
 .../tusky/util/ComposeTokenizer.kt             | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/util/ComposeTokenizer.kt b/app/src/main/java/com/keylesspalace/tusky/util/ComposeTokenizer.kt
index a16fc97f..aad8abaf 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/ComposeTokenizer.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/ComposeTokenizer.kt
@@ -48,16 +48,20 @@ class ComposeTokenizer : MultiAutoCompleteTextView.Tokenizer {
         // caught domain name, try search username
         // don't ask me about this code
         if(i > 3 && character == '@') {
-            i--
-            character = text[i - 1]
+            var j = i - 1
+            var character2 = text[i - 1]
 
-            while(i > 0 && character != '@') {
-                if(!isMentionOrHashtagAllowedCharacter(character)) {
-                    return cursor
+            while(j > 0 && character2 != '@') {
+                if(!isMentionOrHashtagAllowedCharacter(character2)) {
+                    break
                 }
 
-                i--
-                character = if (i == 0) ' ' else text[i - 1]
+                j--
+                character2 = if (i == 0) ' ' else text[i - 1]
+            }
+            if(character2 == '@') {
+                i = j
+                character = character2
             }
         }